From 708f8165e7739c83e26cde1506c09b588c77dc31 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Sat, 29 Nov 2025 04:24:03 +0000
Subject: [PATCH] Portable build

---
 create-redhat-properties-files.bash | 12 +++++++-----
 java-25-openjdk-portable.specfile   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/create-redhat-properties-files.bash b/create-redhat-properties-files.bash
index 39c7ffc..60264f2 100644
--- a/create-redhat-properties-files.bash
+++ b/create-redhat-properties-files.bash
@@ -23,28 +23,30 @@
 #
 # Usage:
 #
-# bash create-redhat-properties-files.bash <target directory>
+# bash create-redhat-properties-files.bash <target directory> <nssadapter path>
 #
 # Example usage in spec file:
 #
-# bash -x create-redhat-properties-files.bash ${imagepath}/conf/security
+# bash -x create-redhat-properties-files.bash ${installdir}/conf/security \
+#     %{_libdir}/%{sdkdir -- ${suffix}}/libnssadapter.so
 #
 # When you make changes to the file set here, also update the %files
 # section in the spec file, and the JDK_PROPS_FILES_JDK_25 variables
 # in TestSecurityProperties.java.
 
-[[ $# == 1 ]] || exit 1
+[[ $# == 2 ]] || exit 1
 
 SECURITY="${1}"
+NSSADAPTER="${2}"
 VENDOR="${SECURITY}"/redhat
 install --directory --mode=755 "${VENDOR}"
 install --directory --mode=755 "${VENDOR}"/true
 install --directory --mode=755 "${VENDOR}"/false
 
 # /usr/lib/jvm/java-25-openjdk/conf/security/redhat/SunPKCS11-FIPS.cfg
-install --mode 644 /dev/stdin "${VENDOR}"/SunPKCS11-FIPS.cfg <<'EOF'
+install --mode 644 /dev/stdin "${VENDOR}"/SunPKCS11-FIPS.cfg <<EOF
 name = FIPS
-library = ${java.home}/lib/libnssadapter.so
+library = ${NSSADAPTER}
 slot = 3
 nssUseSecmod = false
 attributes(*,CKO_SECRET_KEY,*)={ CKA_SIGN=true CKA_ENCRYPT=true }
diff --git a/java-25-openjdk-portable.specfile b/java-25-openjdk-portable.specfile
index 05907ab..a5f24d4 100644
--- a/java-25-openjdk-portable.specfile
+++ b/java-25-openjdk-portable.specfile
@@ -1967,7 +1967,7 @@ done
 %endif
 
 %changelog
-* Thu Nov 27 2025 eabdullin <eabdullin@almalinux.org> - 1:25.0.1.0.8-1
+* Sat Nov 29 2025 eabdullin <eabdullin@almalinux.org> - 1:25.0.1.0.8-1
 - Portable build
 
 * Mon Nov 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-1