OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-17-openjdk?expand=0&rev=114

java-17-openjdk.spec

@@ -20,6 +20,7 @@
 %{!?arm6:%global arm6 armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl}
 %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm} s390x
 %global debug 0
+%global make make
 %global is_release 1
 %global buildoutputdir build
 # Convert an absolute path to a relative path.  Each symbolic link is
@@ -32,9 +33,8 @@
 # Standard JPackage naming and versioning defines.
 %global featurever      17
 %global interimver      0
-%global updatever       8
-%global patchver        1
-%global buildver        1
+%global updatever       9
+%global buildver        9
 %global openjdk_repo    jdk17u
 %global openjdk_tag     jdk-%{featurever}.%{interimver}.%{updatever}%{?patchver:.%{patchver}}+%{buildver}
 %global openjdk_dir     %{openjdk_repo}-jdk-%{featurever}.%{interimver}.%{updatever}%{?patchver:.%{patchver}}-%{buildver}
@@ -168,8 +168,8 @@ Patch13:        implicit-pointer-decl.patch
 # Use SOURCE_DATE_EPOCH in timestamp when writing properties
 Patch14:        reproducible-properties.patch
 Patch15:        system-pcsclite.patch
-Patch16:        fips.patch
-Patch17:        nss-security-provider.patch
+Patch16:        nss-security-provider.patch
+Patch17:        fips.patch
 #
 Patch20:        loadAssistiveTechnologies.patch
 #
@@ -287,9 +287,9 @@ Summary:        OpenJDK %{featurever} Runtime Environment
 Group:          Development/Languages/Java
 Requires:       jpackage-utils
 Requires:       mozilla-nss
-Requires(posttrans):java-ca-certificates
 # Post requires update-alternatives to install tool update-alternatives.
 Requires(post): update-alternatives
+Requires(posttrans):java-ca-certificates
 # Postun requires update-alternatives to uninstall tool update-alternatives.
 Requires(postun):update-alternatives
 Recommends:     tzdata-java8
@@ -464,7 +464,7 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE12} > nss.cfg
 
 # Setup nss.fips.cfg
 sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE13} > nss.fips.cfg
-sed -i -e "s:@NSS_SECMOD@:sql\:/etc/pki/nssdb:g" nss.fips.cfg
+sed -i -e "s:@NSS_SECMOD@:sql\:%{_sysconfdir}/pki/nssdb:g" nss.fips.cfg
 
 %build
 
@@ -521,7 +521,7 @@ bash ../configure \
 %endif
     --disable-warnings-as-errors
 
-make --no-print-directory \
+%{make} --no-print-directory \
     LOG=trace \
     %{imagestarget}
 

jdk-17.0.8.1+1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e57251d8306911282b6f0a2f721431dab5f87c99cce0930fc062e690f7c77f04
-size 105898260

jdk-17.0.9+9.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:836adb5fec5a58ce2f49a0faeaf9e69a3cb89865f4d855c6098f0264843672ad
+size 106413417

nss-security-provider.patch

@@ -1,10 +1,10 @@
---- 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
-@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
+--- a/src/java.base/share/conf/security/java.security
++++ b/src/java.base/share/conf/security/java.security
+@@ -81,6 +81,7 @@ security.provider.tbd=SunMSCAPI
  security.provider.tbd=Apple
  #endif
  security.provider.tbd=SunPKCS11
 +#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
  
  #
- # Security providers used when FIPS mode support is active
+ # A list of preferred providers for specific algorithms. These providers will