From 26c5602993336a4f7f3be14e7b40ec0aa138b2d1 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 17 Jul 2024 02:27:12 +0000 Subject: [PATCH] import UBI java-11-openjdk-11.0.24.0.8-2.el9 --- .gitignore | 2 +- .java-11-openjdk.metadata | 2 +- SOURCES/java-11-openjdk-portable.specfile | 47 ++++++++++++++++++----- SPECS/java-11-openjdk.spec | 21 ++++++++-- 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 12afc47..2220563 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openjdk-jdk11u-jdk-11.0.23+9.tar.xz +SOURCES/openjdk-jdk11u-jdk-11.0.24+8.tar.xz SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/.java-11-openjdk.metadata b/.java-11-openjdk.metadata index fc82b41..3acaed9 100644 --- a/.java-11-openjdk.metadata +++ b/.java-11-openjdk.metadata @@ -1,2 +1,2 @@ -db99bc0a0912f824db1043d18b199c154d57bb5b SOURCES/openjdk-jdk11u-jdk-11.0.23+9.tar.xz +429facc8a28a96db15d2f08bc6eb5179cc465b70 SOURCES/openjdk-jdk11u-jdk-11.0.24+8.tar.xz c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/SOURCES/java-11-openjdk-portable.specfile b/SOURCES/java-11-openjdk-portable.specfile index fc196d3..386d352 100644 --- a/SOURCES/java-11-openjdk-portable.specfile +++ b/SOURCES/java-11-openjdk-portable.specfile @@ -339,7 +339,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 23 +%global updatever 24 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -392,7 +392,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 +%global buildver 8 %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 @@ -746,6 +746,7 @@ BuildRequires: harfbuzz-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h Provides: bundled(freetype) = 2.13.2 @@ -754,11 +755,13 @@ Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.15.0 +Provides: bundled(lcms2) = 2.16.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h Provides: bundled(libjpeg) = 6b # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h Provides: bundled(libpng) = 1.6.40 +# Version in src/java.base/share/native/libzip/zlib/zlib.h +Provides: bundled(zlib) = 1.3.1 # We link statically against libstdc++ to increase portability BuildRequires: libstdc++-static %endif @@ -948,18 +951,18 @@ sh %{SOURCE12} %{top_level_dir_name} # Patch the JDK pushd %{top_level_dir_name} -%patch1 -p1 -%patch3 -p1 +%patch -P1 -p1 +%patch -P3 -p1 # Add crypto policy and FIPS support -%patch1001 -p1 +%patch -P1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security -%patch1000 -p1 +%patch -P1000 -p1 # PKCS11 SHA3 backport -%patch2002 -p1 +%patch -P2002 -p1 # alt-java -%patch600 -p1 +%patch -P600 -p1 # RSA default -%patch1003 -p1 +%patch -P1003 -p1 popd # openjdk @@ -1646,6 +1649,30 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Wed Jul 10 2024 Andrew Hughes - 1:11.0.24.0.8-2 +- Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes + +* Wed Jul 10 2024 Anton Bobrov - 1:11.0.24.0.8-1 +- Update to jdk-11.0.24+8 (GA) +- Update release notes to 11.0.24+8 +- Switch to GA mode for release +- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** + +* Mon Jun 24 2024 Anton Bobrov - 1:11.0.24.0.6-0.2.ea +- Add zlib build required or bundled version (1.3.1), depending on system_libs setting +- Related: OPENJDK-3066 + +* Thu Jun 06 2024 Anton Bobrov - 1:11.0.24.0.6-0.1.ea +- Update to jdk-11.0.24+6 (EA) +- Update release notes to 11.0.24+6 +- Switch to EA mode +- Update LCMS to 2.16 (JDK-8321489) +- Improve VCS exclusion in generate_source_tarball.sh script +- Bring outdated patch macros in the spec file up to date + +* Thu Apr 18 2024 Andrew Hughes - 1:11.0.23.0.9-3 +- Sync release notes with upstream version: https://bit.ly/openjdk11023 + * Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 - Fix 11.0.22 release date in NEWS diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec index f83f9d6..060c6c8 100644 --- a/SPECS/java-11-openjdk.spec +++ b/SPECS/java-11-openjdk.spec @@ -330,7 +330,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 23 +%global updatever 24 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -383,9 +383,9 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 +%global buildver 8 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 3 +%global rpmrelease 2 # Settings used by the portable build %global portablerelease 2 %global portablerhel 8 @@ -1501,6 +1501,7 @@ BuildRequires: harfbuzz-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h Provides: bundled(freetype) = 2.13.2 @@ -1509,11 +1510,13 @@ Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.15.0 +Provides: bundled(lcms2) = 2.16.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h Provides: bundled(libjpeg) = 6b # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h Provides: bundled(libpng) = 1.6.40 +# Version in src/java.base/share/native/libzip/zlib/zlib.h +Provides: bundled(zlib) = 1.3.1 %endif # this is always built, also during debug-only build @@ -2467,6 +2470,16 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jul 10 2024 Anton Bobrov - 1:11.0.24.0.8-1 +- Update to jdk-11.0.24+8 (GA) +- Update release notes to 11.0.24+8 +- Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes +- Switch to GA mode for release +- Fix Provides to reflect up to date component versions +- Add zlib build required or bundled version (1.3.1), depending on system_libs setting +- Resolves: RHEL-45202 +- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** + * Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 - Fix 11.0.22 release date in NEWS