Exclude %{bootjdkpkg}-portable-devel%{?bootdebugpkg:-%{bootdebugpkg}} from BR for bootstrap build

Portable
2025-10-08 18:55:39 +03:00 · 2025-10-07 14:50:13 +03:00
28 changed files with 361 additions and 7134 deletions
--- a/.gitignore
+++ b/.gitignore
@ -39,11 +39,3 @@
 /openjdk-21.0.8+8-ea.tar.xz
 /openjdk-21.0.8+9.tar.xz
 /openjdk-22.0.2+9.tar.xz
-/openjdk-23.0.2+7.tar.xz
-/openjdk-24.0.2+12.tar.xz
-/openjdk-25+36.tar.xz
-/openjdk-25.0.1+8.tar.xz
-/nssadapter-0.1.0.tar.xz
-/openjdk-25.0.2+10.tar.xz
-/nssadapter-0.1.1.tar.xz
-/openjdk-25.0.3+9.tar.xz
--- a/1404
+++ b/1404
--- a/TestSecurityProperties.java
+++ b/TestSecurityProperties.java
@ -21,32 +21,15 @@ import java.security.Security;
 import java.util.Properties;

 public class TestSecurityProperties {
-    private static final String JAVA_HOME = System.getProperty("java.home");
    // JDK 11
-    private static final String JDK_PROPS_FILE_JDK_11 = JAVA_HOME + "/conf/security/java.security";
+    private static final String JDK_PROPS_FILE_JDK_11 = System.getProperty("java.home") + "/conf/security/java.security";
    // JDK 8
-    private static final String JDK_PROPS_FILE_JDK_8 = JAVA_HOME + "/lib/security/java.security";
-    // JDK 25
-    // Omit fips.properties files since they are not relevant to this test.
-    // Omit JAVA_HOME + "/conf/security/redhat/crypto-policies.properties" which simply includes
-    // true/crypto-policies.properties in case redhat.crypto-policies is left undefined.
-    private static final String[] JDK_PROPS_FILES_JDK_25_ENABLED = {
-            JAVA_HOME + "/conf/security/redhat/true/crypto-policies.properties",
-            "/etc/crypto-policies/back-ends/java.config"
-    };
-    private static final String[] JDK_PROPS_FILES_JDK_25_DISABLED = {
-            JAVA_HOME + "/conf/security/redhat/false/crypto-policies.properties"
-    };
+    private static final String JDK_PROPS_FILE_JDK_8 = System.getProperty("java.home") + "/lib/security/java.security";

    private static final String POLICY_FILE = "/etc/crypto-policies/back-ends/java.config";

    private static final String MSG_PREFIX = "DEBUG: ";

-    private static final String javaVersion = System.getProperty("java.version");
-
-    // float for java 1.8
-    private static final float JAVA_FEATURE = Float.parseFloat(System.getProperty("java.specification.version"));
-
    public static void main(String[] args) {
        if (args.length == 0) {
            System.err.println("TestSecurityProperties <true|false>");
@ -57,24 +40,18 @@ public class TestSecurityProperties {
        boolean enabled = Boolean.valueOf(args[0]);
        System.out.println(MSG_PREFIX + "System security properties enabled: " + enabled);
        Properties jdkProps = new Properties();
-        loadProperties(jdkProps, enabled);
+        loadProperties(jdkProps);
        if (enabled) {
            loadPolicy(jdkProps);
        }
-        for (Object key : jdkProps.keySet()) {
-            String sKey = (String) key;
-            if (JAVA_FEATURE >= 25 && sKey.equals("include")) {
-                // Avoid the following exception on 25: IllegalArgumentException: Key 'include' is
-                // reserved and cannot be used as a Security property name.  Hard-code the includes
-                // in JDK_PROPS_FILES_JDK_25_ENABLED and JDK_PROPS_FILES_JDK_25_DISABLED instead.
-                continue;
-            }
+        for (Object key: jdkProps.keySet()) {
+            String sKey = (String)key;
            System.out.println(MSG_PREFIX + "Checking " + sKey);
            String securityVal = Security.getProperty(sKey);
            String jdkSecVal = jdkProps.getProperty(sKey);
            if (!jdkSecVal.equals(securityVal)) {
                String msg = "Expected value '" + jdkSecVal + "' for key '" +
-                        sKey + "'" + " but got value '" + securityVal + "'";
+                             sKey + "'" + " but got value '" + securityVal + "'";
                throw new RuntimeException("Test failed! " + msg);
            } else {
                System.out.println(MSG_PREFIX + sKey + " = " + jdkSecVal + " as expected.");
@ -83,26 +60,17 @@ public class TestSecurityProperties {
        System.out.println("TestSecurityProperties PASSED!");
    }

-    private static void loadPropertiesFile(Properties props, String propsFile) {
-        try (FileInputStream fin = new FileInputStream(propsFile)) {
-            props.load(fin);
-        } catch (Exception e) {
-            throw new RuntimeException("Test failed!", e);
-        }
-    }
-
-    private static void loadProperties(Properties props, boolean enabled) {
+    private static void loadProperties(Properties props) {
+        String javaVersion = System.getProperty("java.version");
        System.out.println(MSG_PREFIX + "Java version is " + javaVersion);
        String propsFile = JDK_PROPS_FILE_JDK_11;
        if (javaVersion.startsWith("1.8.0")) {
            propsFile = JDK_PROPS_FILE_JDK_8;
        }
-        loadPropertiesFile(props, propsFile);
-        if (JAVA_FEATURE >= 25) {
-            for (String file : enabled ? JDK_PROPS_FILES_JDK_25_ENABLED : JDK_PROPS_FILES_JDK_25_DISABLED) {
-                System.out.println(MSG_PREFIX + "Loading " + file);
-                loadPropertiesFile(props, file);
-            }
+        try (FileInputStream fin = new FileInputStream(propsFile)) {
+            props.load(fin);
+        } catch (Exception e) {
+            throw new RuntimeException("Test failed!", e);
        }
    }

@ -115,17 +83,3 @@ public class TestSecurityProperties {
    }

 }
-
-/*
- * Local Variables:
- * compile-command: "\
- * /usr/lib/jvm/java-25-openjdk/bin/javac TestSecurityProperties.java \
- * && (/usr/lib/jvm/java-25-openjdk/bin/java                                TestSecurityProperties false ; [[ $? == 1 ]]) \
- * && (/usr/lib/jvm/java-25-openjdk/bin/java -Dredhat.crypto-policies=true  TestSecurityProperties false ; [[ $? == 1 ]]) \
- * && (/usr/lib/jvm/java-25-openjdk/bin/java -Dredhat.crypto-policies=false TestSecurityProperties true  ; [[ $? == 1 ]]) \
- * &&  /usr/lib/jvm/java-25-openjdk/bin/java                                TestSecurityProperties true                   \
- * &&  /usr/lib/jvm/java-25-openjdk/bin/java -Dredhat.crypto-policies=true  TestSecurityProperties true                   \
- * &&  /usr/lib/jvm/java-25-openjdk/bin/java -Dredhat.crypto-policies=false TestSecurityProperties false"                 \
- * fill-column: 124
- * End:
- */
--- a/TestTranslations.java
+++ b/TestTranslations.java
@ -52,9 +52,9 @@ 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", "MST",
                                              "heure des Rocheuses", "UTC\u221207:00", "MST"});
-        map.put(Locale.GERMANY, new String[] { "Rocky-Mountains-Normalzeit", "GMT-07:00", "MST",
-                                               "Rocky-Mountains-Sommerzeit", "GMT-06:00", "MST",
-                                               "Rocky-Mountains-Zeit", "GMT-07:00", "MST"});
+        map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
+                                               "Rocky-Mountain-Sommerzeit", "GMT-06:00", "MST",
+                                               "Rocky-Mountain-Zeit", "GMT-07:00", "MST"});
        CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
    }

--- a/create-redhat-properties-files.bash
+++ b/create-redhat-properties-files.bash
@ -1,168 +0,0 @@
-#!/bin/bash
-#
-# Create Red Hat OpenJDK security properties directory hierarchy.
-#
-# Copyright (C) 2025 IBM Corporation. All rights reserved.
-#
-# Written by:
-#     Francisco Ferrari Bihurriet <fferrari@redhat.com>
-#     Thomas Fitzsimmons <fitzsim@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/>.
-#
-# Usage:
-#
-# bash create-redhat-properties-files.bash <target directory> <nssadapter path>
-#
-# Example usage in spec file:
-#
-# bash -x create-redhat-properties-files.bash ${installdir}/conf/security \
-#     %{_libdir}/%{sdkdir -- ${suffix}}/libnssadapter.so
-#
-# When you make changes to the file set here, also update the %files
-# section in the spec file, and the JDK_PROPS_FILES_JDK_25 variables
-# in TestSecurityProperties.java.
-
-[[ $# == 2 ]] || exit 1
-
-SECURITY="${1}"
-NSSADAPTER="${2}"
-VENDOR="${SECURITY}"/redhat
-install --directory --mode=755 "${VENDOR}"
-install --directory --mode=755 "${VENDOR}"/true
-install --directory --mode=755 "${VENDOR}"/false
-
-# /usr/lib/jvm/java-25-openjdk/conf/security/redhat/SunPKCS11-FIPS.cfg
-install --mode 644 /dev/stdin "${VENDOR}"/SunPKCS11-FIPS.cfg <<EOF
-name = FIPS
-library = ${NSSADAPTER}
-slot = 3
-nssUseSecmod = false
-attributes(*,CKO_SECRET_KEY,*)={ CKA_SIGN=true CKA_ENCRYPT=true }
-EOF
-
-# /usr/lib/jvm/java-25-openjdk/conf/security/redhat/false/crypto-policies.properties
-install --mode 644 /dev/stdin "${VENDOR}"/false/crypto-policies.properties <<'EOF'
-# Empty on purpose, for ${redhat.crypto-policies}=false
-EOF
-
-# /usr/lib/jvm/java-25-openjdk/conf/security/redhat/true/crypto-policies.properties
-install --mode 644 /dev/stdin "${VENDOR}"/true/crypto-policies.properties <<'EOF'
-#
-# Apply the system-wide crypto policy
-#
-include /etc/crypto-policies/back-ends/java.config
-
-#
-# Apply the FIPS-specific security properties, if needed
-#
-include ../${__redhat_fips__}/fips.properties
-EOF
-
-# /usr/lib/jvm/java-25-openjdk/conf/security/redhat/crypto-policies.properties
-install --mode 644 /dev/stdin "${VENDOR}"/crypto-policies.properties <<'EOF'
-#
-# Default choice for the crypto-policies setup
-#
-include true/crypto-policies.properties
-EOF
-
-# /usr/lib/jvm/java-25-openjdk/conf/security/redhat/false/fips.properties
-install --mode 644 /dev/stdin "${VENDOR}"/false/fips.properties <<'EOF'
-# Empty on purpose, for when FIPS is disabled.
-EOF
-
-# /usr/lib/jvm/java-25-openjdk/conf/security/redhat/true/fips.properties
-install --mode 644 /dev/stdin "${VENDOR}"/true/fips.properties <<'EOF'
-#
-# Enable the downstream-patch RedHatFIPSFilter code
-#
-__redhat_fips_filter__=true
-
-#
-# FIPS mode Security Providers List
-#
-security.provider.1=SunPKCS11 ${java.home}/conf/security/redhat/SunPKCS11-FIPS.cfg
-security.provider.2=SUN
-security.provider.3=SunEC
-security.provider.4=SunJSSE
-security.provider.5=SunJCE
-security.provider.6=SunRsaSign
-security.provider.7=XMLDSig
-security.provider.8=
-#                   ^ empty on purpose, to finish the Providers List
-
-#
-# FIPS mode default keystore type
-#
-keystore.type=pkcs12
-EOF
-
-# Make sure java.security exists before appending
-test -e "${SECURITY}"/java.security || ( echo "${SECURITY}/java.security not found" && false )
-cat >> "${SECURITY}"/java.security <<'EOF'
-
-#
-# System-wide crypto-policies and FIPS setup
-#
-# The following crypto-policies setup automatically detects when the system
-# is in FIPS mode and configures OpenJDK accordingly. If OpenJDK needs to
-# ignore the system and disable its FIPS setup, just disable the usage of
-# the system crypto-policies, by any of the methods described below.
-#
-# The redhat.crypto-policies system property is a boolean switch that
-# controls the usage on a per-run basis. For example, pass
-# -Dredhat.crypto-policies=false to disable the system crypto-policies.
-#
-# This setup consists of the following files in $JAVA_HOME/conf/security:
-#
-#   'redhat/false/crypto-policies.properties' (policies usage disabled file)
-#      Empty file, applied when the boolean switch is passed as false.
-#
-#   'redhat/true/crypto-policies.properties' (policies usage enabled file)
-#      Performs the crypto-policies and FIPS setup, applied when the boolean
-#      switch is passed as true.
-#
-#   'redhat/crypto-policies.properties' (policies usage default file)
-#      Determines the default choice by including one of the previous files,
-#      applied when the boolean switch is not passed.
-#      The system crypto-policies usage is enabled by default:
-#        include true/crypto-policies.properties
-#
-# To enable or disable the usage of the crypto-policies on a per-deployment
-# basis, edit the policies usage default file, changing the included file.
-# For example, execute the following command to persistently disable the
-# crypto-policies:
-#   sed -i s/true/false/ $JAVA_HOME/conf/security/redhat/crypto-policies.properties
-# Applications can still override this on a per-run basis, for example by
-# passing -Dredhat.crypto-policies=true.
-#
-# To disable the redhat.crypto-policies boolean switch, modify the following
-# include directive as follows. Replace ${redhat.crypto-policies} by true to
-# force-apply the system crypto-policies:
-#   include redhat/true/crypto-policies.properties
-# Remove or comment out the include directive to force-disable the setup:
-#   #include redhat/${redhat.crypto-policies}/crypto-policies.properties
-#
-include redhat/${redhat.crypto-policies}/crypto-policies.properties
-#       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-# WARNING: anything placed after this include directive will apply on top
-# of the described setup. Adding properties below this section is strongly
-# discouraged, as it poses a risk of overriding the system crypto-policies
-# or invalidating the FIPS deployment.
-EOF
-
-# Local Variables:
-# compile-command: "shellcheck create-redhat-properties-files.bash"
-# End:
--- a/fips-25u-57722aab802.patch
+++ b/fips-25u-57722aab802.patch
@ -1,87 +0,0 @@
-diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
-index de2845fb550..60eeab678ca 100644
--- a/src/java.base/share/classes/java/security/Provider.java
-+++ b/src/java.base/share/classes/java/security/Provider.java
-@@ -1203,6 +1203,34 @@ public Set<Service> getServices() {
-         return serviceSet;
-     }
- 
-+    /* vvvvvvvvvvvvvvvvvvvvvvvvvvvvv FIPS PATCH vvvvvvvvvvvvvvvvvvvvvvvvvvvvv */
-+    private static final class RedHatFIPSFilter {
-+        static final boolean IS_ON = Boolean.parseBoolean(
-+                Security.getProperty("__redhat_fips_filter__"));
-+        private static final Map<String, Set<String>> ALLOW_LIST = Map.of(
-+                "SUN", Set.of(
-+                        "AlgorithmParameterGenerator",
-+                        "AlgorithmParameters", "CertificateFactory",
-+                        "CertPathBuilder", "CertPathValidator", "CertStore",
-+                        "Configuration", "KeyStore"),
-+                "SunEC", Set.of(
-+                        "AlgorithmParameters", "KeyFactory"),
-+                "SunJCE", Set.of(
-+                        "AlgorithmParameters",
-+                        "AlgorithmParameterGenerator", "KeyFactory",
-+                        "SecretKeyFactory"),
-+                "SunRsaSign", Set.of(
-+                        "KeyFactory", "AlgorithmParameters")
-+        );
-+
-+        static boolean isAllowed(String provName, String serviceType) {
-+            Set<String> allowedServiceTypes = ALLOW_LIST.get(provName);
-+            return allowedServiceTypes == null ||
-+                    allowedServiceTypes.contains(serviceType);
-+        }
-+    }
-+    /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FIPS PATCH ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-+
-     /**
-      * Add a service. If a service of the same type with the same algorithm
-      * name exists, and it was added using {@link #putService putService()},
-@@ -1231,6 +1259,15 @@ protected void putService(Service s) {
-                     ("service.getProvider() must match this Provider object");
-         }
-         String type = s.getType();
-+        /* vvvvvvvvvvvvvvvvvvvvvvvvvvv FIPS PATCH vvvvvvvvvvvvvvvvvvvvvvvvvvv */
-+        if (RedHatFIPSFilter.IS_ON && !RedHatFIPSFilter.isAllowed(name, type)) {
-+            if (debug != null) {
-+                debug.println("The previous " + name + ".putService() call " +
-+                        "was skipped by " + RedHatFIPSFilter.class.getName());
-+            }
-+            return;
-+        }
-+        /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^ FIPS PATCH ^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-         String algorithm = s.getAlgorithm();
-         ServiceKey key = new ServiceKey(type, algorithm, true);
-         implRemoveService(serviceMap.get(key));
-diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
-index 6969fe8a8e1..4501d5971c4 100644
--- a/src/java.base/share/classes/java/security/Security.java
-+++ b/src/java.base/share/classes/java/security/Security.java
-@@ -323,7 +323,27 @@ public Properties getInitialProperties() {
-     }
- 
-     private static void initialize() {
-+        /* vvvvvvvvvvvvvvvvvvvvvvvvvvv FIPS PATCH vvvvvvvvvvvvvvvvvvvvvvvvvvv */
-+        /*   This 'include'-directives-only magic property is an internal     */
-+        /*   implementation detail that could (and probably will!) change.    */
-+        /*   Red Hat customers should NOT rely on this for their own use.     */
-+        String fipsKernelFlag = "/proc/sys/crypto/fips_enabled";
-+        boolean fipsModeOn;
-+        try (InputStream is = new java.io.FileInputStream(fipsKernelFlag)) {
-+            fipsModeOn = is.read() == '1';
-+        } catch (IOException ioe) {
-+            fipsModeOn = false;
-+            if (sdebug != null) {
-+                sdebug.println("Failed to read FIPS kernel file: " + ioe);
-+            }
-+        }
-+        String fipsMagicPropName = "__redhat_fips__";
-+        System.setProperty(fipsMagicPropName, "" + fipsModeOn);
-+        /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^ FIPS PATCH ^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-         SecPropLoader.loadAll();
-+        /* vvvvvvvvvvvvvvvvvvvvvvvvvvv FIPS PATCH vvvvvvvvvvvvvvvvvvvvvvvvvvv */
-+        System.clearProperty(fipsMagicPropName);
-+        /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^ FIPS PATCH ^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-         initialSecurityProperties = (Properties) props.clone();
-         if (sdebug != null) {
-             for (String key : props.stringPropertyNames()) {
--- a/java-25-openjdk-portable.specfile
+++ b/java-25-openjdk-portable.specfile
@ -1,97 +1,4 @@
-# New Version-String scheme-style defines
-%global featurever 25
-%global interimver 0
-%global updatever 3
-%global patchver 0
-%global buildver 9
-%global portablerelease 3
-%global rpmrelease 0
-
-# Define IcedTea version used for SystemTap tapsets and desktop file
-%global icedteaver      6.0.0pre00-c848b93a8598
-# Define current Git revision for the FIPS support patches
-%global fipsver 57722aab802
-# 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}}
-
-# Standard JPackage naming and versioning defines
-%global origin          openjdk
-%global origin_nice     OpenJDK
-%global top_level_dir_name   %{vcstag}
-%global top_level_dir_name_backup %{top_level_dir_name}-backup
-# Define an optional suffix for the OS this package is built on
-%if 0%{?rhel} == 7
-%global pkgos rhel7
-%endif
-
-# Define milestone (EA for pre-releases, GA for releases)
-# Release will be (where N is usually a number starting at 1):
-# - 0.N.ea<dist> for EA releases,
-# - N<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
-
-%global compatiblename  java-%{javaver}-%{origin}
-
-Name:    %{compatiblename}-portable%{?pkgos:-%{pkgos}}
-Version: %{newjavaver}.%{buildver}
-Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist}
-
-%global fullversion     %{compatiblename}-%{version}-%{release}
-
-# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
-# and this change was brought into RHEL-4. java-1.5.0-ibm packages
-# also included the epoch in their virtual provides. This created a
-# situation where in-the-wild java-1.5.0-ibm packages provided "java =
-# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is
-# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be
-# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
-# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
-# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
-Epoch:   1
-Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
-# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
-%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
-Group:   Development/Languages
-%endif
-
-# HotSpot code is licensed under GPLv2
-# JDK library code is licensed under GPLv2 with the Classpath exception
-# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
-# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
-# The JSR166 concurrency code is in the public domain
-# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
-# The OpenJDK source tree includes:
-# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
-# - freetype (FTL), jline (BSD) and LCMS (MIT)
-# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
-# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
-# The test code includes copies of NSS under the Mozilla Public License v2.0
-# The PCSClite headers are under a BSD with advertising license
-# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
-License:  ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
-URL:      http://openjdk.java.net/
-
-# We are producing RPMs containing only tarballs
-# and checksums so there are no binaries outside
-# the tarballs to be processed for debuginfo
+# debug_package %%{nil} is portable-jdks specific
 %define debug_package %{nil}

 # RPM conditionals so as to be able to dynamically produce
@ -189,6 +96,25 @@ URL:      http://openjdk.java.net/
 %global normal_build %{nil}
 %endif

+# We have hardcoded list of files, which  is appearing in alternatives, and in files
+# in alternatives those are slaves and master, very often triplicated by man pages
+# in files all masters and slaves are ghosted
+# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
+# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_
+# TODO - fix those hardcoded lists via single list
+# Those files must *NOT* be ghosted for *slowdebug* packages
+# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
+# you can check via headless and devels:
+#    rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm  | grep bin
+# == rpm -ql           java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm  | grep bin
+# != rpm -ql           java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm  | grep bin
+# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip}
+%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
+
+# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
+# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
+%global is_system_jdk 0
+
 %global aarch64         aarch64 arm64 armv8
 # we need to distinguish between big and little endian PPC64
 %global ppc64le         ppc64le
@ -300,7 +226,7 @@ URL:      http://openjdk.java.net/
 # other targets since this target is configured to use in-tree
 # AWT dependencies: lcms, libjpeg, libpng, libharfbuzz, giflib
 # and possibly others
-%global static_libs_target static-libs-graal-image
+%global static_libs_target static-libs-image
 %else
 %global static_libs_target %{nil}
 %endif
@ -321,13 +247,6 @@ URL:      http://openjdk.java.net/
 %global dtsversion 10
 %endif

-# Check if pandoc is available to generate docs (including man pages)
-%if 0%{?rhel} == 8
-%global pandoc_available 1
-%else
-%global pandoc_available 0
-%endif
-
 # Filter out flags from the optflags macro that cause problems with the OpenJDK build
 # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
 # We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
@ -407,14 +326,18 @@ URL:      http://openjdk.java.net/
 %global with_systemtap 0
 %endif

-
-# buildjdkver is usually same as featurever,
-# but at the time of bootstrap of the next jdk, it is featurever-1,
+# New Version-String scheme-style defines
+%global featurever 22
+%global fakefeaturever 25
+%global interimver 0
+%global updatever 2
+%global patchver 0
+# buildjdkver is usually same as %%{featurever},
+# but in time of bootstrap of next jdk, it is featurever-1,
 # and this it is better to change it here, on single place
 %global buildjdkver %{featurever}
-
 # We don't add any LTS designator for STS packages (Fedora and EPEL).
-# We need to explicitly exclude EPEL as it has the rhel macro defined.
+# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
 %if 0%{?rhel} && !0%{?epel}
  %global lts_designator "LTS"
  %global lts_designator_zip -%{lts_designator}
@ -422,12 +345,26 @@ URL:      http://openjdk.java.net/
  %global lts_designator ""
  %global lts_designator_zip ""
 %endif
+# JDK to use for bootstrapping
+%global bootjdkpkg java-%{fakefeaturever}-openjdk
+%ifarch %{fastdebug_arches}
+%global bootdebugpkg fastdebug
+%endif
+%global bootjdkzip %{_jvmdir}/%{bootjdkpkg}-*.portable%{?bootdebugpkg:.%{bootdebugpkg}}.jdk.%{_arch}.tar.xz
+%global bootjdk %{_builddir}/%{bootjdkpkg}.boot
+# Define whether to use the bootstrap JDK directly or with a fresh libjvm.so
+# This will only work where the bootstrap JDK is the same major version
+# as the JDK being built
+%if %{with fresh_libjvm} && %{buildjdkver} == %{featurever}
+%global build_hotspot_first 1
+%else
+%global build_hotspot_first 0
+%endif

 # Define vendor information used by OpenJDK
 %global oj_vendor Red Hat, Inc.
 %global oj_vendor_url https://www.redhat.com/
-
-# Define what url the JVM should offer in case of a crash report
+# Define what url should JVM offer in case of a crash report
 # order may be important, epel may have rhel declared
 %if 0%{?epel}
 %global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{name}&version=epel%{epel}
@ -443,62 +380,112 @@ URL:      http://openjdk.java.net/
 %endif
 %endif
 %endif
-%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease})
+%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease})

+# Define IcedTea version used for SystemTap tapsets and desktop file
+%global icedteaver      6.0.0pre00-c848b93a8598
+# Define current Git revision for the FIPS support patches
+%global fipsver 9203d50836c
+# Define JDK versions
+%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
+# Force 25 until we are actually ready to build that JDK version
+%global javaver         %{fakefeaturever}
+# 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}}
+
+# Standard JPackage naming and versioning defines
+%global origin          openjdk
+%global origin_nice     OpenJDK
+%global top_level_dir_name   %{vcstag}
+%global top_level_dir_name_backup %{top_level_dir_name}-backup
+%global buildver        9
+%global rpmrelease      2
+#%%global tagsuffix     %%{nil}
+# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
+%if %is_system_jdk
+# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
+# It is very unlikely we will ever have a patch version > 4 or a build version > 20, so we combine as (patch * 20) + build.
+# This means 11.0.9.0+11 would have had a priority of 11000911 as before
+# A 11.0.9.1+1 would have had a priority of 11000921 (20 * 1 + 1), thus ensuring it is bigger than 11.0.9.0+11
+%global combiver $( expr 20 '*' %{patchver} + %{buildver} )
+%global priority %( printf '%02d%02d%02d%02d' %{featurever} %{interimver} %{updatever} %{combiver} )
+%else
+# for techpreview, using 1, so slowdebugs can have 0
+%global priority %( printf '%08d' 1 )
+%endif
+
+# 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
+
+# parametrized macros are order-sensitive
+%global compatiblename  java-%{fakefeaturever}-%{origin}
+%global fullversion     %{compatiblename}-%{version}-%{release}
 # images directories from upstream build
 %global jdkimage                jdk
-%global static_libs_image       static-libs-graal
+%global static_libs_image       static-libs
 # output dir stub
-# Parameterised macros are order-sensitive
-%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
-%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
+%define buildoutputdir() %{expand:build/jdk%{fakefeaturever}.build%{?1}}
+%define installoutputdir() %{expand:install/jdk%{fakefeaturever}.install%{?1}}
 %global altjavaoutputdir install/altjava.install
-%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
+%define packageoutputdir() %{expand:packages/jdk%{fakefeaturever}.packages%{?1}}
 # we can copy the javadoc to not arched dir, or make it not noarch
 %define uniquejavadocdir()    %{expand:%{fullversion}.%{_arch}%{?1}}
 # main id and dir of this jdk
 %define uniquesuffix()        %{expand:%{fullversion}.%{_arch}%{?1}}
 # portable only declarations
 %global jreimage                jre
-%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable%{1}.jre;g")
-%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable%{1}.jdk;g")
-%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable%{1}.static-libs;g")
-
-# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
-# so we have to pass in "" but evaluate it, otherwise files will include it
+%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jre;g")
+%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jdk;g")
+%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.static-libs;g")
 %define jreportablearchive()  %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz}
-%define jreportablearchive_for_files()  %(echo %{jreportablearchive -- ""})
 %define jdkportablearchive()  %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz}
-%define jdkportablearchive_for_files()  %(echo %{jdkportablearchive -- ""})
 %define staticlibsportablearchive()  %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
-%define staticlibsportablearchive_for_files()  %(echo %{staticlibsportablearchive -- ""})
-
 %define jreportablename()     %{expand:%{jreportablenameimpl -- %%{1}}}
 %define jdkportablename()     %{expand:%{jdkportablenameimpl -- %%{1}}}
-# We intentionally use jdkportablenameimpl here since we want to have
-# static-libs files overlayed on top of the JDK archive
+# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
+# top of the JDK archive
 %define staticlibsportablename()     %{expand:%{jdkportablenameimpl -- %%{1}}}
-
-# These macros are not parameterised as the same is shared by all builds
-%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable.docs;g")
+%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
 %define docportablearchive()  %{docportablename}.tar.xz
-%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}[^.]*;portable.misc;g")
+%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
 %define miscportablearchive()  %{miscportablename}.tar.xz

