Add empty NEWS file

Portable build
import UBI java-21-openjdk-21.0.1.0.12-2.el9
2023-11-08 21:24:39 +01:00 · 2023-11-08 20:57:28 +01:00 · 2023-11-07 13:51:25 +00:00
43 changed files with 2440 additions and 7795 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,30 +1,2 @@
-/openjdk-jdk17u-jdk-17.0.7+7.tar.xz
-/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
-/openjdk-jdk18u-jdk-18.0.1+0.tar.xz
-/openjdk-jdk18u-jdk-18.0.1+10.tar.xz
-/openjdk-jdk18u-jdk-18.0.1.1+2.tar.xz
-/openjdk-jdk18u-jdk-18.0.2+9.tar.xz
-/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
+SOURCES/openjdk-21.0.1+12.tar.xz
+SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
--- a/.java-21-openjdk.metadata
+++ b/.java-21-openjdk.metadata
@ -0,0 +1,2 @@
+062c60df2265006e2be6e2cec33b961d5183acd9 SOURCES/openjdk-21.0.1+12.tar.xz
+c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
--- a/0001-Allow-devkit-to-work-with-RHEL.patch
+++ b/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
-
--- a/0002-Disable-multilib-on-x86_64.patch
+++ b/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
-
--- a/0003-Log-devkit-build-to-stdout.patch
+++ b/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
-
--- a/0004-devkit-Remove-.comment-sections-from-sysroot-objects.patch
+++ b/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
-
--- a/0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch
+++ b/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
-
--- a/0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch
+++ b/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
-
--- a/0007-Tools.gmk-Exclude-systemtap-sdt-devel-on-s390x-ppc64.patch
+++ b/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
-
--- a/0008-Tools.gmk-Use-update-repository-on-RHEL-rather-than-.patch
+++ b/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
-
--- a/2641
+++ b/2641
--- a/SOURCES/CheckVendor.java
+++ b/SOURCES/CheckVendor.java
--- a/SOURCES/NEWS
+++ b/SOURCES/NEWS
--- a/SOURCES/README.md
+++ b/SOURCES/README.md
@ -37,10 +37,3 @@ need to be modified if the version or rpmrelease values are changed in
 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.
--- a/SOURCES/TestCryptoLevel.java
+++ b/SOURCES/TestCryptoLevel.java
--- a/SOURCES/TestECDSA.java
+++ b/SOURCES/TestECDSA.java
--- a/SOURCES/TestSecurityProperties.java
+++ b/SOURCES/TestSecurityProperties.java
--- a/SOURCES/TestTranslations.java
+++ b/SOURCES/TestTranslations.java
--- a/SOURCES/alt-java.c
+++ b/SOURCES/alt-java.c
--- a/SOURCES/fips-21u-75ffdc48eda.patch
+++ b/SOURCES/fips-21u-75ffdc48eda.patch
@ -116,7 +116,7 @@ index 00000000000..f48fc7f7e80
 +  AC_SUBST(NSS_LIBDIR)
 +])
 diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
-index 51d4f724c33..feb0bcf3e75 100644
+index a1fc81564b1..ebad69d9dcf 100644
 --- a/make/autoconf/libraries.m4
 +++ b/make/autoconf/libraries.m4
@@ -35,6 +35,7 @@ m4_include([lib-std.m4])
@ -127,7 +127,7 @@ index 51d4f724c33..feb0bcf3e75 100644
 
 ################################################################################
 # Determine which libraries are needed for this configuration
-@@ -128,6 +129,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
+@@ -134,6 +135,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_X11
 
   LIB_TESTS_SETUP_GTEST
@ -136,10 +136,10 @@ index 51d4f724c33..feb0bcf3e75 100644
   BASIC_JDKLIB_LIBS=""
   BASIC_JDKLIB_LIBS_TARGET=""
 diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
-index f6def153c82..4d7abc33427 100644
+index 0f85917814e..9419562b654 100644
 --- a/make/autoconf/spec.gmk.in
 +++ b/make/autoconf/spec.gmk.in
-@@ -873,6 +873,11 @@ INSTALL_SYSCONFDIR=@sysconfdir@
+@@ -867,6 +867,11 @@ INSTALL_SYSCONFDIR=@sysconfdir@
 # Libraries
 #
 
