From 7979a0f2397bbcc2e041771a5a068fca379a0cdb Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 11 Feb 2026 11:45:29 -0500 Subject: [PATCH] Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 - Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 --- java-17-openjdk-portable.specfile | 18 ++++++++++++++++-- java-17-openjdk.spec | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index 921dd75..0aa8141 100644 --- a/java-17-openjdk-portable.specfile +++ b/java-17-openjdk-portable.specfile @@ -365,7 +365,7 @@ # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 6.0.0pre00-c848b93a8598 # Define current Git revision for the FIPS support patches -%global fipsver df4c415ac9a +%global fipsver e1780dd5d39 # Define JDK versions %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} %global javaver %{featurever} @@ -380,7 +380,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 8 -%global rpmrelease 1 +%global rpmrelease 2 #%%global tagsuffix %%{nil} # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk @@ -662,6 +662,7 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d # test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class (#27) # RH1940064: Enable XML Signature provider in FIPS mode (#24) # RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized (#26) +# OPENJDK-4398: Update nss.fips.cfg to grant CKA_SIGN and CKA_ENCRYPT to any CKO_SECRET_KEY (#44) Patch1001: fips-%{featurever}u-%{fipsver}.patch ############################################# @@ -1590,6 +1591,11 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR %endif +# Check blocked.certs is valid (OPENJDK-4362) +jtreg_test=$(pwd)/%{top_level_dir_name}/test/jdk/sun/security/lib/CheckBlockedCerts.java +jtreg_dir=$(dirname ${jtreg_test}) +$JAVA_HOME/bin/java --add-exports java.base/sun.security.util=ALL-UNNAMED -Dtest.src=${jtreg_dir} ${jtreg_test} + # Check src.zip has all sources. See RHBZ#1130490 unzip -l $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' @@ -1832,6 +1838,14 @@ done %endif %changelog +* Wed Feb 11 2026 Andrew Hughes - 1:17.0.18.0.8-2 +- Add test to ensure blocked.certs is valid (OPENJDK-4362) +- Handle 'upgrade' as an alternative to 'update' in openjdk_news.sh + +* Wed Feb 11 2026 Thomas Fitzsimmons - 1:17.0.18.0.8-2 +- Set rpmrelease to 2 +- Set fipsver to e1780dd5d39 + * Fri Jan 16 2026 Thomas Fitzsimmons - 1:17.0.18.0.8-1 - Update to jdk-17.0.18+8 (GA) - Add to .gitignore openjdk-17.0.18+8.tar.xz diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 88525d4..b96183e 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -2512,6 +2512,7 @@ cjc.mainProgram(args) %changelog * Wed Feb 11 2026 Thomas Fitzsimmons - 1:17.0.18.0.8-2 - Set rpmrelease to 2 +- Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 * Fri Jan 16 2026 Thomas Fitzsimmons - 1:17.0.18.0.8-1 - Update to jdk-17.0.18+8 (GA)