开源软件构建与测试

_service:tar_scm:openjdk-latest.spec Changed

@@ -898,7 +898,7 @@
 Version: %{newjavaver}.%{buildver}
 # This package needs `.rolling` as part of Release so as to not conflict on install with
 # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
-Release: 0
+Release: 1
 
 # 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
@@ -1331,23 +1331,6 @@
 
 ARCH=$(uname -m)
 BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk
-if  "$ARCH" = "x86_64" ; then
-    tar -xf %{SOURCE2}
-    BOOTJDKPATH=$PWD/jdk-21.0.3+9
-elif  "$ARCH" = "aarch64" ; then
-    tar -xf %{SOURCE1}
-    BOOTJDKPATH=$PWD/jdk-21.0.3+9
-elif  "$ARCH" = "riscv64" ; then
-    tar -xf %{SOURCE3}
-    BOOTJDKPATH=$PWD/jdk-21.0.3+9
-elif  "$ARCH" = "loongarch64" ; then
-    :
-elif  "$ARCH" = "ppc64le" ; then
-    :
-else
-    echo " Failed to set BOOTJDKPATH "
-    exit 18
-fi
 
 echo $BOOTJDKPATH
 
@@ -1799,7 +1782,12 @@
 
 
 %changelog
-* Tue Aug 6 2024 kuenking111 <wangkun49@huawei,com> - 1:22.0.2.9-rolling
+* Mon Nov 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:22.0.2.9-1
+- Change boot jdk to itself
+- Remove redundant patches to fix ci check
+- Fix typo in changelog
+
+* Tue Aug 6 2024 kuenking111 <wangkun49@huawei.com> - 1:22.0.2.9-rolling
 - update to jdk22.0.2+9
 
 * Fri Jul 12 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:22.0.0.36-3

_service:tar_scm:pr3183-rh1340845-support_system_crypto_policy.patch Deleted

@@ -1,87 +0,0 @@
-
-# HG changeset patch
-# User andrew
-# Date 1478057514 0
-# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
-# Parent  3d53f19b48384e5252f4ec8891f7a3a82d77af2a
-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.
- #

_service:tar_scm:rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch Deleted

_service Changed

_service:tar_scm:OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz Deleted

_service:tar_scm:OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz Deleted

_service:tar_scm:OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz Deleted

Changes of Revision 4