@ -2959,7 +2959,7 @@ index 00000000000..f8d505ca815
 +}
 \ No newline at end of file
 diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
-index c3b412885a6..0e7ce73b158 100644
+index 6b26297b1b4..7ee5e07756c 100644
 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
 +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -37,6 +37,8 @@ import javax.crypto.*;
@ -2981,21 +2981,20 @@ index c3b412885a6..0e7ce73b158 100644
     private static final String PUBLIC = "public";
     private static final String PRIVATE = "private";
     private static final String SECRET = "secret";
-@@ -401,9 +406,10 @@ abstract class P11Key implements Key, Length {
+@@ -401,8 +406,10 @@ abstract class P11Key implements Key, Length {
                     new CK_ATTRIBUTE(CKA_EXTRACTABLE),
         });
 
-        boolean keySensitive =
-                (attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
-                attrs[1].getBoolean() || !attrs[2].getBoolean();
+-        boolean keySensitive = (attrs[0].getBoolean() ||
+-                attrs[1].getBoolean() || !attrs[2].getBoolean());
 +        boolean exportable = plainKeySupportEnabled && !algorithm.equals("DH");
 +        boolean keySensitive = (!exportable &&
-+               ((attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
-+                attrs[1].getBoolean() || !attrs[2].getBoolean()));
+            (attrs[0].getBoolean() ||
+             attrs[1].getBoolean() || !attrs[2].getBoolean()));
 
         return switch (algorithm) {
             case "RSA" -> P11RSAPrivateKeyInternal.of(session, keyID, algorithm,
-@@ -455,7 +461,8 @@ abstract class P11Key implements Key, Length {
+@@ -454,7 +461,8 @@ abstract class P11Key implements Key, Length {
 
         public String getFormat() {
             token.ensureValid();
@ -3005,7 +3004,7 @@ index c3b412885a6..0e7ce73b158 100644
                 return null;
             } else {
                 return "RAW";
-@@ -1625,4 +1632,3 @@ final class SessionKeyRef extends PhantomReference<P11Key> {
+@@ -1624,4 +1632,3 @@ final class SessionKeyRef extends PhantomReference<P11Key> {
         this.clear();
     }
 }
@ -3205,7 +3204,7 @@ index 5cd6828d293..bae49c4e8a9 100644
                 debug.println("logout succeeded");
             }
 diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
-index a6f5f0a8764..9a07c96ca4e 100644
+index 3378409ca1c..7602a92a252 100644
 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
 +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
@@ -33,6 +33,7 @@ import java.lang.ref.*;
--- a/SOURCES/java-21-openjdk-portable.specfile
+++ b/SOURCES/java-21-openjdk-portable.specfile
--- a/SOURCES/jconsole.desktop.in
+++ b/SOURCES/jconsole.desktop.in
--- a/SOURCES/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
+++ b/SOURCES/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
@ -0,0 +1,125 @@
+commit d0523302416bc6507696f20d1068f16427bcf6b8
+Author: Andrew Hughes <gnu.andrew@redhat.com>
+Date:   Thu Aug 24 01:23:49 2023 +0100
+
+    8009550: PlatformPCSC should load versioned so
+
+diff --git a/src/java.base/share/classes/sun/security/util/Debug.java b/src/java.base/share/classes/sun/security/util/Debug.java
+index bff273c6548..e5a6b288ff8 100644
+--- a/src/java.base/share/classes/sun/security/util/Debug.java
+++ b/src/java.base/share/classes/sun/security/util/Debug.java
+@@ -81,6 +81,7 @@ public static void Help()
+         System.err.println("logincontext  login context results");
+         System.err.println("jca           JCA engine class debugging");
+         System.err.println("keystore      KeyStore debugging");
+        System.err.println("pcsc          Smartcard library debugging");
+         System.err.println("policy        loading and granting");
+         System.err.println("provider      security provider debugging");
+         System.err.println("pkcs11        PKCS11 session manager debugging");
+diff --git a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+index bacff32efbc..d9f605ada1e 100644
+--- a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+++ b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
+@@ -46,8 +47,13 @@ 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[] LIB_TEMPLATES = { "/usr/$LIBISA/libpcsclite.so",
+                                                    "/usr/local/$LIBISA/libpcsclite.so",
+                                                    "/usr/lib/$ARCH-linux-gnu/libpcsclite.so",
+                                                    "/usr/lib/arm-linux-gnueabi/libpcsclite.so",
+                                                    "/usr/lib/arm-linux-gnueabihf/libpcsclite.so",
+                                                    "/usr/lib/$ARCH-kfreebsd-gnu/libpcsclite.so" };
+    private static final String[] LIB_SUFFIXES = { ".1", ".0", "" };
+     private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
+ 
+     PlatformPCSC() {
+@@ -73,23 +79,38 @@ public Throwable run() {
+     });
+ 
+     // expand $LIBISA to the system specific directory name for libraries
+    // expand $ARCH to the Debian system architecture in use
+     private static String expand(String lib) {
+         int k = lib.indexOf("$LIBISA");
+-        if (k == -1) {
+-            return lib;
+        if (k != -1) {
+            String libDir;
+            if ("64".equals(System.getProperty("sun.arch.data.model"))) {
+                // assume Linux convention
+                libDir = "lib64";
+            } else {
+                // must be 32-bit
+                libDir = "lib";
+            }
+            lib = lib.replace("$LIBISA", libDir);
+         }
+-        String s1 = lib.substring(0, k);
+-        String s2 = lib.substring(k + 7);
+-        String libDir;
+-        if ("64".equals(System.getProperty("sun.arch.data.model"))) {
+-            // assume Linux convention
+-            libDir = "lib64";
+-        } else {
+-            // must be 32-bit
+-            libDir = "lib";
+
+        k = lib.indexOf("$ARCH");
+        if (k != -1) {
+            String arch = System.getProperty("os.arch");
+            lib = lib.replace("$ARCH", getDebianArchitecture(arch));
+         }
+-        String s = s1 + libDir + s2;
+-        return s;
+
+        return lib;
+    }
+
+    private static String getDebianArchitecture(String jdkArch) {
+        return switch (jdkArch) {
+            case "amd64" -> "x86_64";
+            case "ppc" -> "powerpc";
+            case "ppc64" -> "powerpc64";
+            case "ppc64le" -> "powerpc64le";
+            default -> jdkArch;
+        };
+     }
+ 
+     private static String getLibraryName() throws IOException {
+@@ -98,15 +119,18 @@ private static String getLibraryName() throws IOException {
+         if (lib.length() != 0) {
+             return lib;
+         }
+-        lib = expand(LIB1);
+-        if (new File(lib).isFile()) {
+-            // if LIB1 exists, use that
+-            return lib;
+-        }
+-        lib = expand(LIB2);
+-        if (new File(lib).isFile()) {
+-            // if LIB2 exists, use that
+-            return lib;
+
+        for (String template : LIB_TEMPLATES) {
+            for (String suffix : LIB_SUFFIXES) {
+                lib = expand(template) + suffix;
+                if (debug != null) {
+                    debug.println("Looking for " + lib);
+                }
+                if (new File(lib).isFile()) {
+                    // if library exists, use that
+                    return lib;
+                }
+            }
+         }
+ 
+         // As of macos 11, framework libraries have been removed from the file
--- a/SOURCES/remove-intree-libraries.sh
+++ b/SOURCES/remove-intree-libraries.sh
--- a/SPECS/java-21-openjdk-portable.spec
+++ b/SPECS/java-21-openjdk-portable.spec
--- a/gating.yaml
+++ b/gating.yaml
@ -1,7 +0,0 @@
-# recipients: java-qa
--- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
--- a/openjdk-devkit.specfile
+++ b/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
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -1,3 +0,0 @@
---
-inspections:
-    javabytecode: off
--- a/scripts/builds/build_centos.sh
+++ b/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:
--- a/scripts/builds/build_centos_portable_build.sh
+++ b/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:
--- a/scripts/builds/build_rhel_10.sh
+++ b/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:
--- a/scripts/builds/build_rhel_7_portable_build.sh
+++ b/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:
--- a/scripts/builds/build_rhel_8.sh
+++ b/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:
--- a/scripts/builds/build_rhel_9.sh
+++ b/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:
--- a/scripts/builds/build_rhel_portable_build.sh
+++ b/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:
--- a/scripts/builds/build_vanilla.sh
+++ b/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:
--- a/scripts/discover_trees.sh
+++ b/scripts/discover_trees.sh
@ -1,61 +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 <https://www.gnu.org/licenses/>.
-
-TREE=${1}
-
-if test "${TREE}" = ""; then
-    TREE=${PWD}
-fi
-
-if [ -e "${TREE}"/nashorn/.hg ] || [ -e "${TREE}"/nashorn/merge.changeset ] ; then
-    NASHORN="nashorn" ;
-fi
-
-if [ -e "${TREE}"/corba/.hg ] || [ -e "${TREE}"/corba/merge.changeset ] ; then
-    CORBA="corba";
-fi
-
-if [ -e "${TREE}"/jaxp/.hg ] || [ -e "${TREE}"/jaxp/merge.changeset ] ; then
-    JAXP="jaxp";
-fi
-
-if [ -e "${TREE}"/jaxws/.hg ] || [ -e "${TREE}"/jaxws/merge.changeset ] ; then
-    JAXWS="jaxws";
-fi
-
-if [ -e "${TREE}"/langtools/.hg ] || [ -e "${TREE}"/langtools/merge.changeset ] ; then
-    LANGTOOLS="langtools";
-fi
-
-if [ -e "${TREE}"/jdk/.hg ] || [ -e "${TREE}"/jdk/merge.changeset ] ; then
-    JDK="jdk";
-fi
-
-if [ -e "${TREE}"/hotspot/.hg ] || [ -e "${TREE}"/hotspot/merge.changeset ] ; then
-    HOTSPOT="hotspot";
-fi
-
-SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
-echo "${SUBTREES}"
-
-# Local Variables:
-# compile-command: "shellcheck discover_trees.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/generate_source_tarball.sh
+++ b/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:
--- a/scripts/icedtea_sync.sh
+++ b/scripts/icedtea_sync.sh
@ -1,198 +0,0 @@
-#!/bin/bash
-
-# 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/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f "${RPM_DIR}/jconsole.desktop.in" ] ; then
-    echo "Not in RPM source tree.";
-    exit 1;
-fi
-
-if test "${TMPDIR}" = ""; then
-    TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir "${WORKDIR}"
-pushd "${WORKDIR}"
-
-if test "${WGET}" = ""; then
-    WGET=$(which wget);
-    if test "${WGET}" = ""; then
-	echo "wget not found";
-	exit 1;
-    fi
-fi
-
-if test "${TAR}" = ""; then
-    TAR=$(which tar)
-    if test "${TAR}" = ""; then
-	echo "tar not found";
-	exit 2;
-    fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "${ICEDTEA_USE_VCS}" = "true"; then
-    echo "Mode: Using VCS";
-
-    if test "${GREP}" = ""; then
-	GREP=$(which grep);
-	if test "${GREP}" = ""; then
-	    echo "grep not found";
-	    exit 3;
-	fi
-    fi
-
-    if test "${CUT}" = ""; then
-	CUT=$(which cut);
-	if test "${CUT}" = ""; then
-	    echo "cut not found";
-	    exit 4;
-	fi
-    fi
-
-    if test "${TR}" = ""; then
-	TR=$(which tr);
-	if test "${TR}" = ""; then
-	    echo "tr not found";
-	    exit 5;
-	fi
-    fi
-
-    if test "${HG}" = ""; then
-	HG=$(which hg);
-	if test "${HG}" = ""; then
-	    echo "hg not found";
-	    exit 6;
-	fi
-    fi
-
-    echo "Dependencies:";
-    echo -e "\tGREP: ${GREP}";
-    echo -e "\tCUT: ${CUT}";
-    echo -e "\tTR: ${TR}";
-    echo -e "\tHG: ${HG}";
-
-    echo "Checking out repository from VCS...";
-    ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
-    echo "Obtaining version from configure.ac...";
-    ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
-    echo "Root version from configure: ${ROOT_VER}";
-
-    VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
-    echo "VCS revision: ${VCS_REV}";
-
-    ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
-    echo "Creating 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 icedtea/tapset "icedtea-${ICEDTEA_VERSION}"
-
-    rm -rf icedtea
-else
-    echo "Mode: Using tarball";
-
-    if test "${ICEDTEA_VERSION}" = ""; then
-	echo "No IcedTea version specified for tarball download.";
-	exit 3;
-    fi
-
-    if test "${CHECKSUM}" = ""; then
-	CHECKSUM=$(which sha256sum)
-	if test "${CHECKSUM}" = ""; then
-	    echo "sha256sum not found";
-	    exit 4;
-	fi
-    fi
-
-    if test "${PGP}" = ""; then
-	PGP=$(which gpg)
-	if test "${PGP}" = ""; then
-	    echo "gpg not found";
-	    exit 5;
-	fi
-    fi
-
-    echo "Dependencies:";
-    echo -e "\tCHECKSUM: ${CHECKSUM}";
-    echo -e "\tPGP: ${PGP}\n";
-
-    echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
-    if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
-	echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
-	exit 6;
-    fi
-
-    echo "Downloading IcedTea release tarball...";
-    ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
-    echo "Downloading IcedTea tarball signature...";
-    ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-    echo "Downloading IcedTea tarball checksums...";
-    ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
-    echo "Verifying checksums...";
-    ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
-    echo "Checking signature...";
-    ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
-    echo "Extracting files...";
-    ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
-       icedtea-${ICEDTEA_VERSION}/tapset \
-       icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
-    rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
-    rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-    rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v "icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in" "${RPM_DIR}"
-
-echo "Creating new tapset tarball...";
-mv -v "icedtea-${ICEDTEA_VERSION}" openjdk
-${TAR} cJf "${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz" openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf "${WORKDIR}"
-
-# Local Variables:
-# compile-command: "shellcheck icedtea_sync.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/openjdk_news.sh
+++ b/scripts/openjdk_news.sh
@ -1,83 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2024 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
-# 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/>.
-
-OLD_RELEASE=$1
-NEW_RELEASE=$2
-REPO=$3
-SUBDIR=$4
-SCRIPT_DIR=$(dirname "${0}")
-
-if test "${SUBDIR}" = ""; then
-    echo "No subdirectory specified; using .";
-    SUBDIR=".";
-fi
-
-if test "$REPO" = ""; then
-    echo "No repository specified; using ${PWD}"
-    REPO=${PWD}
-fi
-
-if test "${TMPDIR}" = ""; then
-    TMPDIR=/tmp;
-fi
-
-echo "Repository: ${REPO}"
-
-if [ -e "${REPO}/.git" ] ; then
-    TYPE=git;
-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
-    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"
-for repos in . $("${SCRIPT_DIR}/discover_trees.sh" "${REPO}");
-do
-    if test "$TYPE" = "hg"; then
-	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#'| \
-	    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}" | \
-	    grep -E '^[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}' | \
-	    sed -r 's#^([0-9])#  - JDK-\1#' >> "${TMPDIR}/fixes2";
-	touch "${TMPDIR}/fixes3" ; # unused
-    fi
-done
-
-sort "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" | uniq > "${TMPDIR}/fixes"
-rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3"
-
-echo "In ${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:
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (openjdk-21.0.6+7.tar.xz) = fda4179a18a145a3506b09a83fe1338e7398fa0219922d78f47553ddf0eef5b8f88f67829f57d39f67f54e17cc251f70bb8d4a614322c3b57c1765ccea248f30
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,21 +0,0 @@
---
- hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
-    - always
-  - role: standard-test-basic
-    tags:
-    - classic
-    - atomic
-    required_packages:
-    - java-21-openjdk-devel
-    tests:
-      - javaVersion1:
-          dir: ~
-          run: set -ex; useradd franta1;  su franta1 -c 'java -version';
-          run: set -ex; useradd franta4;  su franta4 -c 'javac -version';
-          run: ls -l /usr/lib/jvm;
-      - javaVersion2:
-          dir: ~
-          run: set -ex; useradd franta2;  su franta2 -c 'java --version'
Author	SHA1	Message	Date
Andrew Lukoshko	73830ebd18	Add empty NEWS file	2023-11-08 21:24:39 +01:00
Andrew Lukoshko	920d708ca8	Portable build	2023-11-08 20:57:28 +01:00
eabdullin	234d62daab	import UBI java-21-openjdk-21.0.1.0.12-2.el9	2023-11-07 13:51:25 +00:00