From 6ea7c1f5f6dd41c9aa154a602c683e482fd4bc18 Mon Sep 17 00:00:00 2001 From: tigro Date: Thu, 19 Oct 2023 21:17:14 +0300 Subject: [PATCH] Update changelog --- SPECS/java-11-openjdk-portable.spec | 93 +++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 24 deletions(-) diff --git a/SPECS/java-11-openjdk-portable.spec b/SPECS/java-11-openjdk-portable.spec index 258e031..91f1806 100644 --- a/SPECS/java-11-openjdk-portable.spec +++ b/SPECS/java-11-openjdk-portable.spec @@ -339,7 +339,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 20 +%global updatever 21 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -367,7 +367,7 @@ %global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{component}&version=%{fedora} %else %if 0%{?rhel} -%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{component} +%global oj_vendor_bug_url https://access.redhat.com/support/cases/ %else %global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi %endif @@ -378,15 +378,22 @@ # 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 b34fb09a5c +%global fipsver f93a863b56 +# Define JDK versions +%global javaver %{featurever} +%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} +# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames +%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn}) +# The tag used to create the OpenJDK tarball +%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}} # Standard JPackage naming and versioning defines %global origin openjdk %global origin_nice OpenJDK -%global top_level_dir_name %{origin} +%global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 8 -%global rpmrelease 2 +%global buildver 9 +%global rpmrelease 1 #%%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 @@ -400,15 +407,6 @@ # for techpreview, using 1, so slowdebugs can have 0 %global priority %( printf '%08d' 1 ) %endif -%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} - -# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames -%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn}) - -# The tag used to create the OpenJDK tarball -%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}} - -%global javaver %{featurever} # Define milestone (EA for pre-releases, GA for releases) # Release will be (where N is usually a number starting at 1): @@ -568,7 +566,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: openjdk-jdk%{featurever}u-%{vcstag}-4curve.tar.xz +Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). @@ -671,11 +669,11 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk1 # need to be reviewed & pushed to the appropriate # updates tree of OpenJDK. ############################################# -Patch2001: jdk8242332-rh2108712-sha3-sunpkcs11.patch +Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch ############################################# # -# Patches appearing in 11.0.20 +# Patches appearing in 11.0.21 # # This section includes patches which are present # in the listed OpenJDK 11u release and should be @@ -683,6 +681,18 @@ Patch2001: jdk8242332-rh2108712-sha3-sunpkcs11.patch # and used by this RPM. ############################################# +############################################# +# +# Patches appearing in 11.0.22 +# +# This section includes patches which are present +# in the listed OpenJDK 8u release and should be +# able to be removed once that release is out +# and used by this RPM. +############################################# +# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar +Patch2000: jdk8312489-max_sig_default_increase.patch + ############################################# # # Portable build specific patches @@ -749,17 +759,17 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.12.1 +Provides: bundled(freetype) = 2.13.0 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 7.0.1 +Provides: bundled(harfbuzz) = 7.2.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.15.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.37 +Provides: bundled(libpng) = 1.6.39 # We link statically against libstdc++ to increase portability BuildRequires: libstdc++-static %endif @@ -955,12 +965,16 @@ pushd %{top_level_dir_name} %patch1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security %patch1000 -p1 +# JDK-8312489 backport, coming in 11.0.22 +%patch2000 -p1 # PKCS11 SHA3 backport -%patch2001 -p1 +%patch2002 -p1 +# alt-java +%patch600 -p1 +# RSA default +%patch1003 -p1 popd # openjdk -%patch600 -%patch1003 # Extract systemtap tapsets %if %{with_systemtap} @@ -1648,6 +1662,37 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Wed Oct 11 2023 Andrew Hughes - 1:11.0.21.0.9-1 +- Update to jdk-11.0.21+9 (GA) +- Update release notes to 11.0.21+9 +- Switch to GA mode for release +- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2 +- Bump freetype version to 2.13.0 following JDK-8306881 +- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. ** + +* Thu Oct 05 2023 Andrew Hughes - 1:11.0.21.0.1-0.1.ea +- Update to jdk-11.0.21+1 (EA) +- Update release notes to 11.0.21+1 +- Switch to EA mode +- Re-generate FIPS patch against 11.0.21+1 following backport of JDK-8155246 +- Re-generate SHA3 patch following backport of JDK-8242151 +- Bump libpng version to 1.6.39 following JDK-8305815 +- Bump HarfBuzz version to 7.2.0 following JDK-8307301 +- Update generate_tarball.sh to be closer to upstream vanilla script inc. no more ECC removal +- Update bug URL for RHEL to point to the Red Hat customer portal +- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball +- Apply all patches using -p1 + +* Tue Sep 05 2023 Andrew Hughes - 1:11.0.20.1.1-1 +- Update to jdk-11.0.20.1+1 (GA) +- Update release notes to 11.0.20.1+1 +- Add backport of JDK-8312489 already upstream in 11.0.22 (see OPENJDK-2095) +- Add backport of JDK-8243210 already upstream in 11.0.21 (see RH2229269) +- Update openjdk_news script to specify subdirectory last +- Add missing discover_trees script required by openjdk_news +- Update README.md to match the version in later RHEL releases +- Resolves: rhbz#2236589 + * Fri Jul 14 2023 Andrew Hughes - 1:11.0.20.0.8-1 - Update to jdk-11.0.20.0+8 (GA) - Update release notes to 11.0.20.0+8