-# JDK to use for bootstrapping
-%global bootjdkpkg java-%{featurever}-%{origin}
-%ifarch %{fastdebug_arches}
-%global bootdebugpkg fastdebug
-%endif
-%global bootjdkzip %{_jvmdir}/%{bootjdkpkg}-*.portable%{?bootdebugpkg:.%{bootdebugpkg}}.jdk.%{_arch}.tar.xz
-%global bootjdk %{_builddir}/%{uniquesuffix -- ""}/%{bootjdkpkg}.boot
-# Define whether to use the bootstrap JDK directly or with a fresh libjvm.so
-# This will only work where the bootstrap JDK is the same major version
-# as the JDK being built
-%if %{with fresh_libjvm} && %{buildjdkver} == %{featurever}
-%global build_hotspot_first 1
+#################################################################
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
+#         https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
+#         https://bugzilla.redhat.com/show_bug.cgi?id=1655938
+%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsystemconf[.]so.*|libzip[.]so.*%{freetype_lib}
+%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
+%if %is_system_jdk
+%global __provides_exclude ^(%{_privatelibs})$
+%global __requires_exclude ^(%{_privatelibs})$
+# Never generate lib-style provides/requires for slowdebug packages
+%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
+%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
+%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
+%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
 %else
-%global build_hotspot_first 0
+# Don't generate provides/requires for JDK provided shared libraries at all.
+%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$
+%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$
 %endif

 # VM variant being built
@ -508,11 +495,28 @@ URL:      http://openjdk.java.net/
 %global vm_variant server
 %endif

+%global etcjavasubdir     %{_sysconfdir}/java/java-%{javaver}-%{origin}
+%define etcjavadir()      %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}}
+# Standard JPackage directories and symbolic links.
+%define sdkdir()        %{expand:%{uniquesuffix -- %{?1}}}
+%define jrelnk()        %{expand:jre-%{javaver}-%{origin}-%{version}-%{release}.%{_arch}%{?1}}
+
+%define sdkbindir()     %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin}
+%define jrebindir()     %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin}
+
 %global alt_java_name     alt-java
 %global devkit_name %{origin}-devkit

 %global rpm_state_dir %{_localstatedir}/lib/rpm-state/

+# For flatpack builds hard-code /usr/sbin/alternatives,
+# otherwise use %%{_sbindir} relative path.
+%if 0%{?flatpak}
+%global alternatives_requires /usr/sbin/alternatives
+%else
+%global alternatives_requires %{_sbindir}/alternatives
+%endif
+
 # Portables have no repo (requires/provides), but these are awesome for orientation in spec
 # Also scriptlets are happily missing and files are handled old fashion
 # not-duplicated requires/provides/obsoletes for normal/debug packages
@ -537,6 +541,11 @@ URL:      http://openjdk.java.net/
 # Prevent brp-java-repack-jars from being run
 %global __jar_repack 0

+# Define an optional suffix for the OS this package is built on
+%if 0%{?rhel} == 7
+%global pkgos rhel7
+%endif
+
 # Define the architectures on which we build
 # On RHEL, this should be the architectures with a devkit
 %if 0%{?centos} == 0
@ -545,13 +554,50 @@ ExclusiveArch: %{devkit_arches}
 ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
 %endif

+Name:    java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}}
+Version: %{newjavaver}.%{buildver}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
+# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
+# and this change was brought into RHEL-4. java-1.5.0-ibm packages
+# also included the epoch in their virtual provides. This created a
+# situation where in-the-wild java-1.5.0-ibm packages provided "java =
+# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is
+# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be
+# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
+# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
+# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
+
+Epoch:   1
+Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
+# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
+%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
+Group:   Development/Languages
+%endif
+
+# HotSpot code is licensed under GPLv2
+# JDK library code is licensed under GPLv2 with the Classpath exception
+# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
+# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
+# The JSR166 concurrency code is in the public domain
+# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
+# The OpenJDK source tree includes:
+# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
+# - freetype (FTL), jline (BSD) and LCMS (MIT)
+# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
+# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
+# The test code includes copies of NSS under the Mozilla Public License v2.0
+# The PCSClite headers are under a BSD with advertising license
+# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
+License:  ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
+URL:      http://openjdk.java.net/
+
 # The source tarball, generated using generate_source_tarball.sh
 Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz

 # Use 'icedtea_sync.sh' to update the following
 # They are based on code contained in the IcedTea project (6.x).
 # Systemtap tapsets. Zipped up to keep it small.
-Source8: tapsets-icedtea-%{icedteaver}.tar.xz
+Source8: tapsets-icedtea-%%{icedteaver}.tar.xz

 # Desktop files. Adapted from IcedTea
 # Disabled in portables
@ -586,18 +632,43 @@ Source18: TestTranslations.java
 # RPM/distribution specific patches
 #
 ############################################
-
 # Crypto policy and FIPS support patches
-
 # Patch is generated from the fips-25u tree at https://github.com/rh-openjdk/jdk/tree/fips-25u
-# as follows: git diff <vcstag> src make test > fips-25u-$(git show -s --format=%h HEAD).patch
+# as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch
 # Diff is limited to src and make subdirectories to exclude .github changes
-
 # Fixes currently included:
-# OPENJDK-2108: Internal __redhat_fips__ property
-# OPENJDK-2123: Algorithms lockdown
-# OPENJDK-4559: Red Hat Build of OpenJDK 25 should not restrict all the providers in FIPS
-Patch1001: fips-%{featurever}u-%{fipsver}.patch
+# PR3183, RH1340845: Follow system wide crypto policy
+# PR3695: Allow use of system crypto policy to be disabled by the user
+# RH1655466: Support RHEL FIPS mode using SunPKCS11 provider
+# RH1818909: No ciphersuites availale for SSLSocket in FIPS mode
+# RH1860986: Disable TLSv1.3 with the NSS-FIPS provider until PKCS#11 v3.0 support is available
+# RH1915071: Always initialise JavaSecuritySystemConfiguratorAccess
+# RH1929465: Improve system FIPS detection
+# RH1995150: Disable non-FIPS crypto in SUN and SunEC security providers
+# RH1996182: Login to the NSS software token in FIPS mode
+# RH1991003: Allow plain key import unless com.redhat.fips.plainKeySupport is set to false
+# RH2021263: Resolve outstanding FIPS issues
+# RH2052819: Fix FIPS reliance on crypto policies
+# RH2052829: Detect NSS at Runtime for FIPS detection
+# RH2052070: Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode
+# RH2023467: Enable FIPS keys export
+# RH2094027: SunEC runtime permission for FIPS
+# RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage
+# RH2090378: Revert to disabling system security properties and FIPS mode support together
+# RH2104724: Avoid import/export of DH private keys
+# RH2092507: P11Key.getEncoded does not work for DH keys in FIPS mode
+# Build the systemconf library on all platforms
+# RH2048582: Support PKCS#12 keystores [now part of JDK-8301553 upstream]
+# RH2020290: Support TLS 1.3 in FIPS mode
+# Add nss.fips.cfg support to OpenJDK tree
+# RH2117972: Extend the support for NSS DBs (PKCS11) in FIPS mode
+# Remove forgotten dead code from RH2020290 and RH2104724
+# OJ1357: Fix issue on FIPS with a SecurityManager in place
+# RH2134669: Add missing attributes when registering services in FIPS mode.
+# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
+# RH1940064: Enable XML Signature provider in FIPS mode
+# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
+# Disabled until 25: Patch1001: fips-%{featurever}u-%{fipsver}.patch

 #############################################
 #
@ -613,12 +684,7 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
 #
 #############################################

