From c05f889a949012108f856993c75d6570a1904162 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 17 Jan 2024 19:38:22 +0000 Subject: [PATCH] import UBI java-1.8.0-openjdk-1.8.0.402.b06-2.el8 --- .gitignore | 2 +- .java-1.8.0-openjdk.metadata | 2 +- SOURCES/java-1.8.0-openjdk-portable.specfile | 19 ++++++-- .../jdk8312489-max_sig_default_increase.patch | 48 ------------------- SPECS/java-1.8.0-openjdk.spec | 32 ++++++++----- 5 files changed, 36 insertions(+), 67 deletions(-) delete mode 100644 SOURCES/jdk8312489-max_sig_default_increase.patch diff --git a/.gitignore b/.gitignore index 00e22cb..c5c84f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u392-b08.tar.xz +SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u402-b06.tar.xz SOURCES/tapsets-icedtea-3.15.0.tar.xz diff --git a/.java-1.8.0-openjdk.metadata b/.java-1.8.0-openjdk.metadata index 53c78a9..7711961 100644 --- a/.java-1.8.0-openjdk.metadata +++ b/.java-1.8.0-openjdk.metadata @@ -1,2 +1,2 @@ -2ca27b0d535c9dcf71679cad14be5660d0554f82 SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u392-b08.tar.xz +0ca0a2433bfd7aa62a21fc37c8079f540e672a9c SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u402-b06.tar.xz 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz diff --git a/SOURCES/java-1.8.0-openjdk-portable.specfile b/SOURCES/java-1.8.0-openjdk-portable.specfile index eaa8267..1231da3 100644 --- a/SOURCES/java-1.8.0-openjdk-portable.specfile +++ b/SOURCES/java-1.8.0-openjdk-portable.specfile @@ -267,7 +267,7 @@ # Define version of OpenJDK 8 used %global project openjdk %global repo shenandoah-jdk8u -%global openjdk_revision jdk8u392-b08 +%global openjdk_revision jdk8u402-b06 %global shenandoah_revision shenandoah-%{openjdk_revision} # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 3.15.0 @@ -597,8 +597,6 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch Patch581: jdk8257794-remove_broken_assert.patch # JDK-8186464, RH1433262: ZipFile cannot read some InfoZip ZIP64 zip files Patch12: jdk8186464-rh1433262-zip64_failure.patch -# 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 ############################################# # @@ -869,8 +867,6 @@ pushd %{top_level_dir_name} %patch1000 -p1 # system cacerts support %patch539 -p1 -# JDK-8312489 backport, proposed for 8u402: https://github.com/openjdk/jdk8u-dev/pull/381 -%patch2000 -p1 popd # RPM-only fixes @@ -1500,6 +1496,19 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Thu Jan 11 2024 Andrew Hughes - 1:1.8.0.402.b06-0.1.ea +- Update to shenandoah-jdk8u402-b06 (GA) +- Update release notes for shenandoah-8u402-b06. +- Drop local copy of JDK-8312489 which is now included upstream +- Switch to GA mode. +- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** + +* Tue Dec 05 2023 Andrew Hughes - 1:1.8.0.402.b01-0.1.ea +- Update to shenandoah-jdk8u402-b01 (EA) +- Update release notes for shenandoah-8u402-b01. +- Switch to EA mode. +- Sync NEWS with vanilla branch version. + * Wed Oct 11 2023 Andrew Hughes - 1:1.8.0.392.b08-1 - Update to shenandoah-jdk8u392-b08 (GA) - Update release notes for shenandoah-8u392-b08. diff --git a/SOURCES/jdk8312489-max_sig_default_increase.patch b/SOURCES/jdk8312489-max_sig_default_increase.patch deleted file mode 100644 index adf9e09..0000000 --- a/SOURCES/jdk8312489-max_sig_default_increase.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit c38a36f124a7eb28920cc367cb01b67d973a55c0 -Author: Andrew John Hughes -Date: Wed Oct 11 01:42:03 2023 +0100 - - Backport e47a84f23dd2608c6f5748093eefe301fb5bf750 - -diff --git a/jdk/src/share/classes/java/util/jar/JarFile.java b/jdk/src/share/classes/java/util/jar/JarFile.java -index a26dcc4a1c7..ac2e1c9d6a8 100644 ---- a/jdk/src/share/classes/java/util/jar/JarFile.java -+++ b/jdk/src/share/classes/java/util/jar/JarFile.java -@@ -436,7 +436,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; - byte[] b = IOUtils.readAllBytes(is); -diff --git a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java -index c335e964f63..afdfa406b92 100644 ---- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java -+++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java -@@ -855,16 +855,16 @@ public class SignatureFileVerifier { - * the maximum allowed number of bytes for the signature-related files - * in a JAR file. - */ -- Integer tmp = AccessController.doPrivileged(new GetIntegerAction( -- "jdk.jar.maxSignatureFileSize", 8000000)); -+ int tmp = AccessController.doPrivileged(new GetIntegerAction( -+ "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; - } diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec index 719c109..beafcaa 100644 --- a/SPECS/java-1.8.0-openjdk.spec +++ b/SPECS/java-1.8.0-openjdk.spec @@ -297,7 +297,7 @@ # Define version of OpenJDK 8 used %global project openjdk %global repo shenandoah-jdk8u -%global openjdk_revision jdk8u392-b08 +%global openjdk_revision jdk8u402-b06 %global shenandoah_revision shenandoah-%{openjdk_revision} # Define IcedTea version used for SystemTap tapsets and desktop files %global icedteaver 3.15.0 @@ -343,7 +343,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 4 +%global rpmrelease 2 # Settings used by the portable build %global portablerelease 1 %global portablesuffix el8 @@ -1136,8 +1136,8 @@ Provides: java-%{javaver}%{?1} = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}%{?1} = %{epoch}:%{version}-%{release} -Provides: java%{?1} = %{epoch}:%{version}-%{release} -Provides: jre%{?1} = %{epoch}:%{version}-%{release} +Provides: java%{?1} = %{epoch}:%{javaver} +Provides: jre%{?1} = %{epoch}:%{javaver} %endif } @@ -1185,8 +1185,8 @@ Provides: java-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release} -Provides: jre-headless%{?1} = %{epoch}:%{version}-%{release} -Provides: java-headless%{?1} = %{epoch}:%{version}-%{release} +Provides: jre-headless%{?1} = %{epoch}:%{javaver} +Provides: java-headless%{?1} = %{epoch}:%{javaver} %endif # https://bugzilla.redhat.com/show_bug.cgi?id=1312019 @@ -1215,8 +1215,8 @@ Provides: java-%{javaver}-%{origin}-devel%{?1} = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{origin}%{?1} = %{epoch}:%{version}-%{release} -Provides: java-devel%{?1} = %{epoch}:%{version}-%{release} -Provides: java-sdk%{?1} = %{epoch}:%{version}-%{release} +Provides: java-devel%{?1} = %{epoch}:%{javaver} +Provides: java-sdk%{?1} = %{epoch}:%{javaver} %endif } @@ -1479,8 +1479,6 @@ Patch203: jdk8042159-allow_using_system_installed_lcms2-root.patch Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch # JDK-8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32 Patch581: jdk8257794-remove_broken_assert.patch -# 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 ############################################# # @@ -1929,8 +1927,6 @@ pushd %{top_level_dir_name} %patch1000 -p1 # system cacerts support %patch539 -p1 -# JDK-8312489 backport, proposed for 8u402: https://github.com/openjdk/jdk8u-dev/pull/381 -%patch2000 -p1 popd # RPM-only fixes @@ -2636,6 +2632,18 @@ cjc.mainProgram(args) %endif %changelog +* Thu Jan 11 2024 Andrew Hughes - 1:1.8.0.402.b06-0.2.ea +- Update to shenandoah-jdk8u402-b06 (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-21477 +- Resolves: RHEL-20975 + +* Sat Dec 16 2023 Andrew Hughes - 1:1.8.0.392.b08-5 +- Restore %%{epoch}:%%{javaver} versioning to jre, java, jre-headless, java-headless, java-devel & java-sdk +- Resolves: RHEL-19636 + * Mon Oct 16 2023 Andrew Hughes - 1:1.8.0.392.b08-4 - Revert jcmd move as jcmd will not operate without tools.jar - Related: RHEL-13612