.gitignore

@@ -1,2 +1,2 @@
-SOURCES/shenandoah8u412-b08.tar.xz
+SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u372-b07-4curve.tar.xz
 SOURCES/tapsets-icedtea-3.15.0.tar.xz

.java-1.8.0-openjdk.metadata

@@ -1,2 +1,2 @@
-9cb6b4c557e9a433fe4c16b3996f998335cec8a5 SOURCES/shenandoah8u412-b08.tar.xz
+3f015b60e085b0e1f0fd9ea13abf775a890c2b1b SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u372-b07-4curve.tar.xz
 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz

SOURCES/java-1.8.0-openjdk-portable.specfile

@@ -256,30 +256,20 @@
 %global stapinstall %{nil}
 %endif
 
+# Always off in portables
 %ifarch %{systemtap_arches}
-%global with_systemtap 1
+%global with_systemtap 0
 %else
 %global with_systemtap 0
 %endif
 
 # New Version-String scheme-style defines
 %global majorver 8
-# Define version of OpenJDK 8 used
-%global project openjdk
-%global repo shenandoah-jdk8u
-%global openjdk_revision 8u412-b08
-%global shenandoah_revision shenandoah%{openjdk_revision}
-# Define IcedTea version used for SystemTap tapsets and desktop file
-%global icedteaver      3.15.0
-# Define current Git revision for the FIPS support patches
-%global fipsver 6d1aade0648
-# Define current Git revision for the cacerts patch
-%global cacertsver 8139f2361c2
 
 # Standard JPackage naming and versioning defines
 %global origin          openjdk
 %global origin_nice     OpenJDK
-%global top_level_dir_name   %{shenandoah_revision}
+%global top_level_dir_name   %{origin}
 
 # Settings for local security configuration
 %global security_file %{top_level_dir_name}/jdk/src/share/lib/security/java.security-%{_target_os}
@@ -298,15 +288,31 @@
 %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://access.redhat.com/support/cases/
+%global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{component}
 %else
 %global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi
 %endif
 %endif
 %endif
 
+# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
+%global shenandoah_project      openjdk
+%global shenandoah_repo         shenandoah-jdk8u
+%global openjdk_revision        jdk8u372-b07
+%global shenandoah_revision     shenandoah-%{openjdk_revision}
+# Define old aarch64/jdk8u tree variables for compatibility
+%global project         %{shenandoah_project}
+%global repo            %{shenandoah_repo}
+%global revision        %{shenandoah_revision}
+# Define IcedTea version used for SystemTap tapsets and desktop file
+%global icedteaver      3.15.0
+# Define current Git revision for the FIPS support patches
+%global fipsver 6d1aade0648
+# Define current Git revision for the cacerts patch
+%global cacertsver 8139f2361c2
+
 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
-%global version_tag     %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
+%global version_tag     %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*})
 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60  (dont forget spec escape % by %%)
 %global whole_update    %(VERSION=%{version_tag}; echo ${VERSION%%-*})
 # eg  jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
@@ -389,6 +395,20 @@
 %global alternatives_requires %{_sbindir}/alternatives
 %endif
 
+%if %{with_systemtap}
+# Where to install systemtap tapset (links)
+# We would like these to be in a package specific sub-dir,
+# but currently systemtap doesn't support that, so we have to
+# use the root tapset dir for now. To distinguish between 64
+# and 32 bit architectures we place the tapsets under the arch
+# specific dir (note that systemtap will only pickup the tapset
+# for the primary arch for now). Systemtap uses the machine name
+# aka target_cpu as architecture specific directory name.
+%global tapsetroot /usr/share/systemtap
+%global tapsetdirttapset %{tapsetroot}/tapset/
+%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
+%endif
+
 # Prevent brp-java-repack-jars from being run.
 %global __jar_repack 0
 
@@ -427,14 +447,14 @@ License:  ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv
 URL:      http://openjdk.java.net/
 
 # Shenandoah HotSpot
-# openjdk/shenandoah-jdk8u contains an integration forest of
-# OpenJDK 8u and the Shenandoah garbage collector
+# aarch64-port/jdk8u-shenandoah contains an integration forest of
+# OpenJDK 8u, the aarch64 port and Shenandoah
 # To regenerate, use:
 # VERSION=%%{shenandoah_revision}
-# FILE_NAME_ROOT=${VERSION}
+# FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
 # REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
-# where the source is obtained from http://github.com/%%{project}/%%{repo}
-Source0: %{shenandoah_revision}.tar.xz
+# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
+Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve.tar.xz
 
 # Custom README for -src subpackage
 Source2:  README.md
@@ -445,11 +465,13 @@ Source7: NEWS
 # Use 'icedtea_sync.sh' to update the following
 # They are based on code contained in the IcedTea project (3.x).
 # Systemtap tapsets. Zipped up to keep it small.
-Source8: tapsets-icedtea-%{icedteaver}.tar.xz
+# Disabled in portables
+#Source8: tapsets-icedtea-%%{icedteaver}.tar.xz
 
 # Desktop files. Adapted from IcedTea
-Source9: jconsole.desktop.in
-Source10: policytool.desktop.in
+# Disabled in portables
+#Source9: jconsole.desktop.in
+#Source10: policytool.desktop.in
 
 # nss configuration file
 Source11: nss.cfg.in
@@ -606,6 +628,8 @@ Patch12: jdk8186464-rh1433262-zip64_failure.patch
 # able to be removed once that release is out
 # and used by this RPM.
 #############################################
+# JDK-8271199, RH2175317: Mutual TLS handshake fails signing client certificate with custom sensitive PKCS11 key
+Patch2001: jdk8271199-rh2175317-custom_pkcs11_provider_support.patch
 
 #############################################
 #
@@ -677,8 +701,8 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
 %endif
-# 2024a required as of JDK-8325150
-BuildRequires: tzdata-java >= 2024a
+# 2023c required as of JDK-8305113
+BuildRequires: tzdata-java >= 2023c
 # Earlier versions have a bug in tree vectorization on PPC
 BuildRequires: gcc >= 4.8.3-8
 
@@ -694,8 +718,6 @@ BuildRequires: lcms2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 %else
-# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h
-Provides: bundled(zlib) = 1.2.13
 # Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
 Provides: bundled(giflib) = 5.2.1
 # Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
