.gitignore

@@ -1,2 +1,2 @@
-SOURCES/openjdk-jdk17u-jdk-17.0.6+9.tar.xz
+SOURCES/openjdk-jdk17-jdk-17+26.tar.xz
-SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
+SOURCES/tapsets-icedtea-3.15.0.tar.xz

.java-17-openjdk.metadata

@@ -1,2 +1,2 @@
-95213324016613e314e5c97dc87f31a0576df00c SOURCES/openjdk-jdk17u-jdk-17.0.6+9.tar.xz
+b24a772841e1adc95eedd2d3d0be5d65e7a41263 SOURCES/openjdk-jdk17-jdk-17+26.tar.xz
-c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
+7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz

SOURCES/CheckVendor.java

@@ -1,65 +0,0 @@
-/* CheckVendor -- Check the vendor properties match specified values.
-   Copyright (C) 2020 Red Hat, Inc.
-
-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/>.
-*/
-
-/**
- * @test
- */
-public class CheckVendor {
-
-    public static void main(String[] args) {
-        if (args.length < 4) {
-            System.err.println("CheckVendor <VENDOR> <VENDOR-URL> <VENDOR-BUG-URL> <VENDOR-VERSION-STRING>");
-	    System.exit(1);
-	}
-
-	String vendor = System.getProperty("java.vendor");
-	String expectedVendor = args[0];
-	String vendorURL = System.getProperty("java.vendor.url");
-	String expectedVendorURL = args[1];
-	String vendorBugURL = System.getProperty("java.vendor.url.bug");
-	String expectedVendorBugURL = args[2];
-        String vendorVersionString = System.getProperty("java.vendor.version");
-        String expectedVendorVersionString = args[3];
-
-	if (!expectedVendor.equals(vendor)) {
-	    System.err.printf("Invalid vendor %s, expected %s\n",
-			      vendor, expectedVendor);
-	    System.exit(2);
-	}
-
-	if (!expectedVendorURL.equals(vendorURL)) {
-	    System.err.printf("Invalid vendor URL %s, expected %s\n",
-			      vendorURL, expectedVendorURL);
-	    System.exit(3);
-	}
-
-	if (!expectedVendorBugURL.equals(vendorBugURL)) {
-            System.err.printf("Invalid vendor bug URL %s, expected %s\n",
-			      vendorBugURL, expectedVendorBugURL);
-	    System.exit(4);
-	}
-
-        if (!expectedVendorVersionString.equals(vendorVersionString)) {
-            System.err.printf("Invalid vendor version string %s, expected %s\n",
-                              vendorVersionString, expectedVendorVersionString);
-	    System.exit(5);
-        }
-
-        System.err.printf("Vendor information verified as %s, %s, %s, %s\n",
-                          vendor, vendorURL, vendorBugURL, vendorVersionString);
-    }
-}

SOURCES/TestSecurityProperties.java

@@ -1,20 +1,3 @@
-/* TestSecurityProperties -- Ensure system security properties can be used to
-                             enable the crypto policies.
-   Copyright (C) 2022 Red Hat, Inc.
-
-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/>.
-*/
 import java.io.File;
 import java.io.FileInputStream;
 import java.security.Security;
