Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package java-17-openjdk for openSUSE:Factory
checked in at 2021-11-08 17:24:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-17-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-17-openjdk.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-17-openjdk"
Mon Nov 8 17:24:23 2021 rev:6 rq:929873 version:17.0.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-17-openjdk/java-17-openjdk.changes
2021-10-23 00:51:56.677146982 +0200
+++
/work/SRC/openSUSE:Factory/.java-17-openjdk.new.1890/java-17-openjdk.changes
2021-11-08 17:25:09.856731922 +0100
@@ -1,0 +2,30 @@
+Fri Nov 5 16:52:14 UTC 2021 - Fridrich Strba <[email protected]>
+
+- Modified patch:
+ * fips.patch
+ + return in native code after generating java.io.IOException
+
+-------------------------------------------------------------------
+Thu Nov 4 07:44:09 UTC 2021 - Fridrich Strba <[email protected]>
+
+- Modified patches:
+ * PStack-808293.patch
+ * adlc-parser.patch
+ * alternative-tzdb_dat.patch
+ * disable-doclint-by-default.patch
+ * java-atk-wrapper-security.patch
+ * jaw-jdk10.patch
+ * jaw-misc.patch
+ * loadAssistiveTechnologies.patch
+ * memory-limits.patch
+ * multiple-pkcs11-library-init.patch
+ * ppc_stack_overflow_fix.patch
+ * system-crypto-policy.patch
+ * system-pcsclite.patch
+ * zero-ranges.patch
+ + Rediff to apply all hunks without shifts
+ * fips.patch
+ + Fix unused function compiler warning found in systemconf.c
+ + Allow plain key import
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-17-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.152732773 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.156732777 +0100
@@ -537,7 +537,7 @@
# Setup nss.fips.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE13} > nss.fips.cfg
-sed -i -e "s:@NSS_SECMOD@:/etc/pki/nssdb:g" nss.fips.cfg
+sed -i -e "s:@NSS_SECMOD@:sql\:/etc/pki/nssdb:g" nss.fips.cfg
%build
++++++ PStack-808293.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.200732806 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.200732806 +0100
@@ -1,6 +1,6 @@
---
jdk10/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
2016-01-21 19:16:09.000000000 +0100
+++
jdk10/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
2016-01-29 15:49:47.815913736 +0100
-@@ -88,7 +89,8 @@
+@@ -101,7 +102,8 @@
if (jthread != null) {
jthread.printThreadInfoOn(out);
}
@@ -10,7 +10,7 @@
ClosestSymbol sym = f.closestSymbolToPC();
Address pc = f.pc();
out.print(pc + "\t");
-@@ -158,10 +160,19 @@
+@@ -183,10 +185,19 @@
}
}
}
++++++ adlc-parser.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.244732834 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.244732834 +0100
@@ -1,6 +1,6 @@
--- jdk10/src/hotspot/share/adlc/formsopt.cpp 2014-07-03 21:56:12.000000000
+0200
+++ jdk10/src/hotspot/share/adlc/formsopt.cpp 2014-07-14 11:43:21.900408570
+0200
-@@ -347,6 +347,7 @@
+@@ -445,6 +445,7 @@
_return_value = NULL;
_c_return_value = NULL;
_interpreter_frame_pointer_reg = NULL;
++++++ alternative-tzdb_dat.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.252732839 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.256732842 +0100
@@ -63,7 +63,7 @@
import java.util.SimpleTimeZone;
import java.util.concurrent.ConcurrentHashMap;
import java.util.zip.CRC32;
-@@ -251,7 +252,15 @@
+@@ -252,7 +253,15 @@
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
try {
@@ -80,7 +80,7 @@
try (DataInputStream dis = new DataInputStream(
new BufferedInputStream(new FileInputStream(
new File(libDir, "tzdb.dat"))))) {
-@@ -265,6 +274,28 @@
+@@ -266,6 +275,28 @@
});
}
++++++ disable-doclint-by-default.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.276732855 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.280732858 +0100
@@ -1,6 +1,6 @@
--- jdk15/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java
2020-03-11 22:25:18.000000000 +0100
+++ jdk15/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java
2020-03-17 19:11:23.870026518 +0100
-@@ -147,12 +147,12 @@
+@@ -155,12 +155,12 @@
files = List.of(new TestJFO("Test.java", code));
test(List.of(htmlVersion),
++++++ fips.patch ++++++
++++ 1608 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-17-openjdk/fips.patch
++++ and /work/SRC/openSUSE:Factory/.java-17-openjdk.new.1890/fips.patch
++++++ java-atk-wrapper-security.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.324732886 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.324732886 +0100
@@ -1,6 +1,6 @@
--- jdk10/src/java.base/share/conf/security/java.security 2017-01-23
23:56:02.000000000 +0100
+++ jdk10/src/java.base/share/conf/security/java.security 2017-01-27
08:41:10.551819770 +0100
-@@ -304,6 +304,8 @@
+@@ -307,6 +307,8 @@
#
package.access=sun.misc.,\
sun.reflect.,\
@@ -9,7 +9,7 @@
#
# List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
+@@ -319,6 +321,8 @@
#
package.definition=sun.misc.,\
sun.reflect.,\
++++++ jaw-jdk10.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.352732905 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.356732907 +0100
@@ -1,6 +1,6 @@
--- java-atk-wrapper-0.33.2/configure.ac 2017-11-06 13:37:11.504756491
+0100
+++ java-atk-wrapper-0.33.2/configure.ac 2017-11-06 13:37:47.224756626
+0100
-@@ -64,7 +64,7 @@
+@@ -63,7 +63,7 @@
# java wrapper
AM_CONDITIONAL(USER, test `whoami` = "root")
@@ -9,7 +9,7 @@
JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build
java-access-bridge"
AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
-@@ -170,6 +170,8 @@
+@@ -163,6 +163,8 @@
wrapper/org/GNOME/Makefile
wrapper/org/GNOME/Accessibility/Makefile
wrapper/org/GNOME/Accessibility/AtkWrapper.java
++++++ jaw-misc.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.364732913 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.364732913 +0100
@@ -17,7 +17,7 @@
JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build
java-access-bridge"
AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
-@@ -98,12 +98,6 @@ if test -z "$JAVAC"; then
+@@ -109,12 +108,6 @@ if test -z "$JAVAC"; then
fi
AC_SUBST(JAVAC)
++++++ loadAssistiveTechnologies.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.396732934 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.396732934 +0100
@@ -1,6 +1,6 @@
--- openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
-@@ -594,9 +594,13 @@
+@@ -601,9 +601,13 @@
!(toolkit instanceof HeadlessToolkit)) {
toolkit = new HeadlessToolkit(toolkit);
}
++++++ memory-limits.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.404732940 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.404732940 +0100
@@ -1,6 +1,6 @@
--- jdk11/src/hotspot/share/gc/shared/gc_globals.hpp 2018-04-20
08:14:25.796265133 +0200
+++ jdk11/src/hotspot/share/gc/shared/gc_globals.hpp 2018-04-20
08:15:53.656690011 +0200
-@@ -640,7 +640,7 @@
+@@ -593,7 +593,7 @@
"Initial heap size (in bytes); zero means use ergonomics") \
constraint(InitialHeapSizeConstraintFunc,AfterErgo) \
\
++++++ multiple-pkcs11-library-init.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.416732947 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.416732947 +0100
@@ -1,6 +1,6 @@
---
jdk10/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
2016-12-20 23:13:34.000000000 +0100
+++
jdk10/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
2016-12-22 11:45:10.418651583 +0100
-@@ -51,6 +51,7 @@
+@@ -52,6 +52,7 @@
static final int ERR_HALT = 1;
static final int ERR_IGNORE_ALL = 2;
static final int ERR_IGNORE_LIB = 3;
@@ -8,7 +8,7 @@
// same as allowSingleThreadedModules but controlled via a system property
// and applied to all providers. if set to false, no SunPKCS11 instances
-@@ -992,6 +993,8 @@
+@@ -1019,6 +1020,8 @@
handleStartupErrors = ERR_IGNORE_LIB;
} else if (val.equals("halt")) {
handleStartupErrors = ERR_HALT;
@@ -19,7 +19,7 @@
}
---
jdk10/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
2016-12-20 23:13:34.000000000 +0100
+++
jdk10/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
2016-12-22 11:45:10.418651583 +0100
-@@ -174,26 +174,37 @@
+@@ -179,26 +179,37 @@
String nssLibraryDirectory = config.getNssLibraryDirectory();
String nssSecmodDirectory = config.getNssSecmodDirectory();
boolean nssOptimizeSpace = config.getNssOptimizeSpace();
++++++ ppc_stack_overflow_fix.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.472732984 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.472732984 +0100
@@ -1,6 +1,6 @@
---- jdk16/src/hotspot/cpu/zero/stack_zero.hpp 2016-12-27 22:00:30.000000000
+0100
-+++ jdk16/src/hotspot/cpu/zero/stack_zero.hpp 2017-01-09 08:35:53.221098668
+0100
-@@ -96,7 +96,7 @@
+--- a/src/hotspot/cpu/zero/stack_zero.hpp 2016-12-27 22:00:30.000000000
+0100
++++ b/src/hotspot/cpu/zero/stack_zero.hpp 2017-01-09 08:35:53.221098668
+0100
+@@ -97,7 +97,7 @@
int shadow_pages_size() const {
return _shadow_pages_size;
}
@@ -9,9 +9,9 @@
public:
void overflow_check(int required_words, TRAPS);
---- jdk16/src/hotspot/cpu/zero/stack_zero.inline.hpp 2016-12-27
22:00:30.000000000 +0100
-+++ jdk16/src/hotspot/cpu/zero/stack_zero.inline.hpp 2017-01-09
08:35:53.221098668 +0100
-@@ -47,11 +47,11 @@
+--- a/src/hotspot/cpu/zero/stack_zero.inline.hpp 2016-12-27
22:00:30.000000000 +0100
++++ b/src/hotspot/cpu/zero/stack_zero.inline.hpp 2017-01-09
08:35:53.221098668 +0100
+@@ -46,11 +46,11 @@
// This method returns the amount of ABI stack available for us
// to use under normal circumstances. Note that the returned
// value can be negative.
++++++ system-crypto-policy.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.484732992 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.484732992 +0100
@@ -1,5 +1,5 @@
---- openjdk/src/java.base/share/classes/java/security/Security.java
2021-03-16 07:15:49.742093294 +0100
-+++ openjdk/src/java.base/share/classes/java/security/Security.java
2021-03-16 07:16:54.394507360 +0100
+--- a/src/java.base/share/classes/java/security/Security.java
++++ b/src/java.base/share/classes/java/security/Security.java
@@ -47,6 +47,9 @@
* implementation-specific location, which is typically the properties file
* {@code conf/security/java.security} in the Java installation directory.
@@ -21,7 +21,7 @@
/* The java.security properties */
private static Properties props;
-@@ -98,6 +105,7 @@
+@@ -99,6 +106,7 @@
if (sdebug != null) {
sdebug.println("reading security properties file: " +
propFile);
@@ -29,11 +29,10 @@
}
} catch (IOException e) {
if (sdebug != null) {
-@@ -183,6 +191,33 @@
- }
+@@ -185,6 +193,33 @@
}
}
-+
+
+ String disableSystemProps =
System.getProperty("java.security.disableSystemPropertiesFile");
+ if (disableSystemProps == null &&
+ "true".equalsIgnoreCase(props.getProperty
@@ -60,22 +59,23 @@
+ }
+ }
+ }
-
++
if (!loadedProps) {
initializeStatic();
---- openjdk/src/java.base/share/conf/security/java.security 2021-03-16
07:15:49.798093653 +0100
-+++ openjdk/src/java.base/share/conf/security/java.security 2021-03-16
11:38:01.416893125 +0100
-@@ -336,6 +336,13 @@
+ if (sdebug != null) {
+--- a/src/java.base/share/conf/security/java.security
++++ b/src/java.base/share/conf/security/java.security
+@@ -330,6 +330,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.
- #
++++++ system-pcsclite.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.496732999 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.496732999 +0100
@@ -52,7 +52,7 @@
+])
--- jdk15/make/autoconf/spec.gmk.in 2020-05-07 13:35:09.825368428 +0200
+++ jdk15/make/autoconf/spec.gmk.in 2020-05-07 13:37:41.358280752 +0200
-@@ -769,6 +769,7 @@
+@@ -767,6 +767,7 @@
# Build setup
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
++++++ zero-ranges.patch ++++++
--- /var/tmp/diff_new_pack.tQpeXA/_old 2021-11-08 17:25:11.512733010 +0100
+++ /var/tmp/diff_new_pack.tQpeXA/_new 2021-11-08 17:25:11.516733013 +0100
@@ -1,6 +1,6 @@
--- jdk10/src/hotspot/cpu/zero/globals_zero.hpp 2016-01-21
19:16:09.000000000 +0100
+++ jdk10/src/hotspot/cpu/zero/globals_zero.hpp 2016-01-29
15:52:57.611610069 +0100
-@@ -50,9 +50,9 @@
+@@ -53,9 +53,9 @@
#define DEFAULT_STACK_SHADOW_PAGES (5 LP64_ONLY(+1) DEBUG_ONLY(+3))
#define DEFAULT_STACK_RESERVED_PAGES (0)
