rpms/java-17-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c8' into a8-portable

Browse Source
This commit is contained in:
eabdullin 2024-07-17 22:18:03 +03:00
commit bb99f1ff2f
5 changed files with 267 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/openjdk-17.0.11+9.tar.xz SOURCES/openjdk-17.0.12+7.tar.xz
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz

2
.java-17-openjdk.metadata
View File

@ -1,2 +1,2 @@
540d8b5c8775178dabc5b1d8b779527512b4dad1 SOURCES/openjdk-17.0.11+9.tar.xz c2066250e6821d30ff4bd1cecb6a0edb95aa73be SOURCES/openjdk-17.0.12+7.tar.xz
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz

37
SOURCES/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch Normal file
View File

@ -0,0 +1,37 @@
From 859dda14f3f0d90294899812f5d34ea2e952a3df Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Wed, 26 Jun 2024 10:47:13 +0000
Subject: [PATCH] 8332174: Remove 2 (unpaired) RLO Unicode characters in
ff_Adlm.xml
Reviewed-by: andrew
Backport-of: d5363bc509d4996529420b453a99e982c843da1c
---
make/data/cldr/common/main/ff_Adlm.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make/data/cldr/common/main/ff_Adlm.xml b/make/data/cldr/common/main/ff_Adlm.xml
index 02feba420c8..05bb2c6db95 100644
--- a/make/data/cldr/common/main/ff_Adlm.xml
+++ b/make/data/cldr/common/main/ff_Adlm.xml
@@ -272,7 +272,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<territory type="BS">𞤄𞤢𞤸𞤢𞤥𞤢𞥄𞤧</territory>
<territory type="BT">𞤄𞤵𞥅𞤼𞤢𞥄𞤲</territory>
<territory type="BV">𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅</territory>
- <territory type="BW">‮𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
+ <territory type="BW">𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
<territory type="BY">𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧</territory>
<territory type="BZ">𞤄𞤫𞤤𞤭𞥅𞥁</territory>
<territory type="CA">𞤑𞤢𞤲𞤢𞤣𞤢𞥄</territory>
@@ -2245,7 +2245,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<exemplarCity>𞤐𞤵𞥅𞤳</exemplarCity>
</zone>
<zone type="America/Scoresbysund">
- <exemplarCity>‮𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
+ <exemplarCity>𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
</zone>
<zone type="America/Danmarkshavn">
<exemplarCity>𞤁𞤢𞥄𞤲𞤥𞤢𞤪𞤳𞥃𞤢𞥄𞤾𞤲</exemplarCity>
--
2.44.0

55
SOURCES/fips-17u-d63771ea660.patch → SOURCES/fips-17u-e893be00150.patch
View File