@@ -26,59 +9,35 @@ public class TestSecurityProperties {
     // JDK 8
     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: ";
-
     public static void main(String[] args) {
-        if (args.length == 0) {
-            System.err.println("TestSecurityProperties <true|false>");
-            System.err.println("Invoke with 'true' if system security properties should be enabled.");
-            System.err.println("Invoke with 'false' if system security properties should be disabled.");
-            System.exit(1);
-        }
-        boolean enabled = Boolean.valueOf(args[0]);
-        System.out.println(MSG_PREFIX + "System security properties enabled: " + enabled);
         Properties jdkProps = new Properties();
         loadProperties(jdkProps);
-        if (enabled) {
-            loadPolicy(jdkProps);
-        }
         for (Object key: jdkProps.keySet()) {
             String sKey = (String)key;
             String securityVal = Security.getProperty(sKey);
             String jdkSecVal = jdkProps.getProperty(sKey);
             if (!securityVal.equals(jdkSecVal)) {
-                String msg = "Expected value '" + jdkSecVal + "' for key '" +
+                String msg = "Expected value '" + jdkSecVal + "' for key '" + 
                              sKey + "'" + " but got value '" + securityVal + "'";
                 throw new RuntimeException("Test failed! " + msg);
             } else {
-                System.out.println(MSG_PREFIX + sKey + " = " + jdkSecVal + " as expected.");
+                System.out.println("DEBUG: " + sKey + " = " + jdkSecVal + " as expected.");
             }
         }
         System.out.println("TestSecurityProperties PASSED!");
     }
-
+    
     private static void loadProperties(Properties props) {
         String javaVersion = System.getProperty("java.version");
-        System.out.println(MSG_PREFIX + "Java version is " + javaVersion);
+        System.out.println("Debug: Java version is " + javaVersion);
         String propsFile = JDK_PROPS_FILE_JDK_11;
         if (javaVersion.startsWith("1.8.0")) {
             propsFile = JDK_PROPS_FILE_JDK_8;
         }
-        try (FileInputStream fin = new FileInputStream(propsFile)) {
+        try (FileInputStream fin = new FileInputStream(new File(propsFile))) {
             props.load(fin);
         } catch (Exception e) {
             throw new RuntimeException("Test failed!", e);
         }
     }
-
-    private static void loadPolicy(Properties props) {
-        try (FileInputStream fin = new FileInputStream(POLICY_FILE)) {
-            props.load(fin);
-        } catch (Exception e) {
-            throw new RuntimeException("Test failed!", e);
-        }
-    }
-
 }

SOURCES/TestTranslations.java

@@ -1,160 +0,0 @@
-/* TestTranslations -- Ensure translations are available for new timezones
-   Copyright (C) 2022 Red Hat, Inc.
-
-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/>.
-*/
-
-import java.text.DateFormatSymbols;
-
-import java.time.ZoneId;
-import java.time.format.TextStyle;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.TimeZone;
-
-public class TestTranslations {
-
-    private static Map<Locale,String[]> KYIV, CIUDAD_JUAREZ;
-
-    static {
-        Map<Locale,String[]> map = new HashMap<Locale,String[]>();
-        map.put(Locale.US, new String[] { "Eastern European Standard Time", "GMT+02:00", "EET",
-                                          "Eastern European Summer Time", "GMT+03:00", "EEST",
-                                          "Eastern European Time", "GMT+02:00", "EET"});
-        map.put(Locale.FRANCE, new String[] { "heure normale d\u2019Europe de l\u2019Est", "UTC+02:00", "EET",
-                                              "heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est", "UTC+03:00", "EEST",
-                                              "heure d\u2019Europe de l\u2019Est", "UTC+02:00", "EET"});
-        map.put(Locale.GERMANY, new String[] { "Osteurop\u00e4ische Normalzeit", "OEZ", "OEZ",
-                                               "Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",
-                                               "Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});
-        KYIV = Collections.unmodifiableMap(map);
-
-        map = new HashMap<Locale,String[]>();
-        map.put(Locale.US, new String[] { "Mountain Standard Time", "MST", "MST",
-                                          "Mountain Daylight Time", "MDT", "MDT",
-                                          "Mountain Time", "MT", "MT"});
-        map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
-                                              "heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
-                                              "heure des Rocheuses", "UTC\u221207:00", "MT"});
-        map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
-                                               "Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
-                                               "Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
-        CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
-    }
-
-
-    public static void main(String[] args) {
-        if (args.length < 1) {
-            System.err.println("Test must be started with the name of the locale provider.");
-            System.exit(1);
-        }
-
-        System.out.println("Checking sanity of full zone string set...");
-        boolean invalid = Arrays.stream(Locale.getAvailableLocales())
-            .peek(l -> System.out.println("Locale: " + l))
-            .map(l -> DateFormatSymbols.getInstance(l).getZoneStrings())
-            .flatMap(zs -> Arrays.stream(zs))
-            .flatMap(names -> Arrays.stream(names))
-            .filter(name -> Objects.isNull(name) || name.isEmpty())
-            .findAny()
-            .isPresent();
-        if (invalid) {
-            System.err.println("Zone string for a locale returned null or empty string");
-            System.exit(2);
-        }
-
-        String localeProvider = args[0];
-        testZone(localeProvider, KYIV,
-                 new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" });
-        testZone(localeProvider, CIUDAD_JUAREZ,
-                 new String[] { "America/Cambridge_Bay", "America/Ciudad_Juarez" });
-    }
-
-    private static void testZone(String localeProvider, Map<Locale,String[]> exp, String[] ids) {
-        for (Locale l : exp.keySet()) {
-            String[] expected = exp.get(l);
-            System.out.printf("Expected values for %s are %s\n", l, Arrays.toString(expected));
-            for (String id : ids) {
-                String expectedShortStd = null;
-                String expectedShortDST = null;
-                String expectedShortGen = null;
-
-                System.out.printf("Checking locale %s for %s...\n", l, id);
-
-                if ("JRE".equals(localeProvider)) {
-                    expectedShortStd = expected[2];
-                    expectedShortDST = expected[5];
-                    expectedShortGen = expected[8];
-                } else if ("CLDR".equals(localeProvider)) {
-                    expectedShortStd = expected[1];
-                    expectedShortDST = expected[4];
-                    expectedShortGen = expected[7];
-                } else {
-                    System.err.printf("Invalid locale provider %s\n", localeProvider);
-                    System.exit(3);
-                }
-                System.out.printf("Locale Provider is %s, using short values %s, %s and %s\n",
-                                  localeProvider, expectedShortStd, expectedShortDST, expectedShortGen);
-
-                String longStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.LONG, l);
-                String shortStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.SHORT, l);
-                String longDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.LONG, l);
-                String shortDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.SHORT, l);
-                String longGen = ZoneId.of(id).getDisplayName(TextStyle.FULL, l);
-                String shortGen = ZoneId.of(id).getDisplayName(TextStyle.SHORT, l);
-
-                if (!expected[0].equals(longStd)) {
-                    System.err.printf("Long standard display name for %s in %s was %s, expected %s\n",
-                                      id, l, longStd, expected[0]);
-                    System.exit(4);
-                }
-
-                if (!expectedShortStd.equals(shortStd)) {
-                    System.err.printf("Short standard display name for %s in %s was %s, expected %s\n",
-                                      id, l, shortStd, expectedShortStd);
-                    System.exit(5);
-                }
-
-                if (!expected[3].equals(longDST)) {
-                    System.err.printf("Long DST display name for %s in %s was %s, expected %s\n",
-                                      id, l, longDST, expected[3]);
-                    System.exit(6);
-                }
-
-                if (!expectedShortDST.equals(shortDST)) {
-                    System.err.printf("Short DST display name for %s in %s was %s, expected %s\n",
-                                      id, l, shortDST, expectedShortDST);
-                    System.exit(7);
-                }
-
-                if (!expected[6].equals(longGen)) {
-                    System.err.printf("Long generic display name for %s in %s was %s, expected %s\n",
-                                      id, l, longGen, expected[6]);
-                    System.exit(8);
-                }
-
-                if (!expectedShortGen.equals(shortGen)) {
-                    System.err.printf("Short generic display name for %s in %s was %s, expected %s\n",
-                                      id, l, shortGen, expectedShortGen);
-                    System.exit(9);
-                }
-            }
-        }
-    }
-}

