import UBI java-11-openjdk-11.0.22.0.7-2.el8
This commit is contained in:
eabdullin
parent
c3614d28f7
commit
0f5c02b14e
|
|
@ -1,2 +1,2 @@
|
|||
SOURCES/openjdk-jdk11u-jdk-11.0.21+9.tar.xz
|
||||
SOURCES/openjdk-jdk11u-jdk-11.0.22+7.tar.xz
|
||||
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
ddc652d12c849ca56ef68be500ec71bfe88a5a29 SOURCES/openjdk-jdk11u-jdk-11.0.21+9.tar.xz
|
||||
7694237019564cbd5568e24ffae9754308d13b29 SOURCES/openjdk-jdk11u-jdk-11.0.22+7.tar.xz
|
||||
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
|
|
|
|||
|
|
@ -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 <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 1:11.0.21.0.9-1
|
||||
- Update to jdk-11.0.21+9 (GA)
|
||||
- Update release notes to 11.0.21+9
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
commit 50074a04e62f91faa080b831d9ce343396ead252
|
||||
Author: Andrew John Hughes <andrew@openjdk.org>
|
||||
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;
|
||||
}
|
||||
|
|
@ -330,7 +330,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,
|
||||
|
|
@ -383,7 +383,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
|
||||
|
|
@ -1427,25 +1427,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
|
||||
|
|
@ -1874,8 +1862,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
|
||||
|
|
@ -2504,6 +2490,13 @@ end
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 1:11.0.21.0.9-2
|
||||
- Update to jdk-11.0.21+9 (GA)
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
|
|
|
|||
Loading…
Reference in New Issue