@ -136,10 +136,10 @@ index 62db5b16c31..f0bb4333fc9 100644
BASIC_JDKLIB_LIBS="" BASIC_JDKLIB_LIBS=""
if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 537c3e3043c..16ad3df6f09 100644 index 807ba27589b..47cb6b7753b 100644
--- a/make/autoconf/spec.gmk.in --- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in +++ b/make/autoconf/spec.gmk.in
@@ -841,6 +841,11 @@ INSTALL_SYSCONFDIR=@sysconfdir@ @@ -844,6 +844,11 @@ INSTALL_SYSCONFDIR=@sysconfdir@
# Libraries # Libraries
# #
@ -2508,7 +2508,7 @@ index 00000000000..dc8bc72fccb
+ } + }
+} +}
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index 9be02033877..4dd055a9ccf 100644 index 8f6e1e12a7e..2726391bcea 100644
--- a/src/java.base/share/conf/security/java.security --- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security +++ b/src/java.base/share/conf/security/java.security
@@ -82,6 +82,17 @@ security.provider.tbd=Apple @@ -82,6 +82,17 @@ security.provider.tbd=Apple
@ -2606,10 +2606,10 @@ index 00000000000..55bbba98b7a
+attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true } +attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true }
+ +
diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy
index b22f26947af..02bea84e210 100644 index 4e3c326cb2f..c39faee2f43 100644
--- a/src/java.base/share/lib/security/default.policy --- a/src/java.base/share/lib/security/default.policy
+++ b/src/java.base/share/lib/security/default.policy +++ b/src/java.base/share/lib/security/default.policy
@@ -121,6 +121,7 @@ grant codeBase "jrt:/jdk.charsets" { @@ -123,6 +123,7 @@ grant codeBase "jrt:/jdk.charsets" {
grant codeBase "jrt:/jdk.crypto.ec" { grant codeBase "jrt:/jdk.crypto.ec" {
permission java.lang.RuntimePermission permission java.lang.RuntimePermission
"accessClassInPackage.sun.security.*"; "accessClassInPackage.sun.security.*";
@ -2617,7 +2617,7 @@ index b22f26947af..02bea84e210 100644
permission java.lang.RuntimePermission "loadLibrary.sunec"; permission java.lang.RuntimePermission "loadLibrary.sunec";
permission java.security.SecurityPermission "putProviderProperty.SunEC"; permission java.security.SecurityPermission "putProviderProperty.SunEC";
permission java.security.SecurityPermission "clearProviderProperties.SunEC"; permission java.security.SecurityPermission "clearProviderProperties.SunEC";
@@ -130,6 +131,7 @@ grant codeBase "jrt:/jdk.crypto.ec" { @@ -132,6 +133,7 @@ grant codeBase "jrt:/jdk.crypto.ec" {
grant codeBase "jrt:/jdk.crypto.cryptoki" { grant codeBase "jrt:/jdk.crypto.cryptoki" {
permission java.lang.RuntimePermission permission java.lang.RuntimePermission
"accessClassInPackage.com.sun.crypto.provider"; "accessClassInPackage.com.sun.crypto.provider";
@ -2625,7 +2625,7 @@ index b22f26947af..02bea84e210 100644
permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc"; permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
permission java.lang.RuntimePermission permission java.lang.RuntimePermission
"accessClassInPackage.sun.security.*"; "accessClassInPackage.sun.security.*";
@@ -140,6 +142,8 @@ grant codeBase "jrt:/jdk.crypto.cryptoki" { @@ -142,6 +144,8 @@ grant codeBase "jrt:/jdk.crypto.cryptoki" {
permission java.util.PropertyPermission "os.name", "read"; permission java.util.PropertyPermission "os.name", "read";
permission java.util.PropertyPermission "os.arch", "read"; permission java.util.PropertyPermission "os.arch", "read";
permission java.util.PropertyPermission "jdk.crypto.KeyAgreement.legacyKDF", "read"; permission java.util.PropertyPermission "jdk.crypto.KeyAgreement.legacyKDF", "read";
@ -3496,7 +3496,7 @@ index 00000000000..f8d505ca815
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
index 39bd783dd25..1146e7f9d80 100644 index d12244337a5..f2e8e4094c8 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -37,6 +37,8 @@ import javax.crypto.*; @@ -37,6 +37,8 @@ import javax.crypto.*;
@ -3518,31 +3518,21 @@ index 39bd783dd25..1146e7f9d80 100644
private static final long serialVersionUID = -2575874101938349339L; private static final long serialVersionUID = -2575874101938349339L;
private static final String PUBLIC = "public"; private static final String PUBLIC = "public";
@@ -139,9 +144,7 @@ abstract class P11Key implements Key, Length { @@ -393,9 +398,10 @@ abstract class P11Key implements Key, Length {
this.tokenObject = tokenObject;
this.sensitive = sensitive;
this.extractable = extractable;
- char[] tokenLabel = this.token.tokenInfo.label;
- isNSS = (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
- && tokenLabel[2] == 'S');
+ isNSS = P11Util.isNSS(this.token);
boolean extractKeyInfo = (!DISABLE_NATIVE_KEYS_EXTRACTION && isNSS &&
extractable && !tokenObject);
this.keyIDHolder = new NativeKeyHolder(this, keyID, session,
@@ -395,8 +398,10 @@ abstract class P11Key implements Key, Length {
new CK_ATTRIBUTE(CKA_EXTRACTABLE), new CK_ATTRIBUTE(CKA_EXTRACTABLE),
}); });
- boolean keySensitive = (attrs[0].getBoolean() || - boolean keySensitive =
- attrs[1].getBoolean() || !attrs[2].getBoolean()); - (attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
- attrs[1].getBoolean() || !attrs[2].getBoolean();
+ boolean exportable = plainKeySupportEnabled && !algorithm.equals("DH"); + boolean exportable = plainKeySupportEnabled && !algorithm.equals("DH");
+ boolean keySensitive = (!exportable && + boolean keySensitive = (!exportable &&
+ (attrs[0].getBoolean() || + ((attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
+ attrs[1].getBoolean() || !attrs[2].getBoolean())); + attrs[1].getBoolean() || !attrs[2].getBoolean()));
switch (algorithm) { switch (algorithm) {
case "RSA": case "RSA":
@@ -451,7 +456,8 @@ abstract class P11Key implements Key, Length { @@ -450,7 +456,8 @@ abstract class P11Key implements Key, Length {
public String getFormat() { public String getFormat() {
token.ensureValid(); token.ensureValid();
@ -3973,7 +3963,7 @@ index 8d1b8ccb0ae..7ea9b4c5e7f 100644
} }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java
index 262cfc062ad..72b64f72c0a 100644 index cabee449346..72b64f72c0a 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java
@@ -27,6 +27,10 @@ package sun.security.pkcs11; @@ -27,6 +27,10 @@ package sun.security.pkcs11;
@ -3987,7 +3977,7 @@ index 262cfc062ad..72b64f72c0a 100644
/** /**
* Collection of static utility methods. * Collection of static utility methods.
@@ -40,10 +44,106 @@ public final class P11Util { @@ -40,6 +44,93 @@ public final class P11Util {
private static volatile Provider sun, sunRsaSign, sunJce; private static volatile Provider sun, sunRsaSign, sunJce;
@ -4081,19 +4071,6 @@ index 262cfc062ad..72b64f72c0a 100644
private P11Util() { private P11Util() {
// empty // empty
} }
+ static boolean isNSS(Token token) {
+ char[] tokenLabel = token.tokenInfo.label;
+ if (tokenLabel != null && tokenLabel.length >= 3) {
+ return (tokenLabel[0] == 'N' && tokenLabel[1] == 'S'
+ && tokenLabel[2] == 'S');
+ }
+ return false;
+ }
+
static Provider getSunProvider() {
Provider p = sun;
if (p == null) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
index aa35e8fa668..1855e5631bd 100644 index aa35e8fa668..1855e5631bd 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java

236
SOURCES/java-17-openjdk-portable.specfile
View File

@ -93,7 +93,7 @@
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ # you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_
# TODO - fix those hardcoded lists via single list # TODO - fix those hardcoded lists via single list
# Those files must *NOT* be ghosted for *slowdebug* packages # Those files must *NOT* be ghosted for *slowdebug* packages
# FIXME - if you are moving jshell or jlink or similar, always modify all three sections # NOTE - if you are moving jshell or jlink or similar, always modify all three sections
# you can check via headless and devels: # you can check via headless and devels:
# rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin # rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin # == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin
@ -313,7 +313,7 @@
# New Version-String scheme-style defines # New Version-String scheme-style defines
%global featurever 17 %global featurever 17
%global interimver 0 %global interimver 0
%global updatever 11 %global updatever 12
%global patchver 0 %global patchver 0
# buildjdkver is usually same as %%{featurever}, # buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1, # but in time of bootstrap of next jdk, it is featurever-1,
@ -345,11 +345,11 @@
# Define what url should JVM offer in case of a crash report # Define what url should JVM offer in case of a crash report
# order may be important, epel may have rhel declared # order may be important, epel may have rhel declared
%if 0%{?epel} %if 0%{?epel}
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{name}&version=epel%{epel} %global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{component}&version=epel%{epel}
%else %else
%if 0%{?fedora} %if 0%{?fedora}
# Does not work for rawhide, keeps the version field empty # Does not work for rawhide, keeps the version field empty
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora} %global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{component}&version=%{fedora}
%else %else
%if 0%{?rhel} %if 0%{?rhel}
%global oj_vendor_bug_url https://access.redhat.com/support/cases/ %global oj_vendor_bug_url https://access.redhat.com/support/cases/
@ -363,7 +363,7 @@
# Define IcedTea version used for SystemTap tapsets and desktop file # Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598 %global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches # Define current Git revision for the FIPS support patches
%global fipsver d63771ea660 %global fipsver e893be00150
# Define JDK versions # Define JDK versions
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
%global javaver %{featurever} %global javaver %{featurever}
@ -377,8 +377,8 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 9 %global buildver 7
%global rpmrelease 3 %global rpmrelease 1
#%%global tagsuffix %%{nil} #%%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 # 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 %if %is_system_jdk
@ -676,6 +676,10 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
# #
############################################# #############################################
# https://github.com/openjdk/jdk17u-dev/commit/859dda14f3f0d90294899812f5d34ea2e952a3df
# Remove after next upstream update.
Patch7: 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
############################################# #############################################
# #
# Portable build specific patches # Portable build specific patches
@ -725,8 +729,6 @@ BuildRequires: libffi-devel
# Full documentation build requirements # Full documentation build requirements
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: pandoc BuildRequires: pandoc
# 2024a required as of JDK-8325150
BuildRequires: tzdata-java >= 2024a
# cacerts build requirement in portable mode # cacerts build requirement in portable mode
BuildRequires: ca-certificates BuildRequires: ca-certificates
# Earlier versions have a bug in tree vectorization on PPC # Earlier versions have a bug in tree vectorization on PPC
@ -744,19 +746,22 @@ BuildRequires: harfbuzz-devel
BuildRequires: lcms2-devel BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: zlib-devel
%else %else
# Version in src/java.desktop/share/legal/freetype.md # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
Provides: bundled(freetype) = 2.13.2 Provides: bundled(freetype) = 2.13.2
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.1 Provides: bundled(giflib) = 5.2.1
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
Provides: bundled(harfbuzz) = 8.2.2 Provides: bundled(harfbuzz) = 8.2.2
# Version in src/java.desktop/share/native/liblcms/lcms2.h # 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 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
Provides: bundled(libjpeg) = 6b Provides: bundled(libjpeg) = 6b
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
Provides: bundled(libpng) = 1.6.40 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 # We link statically against libstdc++ to increase portability
BuildRequires: libstdc++-static BuildRequires: libstdc++-static
%endif %endif
@ -971,6 +976,7 @@ pushd %{top_level_dir_name}
# rpmbuild. # rpmbuild.
%patch -P1 -p1 %patch -P1 -p1
%patch -P6 -p1 %patch -P6 -p1
%patch -P7 -p1
# Add crypto policy and FIPS support # Add crypto policy and FIPS support
%patch -P1001 -p1 %patch -P1001 -p1
# nss.cfg PKCS11 support; must come last as it also alters java.security # nss.cfg PKCS11 support; must come last as it also alters java.security
@ -994,7 +1000,7 @@ else
exit 16 exit 16
fi fi
if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
echo "WARNING: Designator mismatch"; echo "ERROR: Designator mismatch";
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'" echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'"; echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
exit 17 exit 17
@ -1188,18 +1194,22 @@ function buildjdk() {
function stripjdk() { function stripjdk() {
local outputdir=${1} local outputdir=${1}
local jdkimagepath=${outputdir}/images/%{jdkimage} local jdkimagepath=images/%{jdkimage}
local jreimagepath=${outputdir}/images/%{jreimage} local jreimagepath=images/%{jreimage}
local jmodimagepath=${outputdir}/images/jmods local jmodimagepath=images/jmods
local modulefile=lib/modules
local supportdir=${outputdir}/support local supportdir=${outputdir}/support
local modulebuildpath=${outputdir}/jdk/modules
local jdkoutdir=${outputdir}/${jdkimagepath}
local jreoutdir=${outputdir}/${jreimagepath}
if [ "x$suffix" = "x" ] ; then if [ "x$suffix" = "x" ] ; then
# Keep the unstripped version for consumption by RHEL RPMs # Keep the unstripped version for consumption by RHEL RPMs
cp -a ${jdkimagepath}{,.unstripped} cp -a ${jdkoutdir}{,.unstripped}
# Strip the files # Strip the files
for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do for file in $(find ${jdkoutdir} ${jreoutdir} ${supportdir} ${modulebuildpath} -type f) ; do
if file ${file} | grep -q 'ELF'; then if file ${file} | cut -d ':' -f 2 | grep -q 'ELF'; then
noextfile=${file/.so/}; noextfile=${file/.so/};
objcopy --only-keep-debug ${file} ${noextfile}.debuginfo; objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}; objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
@ -1212,24 +1222,53 @@ function stripjdk() {
echo "Support directory missing."; echo "Support directory missing.";
exit 15 exit 15
fi fi
for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do # Build the java.base jmod a third time to fix the hashes of dependent jmods
for cmd in $(find ${supportdir}/${jmodimagepath} -name '*.jmod_exec.cmdline') \
${supportdir}/${jmodimagepath}/*java.base*exec.cmdline ; do
pre=${cmd/_exec/_pre}; pre=${cmd/_exec/_pre};
post=${cmd/_exec/_post}; post=${cmd/_exec/_post};
jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##') jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
echo "Rebuilding ${jmod} against stripped binaries..."; echo "Rebuilding ${jmod} against stripped binaries...";
if [ -e ${pre} ] ; then if [ -e ${pre} ] ; then
echo "Executing ${pre}..."; echo -e "Executing ${pre}...\n$(cat ${pre})";
cat ${pre} | sh -s ; cat ${pre} | sh -s ;
fi fi
echo "Executing ${cmd}..."; echo "Executing ${cmd}...$(cat ${cmd})";
cat ${cmd} | sh -s ; cat ${cmd} | sh -s ;
if [ -e ${post} ] ; then if [ -e ${post} ] ; then
echo "Executing ${post}..."; echo -e "Executing ${post}...\n$(cat ${post})";
cat ${post} | sh -s ; cat ${post} | sh -s ;
fi fi
done done
rm -rf ${jdkimagepath}/jmods
cp -a ${jmodimagepath} ${jdkimagepath} # Rebuild the image with the stripped modules
for image in ${jdkimagepath} ${jreimagepath} ; do
outdir=${outputdir}/${image};
jlink=${supportdir}/${image}/_jlink*_exec.cmdline;
# Backup the existing image as it contains
# files not generated by jlink
mv ${outdir}{,.bak};
# Regenerate the image using the command
# generated using the initial build
echo -e "Executing ${jlink}...\n$(cat ${jlink})";
cat ${jlink} | sh -s;
# Move the new jmods and module file from the new
# image to the old one
if [ -e ${outdir}.bak/jmods ] ; then
rm -rf ${outdir}.bak/jmods;
mv ${outdir}/jmods ${outdir}.bak;
fi
rm -f ${outdir}.bak/${modulefile};
mv ${outdir}/${modulefile} ${outdir}.bak/$(dirname ${modulefile});
# Restore the original image
rm -rf ${outdir};
mv ${outdir}{.bak,};
# Update the CDS archives
for cmd in ${supportdir}/${image}/*_gen_cds*_exec.cmdline ; do
echo -e "Executing ${cmd}...\n$(cat ${cmd})";
cat ${cmd} | sh -s;
done
done
fi fi
} }
@ -1777,6 +1816,155 @@ done
%{_jvmdir}/%{miscportablearchive}.sha256sum %{_jvmdir}/%{miscportablearchive}.sha256sum
%changelog %changelog
* Wed Jul 10 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.7-1
- Update to jdk-17.0.12+7 (GA)
- Update .gitignore to ignore openjdk-17.0.12+7.tar.xz
- Update NEWS for 17.0.12+7 (GA)
- Set buildver to 7
- Set rpmrelease to 1
- Set is_ga to 1
- Update sources to openjdk-17.0.12+7.tar.xz
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
* Mon Jul 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.12.0.6-0.2.ea
- Adjusted DTLS NEWS entry style to match other entries
* Mon Jul 8 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.12.0.6-0.2.ea
- NEWS: Import 21 entries for JDK-8256660, JDK-8326891, JDK-8325496,
JDK-8281658, and JDK-8315503, use 21 formatting for JDK-8256660,
JDK-8316138
* Mon Jul 8 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.6-0.2.ea
- Bump rpmrelease to 2
- NEWS: Reword JDK-8256660 entry, add JDK-8316138 entry
* Thu Jun 27 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.6-0.1.ea
- Update to jdk-17.0.12+6 (EA)
- Update .gitignore to ignore openjdk-17.0.12+6-ea.tar.xz
- Update buildver to 6
- Reset rpmrelease to 1
- Update sources to openjdk-17.0.12+6-ea.tar.xz
- Update NEWS for 17.0.12+6
- Remove --enable-compatible-cds-alignment configure option
- Resolves: OPENJDK-3134
* Wed Jun 26 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.5-0.3.ea
- Add upstream patch that removes illegal RLO Unicode characters
- Related: OPENJDK-2904
* Mon Jun 24 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.5-0.3.ea
- Add build requirement for zlib-devel
- Related: OPENJDK-3065
* Fri Jun 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.12.0.5-0.3.ea
- Re-run jlink to regenerate the jmods directory and lib/modules with stripped libraries
- Resolves: OPENJDK-3055
* Fri Jun 14 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.5-0.3.ea
- Bump rpmrelease to 3
* Fri Jun 14 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.5-0.2.ea
- Delete fips-17u-d63771ea660.patch
- Use fips-17u-e893be00150.patch, rebased to jdk-17.0.12+2
- fips-17u-e893be00150.patch was already committed with "Use 2.16.0...lcms2"
- Update fipsver to e893be00150
* Thu Jun 6 2024 Anton Bobrov <abobrov@redhat.com> - 1:17.0.12.0.5-0.2.ea
- generate_source_tarball.sh: Use tar exclude options for VCS files
- generate_source_tarball.sh: Improve VCS exclusion
* Thu Jun 6 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.12.0.5-0.2.ea
- generate_source_tarball.sh: Update examples in header for clarity
- generate_source_tarball.sh: Cleanup message issued when checkout already exists
- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP
- generate_source_tarball.sh: Only add --depth=1 on non-local repositories
- icedtea_sync.sh: Reinstate from rhel-8.9.0 branch
- Move maintenance scripts to a scripts subdirectory
- discover_trees.sh: Set compile-command and indentation instructions for Emacs
- discover_trees.sh: shellcheck: Do not use -o (SC2166)
- discover_trees.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
- discover_trees.sh: shellcheck: Double-quote variable references (SC2086)
- generate_source_tarball.sh: Add authorship
- icedtea_sync.sh: Set compile-command and indentation instructions for Emacs
- icedtea_sync.sh: shellcheck: Double-quote variable references (SC2086)
- icedtea_sync.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
- openjdk_news.sh: Set compile-command and indentation instructions for Emacs
- openjdk_news.sh: shellcheck: Double-quote variable references (SC2086)
- openjdk_news.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
- openjdk_news.sh: shellcheck: Remove deprecated egrep usage (SC2196)
- generate_source_tarball.sh: Output values of new options WITH_TEMP and OPENJDK_LATEST
- generate_source_tarball.sh: Double-quote DEPTH reference (SC2086)
- generate_source_tarball.sh: Avoid empty DEPTH reference while still appeasing shellcheck
* Mon Jun 3 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.5-0.2.ea
- Bump rpmrelease to 2
- Sync generate_source_tarball.sh from Fedora rawhide
* Wed May 29 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.5-0.1.ea
- Update to jdk-17.0.12+5 (EA)
- Update .gitignore to ignore openjdk-17.0.12+5-ea.tar.xz
- Update buildver to 5
- Update sources to openjdk-17.0.12+5-ea.tar.xz
- Update NEWS for 17.0.12+5
* Wed May 29 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.4-0.1.ea
- Change a fix-me comment to a note instead
* Thu May 23 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.4-0.1.ea
- Update to jdk-17.0.12+4 (EA)
- Update .gitignore to ignore openjdk-17.0.12+4-ea.tar.xz
- Update buildver to 4
- Update sources to openjdk-17.0.12+4-ea.tar.xz
- Update NEWS for 17.0.12+4
* Wed May 22 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.3-0.1.ea
- Update to jdk-17.0.12+3 (EA)
- Update .gitignore to ignore openjdk-17.0.12+3-ea.tar.xz
- Update buildver to 3
- Update sources to openjdk-17.0.12+3-ea.tar.xz
- Update NEWS for 17.0.12+3
* Wed May 15 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.2-0.1.ea
- Use component in EPEL and Fedora bug URLs
- Label as error a designator mismatch
* Mon May 13 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.2-0.1.ea
- Use lcms2.h for bundled provides version reference
- Use 2.16.0, not 2.16, for lcms2 version
- Use zlib.h for bundled provides version reference
- Use freetype.h for bundled provides version reference
- Remove remove-test-left-to-right-override-character.patch
* Fri May 10 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.2-0.1.ea
- Update to jdk-17.0.12+2 (EA)
- Update .gitignore to ignore openjdk-17.0.12+2-ea.tar.xz
- Update buildver to 2
- Update sources to openjdk-17.0.12+2-ea.tar.xz
- Update NEWS for 17.0.12+2
- Add --enable-compatible-cds-alignment configure option (OPENJDK-3007)
- Add remove-test-left-to-right-override-character.patch
- Add remove-test-left-to-right-override-character.patch file
- Remove tzdata build requires (OPENJDK-2843)
* Fri May 10 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.1-0.1.ea
- Update lcms2 version location comment
- Update lcms2 bundled provides to 2.16
- Add zlib 1.3.1 bundled provides
* Thu May 9 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.1-0.1.ea
- Update to jdk-17.0.12+1 (EA)
- Update .gitignore to ignore openjdk-17.0.12+1-ea.tar.xz
- Bump updatever to 12
- Reset buildver to 1
- Reset rpmrelease to 1
- Reset is_ga to 0
- Update sources to openjdk-17.0.12+1-ea.tar.xz
- Update NEWS for 17.0.12+1
- Fix fips-17u-d63771ea660.patch so that it applies to 17.0.12+1
* Thu Apr 18 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.11.0.9-4
- Sync release notes with upstream version: https://bit.ly/openjdk17011
* Wed Apr 10 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.9-3 * Wed Apr 10 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.9-3
- BuildRequires tzdata-java >= 2024a (JDK-8325150) - BuildRequires tzdata-java >= 2024a (JDK-8325150)