-# JDK-8375294: (fs) Files.copy can fail with EOPNOTSUPP when copy_file_range not supported
-Patch2001: jdk8375294-handle-EOPNOTSUPP-in-copying.patch
-# JDK-8347901: C2 should remove unused leaf / pure runtime calls
-Patch2002: jdk8347901-c2_unused_leaf_removal.patch
-# JDK-83787313: C2: performance regression due to missing constant folding for Math.pow()
-Patch2003: jdk8378713-c2_missing_pow_constant_folding.patch
+# Currently empty

 #############################################
 #
@ -672,14 +738,13 @@ BuildRequires: zip
 BuildRequires: tar
 BuildRequires: unzip
 BuildRequires: javapackages-filesystem
-BuildRequires: %{bootjdkpkg}-portable-devel%{?bootdebugpkg:-%{bootdebugpkg}} >= %{buildjdkver}
 # Zero-assembler build requirement
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
 %endif
 # Full documentation build requirements
 # pandoc is only available on RHEL/CentOS 8
-%if %{pandoc_available}
+%if 0%{?rhel} == 8
 BuildRequires: graphviz
 BuildRequires: pandoc
 %endif
@ -701,19 +766,19 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
 # Version in src/java.desktop/share/legal/freetype.md
-Provides: bundled(freetype) = 2.14.2
+Provides: bundled(freetype) = 2.13.3
 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
-Provides: bundled(giflib) = 6.1.2
+Provides: bundled(giflib) = 5.2.2
 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 12.3.2
+Provides: bundled(harfbuzz) = 10.4.0
 # Version in src/java.desktop/share/native/liblcms/lcms2.h
 Provides: bundled(lcms2) = 2.17.0
 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
 Provides: bundled(libjpeg) = 6b
 # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.57
+Provides: bundled(libpng) = 1.6.47
 # Version in src/java.base/share/native/libzip/zlib/zlib.h
-Provides: bundled(zlib) = 1.3.2
+Provides: bundled(zlib) = 1.3.1
 # We link statically against libstdc++ to increase portability
 %ifnarch %{devkit_arches}
 BuildRequires: libstdc++-static
@ -902,6 +967,11 @@ fi
 export XZ_OPT="-T0"
 %setup -q -c -n %{uniquesuffix ""} -T -a 0
 # https://bugzilla.redhat.com/show_bug.cgi?id=1189084
+prioritylength=`expr length %{priority}`
+if [ $prioritylength -ne 8 ] ; then
+ echo "priority must be 8 digits in total, violated"
+ exit 14
+fi

 # OpenJDK patches

@ -911,23 +981,25 @@ sh %{SOURCE12} %{top_level_dir_name}
 %endif

 # Patch the JDK
-
+# 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 %{top_level_dir_name}
 # Add crypto policy and FIPS support
-%patch -P1001 -p1
-# Add EOPNOTSUPP patch
-%patch -P2001 -p1
-# Add C2 patches
-%patch -P2002 -p1
-%patch -P2003 -p1
+# Disabled until 25
+#%patch -P1001 -p1
 popd # openjdk

-echo "Generating %{alt_java_name} man page"
-altjavamanpage=%{top_level_dir_name}/src/java.base/share/man/%{alt_java_name}.md
-altjavatext="Hardened java binary recommended for launching untrusted code from the Web e.g. javaws"
-sed -r -e 's|([^/.])java([^./])|\1alt-java\2|g' %{top_level_dir_name}/src/java.base/share/man/java.md | \
-    sed -e 's|JAVA(|ALT-JAVA(|' | \
-    sed -e "s|java - launch a Java application|alt-java - ${altjavatext}|" >> ${altjavamanpage}

 # The OpenJDK version file includes the current
 # upstream version information. For some reason,
@ -993,7 +1065,7 @@ pushd %{_jvmdir}
 sha256sum --check %{bootjdkzip}.sha256sum
 popd
 tar -xJf %{bootjdkzip}
-mv java-%{featurever}-openjdk-%{buildjdkver}* %{bootjdk}
+mv java-%{fakefeaturever}-openjdk-%{featurever}* %{bootjdk}
 # Print release information
 echo "Installed boot JDK:"
 cat %{bootjdk}/release
@ -1003,6 +1075,7 @@ cat %{bootjdk}/release
 export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
 export NUM_PROC=${NUM_PROC:-1}
 %if 0%{?_smp_ncpus_max}