SOURCES/jconsole.desktop.in

@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
+Name=OpenJDK @JAVA_MAJOR_VERSION@ Monitoring & Management Console @ARCH@
-Comment=Monitor and manage OpenJDK applications
+Comment=Monitor and manage OpenJDK @JAVA_MAJOR_VERSION@ applications for @ARCH@
-Exec=_SDKBINDIR_/jconsole
+Exec=@JAVA_HOME@/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
+Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-tools-jconsole-JConsole

SOURCES/pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch

@@ -0,0 +1,88 @@
+
+# HG changeset patch
+# User andrew
+# Date 1478057514 0
+# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
+# Parent  3d53f19b48384e5252f4ec8891f7a3a82d77af2a
+PR3183: Support Fedora/RHEL system crypto policy
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/classes/java/security/Security.java
+--- a/src/java.base/share/classes/java/security/Security.java	Wed Oct 26 03:51:39 2016 +0100
++++ b/src/java.base/share/classes/java/security/Security.java	Wed Nov 02 03:31:54 2016 +0000
+@@ -43,6 +43,9 @@
+  * implementation-specific location, which is typically the properties file
+  * {@code conf/security/java.security} in the Java installation directory.
+  *
++ * <p>Additional default values of security properties are read from a
++ * system-specific location, if available.</p>
++ *
+  * @author Benjamin Renaud
+  * @since 1.1
+  */
+@@ -52,6 +55,10 @@
+     private static final Debug sdebug =
+                         Debug.getInstance("properties");
+ 
++    /* System property file*/
++    private static final String SYSTEM_PROPERTIES =
++        "/etc/crypto-policies/back-ends/java.config";
++
+     /* The java.security properties */
+     private static Properties props;
+ 
+@@ -93,6 +100,7 @@
+                 if (sdebug != null) {
+                     sdebug.println("reading security properties file: " +
+                                 propFile);
++                    sdebug.println(props.toString());
+                 }
+             } catch (IOException e) {
+                 if (sdebug != null) {
+@@ -114,6 +122,31 @@
+         }
+ 
+         if ("true".equalsIgnoreCase(props.getProperty
++                ("security.useSystemPropertiesFile"))) {
++
++            // now load the system file, if it exists, so its values
++            // will win if they conflict with the earlier values
++            try (BufferedInputStream bis =
++                 new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
++                props.load(bis);
++                loadedProps = true;
++
++                if (sdebug != null) {
++                    sdebug.println("reading system security properties file " +
++                                   SYSTEM_PROPERTIES);
++                    sdebug.println(props.toString());
++                }
++            } catch (IOException e) {
++                if (sdebug != null) {
++                    sdebug.println
++                        ("unable to load security properties from " +
++                         SYSTEM_PROPERTIES);
++                    e.printStackTrace();
++                }
++            }
++        }
++
++        if ("true".equalsIgnoreCase(props.getProperty
+                 ("security.overridePropertiesFile"))) {
+ 
+             String extraPropFile = System.getProperty
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/conf/security/java.security
+--- a/src/java.base/share/conf/security/java.security	Wed Oct 26 03:51:39 2016 +0100
++++ b/src/java.base/share/conf/security/java.security	Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+ 
+ #
++# Determines whether this properties file will be appended to
++# using the system properties file stored at
++# /etc/crypto-policies/back-ends/java.config
++#
++security.useSystemPropertiesFile=true
++
++#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #

SOURCES/remove-intree-libraries.sh

@@ -5,7 +5,6 @@ TREE=${1}
 TYPE=${2}
 
 ZIP_SRC=src/java.base/share/native/libzip/zlib/
-FREETYPE_SRC=src/java.desktop/share/native/libfreetype/
 JPEG_SRC=src/java.desktop/share/native/libjavajpeg/
 GIF_SRC=src/java.desktop/share/native/libsplashscreen/giflib/
 PNG_SRC=src/java.desktop/share/native/libsplashscreen/libpng/
@@ -32,21 +31,15 @@ cd ${TREE}
 
 echo "Removing built-in libs (they will be linked)"
 
-# On full runs, allow for zlib & freetype having already been deleted by minimal
+# On full runs, allow for zlib having already been deleted by minimal
 echo "Removing zlib"
 if [ "x${TYPE}" = "xminimal" -a ! -d ${ZIP_SRC} ]; then
 	echo "${ZIP_SRC} does not exist. Refusing to proceed."
 	exit 1
 fi	
 rm -rvf ${ZIP_SRC}
-echo "Removing freetype"
-if [ "x${TYPE}" = "xminimal" -a ! -d ${FREETYPE_SRC} ]; then
-	echo "${FREETYPE_SRC} does not exist. Refusing to proceed."
-	exit 1
-fi
-rm -rvf ${FREETYPE_SRC}
 
-# Minimal is limited to just zlib and freetype so finish here
+# Minimal is limited to just zlib so finish here
 if test "x${TYPE}" = "xminimal"; then
     echo "Finished.";
     exit 0;

SOURCES/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch

@@ -1,12 +1,12 @@
-diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
+diff -r e3f940bd3c8f src/java.base/share/conf/security/java.security
-index adfaf57d29e..abf89bbf327 100644
+--- openjdk/src/java.base/share/conf/security/java.security	Thu Jun 11 21:54:51 2020 +0530
---- a/src/java.base/share/conf/security/java.security
++++ openjdk/src/java.base/share/conf/security/java.security	Mon Aug 24 10:14:31 2020 +0200
-+++ b/src/java.base/share/conf/security/java.security
+@@ -77,7 +77,7 @@
-@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
+ #ifdef macosx
  security.provider.tbd=Apple
  #endif
- security.provider.tbd=SunPKCS11
+-security.provider.tbd=SunPKCS11
 +#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
  
  #
- # Security providers used when FIPS mode support is active
+ # A list of preferred providers for specific algorithms. These providers will