.gitignore

@@ -7,24 +7,3 @@
 /openjdk-jdk19u-jdk-19+36.tar.xz
 /openjdk-jdk19u-jdk-19.0.1+10.tar.xz
 /openjdk-jdk19u-jdk-19.0.2+7.tar.xz
-/openjdk-jdk20u-jdk-20+36.tar.xz
-/openjdk-jdk20u-jdk-20.0.1+9.tar.xz
-/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
-/openjdk-jdk21u-jdk-21+35.tar.xz
-/openjdk-21.0.1+12.tar.xz
-/openjdk-21.0.2+11.tar.xz
-/openjdk-21.0.2+12.tar.xz
-/openjdk-21.0.2+13.tar.xz
-/openjdk-21.0.3+1-ea.tar.xz
-/openjdk-21.0.3+7-ea.tar.xz
-/openjdk-21.0.3+9.tar.xz
-/openjdk-21.0.4+1-ea.tar.xz
-/openjdk-21.0.4+5-ea.tar.xz
-/openjdk-21.0.4+7.tar.xz
-/openjdk-21.0.5+1-ea.tar.xz
-/openjdk-21.0.5+5-ea.tar.xz
-/openjdk-21.0.5+9-ea.tar.xz
-/openjdk-21.0.5+10.tar.xz
-/openjdk-21.0.5+11.tar.xz
-/openjdk-21.0.6+6-ea.tar.xz
-/openjdk-21.0.6+7.tar.xz

0001-Allow-devkit-to-work-with-RHEL.patch

