522137db4f
Update release notes to actually reflect OpenJDK 18 Support JVM variant zero following JDK-8273494 no longer installing Zero's libjvm.so in the server directory Rebase FIPS patches from fips-18u branch Rebase RH1648249 nss.cfg patch so it applies after the FIPS patch Drop now unused fresh_libjvm, build_hotspot_first and bootjdk variables, as we don't build a JDK here Drop tzdata patches added for 17.0.7 which will eventually appear in the upstream tarball when we reach OpenJDK 21 Disable tzdata tests until we are on the latest JDK and things are back in sync Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch Add new slave jwebserver and corresponding manpage Add javaver- and origin-specific javadoc and javadoczip alternatives. Use empty nss.fips.cfg until it is again available via the FIPS patch Related: RHEL-45217
16 lines
958 B
Diff
16 lines
958 B
Diff
diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
|
index bacff32efbc..ff7b3dcc81c 100644
|
|
--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
|
+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
|
@@ -46,8 +46,8 @@ class PlatformPCSC {
|
|
|
|
private static final String PROP_NAME = "sun.security.smartcardio.library";
|
|
|
|
- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
|
- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
|
+ private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
|
|
+ private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
|
|
private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
|
|
|
PlatformPCSC() {
|