@@ -703,7 +725,7 @@ Provides: bundled(lcms2) = 2.10.0
 # Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
 Provides: bundled(libjpeg) = 6b
 # Version in jdk/src/share/native/sun/awt/libpng/png.h
-Provides: bundled(libpng) = 1.6.39
+Provides: bundled(libpng) = 1.6.37
 # We link statically against libstdc++ to increase portability
 BuildRequires: libstdc++-static
 %endif
@@ -798,9 +820,6 @@ fi
 echo "Update version: %{updatever}"
 echo "Build number: %{buildver}"
 echo "Milestone: %{milestone}"
-%ifnarch %{ix86}
-export XZ_OPT="-T0"
-%endif
 %setup -q -c -n %{uniquesuffix ""} -T -a 0
 # https://bugzilla.redhat.com/show_bug.cgi?id=1189084
 prioritylength=`expr length %{priority}`
@@ -810,7 +829,6 @@ if [ $prioritylength -ne 7 ] ; then
 fi
 # For old patches
 ln -s %{top_level_dir_name} jdk8
-ln -s %{top_level_dir_name} openjdk
 
 cp %{SOURCE2} .
 
@@ -823,20 +841,6 @@ cp %{SOURCE101} %{top_level_dir_name}/common/autoconf/build-aux/
 
 # OpenJDK patches
 
-# This syntax is deprecated:
-#    %patchN [...]
-# and should be replaced with:
-#    %patch -PN [...]
-# For example:
-#    %patch1001 -p1
-# becomes:
-#    %patch -P1001 -p1
-# The replacement format suggested by recent (circa Fedora 38) RPM
-# deprecation messages:
-#    %patch N [...]
-# is not backward-compatible with prior (circa RHEL-8) versions of
-# rpmbuild.
-
 %if %{system_libs}
 # Remove libraries that are linked
 sh %{SOURCE12}
@@ -845,60 +849,62 @@ sh %{SOURCE12}
 # Do not enable them with system_libs, they do not work properly with bundled option
 # System library fixes
 %if %{system_libs}
-%patch -P201
-%patch -P202
-%patch -P203
-%patch -P204
+%patch201
+%patch202
+%patch203
+%patch204
 %endif
 
-%patch -P1
-%patch -P5
+%patch1
+%patch5
 
 # s390 build fixes
-%patch -P102
-%patch -P103
-%patch -P107
+%patch102
+%patch103
+%patch107
 
 # AArch64 fixes
 
 # x86 fixes
-%patch -P105
+%patch105
 
 # Upstreamable fixes
-%patch -P502
-%patch -P512
-%patch -P523
-%patch -P528
-%patch -P571
-%patch -P574
-%patch -P112
-%patch -P581
-%patch -P541
-%patch -P12
+%patch502
+%patch512
+%patch523
+%patch528
+%patch571
+%patch574
+%patch112
+%patch581
+%patch541
+%patch12
 
 pushd %{top_level_dir_name}
 # Add crypto policy and FIPS support
-%patch -P1001 -p1
+%patch1001 -p1
 # nss.cfg PKCS11 support; must come last as it also alters java.security
-%patch -P1000 -p1
+%patch1000 -p1
 # system cacerts support
-%patch -P539 -p1
+%patch539 -p1
+# 8u382 fix
+%patch2001 -p1
 popd
 
 # RPM-only fixes
-%patch -P600
-%patch -P1003
+%patch600
+%patch1003
 
 # RHEL-only patches
 %if ! 0%{?fedora} && 0%{?rhel} <= 7
-%patch -P534
+%patch534
 %endif
 
 # Shenandoah patches
 
 # Extract systemtap tapsets
 %if %{with_systemtap}
-tar --strip-components=1 -x -I 'xz -T0' -f %{SOURCE8}
+tar --strip-components=1 -x -I xz -f %{SOURCE8}
 %if %{include_debug_build}
 cp -r tapset tapset%{debug_suffix}
 %endif