@@ -1,54 +0,0 @@
-From 7733d625ebdea5a6f323a0c5944fb8ab728d1b2b Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Sat, 25 Nov 2023 17:29:36 +0000
-Subject: [PATCH] Allow devkit to work with RHEL
-
----
- make/devkit/Makefile  |  2 +-
- make/devkit/Tools.gmk | 10 +++++++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/make/devkit/Makefile b/make/devkit/Makefile
-index c85a7c21d29..8f69d23c325 100644
---- a/make/devkit/Makefile
-+++ b/make/devkit/Makefile
-@@ -58,7 +58,7 @@
- COMMA := ,
- 
- os := $(shell uname -o)
--cpu := $(shell uname -p)
-+cpu := $(shell uname -m)
- 
- # Figure out what platform this is building on.
- me := $(cpu)-$(if $(findstring Linux,$(os)),linux-gnu)
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index 187320ca26e..001f4b1870c 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -62,6 +62,14 @@ ifeq ($(BASE_OS), OL)
-     BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
-     LINUX_VERSION := OL6.4
-   endif
-+else ifeq ($(BASE_OS), RHEL)
-+  ifeq ($(ARCH), aarch64)
-+    BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-ALT-7/compose/Server/$(ARCH)/os/Packages/
-+    LINUX_VERSION := RHEL7.6
-+  else
-+    BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-7/compose/Server/$(ARCH)/os/Packages/
-+    LINUX_VERSION := RHEL7.9
-+  endif
- else ifeq ($(BASE_OS), Fedora)
-   ifeq ($(ARCH), riscv64)
-     DEFAULT_OS_VERSION := rawhide/68692
-@@ -246,7 +254,7 @@ download-rpms:
-         # Only run this if rpm dir is empty.
-         ifeq ($(wildcard $(DOWNLOAD_RPMS)/*.rpm), )
- 	  cd $(DOWNLOAD_RPMS) && \
--	      wget -r -np -nd $(patsubst %, -A "*%*.rpm", $(RPM_LIST)) $(BASE_URL)
-+	      wget -r -e robots=off -np -nd $(patsubst %, -A "*%*.rpm", $(RPM_LIST)) $(BASE_URL)
-         endif
- 
- ##########################################################################################
--- 
-2.45.2
-

0002-Disable-multilib-on-x86_64.patch

@@ -1,50 +0,0 @@
-From e55afc691c0105623e04a6e76369cf1438afb874 Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Fri, 8 Dec 2023 21:22:02 +0000
-Subject: [PATCH] Disable multilib on x86_64
-
----
- make/devkit/Tools.gmk | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index 001f4b1870c..9ede781413d 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -225,13 +225,7 @@ RPM_LIST := \
- ##########################################################################################
- # Define common directories and files
- 
--# Ensure we have 32-bit libs also for x64. We enable mixed-mode.
--ifeq (x86_64,$(ARCH))
--  LIBDIRS := lib64 lib
--  CFLAGS_lib := -m32
--else
--  LIBDIRS := lib
--endif
-+LIBDIRS := lib
- 
- # Define directories
- BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET)
-@@ -289,8 +283,7 @@ $(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC GDB,$(eval $(call Download,$(p))))
- 
- RPM_ARCHS := $(ARCH) noarch
- ifeq ($(ARCH),x86_64)
--  # Enable mixed mode.
--  RPM_ARCHS += i386 i686
-+  RPM_ARCHS += i686
- else ifeq ($(ARCH),i686)
-   RPM_ARCHS += i386
- else ifeq ($(ARCH), armhfp)
-@@ -526,7 +519,7 @@ ifeq ($(ARCH), armhfp)
-   $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG +=  --with-float=hard
- endif
- 
--ifneq ($(filter riscv64 ppc64 ppc64le s390x, $(ARCH)), )
-+ifneq ($(filter riscv64 ppc64 ppc64le s390x x86_64, $(ARCH)), )
-   # We only support 64-bit on these platforms anyway
-   CONFIG += --disable-multilib
- endif
--- 
-2.45.2
-

0003-Log-devkit-build-to-stdout.patch

@@ -1,92 +0,0 @@
-From fbc27183b35df7778cf106450b144474f8e2a35c Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Wed, 30 Oct 2024 00:42:06 +0000
-Subject: [PATCH] Log devkit build to stdout
-
-Resolves: OPENJDK-3071
----
- make/devkit/Tools.gmk | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index 9ede781413d..b6f895f5a25 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -458,7 +458,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
- 	      --enable-multilib \
- 	      --enable-threads \
- 	      --enable-plugins \
--	) > $(@D)/log.config 2>&1
-+	) 2>&1 | tee $(@D)/log.config 
- 	@echo 'done'
- 
- $(BUILDDIR)/$(mpfr_ver)/Makefile \
-@@ -473,7 +473,7 @@ $(BUILDDIR)/$(mpfr_ver)/Makefile \
- 	      --program-prefix=$(TARGET)- \
- 	      --enable-shared=no \
- 	      --with-gmp=$(PREFIX) \
--	) > $(@D)/log.config 2>&1
-+	) 2>&1 | tee $(@D)/log.config
- 	@echo 'done'
- 
- $(BUILDDIR)/$(gmp_ver)/Makefile \
-@@ -490,7 +490,7 @@ $(BUILDDIR)/$(gmp_ver)/Makefile \
- 	      --program-prefix=$(TARGET)- \
- 	      --enable-shared=no \
- 	      --with-mpfr=$(PREFIX) \
--	) > $(@D)/log.config 2>&1
-+	) 2>&1 | tee $(@D)/log.config
- 	@echo 'done'
- 
- $(BUILDDIR)/$(mpc_ver)/Makefile \
-@@ -506,7 +506,7 @@ $(BUILDDIR)/$(mpc_ver)/Makefile \
- 	      --enable-shared=no \
- 	      --with-mpfr=$(PREFIX) \
- 	      --with-gmp=$(PREFIX) \
--	) > $(@D)/log.config 2>&1
-+	) 2>&1 | tee $(@D)/log.config
- 	@echo 'done'
- 
- # Only valid if glibc target -> linux
-@@ -549,7 +549,7 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \
- 	      --with-mpfr=$(PREFIX) \
- 	      --with-gmp=$(PREFIX) \
- 	      --with-mpc=$(PREFIX) \
--	) > $(@D)/log.config 2>&1
-+	) 2>&1 | tee $(@D)/log.config
- 	@echo 'done'
- 
- # need binutils for gcc
-@@ -571,7 +571,7 @@ ifeq ($(HOST), $(TARGET))
- 	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" $(GDB_CFG) \
- 	      $(CONFIG) \
- 	      --with-sysroot=$(SYSROOT) \
--	) > $(@D)/log.config 2>&1
-+	) 2>&1 | tee $(@D)/log.config
- 	@echo 'done'
- 
-   $(gdb): $(gcc)
-@@ -593,7 +593,7 @@ $(BUILDDIR)/$(ccache_ver)/Makefile \
- 	  cd $(@D) ; \
- 	  $(PATHPRE) $(ENVS) $(CCACHE_CFG) \
- 	      $(CONFIG) \
--	) > $(@D)/log.config 2>&1
-+	) 2>&1 | tee $(@D)/log.config
- 	@echo 'done'
- 
- gccpatch = $(TARGETDIR)/gcc-patched
-@@ -641,9 +641,9 @@ endif
- # Always need to build cross tools for build host self.
- $(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
- 	$(info Building $(basename $@). Log in $(<D)/log.build)
--	$(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.build 2>&1
-+	$(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) 2>&1 | tee $(<D)/log.build
- 	@echo -n 'installing...'
--	$(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.install 2>&1
-+	$(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) 2>&1 | tee $(<D)/log.install
- 	@mkdir -p $(@D)
- 	@touch $@
- 	@echo 'done'
--- 
-2.45.2
-

0004-devkit-Remove-.comment-sections-from-sysroot-objects.patch

@@ -1,41 +0,0 @@
-From 3d81d23118aab95214e24ccc81eff61ac245a1ac Mon Sep 17 00:00:00 2001
-From: Thomas Fitzsimmons <fitzsim@redhat.com>
-Date: Wed, 20 Mar 2024 13:01:47 -0400
-Subject: [PATCH] devkit: Remove .comment sections from sysroot objects
-
-Otherwise the comment sections of C runtime objects, including those
-in static libraries like libc_nonshared.a, contribute RPM package
-version strings to the .comment section in devkit-produced binaries
-and libraries.  These RPM package strings change frequently, even
-across minor toolchain updates.  Their presence interferes when
-comparing binaries built with devkits that use different sysroot RPM
-package sets.
----
- make/devkit/Tools.gmk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index b6f895f5a25..37ea1a6a287 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -324,6 +324,9 @@ $(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
- # have it anyway, but just to make sure...
- # Patch libc.so and libpthread.so to force linking against libraries in sysroot
- # and not the ones installed on the build machine.
-+# Remove comment sections from static libraries and C runtime objects
-+# to prevent leaking RHEL-specific package versions into
-+# devkit-produced binaries.
- $(libs) : $(rpms)
- 	@echo Patching libc and pthreads
- 	@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
-@@ -333,6 +336,7 @@ $(libs) : $(rpms)
- 	      -e 's|/lib/||g' ) > $$f.tmp ; \
- 	  mv $$f.tmp $$f ; \
- 	done)
-+	@find $(SYSROOT) -name '*.[ao]' -exec objcopy --remove-section .comment '{}' ';'
- 	@mkdir -p $(SYSROOT)/usr/lib
- 	@touch $@
- 
--- 
-2.45.2
-

0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch

@@ -1,35 +0,0 @@
-From c370e1194c707f3f6c470e147ec497cc4e76957e Mon Sep 17 00:00:00 2001
-From: Thomas Fitzsimmons <fitzsim@redhat.com>
-Date: Fri, 22 Mar 2024 16:03:17 -0400
-Subject: [PATCH] Tools.gmk: Configure binutils with
- --enable-deterministic-archives
-
----
- make/devkit/Tools.gmk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index 37ea1a6a287..22c6007000b 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -445,6 +445,9 @@ endif
- 
- # Makefile creation. Simply run configure in build dir.
- # Setting CFLAGS to -O2 generates a much faster ld.
-+# Use --enable-deterministic-archives so that make targets that
-+# generate "ar" archives, such as "static-libs-image", produce
-+# deterministic .a files.
- $(bfdmakes) \
- $(BUILDDIR)/$(binutils_ver)/Makefile \
-     : $(BINUTILS_CFG)
-@@ -459,6 +462,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
- 	      --with-sysroot=$(SYSROOT) \
- 	      --disable-nls \
- 	      --program-prefix=$(TARGET)- \
-+	      --enable-deterministic-archives \
- 	      --enable-multilib \
- 	      --enable-threads \
- 	      --enable-plugins \
--- 
-2.45.2
-

0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch

@@ -1,35 +0,0 @@
-From 5958274571b957617d0572101a92217fd5b2f312 Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Wed, 27 Nov 2024 17:04:19 +0000
-Subject: [PATCH] Tools.gmk: Add --enable-linker-build-id to gcc build
-
-This causes --build-id to be passed to the linker, and the
-.note.gnu.build-id section is added (OPENJDK-3068)
----
- make/devkit/Tools.gmk | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index 22c6007000b..57d48ec5114 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -539,6 +539,8 @@ endif
- # skip native language.
- # and link and assemble with the binutils we created
- # earlier, so --with-gnu*
-+# Add --enable-linker-build-id so the .note.gnu.build-id
-+# section is added by the linker (OPENJDK-3068)
- $(BUILDDIR)/$(gcc_ver)/Makefile \
-     : $(GCC_CFG)
- 	$(info Configuring $@. Log in $(@D)/log.config)
-@@ -557,6 +559,7 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \
- 	      --with-mpfr=$(PREFIX) \
- 	      --with-gmp=$(PREFIX) \
- 	      --with-mpc=$(PREFIX) \
-+	      --enable-linker-build-id \
- 	) 2>&1 | tee $(@D)/log.config
- 	@echo 'done'
- 
--- 
-2.45.2
-

0007-Tools.gmk-Exclude-systemtap-sdt-devel-on-s390x-ppc64.patch

@@ -1,38 +0,0 @@
-From 2617c050a909265444b32063b2d271eca42dcaa6 Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Fri, 17 Jan 2025 21:11:01 +0000
-Subject: [PATCH] Tools.gmk: Exclude systemtap-sdt-devel on s390x & ppc64*
-
-There is no DTrace support on s390x (JDK-8305174) and ppc64
-(JDK-8304867) so we don't need the RPMs. They also cause issues with
-static linkage of libstdc++.a on s390x. It fails with 'error:
-relocation refers to local symbol "" [9], which is defined in a
-discarded section'.
-
-Resolves: OPENJDK-3070
----
- make/devkit/Tools.gmk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index 57d48ec5114..07928f69ceb 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -219,9 +219,13 @@ RPM_LIST := \
-     zlib zlib-devel \
-     libffi libffi-devel \
-     fontconfig fontconfig-devel \
--    systemtap-sdt-devel \
-     #
- 
-+# Only include SystemTap on supported architectures
-+ifeq ($(filter ppc64 ppc64le s390x, $(ARCH)), )
-+  RPM_LIST += systemtap-sdt-devel
-+endif
-+
- ##########################################################################################
- # Define common directories and files
- 
--- 
-2.45.2
-

0008-Tools.gmk-Use-update-repository-on-RHEL-rather-than-.patch

@@ -1,33 +0,0 @@
-From 9766818f55726cea630b432f09cce8f9c17c014d Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Fri, 17 Jan 2025 21:27:58 +0000
-Subject: [PATCH] Tools.gmk: Use update repository on RHEL rather than GA
-
-It looks like we were using 7.6 & 7.9 GA repositories rather than
-the latest updates.
-
-Resolves: OPENJDK-3589
----
- make/devkit/Tools.gmk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
-index 07928f69ceb..5b39560ab11 100644
---- a/make/devkit/Tools.gmk
-+++ b/make/devkit/Tools.gmk
-@@ -64,10 +64,10 @@ ifeq ($(BASE_OS), OL)
-   endif
- else ifeq ($(BASE_OS), RHEL)
-   ifeq ($(ARCH), aarch64)
--    BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-ALT-7/compose/Server/$(ARCH)/os/Packages/
-+    BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/updates/RHEL-ALT-7/latest-RHEL-ALT-7/compose/Server/$(ARCH)/os/Packages/
-     LINUX_VERSION := RHEL7.6
-   else
--    BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-7/compose/Server/$(ARCH)/os/Packages/
-+    BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/updates/RHEL-7/latest-RHEL-7/compose/Server/$(ARCH)/os/Packages/
-     LINUX_VERSION := RHEL7.9
-   endif
- else ifeq ($(BASE_OS), Fedora)
--- 
-2.45.2
-

README.md

@@ -1,12 +1,14 @@
-OpenJDK 21 is the latest Long-Term Support (LTS) release of the Java platform.
+OpenJDK 17 is the latest Long-Term Support (LTS) release of the Java platform.
 
-For a list of major changes from OpenJDK 17 (java-17-openjdk), see the upstream
+For a list of major changes from OpenJDK 11 (java-11-openjdk), see the upstream
-release page for OpenJDK 21 and the preceding interim releases:
+release page for OpenJDK 17 and the preceding interim releases:
 
-* 18: https://openjdk.java.net/projects/jdk/18/
+* 12: https://openjdk.java.net/projects/jdk/12/
-* 19: https://openjdk.java.net/projects/jdk/19/
+* 13: https://openjdk.java.net/projects/jdk/13/
-* 20: https://openjdk.java.net/projects/jdk/20/
+* 14: https://openjdk.java.net/projects/jdk/14/
-* 21: https://openjdk.java.net/projects/jdk/21/
+* 15: https://openjdk.java.net/projects/jdk/15/
+* 16: https://openjdk.java.net/projects/jdk/16/
+* 17: https://openjdk.java.net/projects/jdk/17/
 
 # Rebuilding the OpenJDK package
 
@@ -18,29 +20,22 @@ multiple builds which only differ by the platform they were built on.
 
 This does make rebuilding the package slightly more complicated than a
 normal package. Modifications should be made to the
-`java-21-openjdk-portable.specfile` file, which can be found with this
+`java-17-openjdk-portable.specfile` file, which can be found with this
 README file in the source RPM or installed in the documentation tree
-by the `java-21-openjdk-headless` RPM.
+by the `java-17-openjdk-headless` RPM.
 
-Once the modified `java-21-openjdk-portable` RPMs are built, they
+Once the modified `java-17-openjdk-portable` RPMs are built, they
 should be installed and will produce a number of tarballs in the
-`/usr/lib/jvm` directory. The `java-21-openjdk` RPMs can then be
+`/usr/lib/jvm` directory. The `java-17-openjdk` RPMs can then be
 built, which will use these tarballs to create the usual RPMs found in
-RHEL. The `java-21-openjdk-portable` RPMs can be uninstalled once the
+RHEL. The `java-17-openjdk-portable` RPMs can be uninstalled once the
 desired final RPMs are produced.
 
-Note that the `java-21-openjdk.spec` file has a hard requirement on
+Note that the `java-17-openjdk.spec` file has a hard requirement on
-the exact version of java-21-openjdk-portable to use, so this will
+the exact version of java-17-openjdk-portable to use, so this will
 need to be modified if the version or rpmrelease values are changed in
-`java-21-openjdk-portable.specfile`.
+`java-17-openjdk-portable.specfile`.
 
 To reduce the number of RPMs involved, the `fastdebug` and `slowdebug`
 builds may be disabled using `--without fastdebug` and `--without
 slowdebug`.
-
-By default, the portable build on RHEL also uses a "devkit" (a
-toolchain and system libraries) to build.  This aids reproducibility
-by removing build differences caused by differing system toolchains
-and libraries.  This dependency can be dropped by defining 'centos' to
-a non-zero value (e.g. --define='centos 1') or a devkit can be built
-using the `openjdk-devkit.specfile` and associated patches.

TestTranslations.java

@@ -52,7 +52,7 @@ public class TestTranslations {
         map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
                                               "heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
                                               "heure des Rocheuses", "UTC\u221207:00", "MT"});
-        map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
+        map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
                                                "Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
                                                "Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
         CIUDAD_JUAREZ = Collections.unmodifiableMap(map);

alt-java.c

@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2023 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Red Hat designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Red Hat in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include <errno.h>
-#include <libgen.h>
-#include <linux/limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/prctl.h>
-#include <unistd.h>
-
-/* Per task speculation control */
-#ifndef PR_GET_SPECULATION_CTRL
-# define PR_GET_SPECULATION_CTRL    52
-#endif
-#ifndef PR_SET_SPECULATION_CTRL
-# define PR_SET_SPECULATION_CTRL    53
-#endif
-/* Speculation control variants */
-#ifndef PR_SPEC_STORE_BYPASS
-# define PR_SPEC_STORE_BYPASS          0
-#endif
-/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-
-#ifndef PR_SPEC_NOT_AFFECTED
-# define PR_SPEC_NOT_AFFECTED          0
-#endif
-#ifndef PR_SPEC_PRCTL
-# define PR_SPEC_PRCTL                 (1UL << 0)
-#endif
-#ifndef PR_SPEC_ENABLE
-# define PR_SPEC_ENABLE                (1UL << 1)
-#endif
-#ifndef PR_SPEC_DISABLE
-# define PR_SPEC_DISABLE               (1UL << 2)
-#endif
-#ifndef PR_SPEC_FORCE_DISABLE
-# define PR_SPEC_FORCE_DISABLE         (1UL << 3)
-#endif
-#ifndef PR_SPEC_DISABLE_NOEXEC
-# define PR_SPEC_DISABLE_NOEXEC        (1UL << 4)
-#endif
-
-static void set_speculation() {
-#if defined(__linux__) && defined(__x86_64__)
-  // PR_SPEC_DISABLE_NOEXEC doesn't survive execve, so we can't use it
-  //  if ( prctl(PR_SET_SPECULATION_CTRL,
-  //           PR_SPEC_STORE_BYPASS,
-  //           PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
-  //  return;
-  // }
-  prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-#else
-#warning alt-java requested but SSB mitigation not available on this platform.
-#endif
-}
-
-int main(int argc, char **argv) {
-  set_speculation();
-
-  char our_name[PATH_MAX], java_name[PATH_MAX];
-  ssize_t len = readlink("/proc/self/exe", our_name, PATH_MAX - 1);
-  if (len < 0) {
-    perror("I can't find myself");
-    exit(2);
-  }
-
-  our_name[len] = '\0'; // readlink(2) doesn't append a null byte
-  char *path = dirname(our_name);
-  strncpy(java_name, path, PATH_MAX - 1);
-
-  size_t remaining_bytes = PATH_MAX - strlen(path) - 1;
-  strncat(java_name, "/java", remaining_bytes);
-
-  execv(java_name, argv);
-  fprintf(stderr, "%s failed to launch: %s\n", java_name, strerror(errno));
-
-  exit(1);
-}
-

discover_trees.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2024 Red Hat, Inc.
+# Copyright (C) 2020 Red Hat, Inc.
 # Written by Andrew John Hughes <gnu.andrew@redhat.com>.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -18,44 +18,37 @@
 
 TREE=${1}
 
-if test "${TREE}" = ""; then
+if test "x${TREE}" = "x"; then
     TREE=${PWD}
 fi
 
-if [ -e "${TREE}"/nashorn/.hg ] || [ -e "${TREE}"/nashorn/merge.changeset ] ; then
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
     NASHORN="nashorn" ;
 fi
 
-if [ -e "${TREE}"/corba/.hg ] || [ -e "${TREE}"/corba/merge.changeset ] ; then
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
     CORBA="corba";
 fi
 
-if [ -e "${TREE}"/jaxp/.hg ] || [ -e "${TREE}"/jaxp/merge.changeset ] ; then
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
     JAXP="jaxp";
 fi
 
-if [ -e "${TREE}"/jaxws/.hg ] || [ -e "${TREE}"/jaxws/merge.changeset ] ; then
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
     JAXWS="jaxws";
 fi
 
-if [ -e "${TREE}"/langtools/.hg ] || [ -e "${TREE}"/langtools/merge.changeset ] ; then
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
     LANGTOOLS="langtools";
 fi
 
-if [ -e "${TREE}"/jdk/.hg ] || [ -e "${TREE}"/jdk/merge.changeset ] ; then
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
     JDK="jdk";
 fi
 
-if [ -e "${TREE}"/hotspot/.hg ] || [ -e "${TREE}"/hotspot/merge.changeset ] ; then
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
     HOTSPOT="hotspot";
 fi
 
 SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
-echo "${SUBTREES}"
+echo ${SUBTREES}
-
-# Local Variables:
-# compile-command: "shellcheck discover_trees.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

gating.yaml

@@ -1,7 +1,7 @@
 # recipients: java-qa
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

generate_source_tarball.sh

@@ -0,0 +1,210 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
+# If you want to use a local copy of patch PR3788, set the path to it in the PR3788 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=openjdk
+# REPO_NAME=jdk17u
+# VERSION=jdk-17.0.3+5
+# or to eg prepare systemtap:
+# icedtea7's jstack and other tapsets
+# VERSION=6327cf1cea9e
+# REPO_NAME=icedtea7-2.6
+# PROJECT_NAME=release
+# OPENJDK_URL=http://icedtea.classpath.org/hg/
+# TO_COMPRESS="*/tapset"
+#
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR3823" = "x" ] ; then
+  if [ ! -f "$PR3823" ] ; then
+    echo "You have specified PR3823 as $PR3823 but it does not exist. Exiting"
+    exit 1
+  fi
+fi
+
+set -e
+
+OPENJDK_URL_DEFAULT=https://github.com
+COMPRESSION_DEFAULT=xz
+# Corresponding IcedTea version
+ICEDTEA_VERSION=13.0
+
+if [ "x$1" = "xhelp" ] ; then
+    echo -e "Behaviour may be specified by setting the following variables:\n"
+    echo "VERSION - the version of the specified OpenJDK project"
+    echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+    echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+    echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+    echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+    echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+    echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
+    echo "PR3823 - the path to the PR3823 patch to apply (optional; downloaded if unavailable)"
+    echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
+    exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+    echo "No VERSION specified"
+    exit 2
+fi
+echo "Version: ${VERSION}"
+
+NUM_VER=${VERSION##jdk-}
+RELEASE_VER=${NUM_VER%%+*}
+BUILD_VER=${NUM_VER##*+}
+MAJOR_VER=${RELEASE_VER%%.*}
+echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"
+
+if [ "x$BOOT_JDK" = "x" ] ; then
+    echo "No boot JDK specified".
+    BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
+    echo -n "Checking for ${BOOT_JDK}...";
+    if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
+        echo "Boot JDK found at ${BOOT_JDK}";
+    else
+        echo "Not found";
+        PREV_VER=$((${MAJOR_VER} - 1));
+        BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
+        echo -n "Checking for ${BOOT_JDK}...";
+        if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
+            echo "Boot JDK found at ${BOOT_JDK}";
+        else
+            echo "Not found";
+            exit 4;
+        fi
+    fi
+else
+    echo "Boot JDK: ${BOOT_JDK}";
+fi
+
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+  if [ "x$PROJECT_NAME" = "x" ] ; then
+    echo "No PROJECT_NAME specified"
+    exit 1
+  fi
+  echo "Project name: ${PROJECT_NAME}"
+  if [ "x$REPO_NAME" = "x" ] ; then
+    echo "No REPO_NAME specified"
+    exit 3
+  fi
+  echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+    OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+    echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+    echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+    # rhel 5 needs tar.gz
+    COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+    FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+    echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+    REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
+    echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+if [ "x$TO_COMPRESS" = "x" ] ; then
+    TO_COMPRESS="openjdk"
+    echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+fi;
+
+if [ -d ${FILE_NAME_ROOT} ] ; then
+  echo "exists exists exists exists exists exists exists "
+  echo "reusing reusing reusing reusing reusing reusing "
+  echo ${FILE_NAME_ROOT}
+else
+  mkdir "${FILE_NAME_ROOT}"
+  pushd "${FILE_NAME_ROOT}"
+    echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+    git clone -b ${VERSION} ${REPO_ROOT} openjdk
+  popd
+fi
+pushd "${FILE_NAME_ROOT}"
+    if [ -d openjdk/src ]; then
+        pushd openjdk
+            echo "Removing EC source code we don't build"
+            CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
+            rm -vf ${CRYPTO_PATH}/ec2.h
+            rm -vf ${CRYPTO_PATH}/ec2_163.c
+            rm -vf ${CRYPTO_PATH}/ec2_193.c
+            rm -vf ${CRYPTO_PATH}/ec2_233.c
+            rm -vf ${CRYPTO_PATH}/ec2_aff.c
+            rm -vf ${CRYPTO_PATH}/ec2_mont.c
+            rm -vf ${CRYPTO_PATH}/ecp_192.c
+            rm -vf ${CRYPTO_PATH}/ecp_224.c
+
+            echo "Syncing EC list with NSS"
+            if [ "x$PR3823" = "x" ] ; then
+                # get PR3823.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
+                # Do not push it or publish it
+                echo "PR3823 not found. Downloading..."
+                wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/pr3823.patch
+                echo "Applying ${PWD}/pr3823.patch"
+                patch -Np1 < pr3823.patch
+                rm pr3823.patch
+            else
+                echo "Applying ${PR3823}"
+                patch -Np1 < $PR3823
+            fi;
+            find . -name '*.orig' -exec rm -vf '{}' ';'
+        popd
+    fi
+
+    # Generate .src-rev so build has knowledge of the revision the tarball was created from
+    mkdir build
+    pushd build
+    sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
+    make store-source-revision
+    popd
+    rm -rf build
+
+    # Remove commit checks
+    echo "Removing $(find openjdk -name '.jcheck' -print)"
+    find openjdk -name '.jcheck' -print0 | xargs -0 rm -r
+
+    # Remove history and GHA
+    echo "find openjdk -name '.hgtags'"
+    find openjdk -name '.hgtags' -exec rm -v '{}' '+'
+    echo "find openjdk -name '.hgignore'"
+    find openjdk -name '.hgignore' -exec rm -v '{}' '+'
+    echo "find openjdk -name '.gitattributes'"
+    find openjdk -name '.gitattributes' -exec rm -v '{}' '+'
+    echo "find openjdk -name '.gitignore'"
+    find openjdk -name '.gitignore' -exec rm -v '{}' '+'
+    echo "find openjdk -name '.git'"
+    find openjdk -name '.git' -exec rm -rv '{}' '+'
+    echo "find openjdk -name '.github'"
+    find openjdk -name '.github' -exec rm -rv '{}' '+'
+
+    echo "Compressing remaining forest"
+    if [ "X$COMPRESSION" = "Xxz" ] ; then
+        SWITCH=cJf
+    else
+        SWITCH=czf
+    fi
+    tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
+    mv ${FILE_NAME_ROOT}.tar.${COMPRESSION}  ..
+popd
+echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."

icedtea_sync.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2024 Red Hat, Inc.
+# Copyright (C) 2019 Red Hat, Inc.
 # Written by Andrew John Hughes <gnu.andrew@redhat.com>.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -26,31 +26,31 @@ ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
 set -e
 
 RPM_DIR=${PWD}
-if [ ! -f "${RPM_DIR}/jconsole.desktop.in" ] ; then
+if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
     echo "Not in RPM source tree.";
     exit 1;
 fi
 
-if test "${TMPDIR}" = ""; then
+if test "x${TMPDIR}" = "x"; then
     TMPDIR=/tmp;
 fi
 WORKDIR=${TMPDIR}/it.sync
 
 echo "Using working directory ${WORKDIR}"
-mkdir "${WORKDIR}"
+mkdir ${WORKDIR}
-pushd "${WORKDIR}"
+pushd ${WORKDIR}
 
-if test "${WGET}" = ""; then
+if test "x${WGET}" = "x"; then
     WGET=$(which wget);
-    if test "${WGET}" = ""; then
+    if test "x${WGET}" = "x"; then
 	echo "wget not found";
 	exit 1;
     fi
 fi
 
-if test "${TAR}" = ""; then
+if test "x${TAR}" = "x"; then
     TAR=$(which tar)
-    if test "${TAR}" = ""; then
+    if test "x${TAR}" = "x"; then
 	echo "tar not found";
 	exit 2;
     fi
@@ -60,36 +60,36 @@ echo "Dependencies:";
 echo -e "\tWGET: ${WGET}";
 echo -e "\tTAR: ${TAR}\n";
 
-if test "${ICEDTEA_USE_VCS}" = "true"; then
+if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
     echo "Mode: Using VCS";
 
-    if test "${GREP}" = ""; then
+    if test "x${GREP}" = "x"; then
 	GREP=$(which grep);
-	if test "${GREP}" = ""; then
+	if test "x${GREP}" = "x"; then
 	    echo "grep not found";
 	    exit 3;
 	fi
     fi
 
-    if test "${CUT}" = ""; then
+    if test "x${CUT}" = "x"; then
 	CUT=$(which cut);
-	if test "${CUT}" = ""; then
+	if test "x${CUT}" = "x"; then
 	    echo "cut not found";
 	    exit 4;
 	fi
     fi
 
-    if test "${TR}" = ""; then
+    if test "x${TR}" = "x"; then
 	TR=$(which tr);
-	if test "${TR}" = ""; then
+	if test "x${TR}" = "x"; then
 	    echo "tr not found";
 	    exit 5;
 	fi
     fi
 
-    if test "${HG}" = ""; then
+    if test "x${HG}" = "x"; then
 	HG=$(which hg);
-	if test "${HG}" = ""; then
+	if test "x${HG}" = "x"; then
 	    echo "hg not found";
 	    exit 6;
 	fi
@@ -113,33 +113,33 @@ if test "${ICEDTEA_USE_VCS}" = "true"; then
 
     ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
     echo "Creating icedtea-${ICEDTEA_VERSION}";
-    mkdir "icedtea-${ICEDTEA_VERSION}"
+    mkdir icedtea-${ICEDTEA_VERSION}
     echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
     # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
     #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
-    cp -a "${RPM_DIR}/jconsole.desktop.in" "icedtea-${ICEDTEA_VERSION}"
+    cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
-    cp -a icedtea/tapset "icedtea-${ICEDTEA_VERSION}"
+    cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
 
     rm -rf icedtea
 else
     echo "Mode: Using tarball";
 
-    if test "${ICEDTEA_VERSION}" = ""; then
+    if test "x${ICEDTEA_VERSION}" = "x"; then
 	echo "No IcedTea version specified for tarball download.";
 	exit 3;
     fi
 
-    if test "${CHECKSUM}" = ""; then
+    if test "x${CHECKSUM}" = "x"; then
 	CHECKSUM=$(which sha256sum)
-	if test "${CHECKSUM}" = ""; then
+	if test "x${CHECKSUM}" = "x"; then
 	    echo "sha256sum not found";
 	    exit 4;
 	fi
     fi
 
-    if test "${PGP}" = ""; then
+    if test "x${PGP}" = "x"; then
 	PGP=$(which gpg)
-	if test "${PGP}" = ""; then
+	if test "x${PGP}" = "x"; then
 	    echo "gpg not found";
 	    exit 5;
 	fi
@@ -179,20 +179,13 @@ else
 fi
 
 echo "Replacing desktop files...";
-mv -v "icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in" "${RPM_DIR}"
+mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
 
 echo "Creating new tapset tarball...";
-mv -v "icedtea-${ICEDTEA_VERSION}" openjdk
+mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf "${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz" openjdk
+${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
 
 rm -rvf openjdk
 
 popd
-rm -rf "${WORKDIR}"
+rm -rf ${WORKDIR}
-
-# Local Variables:
-# compile-command: "shellcheck icedtea_sync.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

jdk8295447-npe_in_constructor.patch

@@ -0,0 +1,97 @@
+commit c9d485792b99233f381dcdfd69838e7b973909bd
+Author: Victor Rudometov <vrudomet@openjdk.org>
+Date:   Thu Dec 1 10:57:43 2022 +0000
+
+    8295447: NullPointerException with invalid pattern matching construct in constructor call
+    
+    Backport-of: 6c05771b9be3dd5cbcdb40d2e53cc53959926cdd
+
+diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+index 21cc8e57e1f..46b076d3d03 100644
+--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
++++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+@@ -4145,6 +4145,10 @@ public class Attr extends JCTree.Visitor {
+                                          Type exprType,
+                                          Type pattType) {
+         Warner warner = new Warner();
++        // if any type is erroneous, the problem is reported elsewhere
++        if (exprType.isErroneous() || pattType.isErroneous()) {
++            return false;
++        }
+         if (!types.isCastable(exprType, pattType, warner)) {
+             chk.basicHandler.report(pos,
+                     diags.fragment(Fragments.InconvertibleTypes(exprType, pattType)));
+@@ -4206,7 +4210,7 @@ public class Attr extends JCTree.Visitor {
+             tree.record = record;
+         } else {
+             log.error(tree.pos(), Errors.DeconstructionPatternOnlyRecords(site.tsym));
+-            expectedRecordTypes = Stream.generate(() -> Type.noType)
++            expectedRecordTypes = Stream.generate(() -> types.createErrorType(tree.type))
+                                 .limit(tree.nested.size())
+                                 .collect(List.collector());
+         }
+diff --git a/test/langtools/tools/javac/T8295447.java b/test/langtools/tools/javac/T8295447.java
+new file mode 100644
+index 00000000000..76fcaf10f8d
+--- /dev/null
++++ b/test/langtools/tools/javac/T8295447.java
+@@ -0,0 +1,46 @@
++/*
++ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++/**
++ * @test
++ * @bug 8295447
++ * @summary NullPointerException with invalid pattern matching construct in constructor call
++ * @modules jdk.compiler
++ * @compile/fail/ref=T8295447.out -XDrawDiagnostics --enable-preview -source ${jdk.version} T8295447.java
++ */
++public class T8295447 {
++    class Foo {
++        void m(Object o) {
++            if(o instanceof Foo(int x)) {}
++        }
++
++        Foo(Object o) {
++            m((o instanceof Foo(int x))? 0 : 1);
++        }
++        void m(int i) { }
++    }
++
++    class Base { int i; Base(int j) { i = j; } }
++    class Sub extends Base {
++        Sub(Object o) { super(o instanceof java.awt.Point(int x, int y)? x + y: 0); }
++    }
++}
+diff --git a/test/langtools/tools/javac/T8295447.out b/test/langtools/tools/javac/T8295447.out
+new file mode 100644
+index 00000000000..7f6746f802f
+--- /dev/null
++++ b/test/langtools/tools/javac/T8295447.out
+@@ -0,0 +1,6 @@
++T8295447.java:33:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
++T8295447.java:37:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
++T8295447.java:44:44: compiler.err.deconstruction.pattern.only.records: java.awt.Point
++- compiler.note.preview.filename: T8295447.java, DEFAULT
++- compiler.note.preview.recompile
++3 errors
+\ No newline at end of file

jdk8296239-iso4217_up174.patch

@@ -0,0 +1,79 @@
+commit bf899de7aa8cc862ed123865b9aa26e06d96a7de
+Author: duke <duke@openjdk.org>
+Date:   Thu Jan 26 00:55:32 2023 +0000
+
+    Backport fd837649811c866c144c9133d211fb5ad8f994a7
+
+diff --git a/src/java.base/share/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
+index 688de592c7b..d234c96c476 100644
+--- a/src/java.base/share/data/currency/CurrencyData.properties
++++ b/src/java.base/share/data/currency/CurrencyData.properties
+@@ -32,7 +32,7 @@ formatVersion=3
+ # Version of the currency code information in this class.
+ # It is a serial number that accompanies with each amendment.
+ 
+-dataVersion=173
++dataVersion=174
+ 
+ # List of all valid ISO 4217 currency codes.
+ # To ensure compatibility, do not remove codes.
+@@ -189,7 +189,7 @@ CR=CRC
+ # COTE D'IVOIRE
+ CI=XOF
+ # CROATIA
+-HR=HRK
++HR=HRK;2022-12-31-23-00-00;EUR
+ # CUBA
+ CU=CUP
+ # Cura\u00e7ao
+diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
+index b7e64f318b1..b6a91835b19 100644
+--- a/test/jdk/java/util/Currency/ValidateISO4217.java
++++ b/test/jdk/java/util/Currency/ValidateISO4217.java
+@@ -24,7 +24,7 @@
+  * @test
+  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
+  *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
+- *      8208746 8209775 8264792 8274658 8283277
++ *      8208746 8209775 8264792 8274658 8283277 8296239
+  * @summary Validate ISO 4217 data for Currency class.
+  * @modules java.base/java.util:open
+  *          jdk.localedata
+@@ -34,7 +34,7 @@
+  * ############################################################################
+  *
+  *  ValidateISO4217 is a tool to detect differences between the latest ISO 4217
+- *  data and and Java's currency data which is based on ISO 4217.
++ *  data and Java's currency data which is based on ISO 4217.
+  *  If there is a difference, the following file which includes currency data
+  *  may need to be updated.
+  *      src/share/classes/java/util/CurrencyData.properties
+diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt
+index 3e107823042..3eef0eba00e 100644
+--- a/test/jdk/java/util/Currency/tablea1.txt
++++ b/test/jdk/java/util/Currency/tablea1.txt
+@@ -1,12 +1,12 @@
+ #
+ #
+-# Amendments up until ISO 4217 AMENDMENT NUMBER 173
+-#   (As of 23 September 2022)
++# Amendments up until ISO 4217 AMENDMENT NUMBER 174
++#   (As of 2 November 2022)
+ #
+ 
+ # Version
+ FILEVERSION=3
+-DATAVERSION=173
++DATAVERSION=174
+ 
+ # ISO 4217 currency data
+ AF	AFN	971	2
+@@ -67,7 +67,7 @@ CD	CDF	976	2
+ CK	NZD	554	2
+ CR	CRC	188	2
+ CI	XOF	952	0
+-HR	HRK	191	2
++HR	HRK	191	2	2022-12-31-23-00-00	EUR	978	2
+ CU	CUP	192	2
+ CW	ANG	532	2
+ CY	EUR	978	2

jdk8299439-test_for_hr.patch

@@ -0,0 +1,63 @@
+commit cf262d7441d797942d33ed2a79540230fc5c97fa
+Author: Christoph Langer <clanger@openjdk.org>
+Date:   Thu Jan 12 08:02:58 2023 +0000
+
+    8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
+    
+    Reviewed-by: naoto
+    Backport-of: 3b374c0153950ab193f3a188b57d3404b4ce2fe2
+
+diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
+index 70f210e2da6..56e61953a8c 100644
+--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
++++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -35,4 +35,5 @@
+ # This notice and attribution to Taligent may not be removed.
+ # Taligent is a registered trademark of Taligent, Inc.
+ 
++EUR=\u20AC
+ HRK=Kn
+diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
+index dc167492272..a806ebe778a 100644
+--- a/test/jdk/ProblemList.txt
++++ b/test/jdk/ProblemList.txt
+@@ -1,6 +1,6 @@
+ ###########################################################################
+ #
+-# Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
+index cf73a9c7e31..665dd3b290a 100644
+--- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
++++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
+@@ -79,7 +79,7 @@ fr_FR=\u20AC
+ fr_LU=\u20AC
+ hi_IN=\u0930\u0942
+ hr=\u00A4
+-hr_HR=Kn
++hr_HR=\u20AC
+ hu=\u00A4
+ hu_HU=Ft
+ is=\u00A4
+@@ -94,9 +94,9 @@ ja_JP=\uFFE5
+ ko=\u00A4
+ ko_KR=\uFFE6
+ lt=\u00A4
+-lt_LT=Lt;2014-12-31-22-00-00;\u20AC
++lt_LT=\u20AC
+ lv=\u00A4
+-lv_LV=Ls;2013-12-31-22-00-00;\u20AC
++lv_LV=\u20AC
+ mk=\u00A4
+ mk_MK=Den
+ nl=\u00A4

nss.cfg.in

@@ -0,0 +1,5 @@
+name = NSS
+nssLibraryDirectory = @NSS_LIBDIR@
+nssDbMode = noDb
+attributes = compatibility
+handleStartupErrors = ignoreMultipleInitialisation

openjdk-devkit.specfile

@@ -1,230 +0,0 @@
-# Spec file for building a devkit for OpenJDK builds
-
-# We do not want debug packages
-%global debug_package %{nil}
-# Arch definitions from java-*-openjdk RPM
-%global aarch64         aarch64 arm64 armv8
-# x86 is not supported by OpenJDK 17
-ExcludeArch: %{ix86}
-
-# New Version-String scheme-style defines
-%global featurever 21
-%global interimver 0
-%global updatever 5
-%global patchver 0
-%global buildver 11
-# Define JDK versions
-%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global javaver         %{featurever}
-# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
-%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
-# The tag used to create the OpenJDK tarball
-%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
-
-# Define milestone (EA for pre-releases, GA for releases)
-# Release will be (where N is usually a number starting at 1):
-# - 0.N%%{?extraver}%%{?dist} for EA releases,
-# - N%%{?extraver}{?dist} for GA releases
-%global is_ga           1
-%if %{is_ga}
-%global build_type GA
-%global ea_designator ""
-%global ea_designator_zip %{nil}
-%global extraver %{nil}
-%global eaprefix %{nil}
-%else
-%global build_type EA
-%global ea_designator ea
-%global ea_designator_zip -%{ea_designator}
-%global extraver .%{ea_designator}
-%global eaprefix 0.
-%endif
-
-# Date devkit RPMs were download
-%global rpm_download_date 20250117
-
-Name: openjdk-devkit
-Version: 1.0
-Release: 9%{?dist}
-License: GPLv2
-URL: http://openjdk.java.net/
-Summary: OpenJDK Devkit
-
-# The source tarball, generated using generate_source_tarball.sh
-Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz
-# The buildroot RPMs for each architecture
-Source1: devkit-rpms-aarch64-%{rpm_download_date}.tar.xz
-Source2: devkit-rpms-ppc64le-%{rpm_download_date}.tar.xz
-Source3: devkit-rpms-s390x-%{rpm_download_date}.tar.xz
-Source4: devkit-rpms-x86_64-%{rpm_download_date}.tar.xz
-# Toolchain sources
-Source5: binutils-2.39.tar.gz
-Source6: gcc-11.3.0.tar.xz
-Source7: gmp-6.2.1.tar.bz2
-Source8: mpc-1.2.1.tar.gz
-Source9: mpfr-4.1.1.tar.bz2
-Source10: gdb-11.2.tar.xz
-
-# Devkit patches; see https://github.com/rh-openjdk/jdk/tree/devkit
-# To regenerate, use git format-patch -N jdk21u/master
-# Add RHEL RPM URLs and turn off robots
-Patch0: 0001-Allow-devkit-to-work-with-RHEL.patch
-# Turn off multilib on x86_64
-Patch1: 0002-Disable-multilib-on-x86_64.patch
-# Improve build logging (OPENJDK-3071)
-Patch2: 0003-Log-devkit-build-to-stdout.patch
-# Remove .comment sections from sysroot objects
-Patch3: 0004-devkit-Remove-.comment-sections-from-sysroot-objects.patch
-# Configure binutils with --enable-deterministic-archives
-Patch4: 0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch
-# Configure gcc with --enable-linker-build-id (OPENJDK-3068)
-Patch5: 0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch
-# Exclude systemtap-sdt-devel on s390x & ppc64* (OPENJDK-3070)
-Patch6: 0007-Tools.gmk-Exclude-systemtap-sdt-devel-on-s390x-ppc64.patch
-# Use update repository on RHEL rather than GA (OPENJDK-3589)
-Patch7: 0008-Tools.gmk-Use-update-repository-on-RHEL-rather-than-.patch
-
-BuildRequires: make autoconf automake libtool gcc gcc-c++ wget glibc-devel texinfo tar bison
-
-# Setup variables to reference correct sources
-%ifarch %{aarch64}
-%global rpmtarball %{SOURCE1}
-%endif
-%ifarch ppc64le
-%global rpmtarball %{SOURCE2}
-%endif
-%ifarch s390x
-%global rpmtarball %{SOURCE3}
-%endif
-%ifarch x86_64
-%global rpmtarball %{SOURCE4}
-%endif
-
-%description
-OpenJDK Devkit
-
-%prep
-
-# Unpack OpenJDK sources only in build directory
-%setup -q -T -c -a 0
-
-# 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.
-pushd jdk-*
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
-%patch -P5 -p1
-%patch -P6 -p1
-%patch -P7 -p1
-popd
-
-mkdir -p devkit/download
-pushd devkit/download
-tar -xJf %{rpmtarball}
-ln -s %{SOURCE5}
-ln -s %{SOURCE6}
-ln -s %{SOURCE7}
-ln -s %{SOURCE8}
-ln -s %{SOURCE9}
-ln -s %{SOURCE10}
-
-%build
-
-devkit_dir=$(pwd)/devkit
-today=$(date +%Y%m%d)
-arch=%{_target_cpu}
-result_name=${arch}-linux-gnu-to-${arch}-linux-gnu
-result_path=result/${result_name}
-
-pushd jdk-*/make/devkit
-
-# Build devkit first using the native toolchain,
-# than again using itself
-for variant in bootstrap product ; do
-    if [ -e ${devkit_dir}-bootstrap/${result_path}/bin/gcc ] ; then
-        ROOTDIR=${devkit_dir}-bootstrap/${result_path};
-        BINDIR=${ROOTDIR}/bin;
-        TOOLS="CC=${BINDIR}/gcc CXX=${BINDIR}/g++ LD=${BINDIR}/ld \
-               AR=${BINDIR}/ar AS=${BINDIR}/as RANLIB=${BINDIR}/ranlib \
-               OBJDUMP=${BINDIR}/objdump"
-        LIBPATH="${ROOTDIR}/lib64:${ROOTDIR}/lib"
-    else
-        TOOLS="CC=$(which gcc) CXX=$(which g++) LD=$(which ld) \
-               AR=$(which ar) AS=$(which as) RANLIB=$(which ranlib) \
-               OBJDUMP=$(which objdump)"
-    fi
-    mkdir -p ${devkit_dir}-${variant}
-    ln -s ${devkit_dir}/download ${devkit_dir}-${variant}
-    LD_LIBRARY_PATH="${LIBPATH}" \
-        make -f Tools.gmk all ${TOOLS} \
-        HOST=${arch}-linux-gnu \
-        BUILD=${arch}-linux-gnu \
-        RESULT=${devkit_dir}-${variant}/result \
-        OUTPUT_ROOT=${devkit_dir}-${variant} \
-        TARGET=${arch}-linux-gnu \
-        PREFIX=${devkit_dir}-${variant}/${result_path} \
-        BASE_OS=RHEL
-done
-
-make -r -f Tars.gmk \
-     SRC_DIR=${devkit_dir}-product/${result_path} \
-     TAR_FILE=${devkit_dir}-product/result/sdk-${result_name}-${today}.tar.gz
-popd
-
-%install
-mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -p devkit-product/result/*.tar.gz %{buildroot}%{_datadir}/%{name}/
-
-%files
-%{_datadir}/%{name}
-
-%changelog
-* Fri Jan 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-9
-- Update devkit RPMs to latest updates
-- Exclude SystemTap RPMs from s390x and ppc64le
-- Add a date stamp to the RPM bundles
-- Resolves: OPENJDK-3070
-= Resolves: OPENJDK-3589
-
-* Wed Nov 27 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-8
-- Add --enable-linker-build-id to gcc build
-- Resolves: OPENJDK-3068
-
-* Wed Oct 30 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-7
-- Improve build logging by also writing to stdout
-- Cleanup patches and rebase on jdk-21.0.5-ga
-- Drop JDK-8323671 patch which is upstream as of 21.0.3+3
-- Resolves: OPENJDK-3071
-
-* Tue Jun 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-6
-- Fix typo where 'as' binary is accidentally capitalised in AS=<path>/as
-
-* Wed May 01 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-5
-- Bootstrap the devkit, building it again with itself
-
-* Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-4
-- Include Thomas' patches to drop .comment sections and build binutils with deterministic archives
-- Use backward-compatible patch syntax
-
-* Tue Feb 06 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-3
-- Include JDK-8323671 patch so the binaries don't contain the full source path
-
-* Fri Dec 08 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-2
-- Try to turn off multlib on x86_64 as we don't have the dependencies for it
-
-* Tue Dec 05 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-1
-- Create RHEL 7 based devkit for building OpenJDK

openjdk_news.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2024 Red Hat, Inc.
+# Copyright (C) 2022 Red Hat, Inc.
 # Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
 #
 # This program is free software: you can redistribute it and/or modify
@@ -18,66 +18,59 @@
 
 OLD_RELEASE=$1
 NEW_RELEASE=$2
-REPO=$3
+SUBDIR=$3
-SUBDIR=$4
+REPO=$4
-SCRIPT_DIR=$(dirname "${0}")
+SCRIPT_DIR=$(dirname ${0})
 
-if test "${SUBDIR}" = ""; then
+if test "x${SUBDIR}" = "x"; then
     echo "No subdirectory specified; using .";
     SUBDIR=".";
 fi
 
-if test "$REPO" = ""; then
+if test "x$REPO" = "x"; then
     echo "No repository specified; using ${PWD}"
     REPO=${PWD}
 fi
 
-if test "${TMPDIR}" = ""; then
+if test x${TMPDIR} = x; then
     TMPDIR=/tmp;
 fi
 
 echo "Repository: ${REPO}"
 
-if [ -e "${REPO}/.git" ] ; then
+if [ -e ${REPO}/.git ] ; then
     TYPE=git;
-elif [ -e "${REPO}/.hg" ] ; then
+elif [ -e ${REPO}/.hg ] ; then
     TYPE=hg;
 else
     echo "No Mercurial or Git repository detected.";
     exit 1;
 fi
 
-if test "$OLD_RELEASE" = "" || test "$NEW_RELEASE" = ""; then
+if test "x$OLD_RELEASE" = "x" || test "x$NEW_RELEASE" = "x"; then
     echo "ERROR: Need to specify old and new release";
     exit 2;
 fi
 
 echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
-rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" "${TMPDIR}/fixes"
+rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 ${TMPDIR}/fixes
-for repos in . $("${SCRIPT_DIR}/discover_trees.sh" "${REPO}");
+for repos in . $(${SCRIPT_DIR}/discover_trees.sh ${REPO});
 do
-    if test "$TYPE" = "hg"; then
+    if test "x$TYPE" = "xhg"; then
-	hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
+	hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
-	    grep -E '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])#  - JDK-\1#'| \
+	    egrep '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])#  - JDK-\1#'| \
-	    sed 's#^[o:| ]*summary:\W*#  - #' >> "${TMPDIR}/fixes2";
+	    sed 's#^[o:| ]*summary:\W*#  - #' >> ${TMPDIR}/fixes2;
-	hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
+	hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
-	    grep -E '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})#  - JDK-\1#' >> "${TMPDIR}/fixes3";
+	    egrep '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})#  - JDK-\1#' >> ${TMPDIR}/fixes3;
     else
-	git -C "${REPO}" log --no-merges --pretty=format:%B "${NEW_RELEASE}...${OLD_RELEASE}" -- "${SUBDIR}" |grep -E '^[0-9]{7}' | \
+	git -C ${REPO} log --no-merges --pretty=format:%B ${NEW_RELEASE}...${OLD_RELEASE} -- ${SUBDIR} |egrep '^[0-9]{7}' | \
-	    sed -r 's#^([0-9])#  - JDK-\1#' >> "${TMPDIR}/fixes2";
+	    sed -r 's#^([0-9])#  - JDK-\1#' >> ${TMPDIR}/fixes2;
-	touch "${TMPDIR}/fixes3" ; # unused
+	touch ${TMPDIR}/fixes3 ; # unused
     fi
 done
 
-sort "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" | uniq > "${TMPDIR}/fixes"
+sort ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 | uniq > ${TMPDIR}/fixes
-rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3"
+rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3
 
 echo "In ${TMPDIR}/fixes:"
-cat "${TMPDIR}/fixes"
+cat ${TMPDIR}/fixes
-
-# Local Variables:
-# compile-command: "shellcheck openjdk_news.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch

@@ -0,0 +1,16 @@
+diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java
+--- a/src/java.desktop/share/classes/java/awt/Toolkit.java	Thu Jun 13 19:37:49 2019 +0200
++++ b/src/java.desktop/share/classes/java/awt/Toolkit.java	Thu Jul 04 10:35:42 2019 +0200
+@@ -595,7 +595,11 @@
+                 toolkit = new HeadlessToolkit(toolkit);
+             }
+             if (!GraphicsEnvironment.isHeadless()) {
+-                loadAssistiveTechnologies();
++                try {
++                    loadAssistiveTechnologies();
++                } catch (AWTError error) {
++                    // ignore silently
++                }
+             }
+         }
+         return toolkit;

rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch

@@ -0,0 +1,12 @@
+diff --git openjdk.orig/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
+index 68a9c1a2d08..7aa25eb2cb7 100644
+--- openjdk.orig/src/java.base/share/conf/security/java.security
++++ openjdk/src/java.base/share/conf/security/java.security
+@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
+ security.provider.tbd=Apple
+ #endif
+ security.provider.tbd=SunPKCS11
++#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
+ 
+ #
+ # Security providers used when FIPS mode support is active

rh1648644-java_access_bridge_privileged_security.patch

@@ -0,0 +1,20 @@
+--- openjdk/src/java.base/share/conf/security/java.security
++++ openjdk/src/java.base/share/conf/security/java.security
+@@ -304,6 +304,8 @@
+ #
+ package.access=sun.misc.,\
+                sun.reflect.,\
++               org.GNOME.Accessibility.,\
++               org.GNOME.Bonobo.,\
+ 
+ #
+ # List of comma-separated packages that start with or equal this string
+@@ -316,6 +318,8 @@
+ #
+ package.definition=sun.misc.,\
+                    sun.reflect.,\
++                   org.GNOME.Accessibility.,\
++                   org.GNOME.Bonobo.,\
+ 
+ #
+ # Determines whether this properties file can be appended to

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

@@ -0,0 +1,15 @@
+diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+index bacff32efbc..ff7b3dcc81c 100644
+--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
++++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+@@ -46,8 +46,8 @@ class PlatformPCSC {
+ 
+     private static final String PROP_NAME = "sun.security.smartcardio.library";
+ 
+-    private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
+-    private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
++    private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
++    private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
+     private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
+ 
+     PlatformPCSC() {

rh1750419-redhat_alt_java.patch

@@ -0,0 +1,117 @@
+diff --git openjdk.orig/make/modules/java.base/Launcher.gmk openjdk/make/modules/java.base/Launcher.gmk
+index 700ddefda49..2882de68eb2 100644
+--- openjdk.orig/make/modules/java.base/Launcher.gmk
++++ openjdk/make/modules/java.base/Launcher.gmk
+@@ -41,6 +41,14 @@ $(eval $(call SetupBuildLauncher, java, \
+     OPTIMIZATION := HIGH, \
+ ))
+ 
++#Wno-error=cpp is present to allow commented warning in ifdef part of main.c
++$(eval $(call SetupBuildLauncher, alt-java, \
++    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES -DREDHAT_ALT_JAVA -Wno-error=cpp, \
++    EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
++    VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
++    OPTIMIZATION := HIGH, \
++))
++
+ ifeq ($(call isTargetOs, windows), true)
+   $(eval $(call SetupBuildLauncher, javaw, \
+       CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
+diff --git openjdk.orig/src/java.base/share/native/launcher/alt_main.h openjdk/src/java.base/share/native/launcher/alt_main.h
+new file mode 100644
+index 00000000000..697df2898ac
+--- /dev/null
++++ openjdk/src/java.base/share/native/launcher/alt_main.h
+@@ -0,0 +1,73 @@
++/*
++ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#ifdef REDHAT_ALT_JAVA
++
++#include <sys/prctl.h>
++
++
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++# define PR_GET_SPECULATION_CTRL    52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++# define PR_SET_SPECULATION_CTRL    53
++#endif
++/* Speculation control variants */
++#ifndef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS          0
++#endif
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++
++#ifndef PR_SPEC_NOT_AFFECTED
++# define PR_SPEC_NOT_AFFECTED          0
++#endif
++#ifndef PR_SPEC_PRCTL
++# define PR_SPEC_PRCTL                 (1UL << 0)
++#endif
++#ifndef PR_SPEC_ENABLE
++# define PR_SPEC_ENABLE                (1UL << 1)
++#endif
++#ifndef PR_SPEC_DISABLE
++# define PR_SPEC_DISABLE               (1UL << 2)
++#endif
++#ifndef PR_SPEC_FORCE_DISABLE
++# define PR_SPEC_FORCE_DISABLE         (1UL << 3)
++#endif
++#ifndef PR_SPEC_DISABLE_NOEXEC
++# define PR_SPEC_DISABLE_NOEXEC        (1UL << 4)
++#endif
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++  if ( prctl(PR_SET_SPECULATION_CTRL,
++             PR_SPEC_STORE_BYPASS,
++             PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
++    return;
++  }
++  prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
++#endif // REDHAT_ALT_JAVA
+diff --git openjdk.orig/src/java.base/share/native/launcher/main.c openjdk/src/java.base/share/native/launcher/main.c
+index b734fe2ba78..79dc8307650 100644
+--- openjdk.orig/src/java.base/share/native/launcher/main.c
++++ openjdk/src/java.base/share/native/launcher/main.c
+@@ -34,6 +34,14 @@
+ #include "jli_util.h"
+ #include "jni.h"
+ 
++#ifdef REDHAT_ALT_JAVA
++#if defined(__linux__) && defined(__x86_64__)
++#include "alt_main.h"
++#else
++#warning alt-java requested but SSB mitigation not available on this platform.
++#endif
++#endif
++
+ #ifdef _MSC_VER
+ #if _MSC_VER > 1400 && _MSC_VER < 1600
+ 

rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch

@@ -0,0 +1,19 @@
+Remove uses of FAR in jpeg code
+
+Upstream libjpeg-trubo removed the (empty) FAR macro:
+http://sourceforge.net/p/libjpeg-turbo/code/1312/
+
+Adjust our code to not use the undefined FAR macro anymore.
+
+diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+--- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
++++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+@@ -1385,7 +1385,7 @@
+     /* and fill it in */
+     dst_ptr = icc_data;
+     for (seq_no = first; seq_no < last; seq_no++) {
+-        JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
++        JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
+         unsigned int length =
+             icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
+ 

scripts/builds/build_centos.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds the RPM on CentOS 9 or 10
-
-centpkg -v build
-
-# Local Variables:
-# compile-command: "shellcheck build_centos.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/builds/build_centos_portable_build.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds the portable on CentOS
-
-centpkg -v build --target java-openjdk-portable-build --rhel-target none
-
-# Local Variables:
-# compile-command: "shellcheck build_centos_portable_build.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/builds/build_rhel_10.sh

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds the RPM on RHEL 10
-
-NVR=${1}
-USER=${2}
-
-if test "${NVR}" = ""; then
-    echo "${0} <NVR> <USER>";
-    exit 1;
-fi
-
-if test "${USER}" = ""; then
-    echo "${0} <NVR> <USER>";
-    exit 2;
-fi
-
-METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
-rhpkg -v build --target=java-openjdk-rhel-10-build --custom-user-metadata "${METADATA}"
-
-# Local Variables:
-# compile-command: "shellcheck build_rhel_10.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/builds/build_rhel_7_portable_build.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds the portable on RHEL 7
-
-rhpkg -v build --target=java-openjdk-rhel-7-build --skip-nvr-check
-
-# Local Variables:
-# compile-command: "shellcheck build_rhel_7_portable_build.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/builds/build_rhel_8.sh

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds the RPM on RHEL 8
-
-NVR=${1}
-USER=${2}
-
-if test "${NVR}" = ""; then
-    echo "${0} <NVR> <USER>";
-    exit 1;
-fi
-
-if test "${USER}" = ""; then
-    echo "${0} <NVR> <USER>";
-    exit 2;
-fi
-
-METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
-rhpkg -v build --target=java-openjdk-rhel-8-build --custom-user-metadata "${METADATA}"
-
-# Local Variables:
-# compile-command: "shellcheck build_rhel_8.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/builds/build_rhel_9.sh

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds the RPM on RHEL 9
-
-NVR=${1}
-USER=${2}
-
-if test "${NVR}" = ""; then
-    echo "${0} <NVR> <USER>";
-    exit 1;
-fi
-
-if test "${USER}" = ""; then
-    echo "${0} <NVR> <USER>";
-    exit 2;
-fi
-
-METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
-rhpkg -v build --target=java-openjdk-rhel-9-build --custom-user-metadata "${METADATA}"
-
-# Local Variables:
-# compile-command: "shellcheck build_rhel_9.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/builds/build_rhel_portable_build.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds the portable on RHEL 8
-
-rhpkg -v build --target=java-openjdk-rhel-8-build --skip-nvr-check
-
-# Local Variables:
-# compile-command: "shellcheck build_rhel_portable_build.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/builds/build_vanilla.sh

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Builds a scratch build of vanilla OpenJDK with no local patches
-
-SEPARATE_ARCHES=${1}
-CMD="--target java-openjdk-rhel-8-build --skip-nvr-check --nowait";
-SUPPORTED_ARCHES="aarch64 ppc64le s390x x86_64";
-
-if [ "x${SEPARATE_ARCHES}" = "x" ] ; then
-    SEPARATE_ARCHES=0;
-fi
-
-if [ ${SEPARATE_ARCHES} -eq 1 ] ; then
-	for arch in ${SUPPORTED_ARCHES}; do \
-	    rhpkg -v build --arches ${arch} --scratch ${CMD} ; \
-	done && brew watch-task --mine
-else
-    rhpkg -v build ${CMD} && brew watch-task --mine
-fi
-
-# Local Variables:
-# compile-command: "shellcheck build_vanilla.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

scripts/generate_source_tarball.sh

@@ -1,294 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2024 Red Hat, Inc.
-# Written by:
-#     Andrew John Hughes <gnu.andrew@redhat.com>
-#     Thomas Fitzsimmons <fitzsim@redhat.com>
-#     Jiri Vanek <jvanek@redhat.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Generates the source tarball for OpenJDK projects.
-#
-# There are multiple ways to specify the source code location and version:
-#
-# 1. Specify the version (VERSION), the location of the Git repository
-#    (REPO_ROOT) and the root of the output tarball name (FILE_NAME_ROOT)
-# 2. Specify the version (VERSION) along with an upstream project name
-#    (PROJECT_NAME) and repository name (REPO_NAME) that can be used
-#    to construct the URL of the upstream OpenJDK repository.
-# 3. Specify OPENJDK_LATEST=1 and allow the script to obtain the JDK
-#    feature version from the spec file, which is then used to
-#    obtain the latest build promotion from the upstream repository.
-#
-# An appropriate bootstrap JDK is also required for when ./configure
-# is run within the checked out repository to generate the .src-rev.
-# file. This can be specified by setting BOOT_JDK.
-#
-# Example 1:
-# This will check out the specified version from the specified
-# repository and construct a tarball called openjdk-17.0.3+5.tar.xz:
-#
-# $ VERSION=jdk-17.0.3+5 FILE_NAME_ROOT=open${VERSION} \
-#   REPO_ROOT=$HOME/projects/openjdk/upstream/17u \
-#   BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
-#
-# Example 2:
-# This will check out the same version as example 1, but from the
-# upstream repository:
-#
-# $ VERSION=jdk-17.0.3+5 PROJECT_NAME=openjdk REPO_NAME=jdk17u \
-#   BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
-#
-# Example 3:
-# This will read the OpenJDK feature version from the spec file, then create a
-# tarball from the most recent tag for that version in the upstream Git
-# repository.
-#
-# $ OPENJDK_LATEST=1 \
-#   BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
-#
-
-set -e
-
-OPENJDK_URL_DEFAULT=https://github.com
-COMPRESSION_DEFAULT=xz
-
-if [ "$1" = "help" ] ; then
-    echo "Behaviour may be specified by setting the following variables:"
-    echo
-    echo "VERSION        - the version of the specified OpenJDK project"
-    echo "                 (required unless OPENJDK_LATEST is set)"
-    echo "PROJECT_NAME   - the name of the OpenJDK project being archived"
-    echo "                 (needed to compute REPO_ROOT and/or"
-    echo "                  FILE_NAME_ROOT automatically;"
-    echo "                  optional if they are set explicitly)"
-    echo "REPO_NAME      - the name of the OpenJDK repository"
-    echo "                 (needed to compute REPO_ROOT automatically;"
-    echo "                  optional if REPO_ROOT is set explicitly)"
-    echo "OPENJDK_URL    - the URL to retrieve code from"
-    echo "                 (defaults to ${OPENJDK_URL_DEFAULT})"
-    echo "COMPRESSION    - the compression type to use"
-    echo "                 (defaults to ${COMPRESSION_DEFAULT})"
-    echo "FILE_NAME_ROOT - name of the archive, minus extensions"
-    echo "                 (defaults to PROJECT_NAME-VERSION)"
-    echo "REPO_ROOT      - the location of the Git repository to archive"
-    echo "                 (defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
-    echo "TO_COMPRESS    - what part of clone to pack"
-    echo "                 (defaults to ${VERSION})"
-    echo "BOOT_JDK       - the bootstrap JDK to satisfy the configure run"
-    echo "                 (defaults to packaged JDK version)"
-    echo "WITH_TEMP      - run in a temporary directory"
-    echo "                 (defaults to disabled)"
-    echo "OPENJDK_LATEST - deduce VERSION from most recent upstream tag"
-    echo "                 (implies WITH_TEMP, computes everything else"
-    echo "                  automatically; Note: accesses network to read"
-    echo "                  tag list from remote Git repository)"
-    exit 1;
-fi
-
-if [ "$OPENJDK_LATEST" != "" ] ; then
-    FEATURE_VERSION=$(echo '%featurever' \
-                          | rpmspec --shell ./*.spec 2>/dev/null \
-                          | grep --after-context 1 featurever \
-                          | tail --lines 1)
-    PROJECT_NAME=openjdk
-    REPO_NAME=jdk"${FEATURE_VERSION}"u
-    # Skip -ga tags since those are the same as the most recent non-ga tag, and
-    # the non-ga tag is the one that is used to generated the official source
-    # tarball.  For example:
-    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10-ga^{}
-    # 25a2e6c20c9a96853714284cabc6b456eb095070  refs/tags/jdk-17.0.10-ga
-    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10+7^{}
-    # e49c5749b10f3e90274b72e9279f794fdd191d27  refs/tags/jdk-17.0.10+7
-    VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
-                  "${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \
-                  "jdk-${FEATURE_VERSION}*" \
-                  | grep --invert-match '\-ga$' \
-                  | head --lines 1 | cut --characters 52-)
-    FILE_NAME_ROOT=open${VERSION}
-    WITH_TEMP=1
-fi
-
-if [ "$WITH_TEMP" != "" ] ; then
-    pushd "$(mktemp --directory --tmpdir temp-generated-source-tarball-XXX)"
-fi
-
-if [ "$VERSION" = "" ] ; then
-    echo "No VERSION specified"
-    exit 2
-fi
-echo "Version: ${VERSION}"
-
-NUM_VER=${VERSION##jdk-}
-RELEASE_VER=${NUM_VER%%+*}
-BUILD_VER=${NUM_VER##*+}
-MAJOR_VER=${RELEASE_VER%%.*}
-echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"
-
-if [ "$BOOT_JDK" = "" ] ; then
-    echo "No boot JDK specified".
-    BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
-    echo -n "Checking for ${BOOT_JDK}...";
-    if [ -d "${BOOT_JDK}" ] && [ -x "${BOOT_JDK}"/bin/java ] ; then
-        echo "Boot JDK found at ${BOOT_JDK}";
-    else
-        echo "Not found";
-        PREV_VER=$((MAJOR_VER - 1));
-        BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
-        echo -n "Checking for ${BOOT_JDK}...";
-        if [ -d ${BOOT_JDK} ] && [ -x ${BOOT_JDK}/bin/java ] ; then
-            echo "Boot JDK found at ${BOOT_JDK}";
-        else
-            echo "Not found";
-            exit 4;
-        fi
-    fi
-else
-    echo "Boot JDK: ${BOOT_JDK}";
-fi
-
-if [ "$OPENJDK_URL" = "" ] ; then
-    OPENJDK_URL=${OPENJDK_URL_DEFAULT}
-    echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
-else
-    echo "OpenJDK URL: ${OPENJDK_URL}"
-fi
-
-if [ "$COMPRESSION" = "" ] ; then
-    # rhel 5 needs tar.gz
-    COMPRESSION=${COMPRESSION_DEFAULT}
-fi
-echo "Creating a tar.${COMPRESSION} archive"
-
-if [ "$FILE_NAME_ROOT" = "" ] ; then
-    if [ "$PROJECT_NAME" = "" ] ; then
-        echo "No PROJECT_NAME specified, needed by FILE_NAME_ROOT"
-        exit 1
-    fi
-    FILE_NAME_ROOT=${PROJECT_NAME}-${VERSION}
-    echo "No file name root specified; default to ${FILE_NAME_ROOT}"
-fi
-if [ "$REPO_ROOT" = "" ] ; then
-    if [ "$PROJECT_NAME" = "" ] ; then
-        echo "No PROJECT_NAME specified, needed by REPO_ROOT"
-        exit 1
-    fi
-    if [ "$REPO_NAME" = "" ] ; then
-        echo "No REPO_NAME specified, needed by REPO_ROOT"
-        exit 3
-    fi
-    REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
-    echo "No repository root specified; default to ${REPO_ROOT}"
-fi;
-
-if [ "$TO_COMPRESS" = "" ] ; then
-    TO_COMPRESS="${VERSION}"
-    echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
-fi;
-
-echo -e "Settings:"
-echo -e "\tVERSION: ${VERSION}"
-echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
-echo -e "\tREPO_NAME: ${REPO_NAME}"
-echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
-echo -e "\tCOMPRESSION: ${COMPRESSION}"
-echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
-echo -e "\tREPO_ROOT: ${REPO_ROOT}"
-echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
-echo -e "\tBOOT_JDK: ${BOOT_JDK}"
-echo -e "\tWITH_TEMP: ${WITH_TEMP}"
-echo -e "\tOPENJDK_LATEST: ${OPENJDK_LATEST}"
-
-if [ -d "${FILE_NAME_ROOT}" ] ; then
-    echo "Reusing existing ${FILE_NAME_ROOT}"
-    STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
-    TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
-else
-    mkdir "${FILE_NAME_ROOT}"
-    pushd "${FILE_NAME_ROOT}"
-        echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
-        if realpath -q "${REPO_ROOT}"; then
-            echo "Local path detected; not adding depth argument";
-            DEPTH="--";
-        else
-            DEPTH="--depth=1";
-            echo "Remote repository detected; adding ${DEPTH}";
-        fi
-        git clone -b "${VERSION}" "${DEPTH}" "${REPO_ROOT}" "${VERSION}"
-        pushd "${VERSION}"
-            TAR_TIME="$(git log --max-count 1 --format=%cI)"
-        popd
-    popd
-fi
-pushd "${FILE_NAME_ROOT}"
-    # Generate .src-rev so build has knowledge of the revision the tarball was
-    # created from
-    mkdir build
-    pushd build
-        sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
-        make store-source-revision
-    popd
-    rm -rf build
-
-    # Remove commit checks
-    echo "Removing $(find "${VERSION}" -name '.jcheck' -print)"
-    find "${VERSION}" -name '.jcheck' -print0 | xargs -0 rm -r
-
-    # Remove history and GHA
-    echo "find ${VERSION} -name '.hgtags'"
-    find "${VERSION}" -name '.hgtags' -exec rm -v '{}' '+'
-    echo "find ${VERSION} -name '.hgignore'"
-    find "${VERSION}" -name '.hgignore' -exec rm -v '{}' '+'
-    echo "find ${VERSION} -name '.gitattributes'"
-    find "${VERSION}" -name '.gitattributes' -exec rm -v '{}' '+'
-    echo "find ${VERSION} -name '.gitignore'"
-    find "${VERSION}" -name '.gitignore' -exec rm -v '{}' '+'
-    # Work around some Git objects not having write permissions.
-    echo "chmod --recursive u+w ${VERSION}/.git"
-    chmod --recursive u+w "${VERSION}"/.git
-    echo "find ${VERSION} -name '.git'"
-    find "${VERSION}" -name '.git' -exec rm -rv '{}' '+'
-    echo "find ${VERSION} -name '.github'"
-    find "${VERSION}" -name '.github' -exec rm -rv '{}' '+'
-
-    echo "Compressing remaining forest"
-    if [ "$COMPRESSION" = "xz" ] ; then
-        SWITCH=cJf
-    else
-        SWITCH=czf
-    fi
-    EA_PART="$(awk -F= \
-               '/^DEFAULT_PROMOTED_VERSION_PRE/ { if ($2) print "-"$2 }' \
-               "${VERSION}"/make/conf/version-numbers.conf)"
-    TARBALL_NAME=${FILE_NAME_ROOT}${EA_PART}.tar.${COMPRESSION}
-    XZ_OPT=${XZ_OPT-"-T0"} \
-          tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \
-          --exclude-vcs -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
-    mv "${TARBALL_NAME}" ..
-popd
-if [ "$WITH_TEMP" != "" ] ; then
-    echo "Tarball is: $(realpath .)/${TARBALL_NAME}"
-    popd
-else
-    echo -n "Done. You may want to remove the uncompressed version"
-    echo " - $FILE_NAME_ROOT"
-fi
-
-# Local Variables:
-# compile-command: "shellcheck generate_source_tarball.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:

sources

@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (openjdk-21.0.6+7.tar.xz) = fda4179a18a145a3506b09a83fe1338e7398fa0219922d78f47553ddf0eef5b8f88f67829f57d39f67f54e17cc251f70bb8d4a614322c3b57c1765ccea248f30
+SHA512 (openjdk-jdk19u-jdk-19.0.2+7.tar.xz) = f9b54ae43074caa53773000ed8000ff5592cda44b2bef8fafa2c38cf623048722c34a111aacfd1831050525804230b29cc20fd95ad2162c43412b957190cc7b0