+# Honor %%_smp_ncpus_max
 [ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
 %endif
 export XZ_OPT="-T0"
@ -1122,8 +1195,8 @@ function buildjdk() {
    mkdir -p ${outputdir}
    pushd ${outputdir}

-    # Note: zlib and freetype use link_type (macro)
-    # rather than link_opt (shell var) as the system versions
+    # Note: zlib and freetype use %{link_type}
+    # rather than ${link_opt} as the system versions
    # are always used in a system_libs build, even
    # for the static library build
    LD_LIBRARY_PATH=${LIBPATH} \
@ -1287,7 +1360,6 @@ function installjdk() {
    # legacy-jre-image target does not install any man pages for the JRE
    # We copy the jdk man directory and then remove pages for binaries that
    # don't exist in the JRE
-%if %{pandoc_available}
    cp -a ${jdkimagepath}/man ${jreimagepath}
    for manpage in $(find ${jreimagepath}/man -name '*.1'); do
        filename=$(basename ${manpage});
@ -1297,7 +1369,6 @@ function installjdk() {
            rm -f ${manpage};
        fi;
    done
-%endif

    for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do

@ -1448,7 +1519,7 @@ function packagejdk() {
 %if %{with_systemtap}
        cp -a ${tapsetdir}* ${miscname}
 %endif
-        cp -av ${altjavadir}/%{alt_java_name} ${miscname}
+        cp -av ${altjavadir}/%{alt_java_name}{,.1} ${miscname}
        createtar ${miscname} ${miscarchive}
        genchecksum ${miscarchive}
    fi
@ -1489,6 +1560,10 @@ function packagejdk() {
 echo "Building %{SOURCE11}"
 mkdir -p %{altjavaoutputdir}
 LD_LIBRARY_PATH="${LIBPATH}" ${GCC} ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
+echo "Generating %{alt_java_name} man page"
+altjavamanpage=%{altjavaoutputdir}/%{alt_java_name}.1
+echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > ${altjavamanpage}
+cat %{top_level_dir_name}/src/java.base/share/man/java.1 >> ${altjavamanpage}

 echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"

@ -1638,23 +1713,18 @@ $JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -versi
  $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
 %endif

-  # Check blocked.certs is valid (OPENJDK-4362)
-  jtreg_test=$(pwd)/%{top_level_dir_name}/test/jdk/sun/security/lib/CheckBlockedCerts.java
-  jtreg_dir=$(dirname ${jtreg_test})
-  $JAVA_HOME/bin/java --add-exports java.base/sun.security.util=ALL-UNNAMED -Dtest.src=${jtreg_dir} ${jtreg_test}
-
  # Check src.zip has all sources. See RHBZ#1130490
  unzip -l $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'

  # Check class files include useful debugging information
-  $JAVA_HOME/bin/javap -c -l java.lang.Object | grep "Compiled from"
-  $JAVA_HOME/bin/javap -c -l java.lang.Object | grep LineNumberTable
-  $JAVA_HOME/bin/javap -c -l java.lang.Object | grep LocalVariableTable
+  $JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
+  $JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
+  $JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable

  # Check generated class files include useful debugging information
-  $JAVA_HOME/bin/javap -c -l java.nio.ByteBuffer | grep "Compiled from"
-  $JAVA_HOME/bin/javap -c -l java.nio.ByteBuffer | grep LineNumberTable
-  $JAVA_HOME/bin/javap -c -l java.nio.ByteBuffer | grep LocalVariableTable
+  $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
+  $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
+  $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable

 %else

@ -1814,8 +1884,8 @@ done

 %files
 # main package builds always
-%{_jvmdir}/%{jreportablearchive_for_files}
-%{_jvmdir}/%{jreportablearchive_for_files}.sha256sum
+%{_jvmdir}/%{jreportablearchive -- %%{nil}}
+%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum
 %else
 %files
 # placeholder
@ -1824,15 +1894,15 @@ done
 %if %{include_normal_build}

 %files devel
-%{_jvmdir}/%{jdkportablearchive_for_files}
+%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
 %{_jvmdir}/%{jdkportablearchive -- .debuginfo}
-%{_jvmdir}/%{jdkportablearchive_for_files}.sha256sum
+%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum
 %{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum

 %if %{include_staticlibs}
 %files static-libs
-%{_jvmdir}/%{staticlibsportablearchive_for_files}
-%{_jvmdir}/%{staticlibsportablearchive_for_files}.sha256sum
+%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}
+%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}.sha256sum
 %endif

 %files unstripped
@ -1886,120 +1956,6 @@ done
 %endif

 %changelog
-* Mon Jul 13 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-3.0
- Add 25u backports of JDK-8347901 & JDK-8378713 C2 performance fixes
- Resolves: OPENJDK-4885
-
-* Thu Jul 02 2026 Andrea Bolognani <abologna@redhat.com> - 1:25.0.3.0.9-3.0
- Strip %%{dist} more thoroughly
- Resolves: OPENJDK-4881
-
-* Fri Jun 26 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-2.0
- Port ForFiles patch to RHEL and update to use standard function naming format
- Remove macro references in comments where possible (%dnl not compatible enough yet)
- Drop unused tagsuffix line which causes issues on older RPM versions without %dnl
- Cleanup RPM only macros unused in the portable spec file
- Move version information and core NVR definitions back towards the top of the file
- Specify portablerelease and rpmrelease (always 0 for portables) in the Release field
- Related: OPENJDK-4872
- Resolves: OPENJDK-4873
- Resolves: OPENJDK-4875
- Resolves: OPENJDK-4876
-
-* Fri Jun 26 2026 Jiri Vanek <jvanek@redhat.com> - 1:25.0.3.0.9-2
- Redeclared ForFiles release sections as %%nil no longer works with %%1
- RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
- so we have to pass in "" but evaluate it, otherwise files record will include it
- Resolves: OPENJDK-4872
-
-* Sat Apr 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-1
- Update to jdk-25.0.3+9 (GA)
- Update release notes to 25.0.3+9
- Update FIPS patch to 57722aab802 version synced with 25.0.3+8
- Drop local libpng patches now JDK-8372534, JDK-8375063 & JDK-8377526 are included upstream
- Drop local HarfBuzz patch now JDK-8375057 is included upstream
- Bump freetype version to 2.14.2 following JDK-8373290 & JDK-8379158
- Bump giflib version to 6.1.2 following JDK-8379256 & JDK-8380078
- Bump libpng version to 1.6.57 following JDK-8380959 & JDK-8382047
- Bump zlib version to 1.3.2 following JDK-8378631
- Add JDK-8375294 EOPNOTSUPP patch ahead of 25.0.4
- ** This tarball is embargoed until 2026-04-21 @ 1pm PT. **
- Resolves: OPENJDK-4634
- Resolves: OPENJDK-4656
- Resolves: OPENJDK-4607
- Resolves: OPENJDK-4675
-
-* Tue Mar 03 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-3
- Update FIPS patch to e55ada9353e to include the fix for the too restrictive provider lockdown
- Fix FIPS issue list to represent the new 25u version
- Add JDK-8375063 libpng 1.6.54 ahead of 25.0.3
- Add JDK-8375057 harfbuzz 12.3.2 ahead of 25.0.3
- Add JDK-8377526 libpng 1.6.55 ahead of 25.0.3
- Bump libpng version to 1.6.55 following JDK-8375063 & JDK-8377526
- Bump harfbuzz version to 12.3.2 following JDK-8375057
- Resolves: OPENJDK-4570
- Resolves: OPENJDK-4304
- Resolves: OPENJDK-4524
- Resolves: OPENJDK-4544
- Resolves: OPENJDK-4553
-
-* Mon Jan 12 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-2
- Add JDK-8372534 libpng 1.6.51 ahead of 25.0.3
- Bump libpng version to 1.6.51 following JDK-8372534
- Add CVEs for 25.0.2 to NEWS
- Correct version and date for this upcoming release in NEWS
- Related: OPENJDK-4359
-
-* Mon Jan 12 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-1
- Update to jdk-25.0.2+10 (GA)
- Update release notes to 25.0.2+10
- Add test to ensure blocked.certs is valid (OPENJDK-4362)
- ** This tarball is embargoed until 2026-01-20 @ 1pm PT. **
- Resolves: OPENJDK-4359
- Resolves: OPENJDK-4362
-
-* Tue Dec 02 2025 Severin Gehwolf <sgehwolf@redhat.com> - 1:25.0.1.0.8-2
- Switch from static-libs-image to static-libs-graal-image to avoid large unneeded libjvm.a
- Resolves: OPENJDK-4197
-
-* Tue Dec 02 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-2
- Incorporate new FIPS patch for 25u
- Resolves: OPENJDK-4184
-
-* Mon Nov 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1
- Update to jdk-25.0.1+8 (GA)
- Update release notes to 25.0.1+8
- Related: RHELBU-3203
-
-* Mon Nov 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.0.0.36-2
- Drop fakefeaturever and rebuild with ourselves now we have reached OpenJDK 25
- Related: RHELBU-3203
-
-* Sun Nov 09 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.0.0.36-1
- Update to jdk-25.0.0+36 (GA)
- Update release notes with features of JDK 25
- Mention finalisation JEP for features finalised in JDK 22, 23 & 24
- Resolves: RHELBU-3203
-
-* Wed Nov 05 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:24.0.2.0.12-1
- Update to jdk-24.0.2+12 (GA)
- Update release notes with features of JDK 24
- Generate alt-java.md during prep following removal of pre-generated man pages in JDK-8344056
- Introduce pandoc_available global for conditional handling of both pandoc dependency and manpages
- Adjust TestTranslations.java with updated German translations from CLDR 46 (JDK-8333582) (Mountain->Mountains)
- Run javap with the disassembled code (-c) option now required for -l by JDK-8345145
- Related: RHELBU-3203
-
-* Sat Oct 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:23.0.2.0.7-1
- Update to jdk-23.0.2+7 (GA)
- Update release notes with features of JDK 23
- Switch buildjdkver to featurever + 1
- Use buildjdkver in the path to the extracted bootstrap JDK
- Move bootstrap declarations later so they can use variables like uniquesuffix
- Fix bootjdk so it uses our build subdirectory created in setup (_builddir only gives the top-level BUILD)
- Fix double '%' in specification of IcedTea sources
- Related: RHELBU-3203
-
 * Mon Sep 22 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:22.0.2.0.9-2
 - Build using ourselves rather than the system JDK as java-25-openjdk is unavailable on older systems
 - Switch buildjdkver back to featurever temporarily for this rebuild
--- a/java-25-openjdk.spec
+++ b/java-25-openjdk.spec
--- a/java-25-openjdk.spec
+++ b/java-25-openjdk.spec
@ -0,0 +1 @@
+java-25-openjdk-portable.specfile
--- a/jdk8347901-c2_unused_leaf_removal.patch
+++ b/jdk8347901-c2_unused_leaf_removal.patch
@ -1,772 +0,0 @@
-From 09853461a6896ab1f15469c753c21ca212e7e650 Mon Sep 17 00:00:00 2001
-From: duke <duke@openjdk.org>
-Date: Tue, 7 Apr 2026 15:14:53 +0000
-Subject: [PATCH 1/2] Backport ed70910b0f3e1b19d915ec13ac3434407d01bc5d
-
---
- src/hotspot/share/opto/callnode.cpp     |  53 +++++++-
- src/hotspot/share/opto/callnode.hpp     |  29 ++++-
- src/hotspot/share/opto/classes.hpp      |   2 +
- src/hotspot/share/opto/compile.cpp      |  19 +++
- src/hotspot/share/opto/divnode.cpp      | 158 ++++++++++--------------
- src/hotspot/share/opto/divnode.hpp      |  35 +++---
- src/hotspot/share/opto/graphKit.cpp     |  29 +++--
- src/hotspot/share/opto/graphKit.hpp     |   1 +
- src/hotspot/share/opto/library_call.cpp |   2 +-
- src/hotspot/share/opto/macro.cpp        |  15 +--
- src/hotspot/share/opto/multnode.cpp     |  13 ++
- src/hotspot/share/opto/multnode.hpp     |  46 +++++++
- src/hotspot/share/opto/node.cpp         |  12 +-
- src/hotspot/share/opto/node.hpp         |   5 +-
- src/hotspot/share/opto/parse2.cpp       |   8 +-
- 15 files changed, 282 insertions(+), 145 deletions(-)
-
-diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
-index 6f13ce0f809..fc4b0c35dff 100644
--- a/src/hotspot/share/opto/callnode.cpp
-+++ b/src/hotspot/share/opto/callnode.cpp
-@@ -935,7 +935,7 @@ Node *CallNode::result_cast() {
- }
- 
- 
-void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts) {
-+void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts) const {
-   projs->fallthrough_proj      = nullptr;
-   projs->fallthrough_catchproj = nullptr;
-   projs->fallthrough_ioproj    = nullptr;
-@@ -1319,6 +1319,57 @@ void CallLeafVectorNode::calling_convention( BasicType* sig_bt, VMRegPair *parm_
- 
- 
- //=============================================================================
-+bool CallLeafPureNode::is_unused() const {
-+  return proj_out_or_null(TypeFunc::Parms) == nullptr;
-+}
-+
-+bool CallLeafPureNode::is_dead() const {
-+  return proj_out_or_null(TypeFunc::Control) == nullptr;
-+}
-+
-+/* We make a tuple of the global input state + TOP for the output values.
-+ * We use this to delete a pure function that is not used: by replacing the call with
-+ * such a tuple, we let output Proj's idealization pick the corresponding input of the
-+ * pure call, so jumping over it, and effectively, removing the call from the graph.
-+ * This avoids doing the graph surgery manually, but leaves that to IGVN
-+ * that is specialized for doing that right. We need also tuple components for output
-+ * values of the function to respect the return arity, and in case there is a projection
-+ * that would pick an output (which shouldn't happen at the moment).
-+ */
-+TupleNode* CallLeafPureNode::make_tuple_of_input_state_and_top_return_values(const Compile* C) const {
-+  // Transparently propagate input state but parameters
-+  TupleNode* tuple = TupleNode::make(
-+      tf()->range(),
-+      in(TypeFunc::Control),
-+      in(TypeFunc::I_O),
-+      in(TypeFunc::Memory),
-+      in(TypeFunc::FramePtr),
-+      in(TypeFunc::ReturnAdr));
-+
-+  // And add TOPs for the return values
-+  for (uint i = TypeFunc::Parms; i < tf()->range()->cnt(); i++) {
-+    tuple->set_req(i, C->top());
-+  }
-+
-+  return tuple;
-+}
-+
-+Node* CallLeafPureNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-+  if (is_dead()) {
-+    return nullptr;
-+  }
-+
-+  // We need to wait until IGVN because during parsing, usages might still be missing
-+  // and we would remove the call immediately.
-+  if (can_reshape && is_unused()) {
-+    // The result is not used. We remove the call by replacing it with a tuple, that
-+    // is later disintegrated by the projections.
-+    return make_tuple_of_input_state_and_top_return_values(phase->C);
-+  }
-+
-+  return CallRuntimeNode::Ideal(phase, can_reshape);
-+}
-+
- #ifndef PRODUCT
- void CallLeafNode::dump_spec(outputStream *st) const {
-   st->print("# ");
-diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
-index 213fbda4e89..2462a88143f 100644
--- a/src/hotspot/share/opto/callnode.hpp
-+++ b/src/hotspot/share/opto/callnode.hpp
-@@ -752,7 +752,7 @@ class CallNode : public SafePointNode {
-   // Collect all the interesting edges from a call for use in
-   // replacing the call by something else.  Used by macro expansion
-   // and the late inlining support.
-  void extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts = true);
-+  void extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts = true) const;
- 
-   virtual uint match_edge(uint idx) const;
- 
-@@ -928,6 +928,33 @@ class CallLeafNode : public CallRuntimeNode {
- #endif
- };
- 
-+/* A pure function call, they are assumed not to be safepoints, not to read or write memory,
-+ * have no exception... They just take parameters, return a value without side effect. It is
-+ * always correct to create some, or remove them, if the result is not used.
-+ *
-+ * They still have control input to allow easy lowering into other kind of calls that require
-+ * a control, but this is more a technical than a moral constraint.
-+ *
-+ * Pure calls must have only control and data input and output: I/O, Memory and so on must be top.
-+ * Nevertheless, pure calls can typically be expensive math operations so care must be taken
-+ * when letting the node float.
-+ */
-+class CallLeafPureNode : public CallLeafNode {
-+protected:
-+  bool is_unused() const;
-+  bool is_dead() const;
-+  TupleNode* make_tuple_of_input_state_and_top_return_values(const Compile* C) const;
-+
-+public:
-+  CallLeafPureNode(const TypeFunc* tf, address addr, const char* name,
-+                   const TypePtr* adr_type)
-+      : CallLeafNode(tf, addr, name, adr_type) {
-+    init_class_id(Class_CallLeafPure);
-+  }
-+  int Opcode() const override;
-+  Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
-+};
-+
- //------------------------------CallLeafNoFPNode-------------------------------
- // CallLeafNode, not using floating point or using it in the same manner as
- // the generated code
-diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
-index bc259eed2d1..587d5fad8f2 100644
--- a/src/hotspot/share/opto/classes.hpp
-+++ b/src/hotspot/share/opto/classes.hpp
-@@ -61,6 +61,7 @@ macro(CallDynamicJava)
- macro(CallJava)
- macro(CallLeaf)
- macro(CallLeafNoFP)
-+macro(CallLeafPure)
- macro(CallLeafVector)
- macro(CallRuntime)
- macro(CallStaticJava)
-@@ -372,6 +373,7 @@ macro(SubI)
- macro(SubL)
- macro(TailCall)
- macro(TailJump)
-+macro(Tuple)
- macro(MacroLogicV)
- macro(ThreadLocal)
- macro(Unlock)
-diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
-index 2b956dcb5d8..9f7f48b9a34 100644
--- a/src/hotspot/share/opto/compile.cpp
-+++ b/src/hotspot/share/opto/compile.cpp
-@@ -3298,6 +3298,25 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
-   case Op_Opaque1:              // Remove Opaque Nodes before matching
-     n->subsume_by(n->in(1), this);
-     break;
-+  case Op_CallLeafPure: {
-+    // If the pure call is not supported, then lower to a CallLeaf.
-+    if (!Matcher::match_rule_supported(Op_CallLeafPure)) {
-+      CallNode* call = n->as_Call();
-+      CallNode* new_call = new CallLeafNode(call->tf(), call->entry_point(),
-+                                            call->_name, TypeRawPtr::BOTTOM);
-+      new_call->init_req(TypeFunc::Control, call->in(TypeFunc::Control));
-+      new_call->init_req(TypeFunc::I_O, C->top());
-+      new_call->init_req(TypeFunc::Memory, C->top());
-+      new_call->init_req(TypeFunc::ReturnAdr, C->top());
-+      new_call->init_req(TypeFunc::FramePtr, C->top());
-+      for (unsigned int i = TypeFunc::Parms; i < call->tf()->domain()->cnt(); i++) {
-+        new_call->init_req(i, call->in(i));
-+      }
-+      n->subsume_by(new_call, this);
-+    }
-+    frc.inc_call_count();
-+    break;
-+  }
-   case Op_CallStaticJava:
-   case Op_CallJava:
-   case Op_CallDynamicJava:
-diff --git a/src/hotspot/share/opto/divnode.cpp b/src/hotspot/share/opto/divnode.cpp
-index a70194274a7..5dd8be877ff 100644
--- a/src/hotspot/share/opto/divnode.cpp
-+++ b/src/hotspot/share/opto/divnode.cpp
-@@ -42,19 +42,19 @@
- 
- #include <math.h>
- 
-ModFloatingNode::ModFloatingNode(Compile* C, const TypeFunc* tf, const char* name) : CallLeafNode(tf, nullptr, name, TypeRawPtr::BOTTOM) {
-+ModFloatingNode::ModFloatingNode(Compile* C, const TypeFunc* tf, address addr, const char* name) : CallLeafPureNode(tf, addr, name, TypeRawPtr::BOTTOM) {
-   add_flag(Flag_is_macro);
-   C->add_macro_node(this);
- }
- 
-ModDNode::ModDNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::Math_DD_D_Type(), "drem") {
-+ModDNode::ModDNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::Math_DD_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::drem), "drem") {
-   init_req(TypeFunc::Parms + 0, a);
-   init_req(TypeFunc::Parms + 1, C->top());
-   init_req(TypeFunc::Parms + 2, b);
-   init_req(TypeFunc::Parms + 3, C->top());
- }
- 
-ModFNode::ModFNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::modf_Type(), "frem") {
-+ModFNode::ModFNode(Compile* C, Node* a, Node* b) : ModFloatingNode(C, OptoRuntime::modf_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::frem), "frem") {
-   init_req(TypeFunc::Parms + 0, a);
-   init_req(TypeFunc::Parms + 1, b);
- }
-@@ -1516,137 +1516,109 @@ const Type* UModLNode::Value(PhaseGVN* phase) const {
-   return unsigned_mod_value<TypeLong, julong, jlong>(phase, this);
- }
- 
-Node* ModFNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  if (!can_reshape) {
-    return nullptr;
-  }
-  PhaseIterGVN* igvn = phase->is_IterGVN();
-
-  bool result_is_unused = proj_out_or_null(TypeFunc::Parms) == nullptr;
-  bool not_dead = proj_out_or_null(TypeFunc::Control) != nullptr;
-  if (result_is_unused && not_dead) {
-    return replace_with_con(igvn, TypeF::make(0.));
-  }
-
-  // Either input is TOP ==> the result is TOP
-  const Type* t1 = phase->type(dividend());
-  const Type* t2 = phase->type(divisor());
-  if (t1 == Type::TOP || t2 == Type::TOP) {
-    return phase->C->top();
-  }
-
-+const Type* ModFNode::get_result_if_constant(const Type* dividend, const Type* divisor) const {
-   // If either number is not a constant, we know nothing.
-  if ((t1->base() != Type::FloatCon) || (t2->base() != Type::FloatCon)) {
-+  if ((dividend->base() != Type::FloatCon) || (divisor->base() != Type::FloatCon)) {
-     return nullptr; // note: x%x can be either NaN or 0
-   }
- 
-  float f1 = t1->getf();
-  float f2 = t2->getf();
-  jint x1 = jint_cast(f1); // note:  *(int*)&f1, not just (int)f1
-  jint x2 = jint_cast(f2);
-+  float dividend_f = dividend->getf();
-+  float divisor_f = divisor->getf();
-+  jint dividend_i = jint_cast(dividend_f); // note:  *(int*)&f1, not just (int)f1
-+  jint divisor_i = jint_cast(divisor_f);
- 
-   // If either is a NaN, return an input NaN
-  if (g_isnan(f1)) {
-    return replace_with_con(igvn, t1);
-+  if (g_isnan(dividend_f)) {
-+    return dividend;
-   }
-  if (g_isnan(f2)) {
-    return replace_with_con(igvn, t2);
-+  if (g_isnan(divisor_f)) {
-+    return divisor;
-   }
- 
-   // If an operand is infinity or the divisor is +/- zero, punt.
-  if (!g_isfinite(f1) || !g_isfinite(f2) || x2 == 0 || x2 == min_jint) {
-+  if (!g_isfinite(dividend_f) || !g_isfinite(divisor_f) || divisor_i == 0 || divisor_i == min_jint) {
-     return nullptr;
-   }
- 
-   // We must be modulo'ing 2 float constants.
-   // Make sure that the sign of the fmod is equal to the sign of the dividend
-  jint xr = jint_cast(fmod(f1, f2));
-  if ((x1 ^ xr) < 0) {
-+  jint xr = jint_cast(fmod(dividend_f, divisor_f));
-+  if ((dividend_i ^ xr) < 0) {
-     xr ^= min_jint;
-   }
- 
-  return replace_with_con(igvn, TypeF::make(jfloat_cast(xr)));
-+  return TypeF::make(jfloat_cast(xr));
- }
- 
-Node* ModDNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  if (!can_reshape) {
-    return nullptr;
-  }
-  PhaseIterGVN* igvn = phase->is_IterGVN();
-
-  bool result_is_unused = proj_out_or_null(TypeFunc::Parms) == nullptr;
-  bool not_dead = proj_out_or_null(TypeFunc::Control) != nullptr;
-  if (result_is_unused && not_dead) {
-    return replace_with_con(igvn, TypeD::make(0.));
-  }
-
-  // Either input is TOP ==> the result is TOP
-  const Type* t1 = phase->type(dividend());
-  const Type* t2 = phase->type(divisor());
-  if (t1 == Type::TOP || t2 == Type::TOP) {
-    return nullptr;
-  }
-
-+const Type* ModDNode::get_result_if_constant(const Type* dividend, const Type* divisor) const {
-   // If either number is not a constant, we know nothing.
-  if ((t1->base() != Type::DoubleCon) || (t2->base() != Type::DoubleCon)) {
-+  if ((dividend->base() != Type::DoubleCon) || (divisor->base() != Type::DoubleCon)) {
-     return nullptr; // note: x%x can be either NaN or 0
-   }
- 
-  double f1 = t1->getd();
-  double f2 = t2->getd();
-  jlong x1 = jlong_cast(f1); // note:  *(long*)&f1, not just (long)f1
-  jlong x2 = jlong_cast(f2);
-+  double dividend_d = dividend->getd();
-+  double divisor_d = divisor->getd();
-+  jlong dividend_l = jlong_cast(dividend_d); // note:  *(long*)&f1, not just (long)f1
-+  jlong divisor_l = jlong_cast(divisor_d);
- 
-   // If either is a NaN, return an input NaN
-  if (g_isnan(f1)) {
-    return replace_with_con(igvn, t1);
-+  if (g_isnan(dividend_d)) {
-+    return dividend;
-   }
-  if (g_isnan(f2)) {
-    return replace_with_con(igvn, t2);
-+  if (g_isnan(divisor_d)) {
-+    return divisor;
-   }
- 
-   // If an operand is infinity or the divisor is +/- zero, punt.
-  if (!g_isfinite(f1) || !g_isfinite(f2) || x2 == 0 || x2 == min_jlong) {
-+  if (!g_isfinite(dividend_d) || !g_isfinite(divisor_d) || divisor_l == 0 || divisor_l == min_jlong) {
-     return nullptr;
-   }
- 
-   // We must be modulo'ing 2 double constants.
-   // Make sure that the sign of the fmod is equal to the sign of the dividend
-  jlong xr = jlong_cast(fmod(f1, f2));
-  if ((x1 ^ xr) < 0) {
-+  jlong xr = jlong_cast(fmod(dividend_d, divisor_d));
-+  if ((dividend_l ^ xr) < 0) {
-     xr ^= min_jlong;
-   }
- 
-  return replace_with_con(igvn, TypeD::make(jdouble_cast(xr)));
-+  return TypeD::make(jdouble_cast(xr));
- }
- 
-Node* ModFloatingNode::replace_with_con(PhaseIterGVN* phase, const Type* con) {
-  Compile* C = phase->C;
-  Node* con_node = phase->makecon(con);
-  CallProjections projs;
-  extract_projections(&projs, false, false);
-  phase->replace_node(projs.fallthrough_proj, in(TypeFunc::Control));
-  if (projs.fallthrough_catchproj != nullptr) {
-    phase->replace_node(projs.fallthrough_catchproj, in(TypeFunc::Control));
-  }
-  if (projs.fallthrough_memproj != nullptr) {
-    phase->replace_node(projs.fallthrough_memproj, in(TypeFunc::Memory));
-  }
-  if (projs.catchall_memproj != nullptr) {
-    phase->replace_node(projs.catchall_memproj, C->top());
-  }
-  if (projs.fallthrough_ioproj != nullptr) {
-    phase->replace_node(projs.fallthrough_ioproj, in(TypeFunc::I_O));
-  }
-  assert(projs.catchall_ioproj == nullptr, "no exceptions from floating mod");
-  assert(projs.catchall_catchproj == nullptr, "no exceptions from floating mod");
-  if (projs.resproj != nullptr) {
-    phase->replace_node(projs.resproj, con_node);
-+Node* ModFloatingNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-+  if (can_reshape) {
-+    PhaseIterGVN* igvn = phase->is_IterGVN();
-+
-+    // Either input is TOP ==> the result is TOP
-+    const Type* dividend_type = phase->type(dividend());
-+    const Type* divisor_type = phase->type(divisor());
-+    if (dividend_type == Type::TOP || divisor_type == Type::TOP) {
-+      return phase->C->top();
-+    }
-+    const Type* constant_result = get_result_if_constant(dividend_type, divisor_type);
-+    if (constant_result != nullptr) {
-+      return make_tuple_of_input_state_and_constant_result(igvn, constant_result);
-+    }
-   }
-  phase->replace_node(this, C->top());
-  C->remove_macro_node(this);
-  disconnect_inputs(C);
-  return nullptr;
-+
-+  return CallLeafPureNode::Ideal(phase, can_reshape);
-+}
-+
-+/* Give a tuple node for ::Ideal to return, made of the input state (control to return addr)
-+ * and the given constant result. Idealization of projections will make sure to transparently
-+ * propagate the input state and replace the result by the said constant.
-+ */
-+TupleNode* ModFloatingNode::make_tuple_of_input_state_and_constant_result(PhaseIterGVN* phase, const Type* con) const {
-+  Node* con_node = phase->makecon(con);
-+  TupleNode* tuple = TupleNode::make(
-+      tf()->range(),
-+      in(TypeFunc::Control),
-+      in(TypeFunc::I_O),
-+      in(TypeFunc::Memory),
-+      in(TypeFunc::FramePtr),
-+      in(TypeFunc::ReturnAdr),
-+      con_node);
-+
-+  return tuple;
- }
- 
- //=============================================================================
-diff --git a/src/hotspot/share/opto/divnode.hpp b/src/hotspot/share/opto/divnode.hpp
-index 127e2431b0b..b13460c89f5 100644
--- a/src/hotspot/share/opto/divnode.hpp
-+++ b/src/hotspot/share/opto/divnode.hpp
-@@ -156,40 +156,45 @@ class ModLNode : public Node {
- };
- 
- // Base class for float and double modulus
-class ModFloatingNode : public CallLeafNode {
-+class ModFloatingNode : public CallLeafPureNode {
-+  TupleNode* make_tuple_of_input_state_and_constant_result(PhaseIterGVN* phase, const Type* con) const;
-+
- protected:
-  Node* replace_with_con(PhaseIterGVN* phase, const Type* con);
-+  virtual Node* dividend() const = 0;
-+  virtual Node* divisor() const = 0;
-+  virtual const Type* get_result_if_constant(const Type* dividend, const Type* divisor) const = 0;
- 
- public:
-  ModFloatingNode(Compile* C, const TypeFunc* tf, const char *name);
-+  ModFloatingNode(Compile* C, const TypeFunc* tf, address addr, const char* name);
-+  Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
- };
- 
- // Float Modulus
- class ModFNode : public ModFloatingNode {
- private:
-  Node* dividend() const { return in(TypeFunc::Parms + 0); }
-  Node* divisor() const { return in(TypeFunc::Parms + 1); }
-+  Node* dividend() const override { return in(TypeFunc::Parms + 0); }
-+  Node* divisor() const override { return in(TypeFunc::Parms + 1); }
-+  const Type* get_result_if_constant(const Type* dividend, const Type* divisor) const override;
- 
- public:
-   ModFNode(Compile* C, Node* a, Node* b);
-  virtual int Opcode() const;
-  virtual uint ideal_reg() const { return Op_RegF; }
-  virtual uint size_of() const { return sizeof(*this); }
-  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
-+  int Opcode() const override;
-+  uint ideal_reg() const override { return Op_RegF; }
-+  uint size_of() const override { return sizeof(*this); }
- };
- 
- // Double Modulus
- class ModDNode : public ModFloatingNode {
- private:
-  Node* dividend() const { return in(TypeFunc::Parms + 0); }
-  Node* divisor() const { return in(TypeFunc::Parms + 2); }
-+  Node* dividend() const override { return in(TypeFunc::Parms + 0); }
-+  Node* divisor() const override { return in(TypeFunc::Parms + 2); }
-+  const Type* get_result_if_constant(const Type* dividend, const Type* divisor) const override;
- 
- public:
-   ModDNode(Compile* C, Node* a, Node* b);
-  virtual int Opcode() const;
-  virtual uint ideal_reg() const { return Op_RegD; }
-  virtual uint size_of() const { return sizeof(*this); }
-  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
-+  int Opcode() const override;
-+  uint ideal_reg() const override { return Op_RegD; }
-+  uint size_of() const override { return sizeof(*this); }
- };
- 
- //------------------------------UModINode---------------------------------------
-diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
-index 20feca26ede..1b8b7008578 100644
--- a/src/hotspot/share/opto/graphKit.cpp
-+++ b/src/hotspot/share/opto/graphKit.cpp
-@@ -1880,14 +1880,20 @@ Node* GraphKit::set_results_for_java_call(CallJavaNode* call, bool separate_io_p
- // after the call, if this call has restricted memory effects.
- Node* GraphKit::set_predefined_input_for_runtime_call(SafePointNode* call, Node* narrow_mem) {
-   // Set fixed predefined input arguments
-  Node* memory = reset_memory();
-  Node* m = narrow_mem == nullptr ? memory : narrow_mem;
-  call->init_req( TypeFunc::Control,   control()  );
-  call->init_req( TypeFunc::I_O,       top()      ); // does no i/o
-  call->init_req( TypeFunc::Memory,    m          ); // may gc ptrs
-  call->init_req( TypeFunc::FramePtr,  frameptr() );
-  call->init_req( TypeFunc::ReturnAdr, top()      );
-  return memory;
-+  call->init_req(TypeFunc::Control, control());
-+  call->init_req(TypeFunc::I_O, top()); // does no i/o
-+  call->init_req(TypeFunc::ReturnAdr, top());
-+  if (call->is_CallLeafPure()) {
-+    call->init_req(TypeFunc::Memory, top());
-+    call->init_req(TypeFunc::FramePtr, top());
-+    return nullptr;
-+  } else {
-+    Node* memory = reset_memory();
-+    Node* m = narrow_mem == nullptr ? memory : narrow_mem;
-+    call->init_req(TypeFunc::Memory, m); // may gc ptrs
-+    call->init_req(TypeFunc::FramePtr, frameptr());
-+    return memory;
-+  }
- }
- 
- //-------------------set_predefined_output_for_runtime_call--------------------
-@@ -1905,6 +1911,11 @@ void GraphKit::set_predefined_output_for_runtime_call(Node* call,
-                                                       const TypePtr* hook_mem) {
-   // no i/o
-   set_control(_gvn.transform( new ProjNode(call,TypeFunc::Control) ));
-+  if (call->is_CallLeafPure()) {
-+    // Pure function have only control (for now) and data output, in particular
-+    // they don't touch the memory, so we don't want a memory proj that is set after.
-+    return;
-+  }
-   if (keep_mem) {
-     // First clone the existing memory state
-     set_all_memory(keep_mem);
-@@ -2491,6 +2502,8 @@ Node* GraphKit::make_runtime_call(int flags,
-   } else  if (flags & RC_VECTOR){
-     uint num_bits = call_type->range()->field_at(TypeFunc::Parms)->is_vect()->length_in_bytes() * BitsPerByte;
-     call = new CallLeafVectorNode(call_type, call_addr, call_name, adr_type, num_bits);
-+  } else if (flags & RC_PURE) {
-+    call = new CallLeafPureNode(call_type, call_addr, call_name, adr_type);
-   } else {
-     call = new CallLeafNode(call_type, call_addr, call_name, adr_type);
-   }
-diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
-index 28773d75333..806a211d7e2 100644
--- a/src/hotspot/share/opto/graphKit.hpp
-+++ b/src/hotspot/share/opto/graphKit.hpp
-@@ -784,6 +784,7 @@ class GraphKit : public Phase {
-     RC_NARROW_MEM = 16,         // input memory is same as output
-     RC_UNCOMMON = 32,           // freq. expected to be like uncommon trap
-     RC_VECTOR = 64,             // CallLeafVectorNode
-+    RC_PURE = 128,              // CallLeaf is pure
-     RC_LEAF = 0                 // null value:  no flags set
-   };
- 
-diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
-index f74af38387c..12960d101a8 100644
--- a/src/hotspot/share/opto/library_call.cpp
-+++ b/src/hotspot/share/opto/library_call.cpp
-@@ -1802,7 +1802,7 @@ bool LibraryCallKit::runtime_math(const TypeFunc* call_type, address funcAddr, c
-   Node* b = (call_type == OptoRuntime::Math_DD_D_Type()) ? argument(2) : nullptr;
- 
-   const TypePtr* no_memory_effects = nullptr;
-  Node* trig = make_runtime_call(RC_LEAF, call_type, funcAddr, funcName,
-+  Node* trig = make_runtime_call(RC_LEAF | RC_PURE, call_type, funcAddr, funcName,
-                                  no_memory_effects,
-                                  a, top(), b, b ? top() : nullptr);
-   Node* value = _gvn.transform(new ProjNode(trig, TypeFunc::Parms+0));
-diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
-index acf1dbabf19..aafc5d3c170 100644
--- a/src/hotspot/share/opto/macro.cpp
-+++ b/src/hotspot/share/opto/macro.cpp
-@@ -2638,17 +2638,14 @@ bool PhaseMacroExpand::expand_macro_nodes() {
-       switch (n->Opcode()) {
-       case Op_ModD:
-       case Op_ModF: {
-        bool is_drem = n->Opcode() == Op_ModD;
-         CallNode* mod_macro = n->as_Call();
-        CallNode* call = new CallLeafNode(mod_macro->tf(),
-                                          is_drem ? CAST_FROM_FN_PTR(address, SharedRuntime::drem)
-                                                  : CAST_FROM_FN_PTR(address, SharedRuntime::frem),
-                                          is_drem ? "drem" : "frem", TypeRawPtr::BOTTOM);
-+        CallNode* call = new CallLeafPureNode(mod_macro->tf(), mod_macro->entry_point(),
-+                                              mod_macro->_name, TypeRawPtr::BOTTOM);
-         call->init_req(TypeFunc::Control, mod_macro->in(TypeFunc::Control));
-        call->init_req(TypeFunc::I_O, mod_macro->in(TypeFunc::I_O));
-        call->init_req(TypeFunc::Memory, mod_macro->in(TypeFunc::Memory));
-        call->init_req(TypeFunc::ReturnAdr, mod_macro->in(TypeFunc::ReturnAdr));
-        call->init_req(TypeFunc::FramePtr, mod_macro->in(TypeFunc::FramePtr));
-+        call->init_req(TypeFunc::I_O, C->top());
-+        call->init_req(TypeFunc::Memory, C->top());
-+        call->init_req(TypeFunc::ReturnAdr, C->top());
-+        call->init_req(TypeFunc::FramePtr, C->top());
-         for (unsigned int i = 0; i < mod_macro->tf()->domain()->cnt() - TypeFunc::Parms; i++) {
-           call->init_req(TypeFunc::Parms + i, mod_macro->in(TypeFunc::Parms + i));
-         }
-diff --git a/src/hotspot/share/opto/multnode.cpp b/src/hotspot/share/opto/multnode.cpp
-index 736e84315ee..f429d5daac0 100644
--- a/src/hotspot/share/opto/multnode.cpp
-+++ b/src/hotspot/share/opto/multnode.cpp
-@@ -120,6 +120,10 @@ const TypePtr *ProjNode::adr_type() const {
-   if (bottom_type() == Type::MEMORY) {
-     // in(0) might be a narrow MemBar; otherwise we will report TypePtr::BOTTOM
-     Node* ctrl = in(0);
-+    if (ctrl->Opcode() == Op_Tuple) {
-+      // Jumping over Tuples: the i-th projection of a Tuple is the i-th input of the Tuple.
-+      ctrl = ctrl->in(_con);
-+    }
-     if (ctrl == nullptr)  return nullptr; // node is dead
-     const TypePtr* adr_type = ctrl->adr_type();
-     #ifdef ASSERT
-@@ -163,6 +167,15 @@ void ProjNode::check_con() const {
-   assert(_con < t->is_tuple()->cnt(), "ProjNode::_con must be in range");
- }
- 
-+//------------------------------Identity---------------------------------------
-+Node* ProjNode::Identity(PhaseGVN* phase) {
-+  if (in(0) != nullptr && in(0)->Opcode() == Op_Tuple) {
-+    // Jumping over Tuples: the i-th projection of a Tuple is the i-th input of the Tuple.
-+    return in(0)->in(_con);
-+  }
-+  return this;
-+}
-+
- //------------------------------Value------------------------------------------
- const Type* ProjNode::Value(PhaseGVN* phase) const {
-   if (in(0) == nullptr) return Type::TOP;
-diff --git a/src/hotspot/share/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp
-index dff2caed38d..834dcfdca6d 100644
--- a/src/hotspot/share/opto/multnode.hpp
-+++ b/src/hotspot/share/opto/multnode.hpp
-@@ -82,6 +82,7 @@ class ProjNode : public Node {
-   virtual const Type *bottom_type() const;
-   virtual const TypePtr *adr_type() const;
-   virtual bool pinned() const;
-+  virtual Node* Identity(PhaseGVN* phase);
-   virtual const Type* Value(PhaseGVN* phase) const;
-   virtual uint ideal_reg() const;
-   virtual const RegMask &out_RegMask() const;
-@@ -105,4 +106,49 @@ class ProjNode : public Node {
-   ProjNode* other_if_proj() const;
- };
- 
-+/* Tuples are used to avoid manual graph surgery. When a node with Proj outputs (such as a call)
-+ * must be removed and its ouputs replaced by its input, or some other value, we can make its
-+ * ::Ideal return a tuple of what we want for each output: the ::Identity of output Proj will
-+ * take care to jump over the Tuple and directly pick up the right input of the Tuple.
-+ *
-+ * For instance, if a function call is proven to have no side effect and return the constant 0,
-+ * we can replace it with the 6-tuple:
-+ * (control input, IO input, memory input, frame ptr input, return addr input, Con:0)
-+ * all the output projections will pick up the input of the now gone call, except for the result
-+ * projection that is replaced by 0.
-+ *
-+ * Using TupleNode avoid manual graph surgery and leave that to our expert surgeon: IGVN.
-+ * Since the user of a Tuple are expected to be Proj, when creating a tuple during idealization,
-+ * the output Proj should be enqueued for IGVN immediately after, and the tuple should not survive
-+ * after the current IGVN.
-+ */
-+class TupleNode : public MultiNode {
-+  const TypeTuple* _tf;
-+
-+  template <typename... NN>
-+  static void make_helper(TupleNode* tn, uint i, Node* node, NN... nn) {
-+    tn->set_req(i, node);
-+    make_helper(tn, i + 1, nn...);
-+  }
-+
-+  static void make_helper(TupleNode*, uint) {}
-+
-+public:
-+  TupleNode(const TypeTuple* tf) : MultiNode(tf->cnt()), _tf(tf) {}
-+
-+  int Opcode() const override;
-+  const Type* bottom_type() const override { return _tf; }
-+
-+  /* Give as many `Node*` as you want in the `nn` pack:
-+   * TupleNode::make(tf, input1)
-+   * TupleNode::make(tf, input1, input2, input3, input4)
-+   */
-+  template <typename... NN>
-+  static TupleNode* make(const TypeTuple* tf, NN... nn) {
-+    TupleNode* tn = new TupleNode(tf);
-+    make_helper(tn, 0, nn...);
-+    return tn;
-+  }
-+};
-+
- #endif // SHARE_OPTO_MULTNODE_HPP
-diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
-index 8f6c67c16f5..5ecc038954d 100644
--- a/src/hotspot/share/opto/node.cpp
-+++ b/src/hotspot/share/opto/node.cpp
-@@ -2946,23 +2946,13 @@ bool Node::is_dead_loop_safe() const {
- bool Node::is_div_or_mod(BasicType bt) const { return Opcode() == Op_Div(bt) || Opcode() == Op_Mod(bt) ||
-                                                       Opcode() == Op_UDiv(bt) || Opcode() == Op_UMod(bt); }
- 
-bool Node::is_pure_function() const {
-  switch (Opcode()) {
-  case Op_ModD:
-  case Op_ModF:
-    return true;
-  default:
-    return false;
-  }
-}
-
- // `maybe_pure_function` is assumed to be the input of `this`. This is a bit redundant,
- // but we already have and need maybe_pure_function in all the call sites, so
- // it makes it obvious that the `maybe_pure_function` is the same node as in the caller,
- // while it takes more thinking to realize that a locally computed in(0) must be equal to
- // the local in the caller.
- bool Node::is_data_proj_of_pure_function(const Node* maybe_pure_function) const {
-  return Opcode() == Op_Proj && as_Proj()->_con == TypeFunc::Parms && maybe_pure_function->is_pure_function();
-+  return Opcode() == Op_Proj && as_Proj()->_con == TypeFunc::Parms && maybe_pure_function->is_CallLeafPure();
- }
- 
- //=============================================================================
-diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
-index 2bbb10879f5..dc0ac474c4b 100644
--- a/src/hotspot/share/opto/node.hpp
-+++ b/src/hotspot/share/opto/node.hpp
-@@ -54,6 +54,7 @@ class CallDynamicJavaNode;
- class CallJavaNode;
- class CallLeafNode;
- class CallLeafNoFPNode;
-+class CallLeafPureNode;
- class CallNode;
- class CallRuntimeNode;
- class CallStaticJavaNode;
-@@ -673,6 +674,7 @@ class Node {
-           DEFINE_CLASS_ID(CallRuntime,      Call, 1)
-             DEFINE_CLASS_ID(CallLeaf,         CallRuntime, 0)
-               DEFINE_CLASS_ID(CallLeafNoFP,     CallLeaf, 0)
-+              DEFINE_CLASS_ID(CallLeafPure,     CallLeaf, 1)
-           DEFINE_CLASS_ID(Allocate,         Call, 2)
-             DEFINE_CLASS_ID(AllocateArray,    Allocate, 0)
-           DEFINE_CLASS_ID(AbstractLock,     Call, 3)
-@@ -907,6 +909,7 @@ class Node {
-   DEFINE_CLASS_QUERY(CallJava)
-   DEFINE_CLASS_QUERY(CallLeaf)
-   DEFINE_CLASS_QUERY(CallLeafNoFP)
-+  DEFINE_CLASS_QUERY(CallLeafPure)
-   DEFINE_CLASS_QUERY(CallRuntime)
-   DEFINE_CLASS_QUERY(CallStaticJava)
-   DEFINE_CLASS_QUERY(Catch)
-@@ -1289,8 +1292,6 @@ class Node {
- 
-   bool is_div_or_mod(BasicType bt) const;
- 
-  bool is_pure_function() const;
-
-   bool is_data_proj_of_pure_function(const Node* maybe_pure_function) const;
- 
- //----------------- Printing, etc
-diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
-index 1a4c3c91c4f..04b6e49b620 100644
--- a/src/hotspot/share/opto/parse2.cpp
-+++ b/src/hotspot/share/opto/parse2.cpp
-@@ -1097,11 +1097,11 @@ void Parse::jump_switch_ranges(Node* key_val, SwitchRange *lo, SwitchRange *hi,
- 
- Node* Parse::floating_point_mod(Node* a, Node* b, BasicType type) {
-   assert(type == BasicType::T_FLOAT || type == BasicType::T_DOUBLE, "only float and double are floating points");
-  CallNode* mod = type == BasicType::T_DOUBLE ? static_cast<CallNode*>(new ModDNode(C, a, b)) : new ModFNode(C, a, b);
-+  CallLeafPureNode* mod = type == BasicType::T_DOUBLE ? static_cast<CallLeafPureNode*>(new ModDNode(C, a, b)) : new ModFNode(C, a, b);
- 
-  Node* prev_mem = set_predefined_input_for_runtime_call(mod);
-  mod = _gvn.transform(mod)->as_Call();
-  set_predefined_output_for_runtime_call(mod, prev_mem, TypeRawPtr::BOTTOM);
-+  set_predefined_input_for_runtime_call(mod);
-+  mod = _gvn.transform(mod)->as_CallLeafPure();
-+  set_predefined_output_for_runtime_call(mod);
-   Node* result = _gvn.transform(new ProjNode(mod, TypeFunc::Parms + 0));
-   record_for_igvn(mod);
-   return result;
-- 
-2.53.0
-
--- a/jdk8375294-handle-EOPNOTSUPP-in-copying.patch
+++ b/jdk8375294-handle-EOPNOTSUPP-in-copying.patch
@ -1,63 +0,0 @@
-From dbbdc1dffd10608195487fa139e77c4a90c80658 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ji=C5=99=C3=AD=20Van=C4=9Bk?= <jvanek@openjdk.org>
-Date: Wed, 15 Apr 2026 12:54:49 +0000
-Subject: [PATCH] 8375294: (fs) Files.copy can fail with EOPNOTSUPP when
- copy_file_range not supported
-
-Reviewed-by: andrew
-Backport-of: 30cda00010888b6e9a2bf8cdeaedbb3eb4b6a222
---
- src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c    | 5 +++--
- src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c | 3 ++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
-index efbd0ca5684..54d640b03a4 100644
--- a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
-+++ b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
-@@ -1,5 +1,5 @@
- /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2026, 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
-@@ -63,7 +63,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferFrom0(JNIEnv *env, jobject this,
-     if (n < 0) {
-         if (errno == EAGAIN)
-             return IOS_UNAVAILABLE;
-        if (errno == ENOSYS)
-+        if (errno == ENOSYS || errno == EOPNOTSUPP)
-             return IOS_UNSUPPORTED_CASE;
-         if ((errno == EBADF || errno == EINVAL || errno == EXDEV) &&
-             ((ssize_t)count >= 0))
-@@ -103,6 +103,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferTo0(JNIEnv *env, jobject this,
-                 case EINVAL:
-                 case ENOSYS:
-                 case EXDEV:
-+                case EOPNOTSUPP:
-                     // ignore and try sendfile()
-                     break;
-                 default:
-diff --git a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
-index c90e99dda07..4677411b0ba 100644
--- a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
-+++ b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
-@@ -1,5 +1,5 @@
- /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2026, 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
-@@ -193,6 +193,7 @@ Java_sun_nio_fs_LinuxNativeDispatcher_directCopy0
-                     case EINVAL:
-                     case ENOSYS:
-                     case EXDEV:
-+                    case EOPNOTSUPP:
-                         // ignore and try sendfile()
-                         break;
-                     default:
-- 
-2.52.0
-
--- a/jdk8378713-c2_missing_pow_constant_folding.patch
+++ b/jdk8378713-c2_missing_pow_constant_folding.patch
@ -1,626 +0,0 @@
-From 1f61b6754b5abce07db45fd385a19c2cf9296a08 Mon Sep 17 00:00:00 2001
-From: Kangcheng Xu <kxu@redhat.com>
-Date: Mon, 27 Apr 2026 10:14:39 -0400
-Subject: [PATCH 2/2] Backport 7f631ea958e30246b927f3524f0fbf37334422b9
-
---
- src/hotspot/share/opto/callnode.cpp           | 175 ++++++++++++++
- src/hotspot/share/opto/callnode.hpp           |  17 ++
- src/hotspot/share/opto/classes.hpp            |   1 +
- src/hotspot/share/opto/library_call.cpp       |  62 +----
- src/hotspot/share/opto/macro.cpp              |  19 +-
- .../intrinsics/math/PowDNodeTests.java        | 218 ++++++++++++++++++
- .../compiler/lib/ir_framework/IRNode.java     |  11 +
- 7 files changed, 437 insertions(+), 66 deletions(-)
- create mode 100644 test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java
-
-diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
-index fc4b0c35dff..cb6cc2082b3 100644
--- a/src/hotspot/share/opto/callnode.cpp
-+++ b/src/hotspot/share/opto/callnode.cpp
-@@ -42,6 +42,7 @@
- #include "opto/rootnode.hpp"
- #include "opto/runtime.hpp"
- #include "runtime/sharedRuntime.hpp"
-+#include "runtime/stubRoutines.hpp"
- #include "utilities/powerOfTwo.hpp"
- #include "code/vmreg.hpp"
- 
-@@ -1354,6 +1355,25 @@ TupleNode* CallLeafPureNode::make_tuple_of_input_state_and_top_return_values(con
-   return tuple;
- }
- 
-+CallLeafPureNode* CallLeafPureNode::inline_call_leaf_pure_node(Node* control) const {
-+  Node* top = Compile::current()->top();
-+  if (control == nullptr) {
-+    control = in(TypeFunc::Control);
-+  }
-+
-+  CallLeafPureNode* call = new CallLeafPureNode(tf(), entry_point(), _name, nullptr);
-+  call->init_req(TypeFunc::Control, control);
-+  call->init_req(TypeFunc::I_O, top);
-+  call->init_req(TypeFunc::Memory, top);
-+  call->init_req(TypeFunc::ReturnAdr, top);
-+  call->init_req(TypeFunc::FramePtr, top);
-+  for (unsigned int i = 0; i < tf()->domain()->cnt() - TypeFunc::Parms; i++) {
-+    call->init_req(TypeFunc::Parms + i, in(TypeFunc::Parms + i));
-+  }
-+
-+  return call;
-+}
-+
- Node* CallLeafPureNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-   if (is_dead()) {
-     return nullptr;
-@@ -2424,3 +2444,158 @@ bool CallNode::may_modify_arraycopy_helper(const TypeOopPtr* dest_t, const TypeO
- 
-   return true;
- }
-+
-+PowDNode::PowDNode(Compile* C, Node* base, Node* exp)
-+    : CallLeafPureNode(
-+        OptoRuntime::Math_DD_D_Type(),
-+        StubRoutines::dpow() != nullptr ? StubRoutines::dpow() : CAST_FROM_FN_PTR(address, SharedRuntime::dpow),
-+        "pow",
-+        nullptr) {
-+  add_flag(Flag_is_macro);
-+  C->add_macro_node(this);
-+
-+  init_req(TypeFunc::Parms + 0, base);
-+  init_req(TypeFunc::Parms + 1, C->top());  // double slot padding
-+  init_req(TypeFunc::Parms + 2, exp);
-+  init_req(TypeFunc::Parms + 3, C->top());  // double slot padding
-+}
-+
-+const Type* PowDNode::Value(PhaseGVN* phase) const {
-+  const Type* t_base = phase->type(base());
-+  const Type* t_exp  = phase->type(exp());
-+
-+  if (t_base == Type::TOP || t_exp == Type::TOP) {
-+    return Type::TOP;
-+  }
-+
-+  const TypeD* base_con = t_base->isa_double_constant();
-+  const TypeD* exp_con  = t_exp->isa_double_constant();
-+  const TypeD* result_t = nullptr;
-+
-+  // constant folding: both inputs are constants
-+  if (base_con != nullptr && exp_con != nullptr) {
-+    result_t = TypeD::make(SharedRuntime::dpow(base_con->getd(), exp_con->getd()));
-+  }
-+
-+  // Special cases when only the exponent is known:
-+  if (exp_con != nullptr) {
-+    double e = exp_con->getd();
-+
-+    // If the second argument is positive or negative zero, then the result is 1.0.
-+    // i.e., pow(x, +/-0.0D) => 1.0
-+    if (e == 0.0) { // true for both -0.0 and +0.0
-+      result_t = TypeD::ONE;
-+    }
-+
-+    // If the second argument is NaN, then the result is NaN.
-+    // i.e., pow(x, NaN) => NaN
-+    if (g_isnan(e)) {
-+      result_t = TypeD::make(NAN);
-+    }
-+  }
-+
-+  if (result_t != nullptr) {
-+    // We can't simply return a TypeD here, it must be a tuple type to be compatible with call nodes.
-+    const Type** fields = TypeTuple::fields(2);
-+    fields[TypeFunc::Parms + 0] = result_t;
-+    fields[TypeFunc::Parms + 1] = Type::HALF;
-+    return TypeTuple::make(TypeFunc::Parms + 2, fields);
-+  }
-+
-+  return tf()->range();
-+}
-+
-+Node* PowDNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-+  if (!can_reshape) {
-+    return nullptr;  // wait for igvn
-+  }
-+
-+  PhaseIterGVN* igvn = phase->is_IterGVN();
-+  Node* base = this->base();
-+  Node* exp  = this->exp();
-+
-+  const Type* t_exp  = phase->type(exp);
-+  const TypeD* exp_con  = t_exp->isa_double_constant();
-+
-+  // Special cases when only the exponent is known:
-+  if (exp_con != nullptr) {
-+    double e = exp_con->getd();
-+
-+    // If the second argument is 1.0, then the result is the same as the first argument.
-+    // i.e., pow(x, 1.0) => x
-+    if (e == 1.0) {
-+      return make_tuple_of_input_state_and_result(igvn, base);
-+    }
-+
-+    // If the second argument is 2.0, then strength reduce to multiplications.
-+    // i.e., pow(x, 2.0) => x * x
-+    if (e == 2.0) {
-+      Node* mul = igvn->transform(new MulDNode(base, base));
-+      return make_tuple_of_input_state_and_result(igvn, mul);
-+    }
-+
-+    // If the second argument is 0.5, the strength reduce to square roots.
-+    // i.e., pow(x, 0.5) => sqrt(x) iff x > 0
-+    if (e == 0.5 && Matcher::match_rule_supported(Op_SqrtD)) {
-+      Node* ctrl = in(TypeFunc::Control);
-+      Node* zero = igvn->zerocon(T_DOUBLE);
-+
-+      // According to the API specs, pow(-0.0, 0.5) = 0.0 and sqrt(-0.0) = -0.0.
-+      // So pow(-0.0, 0.5) shouldn't be replaced with sqrt(-0.0).
-+      // -0.0/+0.0 are both excluded since floating-point comparison doesn't distinguish -0.0 from +0.0.
-+      Node* cmp = igvn->register_new_node_with_optimizer(new CmpDNode(base, zero));
-+      Node* test = igvn->register_new_node_with_optimizer(new BoolNode(cmp, BoolTest::le));
-+
-+      IfNode* iff = new IfNode(ctrl, test, PROB_UNLIKELY_MAG(3), COUNT_UNKNOWN);
-+      igvn->register_new_node_with_optimizer(iff);
-+      Node* if_slow = igvn->register_new_node_with_optimizer(new IfTrueNode(iff));  // x <= 0
-+      Node* if_fast = igvn->register_new_node_with_optimizer(new IfFalseNode(iff)); // x > 0
-+
-+      // slow path: call pow(x, 0.5)
-+      Node* call = igvn->register_new_node_with_optimizer(inline_call_leaf_pure_node(if_slow));
-+      Node* call_ctrl = igvn->register_new_node_with_optimizer(new ProjNode(call, TypeFunc::Control));
-+      Node* call_result = igvn->register_new_node_with_optimizer(new ProjNode(call, TypeFunc::Parms + 0));
-+
-+      // fast path: sqrt(x)
-+      Node* sqrt = igvn->register_new_node_with_optimizer(new SqrtDNode(igvn->C, if_fast, base));
-+
-+      // merge paths
-+      RegionNode* region = new RegionNode(3);
-+      igvn->register_new_node_with_optimizer(region);
-+      region->init_req(1, call_ctrl); // slow path
-+      region->init_req(2, if_fast);   // fast path
-+
-+      PhiNode* phi = new PhiNode(region, Type::DOUBLE);
-+      igvn->register_new_node_with_optimizer(phi);
-+      phi->init_req(1, call_result); // slow: pow() result
-+      phi->init_req(2, sqrt);        // fast: sqrt() result
-+
-+      igvn->C->set_has_split_ifs(true); // Has chance for split-if optimization
-+
-+      return make_tuple_of_input_state_and_result(igvn, phi, region);
-+    }
-+  }
-+
-+  return CallLeafPureNode::Ideal(phase, can_reshape);
-+}
-+
-+// We can't simply have Ideal() returning a Con or MulNode since the users are still expecting a Call node, but we could
-+// produce a tuple that follows the same pattern so users can still get control, io, memory, etc..
-+TupleNode* PowDNode::make_tuple_of_input_state_and_result(PhaseIterGVN* phase, Node* result, Node* control) {
-+  if (control == nullptr) {
-+    control = in(TypeFunc::Control);
-+  }
-+
-+  Compile* C = phase->C;
-+  C->remove_macro_node(this);
-+  TupleNode* tuple = TupleNode::make(
-+      tf()->range(),
-+      control,
-+      in(TypeFunc::I_O),
-+      in(TypeFunc::Memory),
-+      in(TypeFunc::FramePtr),
-+      in(TypeFunc::ReturnAdr),
-+      result,
-+      C->top());
-+  return tuple;
-+}
-diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
-index 2462a88143f..bb87746a3f6 100644
--- a/src/hotspot/share/opto/callnode.hpp
-+++ b/src/hotspot/share/opto/callnode.hpp
-@@ -953,6 +953,8 @@ class CallLeafPureNode : public CallLeafNode {
-   }
-   int Opcode() const override;
-   Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
-+
-+  CallLeafPureNode* inline_call_leaf_pure_node(Node* control = nullptr) const;
- };
- 
- //------------------------------CallLeafNoFPNode-------------------------------
-@@ -1304,4 +1306,19 @@ class UnlockNode : public AbstractLockNode {
-   JVMState* dbg_jvms() const { return nullptr; }
- #endif
- };
-+
-+//------------------------------PowDNode--------------------------------------
-+class PowDNode : public CallLeafPureNode {
-+  TupleNode* make_tuple_of_input_state_and_result(PhaseIterGVN* phase, Node* result, Node* control = nullptr);
-+
-+public:
-+  PowDNode(Compile* C, Node* base, Node* exp);
-+  int Opcode() const override;
-+  const Type* Value(PhaseGVN* phase) const override;
-+  Node* Ideal(PhaseGVN* phase, bool can_reshape) override;
-+
-+  Node* base() const { return in(TypeFunc::Parms + 0); }
-+  Node* exp() const  { return in(TypeFunc::Parms + 2); }
-+};
-+
- #endif // SHARE_OPTO_CALLNODE_HPP
-diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
-index 587d5fad8f2..b7ba16e99a0 100644
--- a/src/hotspot/share/opto/classes.hpp
-+++ b/src/hotspot/share/opto/classes.hpp
-@@ -283,6 +283,7 @@ macro(OpaqueZeroTripGuard)
- macro(OpaqueNotNull)
- macro(OpaqueInitializedAssertionPredicate)
- macro(OpaqueTemplateAssertionPredicate)
-+macro(PowD)
- macro(ProfileBoolean)
- macro(OrI)
- macro(OrL)
-diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
-index 12960d101a8..6c71a61ba75 100644
--- a/src/hotspot/share/opto/library_call.cpp
-+++ b/src/hotspot/share/opto/library_call.cpp
-@@ -1817,61 +1817,17 @@ bool LibraryCallKit::runtime_math(const TypeFunc* call_type, address funcAddr, c
- 
- //------------------------------inline_math_pow-----------------------------
- bool LibraryCallKit::inline_math_pow() {
-+  Node* base = argument(0);
-   Node* exp = argument(2);
-  const TypeD* d = _gvn.type(exp)->isa_double_constant();
-  if (d != nullptr) {
-    if (d->getd() == 2.0) {
-      // Special case: pow(x, 2.0) => x * x
-      Node* base = argument(0);
-      set_result(_gvn.transform(new MulDNode(base, base)));
-      return true;
-    } else if (d->getd() == 0.5 && Matcher::match_rule_supported(Op_SqrtD)) {
-      // Special case: pow(x, 0.5) => sqrt(x)
-      Node* base = argument(0);
-      Node* zero = _gvn.zerocon(T_DOUBLE);
-
-      RegionNode* region = new RegionNode(3);
-      Node* phi = new PhiNode(region, Type::DOUBLE);
-
-      Node* cmp  = _gvn.transform(new CmpDNode(base, zero));
-      // According to the API specs, pow(-0.0, 0.5) = 0.0 and sqrt(-0.0) = -0.0.
-      // So pow(-0.0, 0.5) shouldn't be replaced with sqrt(-0.0).
-      // -0.0/+0.0 are both excluded since floating-point comparison doesn't distinguish -0.0 from +0.0.
-      Node* test = _gvn.transform(new BoolNode(cmp, BoolTest::le));
-
-      Node* if_pow = generate_slow_guard(test, nullptr);
-      Node* value_sqrt = _gvn.transform(new SqrtDNode(C, control(), base));
-      phi->init_req(1, value_sqrt);
-      region->init_req(1, control());
-
-      if (if_pow != nullptr) {
-        set_control(if_pow);
-        address target = StubRoutines::dpow() != nullptr ? StubRoutines::dpow() :
-                                                        CAST_FROM_FN_PTR(address, SharedRuntime::dpow);
-        const TypePtr* no_memory_effects = nullptr;
-        Node* trig = make_runtime_call(RC_LEAF, OptoRuntime::Math_DD_D_Type(), target, "POW",
-                                       no_memory_effects, base, top(), exp, top());
-        Node* value_pow = _gvn.transform(new ProjNode(trig, TypeFunc::Parms+0));
-#ifdef ASSERT
-        Node* value_top = _gvn.transform(new ProjNode(trig, TypeFunc::Parms+1));
-        assert(value_top == top(), "second value must be top");
-#endif
-        phi->init_req(2, value_pow);
-        region->init_req(2, _gvn.transform(new ProjNode(trig, TypeFunc::Control)));
-      }
-
-      C->set_has_split_ifs(true); // Has chance for split-if optimization
-      set_control(_gvn.transform(region));
-      record_for_igvn(region);
-      set_result(_gvn.transform(phi));
- 
-      return true;
-    }
-  }
-
-  return StubRoutines::dpow() != nullptr ?
-    runtime_math(OptoRuntime::Math_DD_D_Type(), StubRoutines::dpow(),  "dpow") :
-    runtime_math(OptoRuntime::Math_DD_D_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::dpow),  "POW");
-+  CallNode* pow = new PowDNode(C, base, exp);
-+  set_predefined_input_for_runtime_call(pow);
-+  pow = _gvn.transform(pow)->as_CallLeafPure();
-+  set_predefined_output_for_runtime_call(pow);
-+  Node* result = _gvn.transform(new ProjNode(pow, TypeFunc::Parms + 0));
-+  record_for_igvn(pow);
-+  set_result(result);
-+  return true;
- }
- 
- //------------------------------inline_math_native-----------------------------
-diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
-index aafc5d3c170..a28043c8d8f 100644
--- a/src/hotspot/share/opto/macro.cpp
-+++ b/src/hotspot/share/opto/macro.cpp
-@@ -2484,6 +2484,7 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
-         assert(n->Opcode() == Op_LoopLimit ||
-                n->Opcode() == Op_ModD ||
-                n->Opcode() == Op_ModF ||
-+               n->Opcode() == Op_PowD ||
-                n->is_OpaqueNotNull()       ||
-                n->is_OpaqueInitializedAssertionPredicate() ||
-                n->Opcode() == Op_MaxL      ||
-@@ -2637,19 +2638,11 @@ bool PhaseMacroExpand::expand_macro_nodes() {
-     default:
-       switch (n->Opcode()) {
-       case Op_ModD:
-      case Op_ModF: {
-        CallNode* mod_macro = n->as_Call();
-        CallNode* call = new CallLeafPureNode(mod_macro->tf(), mod_macro->entry_point(),
-                                              mod_macro->_name, TypeRawPtr::BOTTOM);
-        call->init_req(TypeFunc::Control, mod_macro->in(TypeFunc::Control));
-        call->init_req(TypeFunc::I_O, C->top());
-        call->init_req(TypeFunc::Memory, C->top());
-        call->init_req(TypeFunc::ReturnAdr, C->top());
-        call->init_req(TypeFunc::FramePtr, C->top());
-        for (unsigned int i = 0; i < mod_macro->tf()->domain()->cnt() - TypeFunc::Parms; i++) {
-          call->init_req(TypeFunc::Parms + i, mod_macro->in(TypeFunc::Parms + i));
-        }
-        _igvn.replace_node(mod_macro, call);
-+      case Op_ModF:
-+      case Op_PowD: {
-+        CallLeafPureNode* call_macro = n->as_CallLeafPure();
-+        CallLeafPureNode* call = call_macro->inline_call_leaf_pure_node();
-+        _igvn.replace_node(call_macro, call);
-         transform_later(call);
-         break;
-       }
-diff --git a/test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java b/test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java
-new file mode 100644
-index 00000000000..e28cc5ab346
--- /dev/null
-+++ b/test/hotspot/jtreg/compiler/intrinsics/math/PowDNodeTests.java
-@@ -0,0 +1,218 @@
-+/*
-+ * Copyright (c) 2026, IBM 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.
-+ *
-+ */
-+package compiler.intrinsics.math;
-+
-+import jdk.test.lib.Asserts;
-+
-+import compiler.lib.ir_framework.*;
-+import compiler.lib.generators.*;
-+import static compiler.lib.generators.Generators.*;
-+
-+import java.util.Random;
-+
-+/*
-+ * @test
-+ * @bug 8378713
-+ * @key randomness
-+ * @summary Math.pow(base, exp) should constant propagate
-+ * @library /test/lib /
-+ * @run driver ${test.main.class}
-+ */
-+public class PowDNodeTests {
-+    public static final Generator<Double> UNIFORMS = G.uniformDoubles(); // [0, 1)
-+
-+    public static final double B = UNIFORMS.next() * 1000.0d;
-+    public static final double E = UNIFORMS.next() * 1000.0d + 3.0d; // e >= 3 to avoid strength reduction code
-+
-+    public static void main(String[] args) {
-+        TestFramework.run();
-+
-+        testCorrectness();
-+    }
-+
-+    // Test 1: pow(2.0, 10.0) -> 1024.0
-+    @Test
-+    @IR(failOn = {IRNode.POW_D})
-+    public static double constantLiteralFolding() {
-+        return Math.pow(2.0, 10.0);  // should fold to 1024.0
-+    }
-+
-+    // Test 2: pow(final B, final E) -> B^E
-+    @Test
-+    @IR(failOn = {IRNode.POW_D})
-+    public static double constantStaticFolding() {
-+        return Math.pow(B, E);  // should fold to B^E
-+    }
-+
-+    // Test 3: pow(b, 0.0) -> 1.0
-+    @Test
-+    @IR(failOn = {IRNode.POW_D})
-+    @Arguments(values = {Argument.RANDOM_EACH})
-+    public static double expZero(double b) {
-+        return Math.pow(b, 0.0);
-+    }
-+
-+    // Test 4: pow(b, 1.0) -> b (identity)
-+    @Test
-+    @IR(failOn = {IRNode.POW_D})
-+    @Arguments(values = {Argument.RANDOM_EACH})
-+    public static double expOne(double b) {
-+        return Math.pow(b, 1.0);
-+    }
-+
-+    // Test 5: pow(b, NaN) -> NaN
-+    @Test
-+    @IR(failOn = {IRNode.POW_D})
-+    @Arguments(values = {Argument.RANDOM_EACH})
-+    public static double expNaN(double b) {
-+        return Math.pow(b, Double.NaN);
-+    }
-+
-+    // Test 6: pow(b, 2.0) -> b * b
-+    // More tests in TestPow2Opt.java
-+    @Test
-+    @IR(failOn = {IRNode.POW_D})
-+    @IR(counts = {IRNode.MUL_D, "1"})
-+    @Arguments(values = {Argument.RANDOM_EACH})
-+    public static double expTwo(double b) {
-+        return Math.pow(b, 2.0);
-+    }
-+
-+    // Test 7: pow(b, 0.5) -> b <= 0.0 ? pow(b, 0.5) : sqrt(b)
-+    // More tests in TestPow0Dot5Opt.java
-+    @Test
-+    @IR(counts = {IRNode.IF, "1"})
-+    @IR(counts = {IRNode.SQRT_D, "1"})
-+    @IR(counts = {".*CallLeaf.*pow.*", "1"}, phase = CompilePhase.BEFORE_MATCHING)
-+    @Arguments(values = {Argument.RANDOM_EACH})
-+    public static double expDot5(double b) {
-+        return Math.pow(b, 0.5); // expand to: if (b > 0) { sqrt(b) } else { call(b) }
-+    }
-+
-+    // Test 8: non-constant exponent stays as call
-+    @Test
-+    @IR(counts = {IRNode.POW_D, "1"})
-+    @Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
-+    public static double nonConstant(double b, double e) {
-+        return Math.pow(b, e);
-+    }
-+
-+    // Test 9: late constant discovery on base (after loop opts)
-+    @Test
-+    @IR(counts = {IRNode.POW_D, "1"}, phase = CompilePhase.AFTER_PARSING)
-+    @IR(failOn = {IRNode.POW_D})
-+    public static double lateBaseConstant() {
-+        double base = 0;
-+        for (int i = 0; i < 4; i++) {
-+            if ((i % 2) == 0) {
-+                base = B;
-+            }
-+        }
-+        // After loop opts, base == B (constant), so pow(B, E) folds
-+        return Math.pow(base, E);
-+    }
-+
-+    // Test 10: late constant discovery on exp (after loop opts)
-+    @Test
-+    @IR(counts = {IRNode.POW_D, "1"}, phase = CompilePhase.AFTER_PARSING)
-+    @IR(failOn = {IRNode.POW_D})
-+    public static double lateExpConstant() {
-+        double exp = 0;
-+        for (int i = 0; i < 4; i++) {
-+            if ((i % 2) == 0) {
-+                exp = E;
-+            }
-+        }
-+        // After loop opts, exp == E (constant), so pow(B, E) folds
-+        return Math.pow(B, exp);
-+    }
-+
-+    // Test 11: late constant discoveries on both base and exp (after loop opts)
-+    @Test
-+    @IR(counts = {IRNode.POW_D, "1"}, phase = CompilePhase.AFTER_PARSING)
-+    @IR(failOn = {IRNode.POW_D})
-+    public static double lateBothConstant() {
-+        double base = 0, exp = 0;
-+        for (int i = 0; i < 4; i++) {
-+            if ((i % 2) == 0) {
-+                base = B;
-+                exp = E;
-+            }
-+        }
-+        // After loop opts, base = B, exp == E, so pow(B, E) folds
-+        return Math.pow(base, exp);
-+    }
-+
-+    private static void assertEQWithinOneUlp(double expected, double observed) {
-+        if (Double.isNaN(expected) && Double.isNaN(observed)) return;
-+
-+        // Math.pow() requires result must be within 1 ulp of the respective magnitude
-+        double ulp = Math.max(Math.ulp(expected), Math.ulp(observed));
-+        if (Math.abs(expected - observed) > ulp) {
-+            throw new AssertionError(String.format(
-+                    "expect = %x, observed = %x, ulp = %x",
-+                    Double.doubleToRawLongBits(expected), Double.doubleToRawLongBits(observed), Double.doubleToRawLongBits(ulp)
-+            ));
-+        }
-+    }
-+
-+    private static void testCorrectness() {
-+        // No need to warm up for intrinsics
-+        Asserts.assertEQ(1024.0d, constantLiteralFolding());
-+
-+        double BE = StrictMath.pow(B, E);
-+        assertEQWithinOneUlp(BE, constantStaticFolding());
-+        assertEQWithinOneUlp(BE, lateBaseConstant());
-+        assertEQWithinOneUlp(BE, lateExpConstant());
-+        assertEQWithinOneUlp(BE, lateBothConstant());
-+
-+        Generator<Double> anyBits = G.anyBitsDouble();
-+        Generator<Double> largeDoubles = G.uniformDoubles(Long.MAX_VALUE, Double.MAX_VALUE);
-+        Generator<Double> doubles = G.doubles();
-+        double[] values = {
-+                Double.MIN_VALUE, Double.MIN_NORMAL, -42.0d, -1.0d, -0.0d, +0.0d, 0.5d, 1.0d, 2.0d, 123d, Double.MAX_VALUE,
-+                Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.NaN,
-+                UNIFORMS.next(), UNIFORMS.next(),
-+                largeDoubles.next(), -largeDoubles.next(), // some sufficiently large magnitudes
-+                anyBits.next(), anyBits.next(), // any bits with potentially more NaN representation
-+                doubles.next(), doubles.next() // a healthy sprinkle of whatever else is possible
-+        };
-+
-+        for (double b : values) {
-+            // Strength reduced, so we know the bits matches exactly
-+            Asserts.assertEQ(1.0d, expZero(b));
-+            Asserts.assertEQ(b, expOne(b));
-+            Asserts.assertEQ(b * b, expTwo(b));
-+
-+            assertEQWithinOneUlp(Double.NaN, expNaN(b));
-+
-+            // Runtime calls, so make sure the result is within 1 ulp
-+            assertEQWithinOneUlp(StrictMath.pow(b, 0.5d), expDot5(b));
-+
-+            for (double e : values) {
-+                assertEQWithinOneUlp(StrictMath.pow(b, e), nonConstant(b, e));
-+            }
-+        }
-+    }
-+}
-diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
-index 7b751f1a72c..6a95a2b5da7 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
-+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
-@@ -1858,6 +1858,11 @@ public class IRNode {
-        beforeMatchingNameRegex(SQRT_HF, "SqrtHF");
-     }
- 
-+    public static final String SQRT_D = PREFIX + "SQRT_D" + POSTFIX;
-+    static {
-+        beforeMatchingNameRegex(SQRT_D, "SqrtD");
-+    }
-+
-     public static final String SQRT_F = PREFIX + "SQRT_F" + POSTFIX;
-     static {
-        beforeMatchingNameRegex(SQRT_F, "SqrtF");
-@@ -2825,6 +2830,12 @@ public class IRNode {
-         macroNodes(MOD_D, regex);
-     }
- 
-+    public static final String POW_D = PREFIX + "POW_D" + POSTFIX;
-+    static {
-+        String regex = START + "PowD" + MID + END;
-+        macroNodes(POW_D, regex);
-+    }
-+
-     public static final String BLACKHOLE = PREFIX + "BLACKHOLE" + POSTFIX;
-     static {
-         fromBeforeRemoveUselessToFinalCode(BLACKHOLE, "Blackhole");
-- 
-2.53.0
-
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -1,4 +1,3 @@
 ---
 inspections:
    javabytecode: off
-    abidiff: off
--- a/scripts/builds/build_rhel_7_portable_build.sh
+++ b/scripts/builds/build_rhel_7_portable_build.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (C) 2026 Red Hat, Inc.
+# Copyright (C) 2024 Red Hat, Inc.
 # Written by:
 #     Andrew John Hughes <gnu.andrew@redhat.com>
 #
@ -17,30 +17,12 @@
 # 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/>.

-# Waive the usual tier0 gating issue
-# Should be resolved by OPENJDK-4517
+# Builds the portable on RHEL 7

-RHEL_VER=${1}
-NVR=${2}
-
-WORKING_DIR=$(dirname "${0}")
-
-if test "${RHEL_VER}" = ""; then
-    echo "No RHEL version specified.";
-    echo "${0} <RHEL_VER> <NVR>";
-    exit 1;
-fi
-
-if test "${NVR}" = ""; then
-    echo "No NVR specified.";
-    echo "${0} <RHEL_VER> <NVR>";
-    exit 2;
-fi
-
-"${WORKING_DIR}"/waive_issue.sh "${RHEL_VER}" "${NVR}" osci.brew-build.tier0.functional "Test unable to parse spec file"
+rhpkg -v build --target=java-openjdk-rhel-7-build --skip-nvr-check

 # Local Variables:
-# compile-command: "shellcheck waive_usual_tier0.sh"
+# compile-command: "shellcheck build_rhel_7_portable_build.sh"
 # fill-column: 80
 # indent-tabs-mode: nil
 # sh-basic-offset: 4
--- a/scripts/builds/waive_leapp_issue.sh
+++ b/scripts/builds/waive_leapp_issue.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (C) 2026 Red Hat, Inc.
+# Copyright (C) 2024 Red Hat, Inc.
 # Written by:
 #     Andrew John Hughes <gnu.andrew@redhat.com>
 #
@ -17,29 +17,26 @@
 # 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/>.

-# Waive the leapp gating test which never seems to work
+# Builds the RPM on RHEL 8

-RHEL_VER=${1}
-NVR=${2}
+NVR=${1}
+USER=${2}

-WORKING_DIR=$(dirname "${0}")
-
-if test "${RHEL_VER}" = ""; then
-    echo "No RHEL version specified.";
-    echo "${0} <RHEL_VER> <NVR>";
+if test "${NVR}" = ""; then
+    echo "${0} <NVR> <USER>";
    exit 1;
 fi

-if test "${NVR}" = ""; then
-    echo "No NVR specified.";
-    echo "${0} <RHEL_VER> <NVR>";
+if test "${USER}" = ""; then
+    echo "${0} <NVR> <USER>";
    exit 2;
 fi

-"${WORKING_DIR}"/waive_issue.sh "${RHEL_VER}" "${NVR}" leapp.brew-build.upgrade.distro "AWOL"
+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 waive_leapp_issue.sh"
+# compile-command: "shellcheck build_rhel_8.sh"
 # fill-column: 80
 # indent-tabs-mode: nil
 # sh-basic-offset: 4
--- a/scripts/builds/build_vanilla.sh
+++ b/scripts/builds/build_vanilla.sh
@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh

-# Copyright (C) 2026 Red Hat, Inc.
+# Copyright (C) 2024 Red Hat, Inc.
 # Written by:
 #     Andrew John Hughes <gnu.andrew@redhat.com>
 #
@ -20,24 +20,20 @@
 # Builds a scratch build of vanilla OpenJDK with no local patches

 SEPARATE_ARCHES=${1}
-CMD=(rhpkg -v build --target java-openjdk-rhel-8-build --skip-nvr-check --nowait);
+CMD="--target java-openjdk-rhel-8-build --skip-nvr-check --nowait";
 SUPPORTED_ARCHES="aarch64 ppc64le s390x x86_64";

-if [ "${SEPARATE_ARCHES}" = "" ] ; then
+if [ "x${SEPARATE_ARCHES}" = "x" ] ; then
    SEPARATE_ARCHES=0;
 fi

-if [ "${SEPARATE_ARCHES}" -eq 1 ] ; then
-    for arch in ${SUPPORTED_ARCHES}; do \
-        ARCH_CMD=("${CMD[@]}" --arches "${arch}" --scratch) ;
-        echo "Executing ${ARCH_CMD[*]}";
-        command "${ARCH_CMD[@]}";
-    done
+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
-    echo "Executing ${CMD[*]}";
-    command "${CMD[@]}";
+    rhpkg -v build ${CMD} && brew watch-task --mine
 fi
-brew watch-task --mine

 # Local Variables:
 # compile-command: "shellcheck build_vanilla.sh"
--- a/scripts/builds/check_signatures.sh
+++ b/scripts/builds/check_signatures.sh
@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Check the signatures (if any) in RHEL RPM buildinfo
-# This is intended to be run from the tagging scripts
-
-# Return codes:
-# - 1 - Buildinfo file not specified
-# - 2 = Missing buildinfo file
-# - 3 = No signatures
-# - 4 = Multiple signature types found
-# - 5 = PQC signature found
-# - 6 = Old signature (fd431d51) found
-# - 7 = Unknown signature found
-
-BUILDINFO=${1}
-NEW_SIGNATURE="release4";
-OLD_SIGNATURE="fd431d51";
-
-if test "${BUILDINFO}" = ""; then
-    echo "${0} <BUILDINFO>";
-    exit 1;
-fi
-
-if ! test -e "${BUILDINFO}" ; then
-    echo "${BUILDINFO} not found.";
-    exit 2;
-fi
-
-if grep -q "Signatures" < "${BUILDINFO}" ; then
-    signature=$(grep "Signatures" < "${BUILDINFO}" | cut -d ' ' -f 2- | uniq -c | sed 's#^\W*##');
-    uniq_count=$(echo "${signature}" | wc -l);
-    if test "${uniq_count}" -gt 1; then
-        echo "Multiple signature types found:";
-        echo "${signature}";
-        exit 4;
-    fi
-    sig_count=$(echo "${signature}" | cut -d ' ' -f 1);
-    sig_type=$(echo "${signature}" | cut -d ' ' -f 2);
-    echo "${sig_count} signatures of type ${sig_type} found";
-    if echo "${sig_type}" | grep -q "${NEW_SIGNATURE}" ; then
-        echo "PQC signature found.";
-        exit 5;
-    elif echo "${sig_type}" | grep -q "${OLD_SIGNATURE}"; then
-        echo "Old pre-PQC signature found.";
-        exit 6;
-    else
-        echo "Unknown signature found.";
-        exit 7;
-    fi
-else
-    echo "Build has no signatures.";
-    exit 3;
-fi
-
-# Local Variables:
-# compile-command: "shellcheck check_signatures.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/get_gating_results.sh
+++ b/scripts/builds/get_gating_results.sh
@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2026 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/>.
-
-# Retrieve the results of a gating test using the ID from the JSON
-# retrieved by query_build_gating.sh
-
-RESULT_ID=${1}
-
-if test "${RESULT_ID}" = ""; then
-    echo "No ID specified.";
-    echo "${0} <RESULT_ID>";
-    exit 1;
-fi
-
-CURL=$(command -v curl)
-JSON_TOOL=$(command -v jq)
-
-if test "${CURL}" = ""; then
-    echo "curl not found";
-    exit 2;
-fi
-
-if test "${JSON_TOOL}" = ""; then
-    echo "jq not found";
-    exit 3;
-fi
-
-URL="https://resultsdb-api.engineering.redhat.com/api/v2.0/results/${RESULT_ID}"
-JSON_OUT=$(mktemp --tmpdir out.XXXXXX.json)
-
-CMD=("${CURL}" --silent --show-error "${URL}")
-
-echo "${CMD[@]}"
-
-if command "${CMD[@]}" > "${JSON_OUT}" ; then
-    "${JSON_TOOL}" < "${JSON_OUT}"
-else
-    echo "Failed to obtain JSON";
-    exit 4;
-fi
-
-# Local Variables:
-# compile-command: "shellcheck get_gating_results.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/query_build_gating.sh
+++ b/scripts/builds/query_build_gating.sh
@ -1,94 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2026 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/>.
-
-# Retrieve the status of a build's progress through gating
-
-RHEL_VER=${1}
-NVR=${2}
-
-if test "${RHEL_VER}" = ""; then
-    echo "No RHEL version specified.";
-    echo "${0} <RHEL_VER> <NVR>";
-    exit 1;
-fi
-
-if test "${NVR}" = ""; then
-    echo "No NVR specified.";
-    echo "${0} <RHEL_VER> <NVR>";
-    exit 2;
-fi
-
-CURL=$(command -v curl)
-JSON_TOOL=$(command -v jq)
-JSON_FILE=$(mktemp --tmpdir query.XXXXXX.json)
-JSON_OUT=$(mktemp --tmpdir out.XXXXXX.json)
-URL="https://greenwave.engineering.redhat.com/api/v1.0/decision"
-
-if test "${CURL}" = ""; then
-    echo "curl not found";
-    exit 3;
-fi
-
-if test "${JSON_TOOL}" = ""; then
-    echo "jq not found";
-    exit 4;
-fi
-
-{
-    echo "{";
-    printf "\t\"decision_context\":\"osci_compose_gate\",\n";
-    printf "\t\"product_version\":\"rhel-%d\",\n" "${RHEL_VER}";
-    printf "\t\"subject_type\":\"koji_build\",\n";
-    printf "\t\"subject_identifier\":\"%s\",\n" "${NVR}";
-    printf "\t\"verbose\":false\n";
-    echo "}";
-} > "${JSON_FILE}"
-
-echo "Sending the following JSON...";
-cat "${JSON_FILE}"
-
-CMD=("${CURL}" --silent --show-error -X POST)
-
-JSON_COMMAND="--json";
-# Check --json is available
-${CURL} ${JSON_COMMAND} 2> /dev/null
-if [ $? -eq 2 ] ; then
-    echo "--json unsupported; falling back on --data-ascii";
-    CMD=("${CMD[@]}" --header Content-Type:application/json --data-ascii);
-else
-    CMD=("${CMD[@]}" "${JSON_COMMAND}");
-fi
-
-CMD=("${CMD[@]}" "@${JSON_FILE}" "${URL}")
-
-echo "${CMD[@]}"
-
-if command "${CMD[@]}" > "${JSON_OUT}" ; then
-    "${JSON_TOOL}" < "${JSON_OUT}"
-else
-    echo "Failed to obtain JSON";
-    exit 5;
-fi
-
-# Local Variables:
-# compile-command: "shellcheck query_build_gating.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/tag_rhel.sh
+++ b/scripts/builds/tag_rhel.sh
@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Tag public RHEL RPMs into gating for all supported streams
-# This is intended to be run from tag_rhel_<ver>_(public|embargoed).sh
-
-BUILD="${1}"
-BUILDLOG="${2}"
-SUFFIX="${3}"
-shift 3;
-SUPPORTED_VERS="$*"
-
-CMD_SYNTAX="${0} <BUILD> <BUILDLOG> <SUFFIX> <SUPPORTED_VERS>";
-GATE_SUFFIX="gate"
-
-if test "${BUILD}" = ""; then
-    echo "${CMD_SYNTAX}";
-    exit 1;
-fi
-
-if test "${BUILDLOG}" = ""; then
-    echo "${CMD_SYNTAX}";
-    exit 2;
-fi
-
-if test "${SUPPORTED_VERS}" = ""; then
-    echo "${CMD_SYNTAX}";
-    exit 3;
-fi
-
-buildtags=$(grep "^Tag" "${BUILDLOG}" | cut -d : -f 2-)
-echo "Build has tags ${buildtags}";
-
-if [ "${SUFFIX}" = "${GATE_SUFFIX}" ] ; then
-    echo "Gating system can only handle one tag at a time."
-    echo "Script will need to be re-run for subsequent tags once previous tag has moved to -candidate."
-    if echo "${buildtags}" | grep -q "${GATE_SUFFIX}"; then
-        echo "Tag with \"-${GATE_SUFFIX}\" found. Please complete gating before re-running.";
-        exit 1;
-    fi
-fi
-
-done=0;
-for ver in ${SUPPORTED_VERS}; do
-    vertag="rhel-${ver}";
-    proposedtag="${vertag}-${SUFFIX}";
-    echo "Checking if ${BUILD} has been added to ${vertag}...";
-    if echo "${buildtags}" | grep -q "${vertag}" ; then
-        echo "${BUILD} has been tagged into ${proposedtag}";
-    else
-        if [ "${SUFFIX}" = "${GATE_SUFFIX}" ] && [ "${done}" -eq 1 ]; then
-            echo "Already added a tag. Need to tag ${proposedtag} in a future run.";
-        else
-            echo "Tagging ${BUILD} into ${proposedtag}";
-            brew tag-build --nowait "${proposedtag}" "${BUILD}";
-            done=1;
-        fi
-    fi
-done
-if [ "${done}" -eq 1 ]; then
-    brew watch-task --mine;
-else
-    echo "Nothing to do.";
-fi
-
-# Local Variables:
-# compile-command: "shellcheck tag_rhel.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/tag_rhel_10_embargoed_pqc.sh
+++ b/scripts/builds/tag_rhel_10_embargoed_pqc.sh
@ -1,67 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Tag newer PQC embargoed RHEL 10 RPMs into supported z-streams
-
-BUILD=${1}
-
-if test "${BUILD}" = ""; then
-    echo "${0} <BUILD>";
-    exit 1;
-fi
-
-BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="10.2-z 10.1-z"
-WORKING_DIR=$(dirname "${0}")
-EMBARGOED_SUFFIX="nocompose-candidate"
-
-echo "Obtaining buildinfo for ${BUILD}...";
-brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
-
-echo "Checking signatures for ${BUILD}...";
-"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
-
-# Return codes:
-# - 1 - Buildinfo file not specified
-# - 2 = Missing buildinfo file
-# - 3 = No signatures
-# - 4 = Multiple signature types found
-# - 5 = PQC signature found
-# - 6 = Old signature (fd431d51) found
-# - 7 = Unknown signature found
-ret=$?;
-if [ "${ret}" -eq 6 ] ; then
-    echo "Build has old signatures which should not be the case for OpenJDK 25";
-    exit 2;
-elif ! { [ "${ret}" -eq 6 ] || [ "${ret}" -eq 3 ] ; } ; then
-    echo "Signature check failed.";
-    exit 3;
-fi
-
-echo "Tagging embargoed build for ${SUPPORTED_VERS}...";
-"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${EMBARGOED_SUFFIX}" "${SUPPORTED_VERS}"
-
-rm -f "${BUILDLOG}"
-
-# Local Variables:
-# compile-command: "shellcheck tag_rhel_10_embargoed_pqc.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/tag_rhel_10_public_pqc.sh
+++ b/scripts/builds/tag_rhel_10_public_pqc.sh
@ -1,67 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Tag newer PQC public RHEL 10 RPMs into gating for all supported streams
-
-BUILD=${1}
-
-if test "${BUILD}" = ""; then
-    echo "${0} <BUILD>";
-    exit 1;
-fi
-
-BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="10.3 10.2-z 10.1-z"
-WORKING_DIR=$(dirname "${0}")
-GATE_SUFFIX="gate"
-
-echo "Obtaining buildinfo for ${BUILD}...";
-brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
-
-echo "Checking signatures for ${BUILD}...";
-"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
-
-# Return codes:
-# - 1 - Buildinfo file not specified
-# - 2 = Missing buildinfo file
-# - 3 = No signatures
-# - 4 = Multiple signature types found
-# - 5 = PQC signature found
-# - 6 = Old signature (fd431d51) found
-# - 7 = Unknown signature found
-ret=$?;
-if [ "${ret}" -eq 6 ] ; then
-    echo "Build has old signatures which should not be the case for OpenJDK 25";
-    exit 2;
-elif ! { [ "${ret}" -eq 5 ] || [ "${ret}" -eq 3 ] ; } ; then
-    echo "Signature check failed.";
-    exit 3;
-fi
-
-echo "Tagging build into gating for ${SUPPORTED_VERS}...";
-"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${GATE_SUFFIX}" "${SUPPORTED_VERS}"
-
-rm -f "${BUILDLOG}"
-
-# Local Variables:
-# compile-command: "shellcheck tag_rhel_10_public_pqc.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/tag_rhel_9_embargoed_pqc.sh
+++ b/scripts/builds/tag_rhel_9_embargoed_pqc.sh
@ -1,67 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Tag newer PQC embargoed RHEL 9 RPMs into supported z-streams
-
-BUILD=${1}
-
-if test "${BUILD}" = ""; then
-    echo "${0} <BUILD>";
-    exit 1;
-fi
-
-BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="9.8.0-z 9.7.0-z"
-WORKING_DIR=$(dirname "${0}")
-EMBARGOED_SUFFIX="nocompose-candidate"
-
-echo "Obtaining buildinfo for ${BUILD}...";
-brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
-
-echo "Checking signatures for ${BUILD}...";
-"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
-
-# Return codes:
-# - 1 - Buildinfo file not specified
-# - 2 = Missing buildinfo file
-# - 3 = No signatures
-# - 4 = Multiple signature types found
-# - 5 = PQC signature found
-# - 6 = Old signature (fd431d51) found
-# - 7 = Unknown signature found
-ret=$?;
-if [ "${ret}" -eq 6 ] ; then
-    echo "Build has old signatures which should not be the case for OpenJDK 25";
-    exit 2;
-elif ! { [ "${ret}" -eq 6 ] || [ "${ret}" -eq 3 ] ; } ; then
-    echo "Signature check failed.";
-    exit 3;
-fi
-
-echo "Tagging embargoed build for ${SUPPORTED_VERS}...";
-"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${EMBARGOED_SUFFIX}" "${SUPPORTED_VERS}"
-
-rm -f "${BUILDLOG}"
-
-# Local Variables:
-# compile-command: "shellcheck tag_rhel_9_embargoed_pqc.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/tag_rhel_9_public_pqc.sh
+++ b/scripts/builds/tag_rhel_9_public_pqc.sh
@ -1,67 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Tag newer PQC public RHEL 9 RPMs into gating for all supported streams
-
-BUILD=${1}
-
-if test "${BUILD}" = ""; then
-    echo "${0} <BUILD>";
-    exit 1;
-fi
-
-BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="9.9.0 9.8.0-z 9.7.0-z"
-WORKING_DIR=$(dirname "${0}")
-GATE_SUFFIX="gate"
-
-echo "Obtaining buildinfo for ${BUILD}...";
-brew buildinfo "${BUILD}" 2>&1 | tee "${BUILDLOG}" > /dev/null
-
-echo "Checking signatures for ${BUILD}...";
-"${WORKING_DIR}"/check_signatures.sh "${BUILDLOG}"
-
-# Return codes:
-# - 1 - Buildinfo file not specified
-# - 2 = Missing buildinfo file
-# - 3 = No signatures
-# - 4 = Multiple signature types found
-# - 5 = PQC signature found
-# - 6 = Old signature (fd431d51) found
-# - 7 = Unknown signature found
-ret=$?;
-if [ "${ret}" -eq 6 ] ; then
-    echo "Build has old signatures which should not be the case for OpenJDK 25";
-    exit 2;
-elif ! { [ "${ret}" -eq 5 ] || [ "${ret}" -eq 3 ] ; } ; then
-    echo "Signature check failed.";
-    exit 3;
-fi
-
-echo "Tagging build into gating for ${SUPPORTED_VERS}...";
-"${WORKING_DIR}"/tag_rhel.sh "${BUILD}" "${BUILDLOG}" "${GATE_SUFFIX}" "${SUPPORTED_VERS}"
-
-rm -f "${BUILDLOG}"
-
-# Local Variables:
-# compile-command: "shellcheck tag_rhel_9_public_pqc.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/waive_issue.sh
+++ b/scripts/builds/waive_issue.sh
@ -1,132 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2026 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/>.
-
-# Waive a gating issue
-
-RHEL_VER=${1}
-NVR=${2}
-TESTCASE=${3}
-COMMENT=${4}
-
-CURL=$(command -v curl)
-JSON_TOOL=$(command -v json_verify)
-JSON_FORMAT=$(command -v jq)
-JSON_FILE=$(mktemp --tmpdir waive.XXXXXX.json)
-HEADER_FILE=$(mktemp --tmpdir waive.XXXXXX.headers)
-JSON_OUT=$(mktemp --tmpdir out.XXXXXX.json)
-
-CACERT=/etc/ssl/certs/2022-IT-Root-CA.pem
-CACERT_DIR=$(dirname ${CACERT})
-URL="https://waiverdb.engineering.redhat.com/api/v1.0/waivers/"
-
-if test -z "${JSON_TOOL}" -o ! -x "${JSON_TOOL}" ; then
-    echo "JSON verifier not found. Skipping verification.";
-    SKIP_JSON=1;
-else
-    SKIP_JSON=0;
-fi
-
-if test "${RHEL_VER}" = ""; then
-    echo "No RHEL version specified.";
-    echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
-    exit 1;
-fi
-
-if test "${NVR}" = ""; then
-    echo "No NVR specified.";
-    echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
-    exit 2;
-fi
-
-if test "${TESTCASE}" = ""; then
-    echo "No testcase specified.";
-    echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
-    exit 3;
-fi
-
-if test "${COMMENT}" = ""; then
-    COMMENT="Gating broken";
-    echo "Setting COMMENT to default of '${COMMENT}'"
-fi
-
-if test "${CURL}" = ""; then
-    echo "curl not found";
-    exit 4;
-fi
-
-if test "${JSON_FORMAT}" = ""; then
-    echo "jq not found";
-    exit 5;
-fi
-
-{
-    echo "{";
-    printf "\t\"subject_type\":\"brew-build\",\n";
-    printf "\t\"subject_identifier\":\"%s\",\n" "${NVR}";
-    printf "\t\"testcase\":\"%s\",\n" "${TESTCASE}";
-    printf "\t\"waived\":true,\n";
-    printf "\t\"product_version\":\"rhel-%d\",\n" "${RHEL_VER}"
-    printf "\t\"comment\":\"%s\"\n" "${COMMENT}";
-    echo "}"
-} > "${JSON_FILE}"
-
-if [ "${SKIP_JSON}" -eq 0 ] ; then
-   "${JSON_TOOL}" < "${JSON_FILE}" || exit 6;
-fi
-
-CMD=("${CURL}" --silent --show-error --capath "${CACERT_DIR}" --negotiate -u :)
-
-JSON_COMMAND="--json";
-# Check --json is available
-${CURL} ${JSON_COMMAND} 2> /dev/null
-if [ $? -eq 2 ] ; then
-    echo "--json unsupported; falling back on --data-binary";
-    {
-        echo "Content-Type: application/json";
-        echo "Accept: application/json";
-    } > "${HEADER_FILE}"
-    echo "Header file:";
-    cat "${HEADER_FILE}"
-    CMD=("${CMD[@]}" --header "@${HEADER_FILE}" --data-binary);
-else
-    CMD=("${CMD[@]}" "${JSON_COMMAND}");
-fi
-CMD=("${CMD[@]}" "@${JSON_FILE}" "${URL}")
-
-echo "Sending the following JSON...";
-cat "${JSON_FILE}"
-
-echo "${CMD[@]}"
-
-if command "${CMD[@]}" > "${JSON_OUT}" ; then
-    "${JSON_FORMAT}" < "${JSON_OUT}"
-else
-    echo "Failed to file waiver";
-    exit 7;
-fi
-
-rm -v "${JSON_FILE}"
-rm -v "${HEADER_FILE}"
-
-# Local Variables:
-# compile-command: "shellcheck waive_issue.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/waive_rpminspect.sh
+++ b/scripts/builds/waive_rpminspect.sh
@ -1,53 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Waive a rpminspect gating issue
-
-RHEL_VER=${1}
-NVR=${2}
-COMMENT=${3}
-
-WORKING_DIR=$(dirname "${0}")
-
-if test "${RHEL_VER}" = ""; then
-    echo "No RHEL version specified.";
-    echo "${0} <RHEL_VER> <NVR> <COMMENT>";
-    exit 1;
-fi
-
-if test "${NVR}" = ""; then
-    echo "No NVR specified.";
-    echo "${0} <RHEL_VER> <NVR> <COMMENT>";
-    exit 2;
-fi
-
-if test "${COMMENT}" = ""; then
-    echo "No comment specified.";
-    echo "${0} <RHEL_VER> <NVR> <COMMENT>";
-    exit 3;
-fi
-
-"${WORKING_DIR}"/waive_issue.sh "${RHEL_VER}" "${NVR}" osci.brew-build.rpminspect.static-analysis "${COMMENT}"
-
-# Local Variables:
-# compile-command: "shellcheck waive_rpminspect.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/builds/waive_usual_rpminspect.sh
+++ b/scripts/builds/waive_usual_rpminspect.sh
@ -1,48 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2026 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/>.
-
-# Waive the recurring rpminspect gating issues
-# Should be resolved by RHELPLAN-102267
-
-WORKING_DIR=$(dirname "${0}")
-
-RHEL_VER=${1}
-NVR=${2}
-
-if test "${RHEL_VER}" = ""; then
-    echo "No RHEL version specified.";
-    echo "${0} <RHEL_VER> <NVR>";
-    exit 1;
-fi
-
-if test "${NVR}" = ""; then
-    echo "No NVR specified.";
-    echo "${0} <RHEL_VER> <NVR>";
-    exit 2;
-fi
-
-"${WORKING_DIR}"/waive_rpminspect.sh "${RHEL_VER}" "${NVR}" \
-		"Usual failures we waived through rpmdiff; slowdebug unoptimised, RPATH and IPv4 functions"
-
-# Local Variables:
-# compile-command: "shellcheck waive_usual_rpminspect.sh"
-# fill-column: 80
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
--- a/scripts/openjdk_news.sh
+++ b/scripts/openjdk_news.sh
@ -98,7 +98,7 @@ else
    echo "No apparent backouts.";
 fi
 printf "\nChecking for bundled library updates...";
-if grep -iE ':( \(tz\))? (update|upgrade).*(freetype|gif|harfbuzz|lcms|jpeg|png|timezone|zlib)' "${TMPDIR}/fixes" > "${TMPDIR}/bundles"; then
+if grep -iE ':( \(tz\))? update.*(freetype|gif|harfbuzz|lcms|jpeg|png|timezone|zlib)' "${TMPDIR}/fixes" > "${TMPDIR}/bundles"; then
    printf "found.\nWARNING: Review the following with respect to bundled provides:\n";
    cat "${TMPDIR}/bundles";
    echo "Compare the output of $(dirname "${0}")/get_bundle_versions.sh with the RPM using the JDK source tree"
--- a/3
+++ b/3
@ -1,3 +1,2 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (nssadapter-0.1.1.tar.xz) = 2b4675cfbfa2ccb6c9a4870a4b58ae555267f5b8c9bdb0cf37b075483e6e9ea929561c05070453cf0d67b0b029de5408274555bf2ff50e9533219e898b2717f9
-SHA512 (openjdk-25.0.3+9.tar.xz) = 382dcf42ede35c7e48e0f9403d30172e6bc6367517e0c49211ab9d2e43373c3d7e586969c27795f0bfd17ae5c9f00702e955495a31d7ea757f54f06e8a4cf113
+SHA512 (openjdk-22.0.2+9.tar.xz) = 960746381f56cb516a2298f75dbf877554b59e73752dc29b040b8629b153174d2ea2f612d3479b511aaac293e4d336c798a58fd1ba4d2b9d5933899f64d04313
Author	SHA1	Message	Date
eabdullin	6c2ab26cd7	Exclude %{bootjdkpkg}-portable-devel%{?bootdebugpkg:-%{bootdebugpkg}} from BR for bootstrap build	2025-10-08 18:55:39 +03:00
eabdullin	91dc9761a6	Portable	2025-10-07 14:50:13 +03:00