diff --git a/dragonwell-standard-17.0.5.0.5+8_jdk-17.0.5-ga.tar.gz b/dragonwell-standard-17.0.7.0.7+7_jdk-17.0.7-ga.tar.gz similarity index 85% rename from dragonwell-standard-17.0.5.0.5+8_jdk-17.0.5-ga.tar.gz rename to dragonwell-standard-17.0.7.0.7+7_jdk-17.0.7-ga.tar.gz index 76849551d39a60e90073e342a46c27cbeab95ccf..05f1490f188f22b790491d2590ad473cfc702325 100644 Binary files a/dragonwell-standard-17.0.5.0.5+8_jdk-17.0.5-ga.tar.gz and b/dragonwell-standard-17.0.7.0.7+7_jdk-17.0.7-ga.tar.gz differ diff --git a/java-17-alibaba-dragonwell.spec b/java-17-alibaba-dragonwell.spec index 21a73a80cff837b322ece84c0b89c528296c8d13..dd710145e1d77c323b8ed8e2e3705b38c4871e46 100644 --- a/java-17-alibaba-dragonwell.spec +++ b/java-17-alibaba-dragonwell.spec @@ -21,10 +21,10 @@ %global major_ver 17 %global inter_ver 0 -%global update_ver 5 +%global update_ver 7 %global patch_ver 0 -%global alibaba_ver 5 -%global buildver 8 +%global alibaba_ver 7 +%global buildver 7 %global dragonwell_ver %{major_ver}.%{inter_ver}.%{update_ver} %global newdragonwellver %{major_ver}.%{inter_ver}.%{update_ver}.%{patch_ver}.%{alibaba_ver} %global distro_version %{dragonwell_ver}-%(printf "b%02d" %{anolis_release}) @@ -890,8 +890,6 @@ for suffix in %{build_loop} ; do install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a ${top_dir_abs_main_build_path}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} built_doc_archive=jdk-%{dragonwell_ver}.%{buildver}+%{buildver}-docs.zip - cp -a ${top_dir_abs_main_build_path}/bundles/${built_doc_archive} \ - $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}/bundles/ fi # Install icons and menu entries @@ -2086,6 +2084,9 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %endif %changelog +* Fri Jun 02 2023 zhaoyuanfang - 3:17.0.7.0.7.7-2 +- update to 17.0.7.0.7.7 + * Mon Apr 03 2023 mgb01105731 - 3:17.0.5.0.5.8-3 - Del Specific Fields diff --git a/pr3694-rh1340845-support_fedora_rhel_system_crypto_policy.patch b/pr3694-rh1340845-support_fedora_rhel_system_crypto_policy.patch index 97f276f7b848e8d495ab9fdd050b33b3ee70426e..437db116c0c5b3f97627b6060c28103dd1249d31 100644 --- a/pr3694-rh1340845-support_fedora_rhel_system_crypto_policy.patch +++ b/pr3694-rh1340845-support_fedora_rhel_system_crypto_policy.patch @@ -8,9 +8,9 @@ PR3694: 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. +@@ -51,6 +51,9 @@ import sun.security.jca.*; + * @implNote If the properties file fails to load, the JDK implementation will + * throw an unspecified error when initializing the {@code Security} class. * + *

Additional default values of security properties are read from a + * system-specific location, if available.

@@ -18,28 +18,20 @@ diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/classes/java/security/S * @author Benjamin Renaud * @since 1.1 */ -@@ -52,6 +55,10 @@ +@@ -61,6 +64,10 @@ public final class Security { 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 @@ + +@@ -107,6 +114,31 @@ public final class Security { } - + if ("true".equalsIgnoreCase(props.getProperty + ("security.useSystemPropertiesFile"))) { + @@ -67,8 +59,9 @@ diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/classes/java/security/S + + 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 diff --git a/pr3695-toggle_system_crypto_policy.patch b/pr3695-toggle_system_crypto_policy.patch index 37992373f086e4478c6661dc1ec4a727fa746bd4..0d5a0c099fc6dd2fe852b8026f2fd3de4b2b2d08 100644 --- a/pr3695-toggle_system_crypto_policy.patch +++ b/pr3695-toggle_system_crypto_policy.patch @@ -10,9 +10,9 @@ Summary: Read user overrides first so security.useSystemPropertiesFile can be di diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java --- a/src/java.base/share/classes/java/security/Security.java +++ b/src/java.base/share/classes/java/security/Security.java -@@ -125,31 +125,6 @@ +@@ -114,31 +114,6 @@ public final class Security { } - + if ("true".equalsIgnoreCase(props.getProperty - ("security.useSystemPropertiesFile"))) { - @@ -40,39 +40,6 @@ diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java. - - if ("true".equalsIgnoreCase(props.getProperty ("security.overridePropertiesFile"))) { - + String extraPropFile = System.getProperty -@@ -215,6 +190,33 @@ - } - } - -+ String disableSystemProps = System.getProperty("java.security.disableSystemPropertiesFile"); -+ if (disableSystemProps == null && -+ "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 (!loadedProps) { - initializeStatic(); - if (sdebug != null) { +