@@ -909,7 +915,17 @@ cp -r tapset tapset%{fastdebug_suffix}
 
 for suffix in %{build_loop} ; do
   for file in "tapset"$suffix/*.in; do
-    sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $file
+    OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
+    sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/jre/lib/%{archinstall}/server/libjvm.so:g" $file > $file.1
+# TODO find out which architectures other than i686 have a client vm
+%ifarch %{ix86}
+    sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/jre/lib/%{archinstall}/client/libjvm.so:g" $file.1 > $OUTPUT_FILE
+%else
+    sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.1 > $OUTPUT_FILE
+%endif
+    sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
+    sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
+    sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
   done
 done
 # systemtap tapsets ends
@@ -937,9 +953,6 @@ export NUM_PROC=${NUM_PROC:-1}
 # Honor %%_smp_ncpus_max
 [ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
 %endif
-%ifnarch %{ix86}
-export XZ_OPT="-T0"
-%endif
 
 %ifarch s390x sparc64 alpha %{power64} %{aarch64}
 export ARCH_DATA_MODEL=64
@@ -1035,10 +1048,10 @@ function buildjdk() {
     cat hotspot-spec.gmk
 
     make \
-        JAVAC_FLAGS=-g \
-        LOG=trace \
-        SCTP_WERROR= \
-        ${maketargets} || ( pwd; find ${top_srcdir_abs_path} ${top_builddir_abs_path} -name "hs_err_pid*.log" | xargs cat && false )
+	JAVAC_FLAGS=-g \
+	LOG=trace \
+	SCTP_WERROR= \
+	${maketargets} || ( pwd; find ${top_srcdir_abs_path} ${top_builddir_abs_path} -name "hs_err_pid*.log" | xargs cat && false )
 
     popd
 }
@@ -1118,20 +1131,11 @@ function genchecksum() {
 }
 
 function packagejdk() {
-    # Reusing OPENJDK_UPSTREAM_TAG_EPOCH for the modification times of all
-    # files in the portable tarballs eliminates one source of variability
-    # across RPM rebuilds.
-    VERSION_FILE="$(pwd)"/"%{top_level_dir_name}"/common/autoconf/version-numbers
-    OPENJDK_UPSTREAM_TAG_EPOCH="$(stat --format=%Y "${VERSION_FILE}")"
-
     local imagesdir=$(pwd)/${1}/images
     local docdir=$(pwd)/${1}/docs
     local bundledir=$(pwd)/${1}/bundles
     local packagesdir=$(pwd)/${2}
     local srcdir=$(pwd)/%{top_level_dir_name}
-    local tapsetdir=$(pwd)/tapset
-    local tar_time="$(date --utc --iso-8601=seconds --date=@"${OPENJDK_UPSTREAM_TAG_EPOCH}")"
-    local tar_opts="--mtime=${tar_time} --sort=name -cJf"
 
     echo "Packaging build from ${imagesdir} to ${packagesdir}..."
     mkdir -p ${packagesdir}
@@ -1165,7 +1169,7 @@ function packagejdk() {
     # Release images have external debug symbols
     if [ "x$suffix" = "x" ] ; then
         # Keep the unstripped version for consumption by RHEL RPMs
-        tar ${tar_opts} ${unstrippedarchive} ${jdkname}
+        tar -cJf ${unstrippedarchive} ${jdkname}
         genchecksum ${unstrippedarchive}
 
         # Strip the files
@@ -1178,32 +1182,29 @@ function packagejdk() {
             fi
         done
 
-        tar ${tar_opts} ${debugjdkarchive} $(find ${jdkname} -name \*.debuginfo)
+        tar -cJf ${debugjdkarchive} $(find ${jdkname} -name \*.debuginfo)
         genchecksum ${debugjdkarchive}
-        tar ${tar_opts} ${debugjrearchive} $(find ${jdkname} -name \*.debuginfo)
+        tar -cJf ${debugjrearchive} $(find ${jrename} -name \*.debuginfo)
         genchecksum ${debugjrearchive}
 
-        mkdir ${docname}
-        mv ${docdir} ${docname}
-        mv ${bundledir}/${built_doc_archive} ${docname}
-        tar ${tar_opts} ${docarchive} ${docname}
-        genchecksum ${docarchive}
+	mkdir ${docname}
+	mv ${docdir} ${docname}
+	mv ${bundledir}/${built_doc_archive} ${docname}
+	tar -cJf ${docarchive} ${docname}
+	genchecksum ${docarchive}
 
-        mkdir ${miscname}
-        for s in 16 24 32 48 ; do
-            cp -av ${srcdir}/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png ${miscname}
-        done
-%if %{with_systemtap}
-        cp -a ${tapsetdir}* ${miscname}
-%endif
-        tar ${tar_opts} ${miscarchive} ${miscname}
-        genchecksum ${miscarchive}
+	mkdir ${miscname}
+	for s in 16 24 32 48 ; do
+	    cp -av ${srcdir}/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png ${miscname}
+	done
+	tar -cJf ${miscarchive} ${miscname}
+	genchecksum ${miscarchive}
     fi
 
-    tar ${tar_opts} ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
+    tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
     genchecksum ${jdkarchive}
 
-    tar ${tar_opts} ${jrearchive}  --exclude='**.debuginfo' ${jrename}
+    tar -cJf ${jrearchive}  --exclude='**.debuginfo' ${jrename}
     genchecksum ${jrearchive}
 
     # Revert directory renaming so testing will run
@@ -1523,143 +1524,6 @@ done
 %{_jvmdir}/%{miscportablearchive}.sha256sum
 
 %changelog
-* Wed Apr 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-2
-- Add CVEs to release notes
-
-* Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-1
-- Update to shenandoah-jdk8u412-b08 (GA)
-- Update release notes for shenandoah-8u412-b08.
-- Complete release note for Certainly roots
-- Switch to GA mode.
-- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
-
-* Fri Apr 05 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b07-0.1.ea
-- Update to shenandoah-jdk8u412-b07 (EA)
-- Update release notes for shenandoah-8u412-b07.
-- Require tzdata 2024a due to upstream inclusion of JDK-8322725
-
-* Fri Mar 29 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b01-0.2.ea
-- Move to upstream tag style (shenandoah8ux-by) in preparation for eventually moving back to official sources
-- generate_source_tarball.sh: Rename JCONSOLE_JS_PATCH{,_DEFAULT} to JCONSOLE_PATCH{,_DEFAULT} for brevity
-- generate_source_tarball.sh: Adapt OPENJDK_LATEST logic to work with 8u Shenandoah fork
-- generate_source_tarball.sh: Adapt version logic to work with 8u
-- generate_source_tarball.sh: Add quoting for SCRIPT_DIR and JCONSOLE_PATCH (SC2086)
-- generate_source_tarball.sh: Update examples in header for clarity
-- 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.8.0 branch
-- Move maintenance scripts to a scripts subdirectory
-- icedtea_sync.sh: Update with a VCS mode that retrieves sources from a Mercurial repository
-- jconsole.desktop.in: Restored by running icedtea_sync.sh
-- policytool.desktop.in: Likewise.
-- Restore IcedTea sources correctly in spec file
-- 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)
-- Remove pointless empty file generate_singlerepo_source_tarball.sh
-- Remove pointless empty file update_main_sources.sh
-- generate_source_tarball.sh: Handle an existing checkout
-- generate_source_tarball.sh: Sync indentation with java-21-openjdk version
-- generate_source_tarball.sh: Support using a subdirectory via TO_COMPRESS
-
-* Fri Mar 29 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:1.8.0.412.b01-0.2.ea
-- generate_source_tarball.sh: Add WITH_TEMP environment variable
-- generate_source_tarball.sh: Multithread xz on all available cores
-- generate_source_tarball.sh: Add OPENJDK_LATEST environment variable
-- generate_source_tarball.sh: Update comment about tarball naming
-- generate_source_tarball.sh: Reformat comment header
-- generate_source_tarball.sh: Reformat and update help output
-- generate_source_tarball.sh: Do a shallow clone, for speed
-- generate_source_tarball.sh: Eliminate some removal prompting
-- generate_source_tarball.sh: Make tarball reproducible
-- generate_source_tarball.sh: Prefix temporary directory with temp-
-- generate_source_tarball.sh: Remove temporary directory exit conditions
-- generate_source_tarball.sh: Set compile-command in Emacs
-- generate_source_tarball.sh: Remove REPO_NAME from FILE_NAME_ROOT
-- generate_source_tarball.sh: Move PROJECT_NAME and REPO_NAME checks
-- generate_source_tarball.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
-- generate_source_tarball.sh: shellcheck: Double-quote variable references (SC2086)
-- generate_source_tarball.sh: shellcheck: Do not use -a (SC2166)
-- generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
-- Use backward-compatible patch syntax
-- generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST
-- generate_source_tarball.sh: Remove trailing period in echo
-- generate_source_tarball.sh: Use long-style argument to grep
-- generate_source_tarball.sh: Add license
-- generate_source_tarball.sh: Add indentation instructions for Emacs
-
-* Fri Mar 22 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b01-0.1.ea
-- Introduce tar_opts to avoid repetition of lengthy tar creation options
-- Normalise whitespace
-- Turn off xz multi-threading on i686 as it fails with an out of memory error
-
-* Fri Mar 22 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:1.8.0.412.b01-0.1.ea
-- Invoke xz in multi-threaded mode
-- Make portable tarball modification times reproducible
-
-* Thu Mar 21 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b01-0.1.ea
-- Update to shenandoah-jdk8u412-b01 (EA)
-- Update release notes for shenandoah-8u412-b01.
-- Switch to EA mode.
-
-* Thu Jan 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-1
-- Update to shenandoah-jdk8u392-b08 (GA)
-- Update release notes for shenandoah-8u392-b08.
-- Regenerate PR2462 patch following JDK-8315135
-- Bump version of bundled libpng to 1.6.39
-- Add backport of JDK-8312489 heading upstream for 8u402 (see OPENJDK-2095)
-- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. **
-
-* Fri Sep 29 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b01-1
-- Update to shenandoah-jdk8u392-b01 (GA)
-- Update release notes for shenandoah-8u392-b01.
-- 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
-
-* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-2
-- Re-enable SystemTap support and perform only substitutions possible without final NVR available
-- Include tapsets in the miscellaneous tarball
-- Drop unused globals for tapset installation
-
-* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-1
-- Update to shenandoah-jdk8u382-b05 (GA)
-- Update release notes for shenandoah-8u382-b05.
-- ** This tarball is embargoed until 2023-07-18 @ 1pm PT. **
-
-* Fri Jul 07 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b04-0.1.ea
-- Update to shenandoah-jdk8u382-b04 (EA)
-- Update release notes for shenandoah-8u382-b04.
-
-* Wed Jun 28 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b01-0.1.ea
-- Update to shenandoah-jdk8u382-b01 (EA)
-- Update release notes for shenandoah-8u382-b01.
-- Switch to EA mode.
-- Remove JDK-8271199 patch which is now upstream.
-- Add version of bundled zlib (bumped from 1.2.11 to 1.2.13 with this update)
-
 * Thu Apr 27 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.372.b07-2
 - Sync with existing RHEL 8 build, in order to start building portables on RHEL 8
 - Fix debug symbols flag to newboot and package naming

SOURCES/jdk8186464-rh1433262-zip64_failure.patch

@@ -1,286 +0,0 @@
-# HG changeset patch
-# User sherman
-# Date 1505950914 25200
-#      Wed Sep 20 16:41:54 2017 -0700
-# Node ID 723486922bfe4c17e3f5c067ce5e97229842fbcd
-# Parent  c8ac05bbe47771b3dafa2e7fc9a95d86d68d7c07
-8186464: ZipFile cannot read some InfoZip ZIP64 zip files
-Reviewed-by: martin
-
-diff --git openjdk.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java openjdk/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
-index 26e2a5bf9e9..2630c118817 100644
---- openjdk.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
-+++ openjdk/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
-@@ -92,6 +92,7 @@ public class ZipFileSystem extends FileSystem {
-     private final boolean createNew;     // create a new zip if not exists
-     private static final boolean isWindows =
-         System.getProperty("os.name").startsWith("Windows");
-+    private final boolean forceEnd64;
- 
-     // a threshold, in bytes, to decide whether to create a temp file
-     // for outputstream of a zip entry
-@@ -112,12 +113,13 @@ public class ZipFileSystem extends FileSystem {
-         if (this.defaultDir.charAt(0) != '/')
-             throw new IllegalArgumentException("default dir should be absolute");
- 
-+        this.forceEnd64 = "true".equals(env.get("forceZIP64End"));
-         this.provider = provider;
-         this.zfpath = zfpath;
-         if (Files.notExists(zfpath)) {
-             if (createNew) {
-                 try (OutputStream os = Files.newOutputStream(zfpath, CREATE_NEW, WRITE)) {
--                    new END().write(os, 0);
-+                    new END().write(os, 0, forceEnd64);
-                 }
-             } else {
-                 throw new FileSystemNotFoundException(zfpath.toString());
-@@ -1014,28 +1016,36 @@ public class ZipFileSystem extends FileSystem {
-                     end.cenoff = ENDOFF(buf);
-                     end.comlen = ENDCOM(buf);
-                     end.endpos = pos + i;
--                    if (end.cenlen == ZIP64_MINVAL ||
--                        end.cenoff == ZIP64_MINVAL ||
--                        end.centot == ZIP64_MINVAL32)
--                    {
--                        // need to find the zip64 end;
--                        byte[] loc64 = new byte[ZIP64_LOCHDR];
--                        if (readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR)
--                            != loc64.length) {
--                            return end;
--                        }
--                        long end64pos = ZIP64_LOCOFF(loc64);
--                        byte[] end64buf = new byte[ZIP64_ENDHDR];
--                        if (readFullyAt(end64buf, 0, end64buf.length, end64pos)
--                            != end64buf.length) {
--                            return end;
--                        }
--                        // end64 found, re-calcualte everything.
--                        end.cenlen = ZIP64_ENDSIZ(end64buf);
--                        end.cenoff = ZIP64_ENDOFF(end64buf);
--                        end.centot = (int)ZIP64_ENDTOT(end64buf); // assume total < 2g
--                        end.endpos = end64pos;
-+                    // try if there is zip64 end;
-+                    byte[] loc64 = new byte[ZIP64_LOCHDR];
-+                    if (end.endpos < ZIP64_LOCHDR ||
-+                        readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR)
-+                        != loc64.length ||
-+                        !locator64SigAt(loc64, 0)) {
-+                        return end;
-+                    }
-+                    long end64pos = ZIP64_LOCOFF(loc64);
-+                    byte[] end64buf = new byte[ZIP64_ENDHDR];
-+                    if (readFullyAt(end64buf, 0, end64buf.length, end64pos)
-+                        != end64buf.length ||
-+                        !end64SigAt(end64buf, 0)) {
-+                        return end;
-+                    }
-+                    // end64 found,
-+                    long cenlen64 = ZIP64_ENDSIZ(end64buf);
-+                    long cenoff64 = ZIP64_ENDOFF(end64buf);
-+                    long centot64 = ZIP64_ENDTOT(end64buf);
-+                    // double-check
-+                    if (cenlen64 != end.cenlen && end.cenlen != ZIP64_MINVAL ||
-+                        cenoff64 != end.cenoff && end.cenoff != ZIP64_MINVAL ||
-+                        centot64 != end.centot && end.centot != ZIP64_MINVAL32) {
-+                        return end;
-                     }
-+                    // to use the end64 values
-+                    end.cenlen = cenlen64;
-+                    end.cenoff = cenoff64;
-+                    end.centot = (int)centot64; // assume total < 2g
-+                    end.endpos = end64pos;
-                     return end;
-                 }
-             }
-@@ -1201,7 +1211,7 @@ public class ZipFileSystem extends FileSystem {
- 
-     // sync the zip file system, if there is any udpate
-     private void sync() throws IOException {
--        //System.out.printf("->sync(%s) starting....!%n", toString());
-+        // System.out.printf("->sync(%s) starting....!%n", toString());
-         // check ex-closer
-         if (!exChClosers.isEmpty()) {
-             for (ExChannelCloser ecc : exChClosers) {
-@@ -1292,7 +1302,7 @@ public class ZipFileSystem extends FileSystem {
-             }
-             end.centot = elist.size();
-             end.cenlen = written - end.cenoff;
--            end.write(os, written);
-+            end.write(os, written, forceEnd64);
-         }
-         if (!streams.isEmpty()) {
-             //
-@@ -1849,8 +1859,8 @@ public class ZipFileSystem extends FileSystem {
-         long endpos;
-         int disktot;
- 
--        void write(OutputStream os, long offset) throws IOException {
--            boolean hasZip64 = false;
-+        void write(OutputStream os, long offset, boolean forceEnd64) throws IOException {
-+            boolean hasZip64 = forceEnd64; // false;
-             long xlen = cenlen;
-             long xoff = cenoff;
-             if (xlen >= ZIP64_MINVAL) {
-@@ -1875,8 +1885,8 @@ public class ZipFileSystem extends FileSystem {
-                 writeShort(os, 45);               // version needed to extract
-                 writeInt(os, 0);                  // number of this disk
-                 writeInt(os, 0);                  // central directory start disk
--                writeLong(os, centot);            // number of directory entires on disk
--                writeLong(os, centot);            // number of directory entires
-+                writeLong(os, centot);            // number of directory entries on disk
-+                writeLong(os, centot);            // number of directory entries
-                 writeLong(os, cenlen);            // length of central directory
-                 writeLong(os, cenoff);            // offset of central directory
- 
-diff --git openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c
-index 5fd6fea049d..858e5814e92 100644
---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c
-@@ -385,6 +385,9 @@ findEND64(jzfile *zip, void *end64buf, jlong endpos)
- {
-     char loc64[ZIP64_LOCHDR];
-     jlong end64pos;
-+    if (endpos < ZIP64_LOCHDR) {
-+	return -1;
-+    }
-     if (readFullyAt(zip->zfd, loc64, ZIP64_LOCHDR, endpos - ZIP64_LOCHDR) == -1) {
-         return -1;    // end64 locator not found
-     }
-@@ -567,6 +570,7 @@ readCEN(jzfile *zip, jint knownTotal)
- {
-     /* Following are unsigned 32-bit */
-     jlong endpos, end64pos, cenpos, cenlen, cenoff;
-+    jlong cenlen64, cenoff64, centot64;
-     /* Following are unsigned 16-bit */
-     jint total, tablelen, i, j;
-     unsigned char *cenbuf = NULL;
-@@ -594,13 +598,20 @@ readCEN(jzfile *zip, jint knownTotal)
-     cenlen = ENDSIZ(endbuf);
-     cenoff = ENDOFF(endbuf);
-     total  = ENDTOT(endbuf);
--    if (cenlen == ZIP64_MAGICVAL || cenoff == ZIP64_MAGICVAL ||
--        total == ZIP64_MAGICCOUNT) {
--        unsigned char end64buf[ZIP64_ENDHDR];
--        if ((end64pos = findEND64(zip, end64buf, endpos)) != -1) {
--            cenlen = ZIP64_ENDSIZ(end64buf);
--            cenoff = ZIP64_ENDOFF(end64buf);
--            total = (jint)ZIP64_ENDTOT(end64buf);
-+    unsigned char end64buf[ZIP64_ENDHDR];
-+    if ((end64pos = findEND64(zip, end64buf, endpos)) != -1) {
-+	// end64 candidate found,
-+	cenlen64 = ZIP64_ENDSIZ(end64buf);
-+	cenoff64 = ZIP64_ENDOFF(end64buf);
-+	centot64 = ZIP64_ENDTOT(end64buf);
-+	// double-check
-+	if ((cenlen64 == cenlen || cenlen == ZIP64_MAGICVAL) &&
-+	    (cenoff64 == cenoff || cenoff == ZIP64_MAGICVAL) &&
-+	    (centot64 == total || total == ZIP64_MAGICCOUNT)) {
-+	    // to use the end64 values
-+            cenlen = cenlen64;
-+            cenoff = cenoff64;
-+            total = (jint)centot64;
-             endpos = end64pos;
-             endhdrlen = ZIP64_ENDHDR;
-         }
-diff --git openjdk.orig/jdk/test/java/util/zip/ZipFile/ReadZip.java openjdk/jdk/test/java/util/zip/ZipFile/ReadZip.java
-index ffe8a8ed712..9b380003893 100644
---- openjdk.orig/jdk/test/java/util/zip/ZipFile/ReadZip.java
-+++ openjdk/jdk/test/java/util/zip/ZipFile/ReadZip.java
-@@ -22,7 +22,7 @@
-  */
- 
- /* @test
-- * @bug 4241361 4842702 4985614 6646605 5032358 6923692 6233323 8144977 8184993
-+ * @bug 4241361 4842702 4985614 6646605 5032358 6923692 6233323 8144977 8184993 8186464
-  * @summary Make sure we can read a zip file.
-    @key randomness
-  * @run main/othervm ReadZip
-@@ -31,12 +31,24 @@
-  */
- 
- import java.io.*;
-+import java.net.URI;
- import java.nio.file.Files;
-+import java.nio.file.FileSystem;
-+import java.nio.file.FileSystems;
-+import java.nio.file.Path;
- import java.nio.file.Paths;
- import java.nio.file.StandardCopyOption;
- import java.nio.file.StandardOpenOption;
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
- import java.util.zip.*;
- 
-+import sun.misc.IOUtils;
-+
-+import static java.nio.charset.StandardCharsets.US_ASCII;
-+
- public class ReadZip {
-     private static void unreached (Object o)
-         throws Exception
-@@ -144,8 +156,6 @@ public class ReadZip {
-             newZip.delete();
-         }
- 
--
--
-         // Throw a FNF exception when read a non-existing zip file
-         try { unreached (new ZipFile(
-                              new File(System.getProperty("test.src", "."),
-@@ -153,5 +163,54 @@ public class ReadZip {
-                                       + String.valueOf(new java.util.Random().nextInt())
-                                       + ".zip")));
-         } catch (FileNotFoundException fnfe) {}
-+
-+        // read a zip file with ZIP64 end
-+        Path path = Paths.get(System.getProperty("test.dir", ""), "end64.zip");
-+        try {
-+            URI uri = URI.create("jar:" + path.toUri());
-+            Map<String, Object> env = new HashMap<>();
-+	    env.put("create", "true");
-+	    env.put("forceZIP64End", "true");
-+            try (FileSystem fs = FileSystems.newFileSystem(uri, env)) {
-+                Files.write(fs.getPath("hello"), "hello".getBytes());
-+            }
-+            try (ZipFile zf = new ZipFile(path.toFile())) {
-+                if (!"hello".equals(new String(IOUtils.readAllBytes(zf.getInputStream(new ZipEntry("hello"))),
-+                                               US_ASCII)))
-+                    throw new RuntimeException("zipfile: read entry failed");
-+            } catch (IOException x) {
-+                throw new RuntimeException("zipfile: zip64 end failed");
-+            }
-+            try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
-+                if (!"hello".equals(new String(Files.readAllBytes(fs.getPath("hello")))))
-+                    throw new RuntimeException("zipfs: read entry failed");
-+            } catch (IOException x) {
-+                throw new RuntimeException("zipfile: zip64 end failed");
-+            }
-+        } finally {
-+            Files.deleteIfExists(path);
-+        }
-+
-+        // read a zip file created via "echo hello | zip dst.zip -", which uses
-+        // ZIP64 end record
-+        if (Files.notExists(Paths.get("/usr/bin/zip")))
-+            return;
-+        try {
-+            Process zip = new ProcessBuilder("zip", path.toString().toString(), "-").start();
-+            OutputStream os = zip.getOutputStream();
-+            os.write("hello".getBytes(US_ASCII));
-+            os.close();
-+            zip.waitFor();
-+            if (zip.exitValue() == 0 && Files.exists(path)) {
-+                try (ZipFile zf = new ZipFile(path.toFile())) {
-+                    if (!"hello".equals(new String(IOUtils.readAllBytes(zf.getInputStream(new ZipEntry("-"))))))
-+                        throw new RuntimeException("zipfile: read entry failed");
-+                } catch (IOException x) {
-+                    throw new RuntimeException("zipfile: zip64 end failed");
-+                }
-+            }
-+        } finally {
-+            Files.deleteIfExists(path);
-+        }
-     }
- }

SOURCES/jdk8218811-perfMemory_linux.patch

@@ -0,0 +1,12 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/perfMemory_linux.cpp openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/perfMemory_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp
+@@ -878,7 +878,7 @@
+ 
+   // open the file
+   int result;
+-  RESTARTABLE(::open(filename, oflags), result);
++  RESTARTABLE(::open(filename, oflags, 0), result);
+   if (result == OS_ERR) {
+     if (errno == ENOENT) {
+       THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),

SOURCES/jdk8271199-rh2175317-custom_pkcs11_provider_support.patch

@@ -0,0 +1,167 @@
+commit d41618f34f1d2f5416ec3c035f33dcb15cf5ab99
+Author: Alexey Bakhtin <abakhtin@openjdk.org>
+Date:   Tue Apr 4 10:29:11 2023 +0000
+
+    8271199: Mutual TLS handshake fails signing client certificate with custom sensitive PKCS11 key
+    
+    Reviewed-by: andrew, mbalao
+    Backport-of: f6232982b91cb2314e96ddbde3984836a810a556
+
+diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java b/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java
+index a79e97d7c74..5378446b97b 100644
+--- a/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java
++++ b/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java
+@@ -127,12 +127,15 @@ public class RSAPSSSignature extends SignatureSpi {
+     @Override
+     protected void engineInitVerify(PublicKey publicKey)
+             throws InvalidKeyException {
+-        if (!(publicKey instanceof RSAPublicKey)) {
++        if (publicKey instanceof RSAPublicKey) {
++            RSAPublicKey rsaPubKey = (RSAPublicKey)publicKey;
++            isPublicKeyValid(rsaPubKey);
++            this.pubKey = rsaPubKey;
++            this.privKey = null;
++            resetDigest();
++        } else {
+             throw new InvalidKeyException("key must be RSAPublicKey");
+         }
+-        this.pubKey = (RSAPublicKey) isValid((RSAKey)publicKey);
+-        this.privKey = null;
+-        resetDigest();
+     }
+ 
+     // initialize for signing. See JCA doc
+@@ -146,14 +149,17 @@ public class RSAPSSSignature extends SignatureSpi {
+     @Override
+     protected void engineInitSign(PrivateKey privateKey, SecureRandom random)
+             throws InvalidKeyException {
+-        if (!(privateKey instanceof RSAPrivateKey)) {
++        if (privateKey instanceof RSAPrivateKey) {
++            RSAPrivateKey rsaPrivateKey = (RSAPrivateKey)privateKey;
++            isPrivateKeyValid(rsaPrivateKey);
++            this.privKey = rsaPrivateKey;
++            this.pubKey = null;
++            this.random =
++                    (random == null ? JCAUtil.getSecureRandom() : random);
++            resetDigest();
++        } else {
+             throw new InvalidKeyException("key must be RSAPrivateKey");
+         }
+-        this.privKey = (RSAPrivateKey) isValid((RSAKey)privateKey);
+-        this.pubKey = null;
+-        this.random =
+-            (random == null? JCAUtil.getSecureRandom() : random);
+-        resetDigest();
+     }
+ 
+     /**
+@@ -205,11 +211,57 @@ public class RSAPSSSignature extends SignatureSpi {
+         }
+     }
+ 
++    /**
++     * Validate the specified RSAPrivateKey
++     */
++    private void isPrivateKeyValid(RSAPrivateKey prKey)  throws InvalidKeyException {
++        try {
++            if (prKey instanceof RSAPrivateCrtKey) {
++                RSAPrivateCrtKey crtKey = (RSAPrivateCrtKey)prKey;
++                if (RSAPrivateCrtKeyImpl.checkComponents(crtKey)) {
++                    RSAKeyFactory.checkRSAProviderKeyLengths(
++                            crtKey.getModulus().bitLength(),
++                            crtKey.getPublicExponent());
++                } else {
++                    throw new InvalidKeyException(
++                            "Some of the CRT-specific components are not available");
++                }
++            } else {
++                RSAKeyFactory.checkRSAProviderKeyLengths(
++                        prKey.getModulus().bitLength(),
++                        null);
++            }
++        } catch (InvalidKeyException ikEx) {
++            throw ikEx;
++        } catch (Exception e) {
++            throw new InvalidKeyException(
++                    "Can not access private key components", e);
++        }
++        isValid(prKey);
++    }
++
++    /**
++     * Validate the specified RSAPublicKey
++     */
++    private void isPublicKeyValid(RSAPublicKey pKey)  throws InvalidKeyException {
++        try {
++            RSAKeyFactory.checkRSAProviderKeyLengths(
++                    pKey.getModulus().bitLength(),
++                    pKey.getPublicExponent());
++        } catch (InvalidKeyException ikEx) {
++            throw ikEx;
++        } catch (Exception e) {
++            throw new InvalidKeyException(
++                    "Can not access public key components", e);
++        }
++        isValid(pKey);
++    }
++
+     /**
+      * Validate the specified RSAKey and its associated parameters against
+      * internal signature parameters.
+      */
+-    private RSAKey isValid(RSAKey rsaKey) throws InvalidKeyException {
++    private void isValid(RSAKey rsaKey) throws InvalidKeyException {
+         try {
+             AlgorithmParameterSpec keyParams = rsaKey.getParams();
+             // validate key parameters
+@@ -227,7 +279,6 @@ public class RSAPSSSignature extends SignatureSpi {
+                 }
+                 checkKeyLength(rsaKey, hLen, this.sigParams.getSaltLength());
+             }
+-            return rsaKey;
+         } catch (SignatureException e) {
+             throw new InvalidKeyException(e);
+         }
+diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+index 6b219937981..b3c1fae9672 100644
+--- a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
++++ b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+@@ -80,22 +80,28 @@ public final class RSAPrivateCrtKeyImpl
+         RSAPrivateCrtKeyImpl key = new RSAPrivateCrtKeyImpl(encoded);
+         // check all CRT-specific components are available, if any one
+         // missing, return a non-CRT key instead
+-        if ((key.getPublicExponent().signum() == 0) ||
+-            (key.getPrimeExponentP().signum() == 0) ||
+-            (key.getPrimeExponentQ().signum() == 0) ||
+-            (key.getPrimeP().signum() == 0) ||
+-            (key.getPrimeQ().signum() == 0) ||
+-            (key.getCrtCoefficient().signum() == 0)) {
++        if (checkComponents(key)) {
++            return key;
++        } else {
+             return new RSAPrivateKeyImpl(
+                 key.algid,
+                 key.getModulus(),
+-                key.getPrivateExponent()
+-            );
+-        } else {
+-            return key;
++                key.getPrivateExponent());
+         }
+     }
+ 
++    /**
++     * Validate if all CRT-specific components are available.
++     */
++    static boolean checkComponents(RSAPrivateCrtKey key) {
++        return !((key.getPublicExponent().signum() == 0) ||
++            (key.getPrimeExponentP().signum() == 0) ||
++            (key.getPrimeExponentQ().signum() == 0) ||
++            (key.getPrimeP().signum() == 0) ||
++            (key.getPrimeQ().signum() == 0) ||
++            (key.getCrtCoefficient().signum() == 0));
++    }
++
+     /**
+      * Generate a new key from the specified type and components.
+      * Returns a CRT key if possible and a non-CRT key otherwise.

SOURCES/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch

@@ -7,11 +7,10 @@
 8074839: Resolve disabled warnings for libunpack and the unpack200 binary
 Reviewed-by: dholmes, ksrini
 
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-index bdaf95a2f6a..60c5b4f2a69 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-@@ -63,7 +63,7 @@ struct bytes {
+@@ -63,7 +63,7 @@
      bytes res;
      res.ptr = ptr + beg;
      res.len = end - beg;
@@ -20,11 +19,10 @@ index bdaf95a2f6a..60c5b4f2a69 100644
      return res;
    }
    // building C strings inside byte buffers:
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-index 5fbc7261fb3..4c002e779d8 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
+@@ -292,7 +292,7 @@
  
    if (uPtr->aborting()) {
      THROW_IOE(uPtr->get_abort_message());
@@ -33,16 +31,16 @@ index 5fbc7261fb3..4c002e779d8 100644
    }
  
    // We have fetched all the files.
-@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
-   // There's no need to create a new unpacker here if we don't already have one
-   // just to immediatly free it afterwards.
-   unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true);
+@@ -310,7 +310,7 @@
+ JNIEXPORT jlong JNICALL
+ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
+   unpacker* uPtr = get_unpacker(env, pObj, false);
 -  CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
 +  CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
    size_t consumed = uPtr->input_consumed();
-   // free_unpacker() will set the unpacker field on 'pObj' to null
    free_unpacker(env, pObj, uPtr);
-@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL
+   return consumed;
+@@ -320,6 +320,7 @@
  Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
                                         jstring pProp, jstring pValue) {
    unpacker*   uPtr  = get_unpacker(env, pObj);
@@ -50,11 +48,10 @@ index 5fbc7261fb3..4c002e779d8 100644
    const char* prop  = env->GetStringUTFChars(pProp, JNI_FALSE);
    CHECK_EXCEPTION_RETURN_VALUE(prop, false);
    const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-index 6fbc43a18ae..722c8baaff0 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-@@ -142,31 +142,28 @@ static const char* nbasename(const char* progname) {
+@@ -142,31 +142,28 @@
    return progname;
  }
  
@@ -104,11 +101,10 @@ index 6fbc43a18ae..722c8baaff0 100644
    }
  }
  
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-index 56f391b1e87..f0a25f8cd20 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-@@ -225,9 +225,9 @@ struct entry {
+@@ -222,9 +222,9 @@
    }
  
  #ifdef PRODUCT
@@ -120,7 +116,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  #endif
  };
  
-@@ -718,13 +718,13 @@ void unpacker::read_file_header() {
+@@ -715,13 +715,13 @@
    // Now we can size the whole archive.
    // Read everything else into a mega-buffer.
    rp = hdr.rp;
@@ -138,7 +134,7 @@ index 56f391b1e87..f0a25f8cd20 100644
        abort("EOF reading fixed input buffer");
        return;
      }
-@@ -738,7 +738,7 @@ void unpacker::read_file_header() {
+@@ -735,7 +735,7 @@
        return;
      }
      input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
@@ -147,7 +143,7 @@ index 56f391b1e87..f0a25f8cd20 100644
      CHECK;
      assert(input.limit()[0] == 0);
      // Move all the bytes we read initially into the real buffer.
-@@ -961,13 +961,13 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
+@@ -958,13 +958,13 @@
    nentries = next_entry;
  
    // place a limit on future CP growth:
@@ -163,7 +159,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  
    // Note that this CP does not include "empty" entries
    // for longs and doubles.  Those are introduced when
-@@ -985,8 +985,9 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
+@@ -982,8 +982,9 @@
    }
  
    // Initialize *all* our entries once
@@ -174,7 +170,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  
    initGroupIndexes();
    // Initialize hashTab to a generous power-of-two size.
-@@ -3681,21 +3682,22 @@ void cpool::computeOutputIndexes() {
+@@ -3677,21 +3678,22 @@
  
  unpacker* debug_u;
  
@@ -201,7 +197,7 @@ index 56f391b1e87..f0a25f8cd20 100644
    case CONSTANT_Signature:
      if (value.b.ptr == null)
        return ref(0)->string();
-@@ -3715,26 +3717,28 @@ char* entry::string() {
+@@ -3711,26 +3713,28 @@
      break;
    default:
      if (nrefs == 0) {
@@ -239,11 +235,10 @@ index 56f391b1e87..f0a25f8cd20 100644
  }
  
  void print_cp_entries(int beg, int end) {
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-index cec7a88b24e..ed5f3336a59 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-@@ -209,7 +209,7 @@ struct unpacker {
+@@ -209,7 +209,7 @@
    byte*     rp;          // read pointer (< rplimit <= input.limit())
    byte*     rplimit;     // how much of the input block has been read?
    julong    bytes_read;
@@ -252,11 +247,10 @@ index cec7a88b24e..ed5f3336a59 100644
  
    // callback to read at least one byte, up to available input
    typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-index e5197e1a3f1..40a10055ea5 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-@@ -81,7 +81,7 @@ void breakpoint() { }  // hook for debugger
+@@ -81,7 +81,7 @@
  int assert_failed(const char* p) {
    char message[1<<12];
    sprintf(message, "@assert failed: %s\n", p);
@@ -265,11 +259,10 @@ index e5197e1a3f1..40a10055ea5 100644
    breakpoint();
    unpack_abort(message);
    return 0;
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-index f58c94956c0..343da3e183b 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-@@ -84,7 +84,7 @@ void jar::init(unpacker* u_) {
+@@ -84,7 +84,7 @@
  }
  
  // Write data to the ZIP output stream.
@@ -278,7 +271,7 @@ index f58c94956c0..343da3e183b 100644
    while (len > 0) {
      int rc = (int)fwrite(buff, 1, len, jarfp);
      if (rc <= 0) {
-@@ -323,12 +323,12 @@ void jar::write_central_directory() {
+@@ -323,12 +323,12 @@
      // Total number of disks (int)
      header64[36] = (ushort)SWAP_BYTES(1);
      header64[37] = 0;
@@ -293,11 +286,10 @@ index f58c94956c0..343da3e183b 100644
  
    PRINTCR((2, "writing zip comment\n"));
    // Write the comment.
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-index 14ffc9d65bd..9877f6f68ca 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-@@ -68,8 +68,8 @@ struct jar {
+@@ -68,8 +68,8 @@
    }
  
    // Private Methods

SOURCES/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch

@@ -1,16 +0,0 @@
-diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
---- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java	2009-01-23 11:59:47.000000000 -0500
-+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java	2009-01-23 12:05:20.000000000 -0500
-@@ -883,7 +883,11 @@
-                     return null;
-                 }
-             });
--            loadAssistiveTechnologies();
-+         try {
-+                 loadAssistiveTechnologies();
-+             } catch ( AWTError error) {
-+                 // ignore silently
-+             }
-         }
-         return toolkit;
-     }

SOURCES/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch

@@ -1,13 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java	2013-03-01 10:48:12.038189968 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java	2013-03-01 10:48:11.913188505 +0100
-@@ -48,8 +48,8 @@
- 
-     private final static String PROP_NAME = "sun.security.smartcardio.library";
- 
--    private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so";
--    private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
-+    private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
-+    private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
-     private final static String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
- 
-     PlatformPCSC() {

SOURCES/s390-8214206_fix.patch

@@ -16,7 +16,7 @@ diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenan
    Atomic::add(val, &_sum);
  
 -  int mag = log2_intptr(val) + 1;
-+  int mag = log2_long(val) + 1;
++  int mag = log2_intptr((uintptr_t)val) + 1;
  
    // Defensively saturate for product bits:
    if (mag < 0) {