Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package java-22-openjdk for openSUSE:Factory
checked in at 2024-04-18 22:13:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-22-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-22-openjdk.new.26366 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-22-openjdk"
Thu Apr 18 22:13:44 2024 rev:2 rq:1168901 version:22.0.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-22-openjdk/java-22-openjdk.changes
2024-03-20 21:20:28.375552973 +0100
+++
/work/SRC/openSUSE:Factory/.java-22-openjdk.new.26366/java-22-openjdk.changes
2024-04-18 22:14:51.282441540 +0200
@@ -1,0 +2,140 @@
+Thu Apr 18 14:57:53 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to upstream tag jdk-22.0.1+8 (April 2024 CPU)
+ * Security fixes
+ + JDK-8315708, CVE-2024-21012, bsc#1222987: Enhance HTTP/2
+ client usage
+ + JDK-8318340: Improve RSA key implementations
+ + JDK-8319851, CVE-2024-21011, bsc#1222979: Improve exception
+ logging
+ + JDK-8322122, CVE-2024-21068, bsc#1222983: Enhance generation
+ of addresses
+ * Other changes
+ + JDK-8314164: java/net/HttpURLConnection/
+ /HttpURLConnectionExpectContinueTest.java fails intermittently
+ in timeout
+ + JDK-8314275: Incorrect stepping in switch
+ + JDK-8317299: safepoint scalarization doesn't keep track of
+ the depth of the JVM state
+ + JDK-8317804: com/sun/jdi/JdwpAllowTest.java fails on Alpine
+ 3.17 / 3.18
+ + JDK-8318158: RISC-V: implement roundD/roundF intrinsics
+ + JDK-8318603: Parallelize sun/java2d/marlin/ClipShapeTest.java
+ + JDK-8318696: Do not use LFS64 symbols on Linux
+ + JDK-8319382: com/sun/jdi/JdwpAllowTest.java shows failures on
+ AIX if prefixLen of mask is larger than 32 in IPv6 case
+ + JDK-8320890: [AIX] Find a better way to mimic dl handle
+ equality
+ + JDK-8321151: JDK-8294427 breaks Windows L&F on all older
+ Windows versions
+ + JDK-8321374: Add a configure option to explicitly set
+ CompanyName property in VersionInfo resource for Windows
+ exe/dll
+ + JDK-8321408: Add Certainly roots R1 and E1
+ + JDK-8321480: ISO 4217 Amendment 176 Update
+ + JDK-8321489: Update LCMS to 2.16
+ + JDK-8321815: Shenandoah: gc state should be synchronized to
+ java threads only once per safepoint
+ + JDK-8321972: test runtime/Unsafe/InternalErrorTest.java
+ timeout on linux-riscv64 platform
+ + JDK-8322092: Bump version numbers for 22.0.1
+ + JDK-8322098: os::Linux::print_system_memory_info enhance the
+ THP output with
+ /sys/kernel/mm/transparent_hugepage/hpage_pmd_size
+ + JDK-8322159: ThisEscapeAnalyzer crashes for erroneous code
+ + JDK-8322163: runtime/Unsafe/InternalErrorTest.java fails on
+ Alpine after JDK-8320886
+ + JDK-8322417: Console read line with zero out should zero out
+ when throwing exception
+ + JDK-8322725: (tz) Update Timezone Data to 2023d
+ + JDK-8322772: Clean up code after JDK-8322417
+ + JDK-8322783: prioritize /etc/os-release over
+ /etc/SuSE-release in hs_err/info output
+ + JDK-8322790: RISC-V: Tune costs for shuffles with no
+ conversion
+ + JDK-8322945: Problemlist runtime/CompressedOops/
+ /CompressedClassPointers.java on AIX
+ + JDK-8323021: Shenandoah: Encountered reference count always
+ attributed to first worker thread
+ + JDK-8323065: Unneccesary CodeBlob lookup in
+ CompiledIC::internal_set_ic_destination
+ + JDK-8323086: Shenandoah: Heap could be corrupted by oom
+ during evacuation
+ + JDK-8323154: C2: assert(cmp != nullptr && cmp->Opcode() ==
+ Op_Cmp(bt)) failed: no exit test
+ + JDK-8323170: j2dbench is using outdated javac source/target
+ to be able to build by itself
+ + JDK-8323210: Update the usage of cmsFLAGS_COPY_ALPHA
+ + JDK-8323331: fix typo hpage_pdm_size
+ + JDK-8323428: Shenandoah: Unused memory in regions compacted
+ during a full GC should be mangled
+ + JDK-8323515: Create test alias "all" for all test roots
+ + JDK-8323637: Capture hotspot replay files in GHA
+ + JDK-8323657: Compilation of snippet results in VerifyError at
+ runtime with --release 9 (and above)
+ + JDK-8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java
+ still fails with JNI warning on some Windows configurations
+ + JDK-8323675: Race in jdk.javadoc-gendata
+ + JDK-8323920: Change milestone to fcs for all releases
+ + JDK-8323964: runtime/Thread/ThreadCountLimit.java fails
+ intermittently on AIX
+ + JDK-8324041: ModuleOption.java failed with update release
+ versioning scheme
+ + JDK-8324050: Issue store-store barrier after re-materializing
+ objects during deoptimization
+ + JDK-8324280: RISC-V: Incorrect implementation in
+ VM_Version::parse_satp_mode
+ + JDK-8324347: Enable "maybe-uninitialized" warning for
+ FreeType 2.13.1
+ + JDK-8324598: use mem_unit when working with sysinfo memory
+ and swap related information
+ + JDK-8324637: [aix] Implement support for reporting swap space
+ in jdk.management
+ + JDK-8324647: Invalid test group of lib-test after JDK-8323515
+ + JDK-8324659: GHA: Generic jtreg errors are not reported
+ + JDK-8324753: [AIX] adjust os_posix after JDK-8318696
+ + JDK-8324937: GHA: Avoid multiple test suites per job
+ + JDK-8325074: ZGC fails assert(index == 0 ||
+ is_power_of_2(index)) failed: Incorrect load shift: 11
+ + JDK-8325150: (tz) Update Timezone Data to 2024a
+ + JDK-8325203: System.exit(0) kills the launched 3rd party
+ application
+ + JDK-8325213: Flags introduced by configure script are not
+ passed to ADLC build
+ + JDK-8325313: Header format error in TestIntrinsicBailOut
+ after JDK-8317299
+ + JDK-8325326: [PPC64] Don't relocate in case of allocation
+ failure
+ + JDK-8325470: [AIX] use fclose after fopen in read_psinfo
+ + JDK-8325496: Make TrimNativeHeapInterval a product switch
+ + JDK-8325590: Regression in round-tripping UTF-16 strings
+ after JDK-8311906
+ + JDK-8325672: C2: allocate PhaseIdealLoop::_loop_or_ctrl from
+ C->comp_arena()
+ + JDK-8325876: crashes in docker container tests on
+ Linuxppc64le Power8 machines
+ + JDK-8326000: Remove obsolete comments for class
+ sun.security.ssl.SunJSSE
+ + JDK-8326101: [PPC64] Need to bailout cleanly if creation of
+ stubs fails when code cache is out of space
+ + JDK-8326360: Update the Zlib version in
+ open/src/java.base/share/legal/zlib.md to 1.3
+ + JDK-8326638: Crash in
+ PhaseIdealLoop::remix_address_expressions due to unexpected
+ Region instead of Loop
+ + JDK-8327391: Add SipHash attribution file
+- Modified patches:
+ * PStack-808293.patch
+ * disable-doclint-by-default.patch
+ * fips.patch
+ * java-22-openjdk.spec
+ * java-atk-wrapper-security.patch
+ * loadAssistiveTechnologies.patch
+ * memory-limits.patch
+ * multiple-pkcs11-library-init.patch
+ * reproducible-properties.patch
+ * system-pcsclite.patch
+ * zero-ranges.patch
+ + rediff to apply without fuzz
+
+-------------------------------------------------------------------
Old:
----
jdk-22+36.tar.gz
New:
----
jdk-22.0.1+8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-22-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.406519643 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.410519790 +0200
@@ -33,8 +33,8 @@
# Standard JPackage naming and versioning defines.
%global featurever 22
%global interimver 0
-#global updatever 0
-%global buildver 36
+%global updatever 1
+%global buildver 8
%global openjdk_repo jdk22u
%global openjdk_tag
jdk-%{featurever}%{?updatever:.%{interimver}.%{updatever}}%{?patchver:.%{patchver}}+%{buildver}
%global openjdk_dir
%{openjdk_repo}-jdk-%{featurever}%{?updatever:.%{interimver}.%{updatever}}%{?patchver:.%{patchver}}-%{buildver}
@@ -100,6 +100,9 @@
%global package_version
%{featurever}.%{interimver}.%{?updatever:%{updatever}}%{!?updatever:0}.%{?patchver:%{patchver}}%{!?patchver:0}~%{buildver}
%endif
%global NSS_LIBDIR %(pkg-config --variable=libdir nss)
+%if 0%{?gcc_version} < 7
+%global with_gcc 7
+%endif
%bcond_with zero
%if ! %{with zero}
%global with_systemtap 1
@@ -178,6 +181,8 @@
BuildRequires: fdupes
BuildRequires: fontconfig-devel
BuildRequires: freetype2-devel
+BuildRequires: gcc%{?with_gcc}
+BuildRequires: gcc%{?with_gcc}-c++
BuildRequires: giflib-devel
BuildRequires: hicolor-icon-theme
BuildRequires: java-ca-certificates
@@ -231,13 +236,6 @@
Provides: jre1.8.x
Provides: jre1.9.x
%endif
-%if 0%{?suse_version} < 1500
-BuildRequires: gcc7
-BuildRequires: gcc7-c++
-%else
-BuildRequires: gcc >= 7
-BuildRequires: gcc-c++ >= 7
-%endif
%if %{with_system_lcms}
BuildRequires: liblcms2-devel
%endif
@@ -450,11 +448,11 @@
pushd %{buildoutputdir}
bash ../configure \
-%if 0%{?suse_version} < 1500
- CPP=cpp-7 \
- CXX=g++-7 \
- CC=gcc-7 \
- NM=gcc-nm-7 \
+%if 0%{?with_gcc}
+ CPP="cpp-%{with_gcc}" \
+ CXX="g++-%{with_gcc}" \
+ CC="gcc-%{with_gcc}" \
+ NM="gcc-nm-%{with_gcc}" \
%endif
%if %{is_release}
--with-version-pre="" \
++++++ PStack-808293.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.438520820 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.438520820 +0200
@@ -1,6 +1,6 @@
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
-@@ -101,7 +101,8 @@ public class PStack extends Tool {
+@@ -101,7 +101,8 @@ public void run(PrintStream out, Debugger dbg) {
if (jthread != null) {
jthread.printThreadInfoOn(out);
}
@@ -10,7 +10,7 @@
ClosestSymbol sym = f.closestSymbolToPC();
Address pc = f.pc();
out.print(pc + "\t");
-@@ -183,10 +184,19 @@ public class PStack extends Tool {
+@@ -183,10 +184,19 @@ public void run(PrintStream out, Debugger dbg) {
}
}
}
++++++ disable-doclint-by-default.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.522523909 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.526524055 +0200
@@ -1,6 +1,6 @@
---
a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
+++
b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
-@@ -795,7 +795,7 @@ public abstract class BaseConfiguration {
+@@ -631,7 +631,7 @@ public void initDocLint(List<String> opts, Set<String>
customTagNames) {
}
} else {
// no -Xmsgs options of any kind, use default
@@ -11,7 +11,7 @@
if (!customTagNames.isEmpty()) {
--- a/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java
+++ b/test/langtools/jdk/javadoc/tool/doclint/DocLintTest.java
-@@ -150,12 +150,12 @@ public class DocLintTest {
+@@ -150,12 +150,12 @@ void run() throws Exception {
files = List.of(new TestJFO("Test.java", code));
test(List.of(htmlVersion),
@@ -28,7 +28,7 @@
// test(List.of("-Xdoclint:none"),
// Main.Result.OK,
-@@ -178,8 +178,8 @@ public class DocLintTest {
+@@ -178,8 +178,8 @@ void run() throws Exception {
EnumSet.of(Message.DL_WRN14));
test(List.of(htmlVersion, rawDiags, "-private"),
++++++ fips.patch ++++++
++++ 784 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-22-openjdk/fips.patch
++++ and /work/SRC/openSUSE:Factory/.java-22-openjdk.new.26366/fips.patch
++++++ java-atk-wrapper-security.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.558525233 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.558525233 +0200
@@ -1,6 +1,6 @@
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
-@@ -307,6 +307,8 @@ keystore.type.compat=true
+@@ -313,6 +313,8 @@ keystore.type.compat=true
#
package.access=sun.misc.,\
sun.reflect.,\
@@ -9,7 +9,7 @@
#
# List of comma-separated packages that start with or equal this string
-@@ -319,6 +321,8 @@ package.access=sun.misc.,\
+@@ -325,6 +327,8 @@ package.access=sun.misc.,\
#
package.definition=sun.misc.,\
sun.reflect.,\
++++++ jdk-22+36.tar.gz -> jdk-22.0.1+8.tar.gz ++++++
/work/SRC/openSUSE:Factory/java-22-openjdk/jdk-22+36.tar.gz
/work/SRC/openSUSE:Factory/.java-22-openjdk.new.26366/jdk-22.0.1+8.tar.gz
differ: char 12, line 1
++++++ loadAssistiveTechnologies.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.590526409 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.594526556 +0200
@@ -1,6 +1,6 @@
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
-@@ -602,7 +602,11 @@ public abstract class Toolkit {
+@@ -598,7 +598,11 @@ public static synchronized Toolkit getDefaultToolkit() {
toolkit = new HeadlessToolkit(toolkit);
}
if (!GraphicsEnvironment.isHeadless()) {
++++++ memory-limits.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.602526850 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.606526997 +0200
@@ -1,6 +1,6 @@
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
-@@ -596,7 +596,7 @@
+@@ -591,7 +591,7 @@
"Initial heap size (in bytes); zero means use ergonomics") \
constraint(InitialHeapSizeConstraintFunc,AfterErgo) \
\
++++++ multiple-pkcs11-library-init.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.614527291 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.618527439 +0200
@@ -1,6 +1,6 @@
---- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
2023-04-01 12:03:26.147543172 +0200
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
2023-04-01 12:03:45.455660866 +0200
-@@ -52,6 +52,7 @@
+--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
+@@ -52,6 +52,7 @@ final class Config {
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
-@@ -1037,6 +1038,7 @@
+@@ -1037,6 +1038,7 @@ private void parseHandleStartupErrors(String keyword)
throws IOException {
handleStartupErrors = switch (val) {
case "ignoreAll" -> ERR_IGNORE_ALL;
case "ignoreMissingLibrary" -> ERR_IGNORE_LIB;
@@ -16,9 +16,9 @@
case "halt" -> ERR_HALT;
default -> throw excToken("Invalid value for
handleStartupErrors:");
};
---- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
2023-04-01 12:03:26.147543172 +0200
-+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
2023-04-01 12:07:19.664979695 +0200
-@@ -184,26 +184,37 @@
+--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
++++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+@@ -184,26 +184,37 @@ private static <T> T checkNull(T obj) {
String nssLibraryDirectory = config.getNssLibraryDirectory();
String nssSecmodDirectory = config.getNssSecmodDirectory();
boolean nssOptimizeSpace = config.getNssOptimizeSpace();
++++++ reproducible-properties.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.638528174 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.642528321 +0200
@@ -1,6 +1,6 @@
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
-@@ -955,7 +955,7 @@ public class Properties extends Hashtable<Object,Object> {
+@@ -955,7 +955,7 @@ private static void writeDateComment(BufferedWriter bw)
throws IOException {
if (sysPropVal != null && !sysPropVal.isEmpty()) {
writeComments(bw, sysPropVal);
} else {
++++++ system-pcsclite.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.654528763 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.658528909 +0200
@@ -1,6 +1,6 @@
---- jdk22u-jdk-22-36/make/autoconf/lib-bundled.m4 2024-03-15
16:01:46.767610222 +0100
-+++ jdk22u-jdk-22-36/make/autoconf/lib-bundled.m4 2024-03-15
16:01:55.957616058 +0100
-@@ -41,6 +41,7 @@
+--- a/make/autoconf/lib-bundled.m4
++++ b/make/autoconf/lib-bundled.m4
+@@ -41,6 +41,7 @@ AC_DEFUN_ONCE([LIB_SETUP_BUNDLED_LIBS],
LIB_SETUP_ZLIB
LIB_SETUP_LCMS
LIB_SETUP_HARFBUZZ
@@ -8,7 +8,7 @@
])
################################################################################
-@@ -309,3 +310,41 @@
+@@ -309,3 +310,41 @@ AC_DEFUN_ONCE([LIB_SETUP_HARFBUZZ],
AC_SUBST(HARFBUZZ_CFLAGS)
AC_SUBST(HARFBUZZ_LIBS)
])
@@ -50,9 +50,9 @@
+
+ AC_SUBST(USE_EXTERNAL_PCSCLITE)
+])
---- jdk22u-jdk-22-36/make/autoconf/spec.gmk.in 2024-03-15 16:01:46.767610222
+0100
-+++ jdk22u-jdk-22-36/make/autoconf/spec.gmk.in 2024-03-15 16:03:08.207661924
+0100
-@@ -813,6 +813,7 @@
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -814,6 +814,7 @@ TAR_SUPPORTS_TRANSFORM := @TAR_SUPPORTS_TRANSFORM@
# Build setup
USE_EXTERNAL_LIBJPEG := @USE_EXTERNAL_LIBJPEG@
USE_EXTERNAL_LIBGIF := @USE_EXTERNAL_LIBGIF@
@@ -60,9 +60,9 @@
USE_EXTERNAL_LIBZ := @USE_EXTERNAL_LIBZ@
LIBZ_CFLAGS := @LIBZ_CFLAGS@
LIBZ_LIBS := @LIBZ_LIBS@
---- jdk22u-jdk-22-36/make/modules/java.smartcardio/Lib.gmk 2024-03-15
16:01:46.850943608 +0100
-+++ jdk22u-jdk-22-36/make/modules/java.smartcardio/Lib.gmk 2024-03-15
16:01:55.957616058 +0100
-@@ -30,12 +30,12 @@
+--- a/make/modules/java.smartcardio/Lib.gmk
++++ b/make/modules/java.smartcardio/Lib.gmk
+@@ -30,12 +30,12 @@ include LibCommon.gmk
$(eval $(call SetupJdkLibrary, BUILD_LIBJ2PCSC, \
NAME := j2pcsc, \
CFLAGS := $(CFLAGS_JDKLIB), \
@@ -78,8 +78,8 @@
LIBS_windows := winscard.lib, \
))
---- jdk22u-jdk-22-36/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c
2024-03-15 16:01:47.044277064 +0100
-+++ jdk22u-jdk-22-36/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c
2024-03-15 16:01:55.957616058 +0100
+--- a/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c
++++ b/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c
@@ -36,6 +36,7 @@
#include "pcsc_md.h"
@@ -88,7 +88,7 @@
void *hModule;
FPTR_SCardEstablishContext scardEstablishContext;
FPTR_SCardConnect scardConnect;
-@@ -47,6 +48,7 @@
+@@ -47,6 +48,7 @@ FPTR_SCardListReaders scardListReaders;
FPTR_SCardBeginTransaction scardBeginTransaction;
FPTR_SCardEndTransaction scardEndTransaction;
FPTR_SCardControl scardControl;
@@ -96,7 +96,7 @@
/*
* Throws a Java Exception by name
-@@ -75,6 +77,7 @@
+@@ -75,6 +77,7 @@ static void throwIOException(JNIEnv *env, const char *msg)
throwByName(env, "java/io/IOException", msg);
}
@@ -104,7 +104,7 @@
static void *findFunction(JNIEnv *env, void *hModule, char *functionName) {
void *fAddress = dlsym(hModule, functionName);
if (fAddress == NULL) {
-@@ -85,9 +88,11 @@
+@@ -85,9 +88,11 @@ static void *findFunction(JNIEnv *env, void *hModule, char
*functionName) {
}
return fAddress;
}
@@ -116,14 +116,14 @@
const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
if (libName == NULL) {
throwNullPointerException(env, "PCSC library name is null");
-@@ -141,4 +146,5 @@
+@@ -141,4 +146,5 @@ JNIEXPORT void JNICALL
Java_sun_security_smartcardio_PlatformPCSC_initialize
#else
scardControl = (FPTR_SCardControl) findFunction(env,
hModule, "SCardControl132");
#endif // __APPLE__
+#endif
}
---- jdk22u-jdk-22-36/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h
2024-03-15 16:01:47.044277064 +0100
-+++ jdk22u-jdk-22-36/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h
2024-03-15 16:01:55.960949394 +0100
+--- a/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h
++++ b/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h
@@ -23,6 +23,8 @@
* questions.
*/
@@ -133,7 +133,7 @@
typedef LONG (*FPTR_SCardEstablishContext)(DWORD dwScope,
LPCVOID pvReserved1,
LPCVOID pvReserved2,
-@@ -111,3 +113,41 @@
+@@ -111,3 +113,41 @@ extern FPTR_SCardListReaders scardListReaders;
extern FPTR_SCardBeginTransaction scardBeginTransaction;
extern FPTR_SCardEndTransaction scardEndTransaction;
extern FPTR_SCardControl scardControl;
++++++ zero-ranges.patch ++++++
--- /var/tmp/diff_new_pack.Hy4jTs/_old 2024-04-18 22:14:53.670529351 +0200
+++ /var/tmp/diff_new_pack.Hy4jTs/_new 2024-04-18 22:14:53.670529351 +0200
@@ -1,6 +1,6 @@
--- a/src/hotspot/cpu/zero/globals_zero.hpp
+++ b/src/hotspot/cpu/zero/globals_zero.hpp
-@@ -52,9 +52,9 @@ define_pd_global(intx, InitArrayShortSize, 0);
+@@ -54,9 +54,9 @@ define_pd_global(intx, InitArrayShortSize, 0);
#define DEFAULT_STACK_SHADOW_PAGES (5 LP64_ONLY(+1) DEBUG_ONLY(+3))
#define DEFAULT_STACK_RESERVED_PAGES (0)
