diff --git a/dist b/dist index 5aa45c5bf3f5e5b781981aec176b4910ac39baaf..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_8 +an8 diff --git a/download b/download index 258313e1b60d1e02cfbb6c277118c876c6b28855..56f97f32fdbe909dedd57f280f770be434ab75b2 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -49f8d97c51b5bf38fd420cf7a163fd91 openjdk-jdk11u-jdk-11.0.21+9.tar.xz +492b86b3cb64b98765dbe313fe0ee9ca openjdk-jdk11u-jdk-11.0.22+7.tar.xz 5d441d6217cc75372ca5a0943997cb24 tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/java-11-openjdk-portable.specfile b/java-11-openjdk-portable.specfile index 91f1806298201af3637016ebf303918332c823f2..987161316fd33a000decb43e22675c36c4505f82 100644 --- a/java-11-openjdk-portable.specfile +++ b/java-11-openjdk-portable.specfile @@ -339,7 +339,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 21 +%global updatever 22 %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 7 %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 @@ -673,25 +673,13 @@ Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch ############################################# # -# Patches appearing in 11.0.21 -# -# This section includes patches which are present -# in the listed OpenJDK 11u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# - -############################################# -# -# Patches appearing in 11.0.22 +# Patches appearing in 11.0.23 # # 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 ############################################# # @@ -965,8 +953,6 @@ 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 %patch2002 -p1 # alt-java @@ -1662,6 +1648,22 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 +- Update to jdk-11.0.22+7 (GA) +- Update release notes to 11.0.22+7 +- Switch to GA mode for release +- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** + +* Mon Jan 08 2024 Andrew Hughes - 1:11.0.22.0.6-0.1.ea +- Update to jdk-11.0.22+6 (EA) +- Update release notes to 11.0.22+6 + +* Thu Jan 04 2024 Andrew Hughes - 1:11.0.22.0.1-0.1.ea +- Update to jdk-11.0.22+1 (EA) +- Update release notes to 11.0.22+1 +- Switch to EA mode +- Drop local copy of JDK-8312489 which is now included upstream + * 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 diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 6159d7baeffab35563f48da91892a05ef85e07d9..c0b20f8bb323e6996b019679a5b39e9f337ab33a 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-11-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -336,7 +336,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 21 +%global updatever 22 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -389,7 +389,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 7 # rpmrelease numbering must start at 2 to be later than the 8.6 RPM %global rpmrelease 2 # Settings used by the portable build @@ -1196,7 +1196,7 @@ Provides: java-headless%{?1} = %{epoch}:%{version}-%{release} %define java_devel_rpo() %{expand: # Requires base package -Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # Post requires alternatives to install tool alternatives Requires(post): %{alternatives_requires} @@ -1217,14 +1217,14 @@ Provides: java-sdk%{?1} = %{epoch}:%{version}-%{release} } %define java_static_libs_rpo() %{expand: -Requires: %{name}-devel%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-devel%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} } %define java_jmods_rpo() %{expand: # Requires devel package # as jmods are bytecode, they should be OK without any _isa -Requires: %{name}-devel%{?1} = %{epoch}:%{version}-%{release} +Requires: %{name}-devel%{?1} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-jmods%{?1} = %{epoch}:%{version}-%{release} @@ -1276,7 +1276,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} # Prevent brp-java-repack-jars from being run %global __jar_repack 0 -Name: java-%{javaver}-%{origin} +Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{anolis_release}%{?dist} # Equivalent for the portable build @@ -1291,10 +1291,10 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{anolis_release}%{?dist} # JDK package >= 1.6.0 to 1, and packages referring to JDK virtual # provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". -Epoch: 1 +Epoch: 1 Summary: %{origin_nice} %{featurever} Runtime Environment %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif # HotSpot code is licensed under GPLv2 @@ -1311,8 +1311,8 @@ Group: Development/Languages # The test code includes copies of NSS under the Mozilla Public License v2.0 # The PCSClite headers are under a BSD with advertising license # The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version -License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA -URL: http://openjdk.java.net/ +License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA +URL: http://openjdk.java.net/ # to regenerate source0 (jdk) run update_package.sh @@ -1372,7 +1372,7 @@ Source20: java-%{featurever}-openjdk-portable.specfile ############################################ # Ignore AWTError when assistive technologies are loaded -Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch +Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch # NSS via SunPKCS11 Provider (disabled due to memory leak). Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch # RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639) @@ -1419,7 +1419,7 @@ Patch1001: fips-11u-%{fipsver}.patch # be reviewed & pushed to the current development # tree of OpenJDK. ############################################# -Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch +Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch ############################################# # @@ -1434,25 +1434,13 @@ Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch ############################################# # -# Patches appearing in 11.0.21 -# -# This section includes patches which are present -# in the listed OpenJDK 11u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# - -############################################# -# -# Patches appearing in 11.0.22 +# Patches appearing in 11.0.23 # # 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 BuildRequires: autoconf BuildRequires: automake @@ -1543,7 +1531,7 @@ The %{origin_nice} %{featurever} runtime environment. %package slowdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_rpo -- %{debug_suffix_unquoted}} @@ -1556,7 +1544,7 @@ The %{origin_nice} %{featurever} runtime environment. %package fastdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_rpo -- %{fastdebug_suffix_unquoted}} @@ -1569,7 +1557,7 @@ The %{origin_nice} %{featurever} runtime environment. %package headless Summary: %{origin_nice} %{featurever} Headless Runtime Environment %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_headless_rpo %{nil}} @@ -1581,7 +1569,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup %if %{include_debug_build} %package headless-slowdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on} -Group: Development/Languages +Group: Development/Languages %{java_headless_rpo -- %{debug_suffix_unquoted}} @@ -1593,7 +1581,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup %if %{include_fastdebug_build} %package headless-fastdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on} -Group: Development/Languages +Group: Development/Languages %{java_headless_rpo -- %{fastdebug_suffix_unquoted}} @@ -1606,7 +1594,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup %package devel Summary: %{origin_nice} %{featurever} Development Environment %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_devel_rpo %{nil}} @@ -1619,7 +1607,7 @@ The %{origin_nice} %{featurever} development tools. %package devel-slowdebug Summary: %{origin_nice} %{featurever} Development Environment %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_devel_rpo -- %{debug_suffix_unquoted}} @@ -1632,7 +1620,7 @@ The %{origin_nice} %{featurever} development tools. %if %{include_fastdebug_build} %package devel-fastdebug Summary: %{origin_nice} %{featurever} Development Environment %{fastdebug_on} -Group: Development/Tools +Group: Development/Tools %{java_devel_rpo -- %{fastdebug_suffix_unquoted}} @@ -1682,7 +1670,7 @@ The %{origin_nice} %{featurever} libraries for static linking. %package jmods Summary: JMods for %{origin_nice} %{featurever} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_jmods_rpo %{nil}} @@ -1695,7 +1683,7 @@ The JMods for %{origin_nice} %{featurever}. %package jmods-slowdebug Summary: JMods for %{origin_nice} %{featurever} %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_jmods_rpo -- %{debug_suffix_unquoted}} @@ -1708,7 +1696,7 @@ The JMods for %{origin_nice} %{featurever}. %if %{include_fastdebug_build} %package jmods-fastdebug Summary: JMods for %{origin_nice} %{featurever} %{fastdebug_on} -Group: Development/Tools +Group: Development/Tools %{java_jmods_rpo -- %{fastdebug_suffix_unquoted}} @@ -1721,7 +1709,7 @@ The JMods for %{origin_nice} %{featurever}. %package demo Summary: %{origin_nice} %{featurever} Demos %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_demo_rpo %{nil}} @@ -1734,7 +1722,7 @@ The %{origin_nice} %{featurever} demos. %package demo-slowdebug Summary: %{origin_nice} %{featurever} Demos %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_demo_rpo -- %{debug_suffix_unquoted}} @@ -1747,7 +1735,7 @@ The %{origin_nice} %{featurever} demos. %if %{include_fastdebug_build} %package demo-fastdebug Summary: %{origin_nice} %{featurever} Demos %{fastdebug_on} -Group: Development/Languages +Group: Development/Languages %{java_demo_rpo -- %{fastdebug_suffix_unquoted}} @@ -1760,7 +1748,7 @@ The %{origin_nice} %{featurever} demos. %package src Summary: %{origin_nice} %{featurever} Source Bundle %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_src_rpo %{nil}} @@ -1774,7 +1762,7 @@ class library source code for use by IDE indexers and debuggers. %package src-slowdebug Summary: %{origin_nice} %{featurever} Source Bundle %{for_debug} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_src_rpo -- %{debug_suffix_unquoted}} @@ -1787,7 +1775,7 @@ The %{compatiblename}-src-slowdebug sub-package contains the complete %{origin_n %if %{include_fastdebug_build} %package src-fastdebug Summary: %{origin_nice} %{featurever} Source Bundle %{for_fastdebug} -Group: Development/Languages +Group: Development/Languages %{java_src_rpo -- %{fastdebug_suffix_unquoted}} @@ -1800,7 +1788,7 @@ The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_n %package javadoc Summary: %{origin_nice} %{featurever} API documentation %if 0%{?rhel} <= 8 -Group: Documentation +Group: Documentation %endif Requires: javapackages-filesystem Obsoletes: javadoc-debug @@ -1813,7 +1801,7 @@ The %{origin_nice} %{featurever} API documentation. %package javadoc-zip Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive %if 0%{?rhel} <= 8 -Group: Documentation +Group: Documentation %endif Requires: javapackages-filesystem Obsoletes: javadoc-zip-debug @@ -1881,8 +1869,6 @@ 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 %patch2002 -p1 # alt-java @@ -2513,11 +2499,19 @@ end %endif %changelog -* Fri Nov 03 2023 Leslie Zhai - 1:11.0.21.0.9-2.0.2 -- Init 11.0.21.0.9 for LoongArch64 - -* Fri Nov 03 2023 Zhao Hang - 1:11.0.21.0.9-2.0.2 +* Mon Jan 22 2024 Zhao Hang - 1:11.0.22.0.7-2.0.1 - Update version for dependecy +- Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) + +* Thu Jan 18 2024 Release Engineering - 11.0.22.0.7-2 +- Build for Rocky Linux %{rocky} using our own portable + +* Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 +- Update to jdk-11.0.22+7 (GA) +- Sync the copy of the portable specfile with the latest update +- Drop local copy of JDK-8312489 which is now included upstream +- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** +- Resolves: RHEL-20981 * Fri Oct 13 2023 Andrew Hughes - 1:11.0.21.0.9-2 - Update to jdk-11.0.21+9 (GA) diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch deleted file mode 100644 index e0c4eebbe08e9880ea323a7db97b4c1b566acf38..0000000000000000000000000000000000000000 --- a/jdk8312489-max_sig_default_increase.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 50074a04e62f91faa080b831d9ce343396ead252 -Author: Andrew John Hughes -Date: Tue Sep 5 20:48:42 2023 +0000 - - 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar - - Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750 - -diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java -index cb7e308e0d..cce897c0d3 100644 ---- a/src/java.base/share/classes/java/util/jar/JarFile.java -+++ b/src/java.base/share/classes/java/util/jar/JarFile.java -@@ -809,7 +809,9 @@ class JarFile extends ZipFile { - throw new IOException("Unsupported size: " + uncompressedSize + - " for JarEntry " + ze.getName() + - ". Allowed max size: " + -- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes"); -+ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " + -+ "You can use the jdk.jar.maxSignatureFileSize " + -+ "system property to increase the default value."); - } - int len = (int)uncompressedSize; - int bytesRead; -diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -index cb477fc134..a766b8249f 100644 ---- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -+++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -@@ -852,16 +852,16 @@ public class SignatureFileVerifier { - * the maximum allowed number of bytes for the signature-related files - * in a JAR file. - */ -- Integer tmp = GetIntegerAction.privilegedGetProperty( -- "jdk.jar.maxSignatureFileSize", 8000000); -+ int tmp = GetIntegerAction.privilegedGetProperty( -+ "jdk.jar.maxSignatureFileSize", 16000000); - if (tmp < 0 || tmp > MAX_ARRAY_SIZE) { - if (debug != null) { -- debug.println("Default signature file size 8000000 bytes " + -- "is used as the specified size for the " + -- "jdk.jar.maxSignatureFileSize system property " + -+ debug.println("The default signature file size of 16000000 bytes " + -+ "will be used for the jdk.jar.maxSignatureFileSize " + -+ "system property since the specified value " + - "is out of range: " + tmp); - } -- tmp = 8000000; -+ tmp = 16000000; - } - return tmp; - }