From 7d99ce785209a62462c0389ae489c55e7fb35368 Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
Date: Tue, 4 Nov 2025 10:39:09 +0100
Subject: [PATCH] Rebase to 5.8.0

---
 .gitignore               |  1 +
 jss-5.4.2-nss-3.97.patch | 40 ----------------------------------------
 jss.spec                 |  9 ++++++---
 sources                  |  5 +----
 4 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 jss-5.4.2-nss-3.97.patch

diff --git a/.gitignore b/.gitignore
index 0bac5df..edcc16f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ jss-4.2.6.tar.gz
 /jss-5.8.0-beta1.tar.gz
 /jss-5.8.0-beta3.tar.gz
 /jss-5.8.0-beta4.tar.gz
+/jss-5.8.0.tar.gz
diff --git a/jss-5.4.2-nss-3.97.patch b/jss-5.4.2-nss-3.97.patch
deleted file mode 100644
index 8b9d64d..0000000
--- a/jss-5.4.2-nss-3.97.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 130d543f3a7c33196bef386b4ee87ccc4ed53d0b Mon Sep 17 00:00:00 2001
-From: "Endi S. Dewata" <edewata@redhat.com>
-Date: Wed, 7 Feb 2024 14:59:31 -0600
-Subject: [PATCH] Update kea_alg_defs to match NSS 3.97
-
-The kea_alg_defs array in SSLCipher.c has been updated to match
-the one defined in NSS 3.97. The assertion that compares the size
-of the array with ssl_kea_size has also been removed. These
-changes will allow JSS to work with the newer NSS 3.97 on Fedora
-Rawhide as well as the older NSS versions on other platforms.
-
-Resolves: https://github.com/dogtagpki/jss/issues/991
----
- native/src/main/native/org/mozilla/jss/ssl/SSLCipher.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/native/src/main/native/org/mozilla/jss/ssl/SSLCipher.c b/native/src/main/native/org/mozilla/jss/ssl/SSLCipher.c
-index 4f2dacb0b..ea739617a 100644
---- a/native/src/main/native/org/mozilla/jss/ssl/SSLCipher.c
-+++ b/native/src/main/native/org/mozilla/jss/ssl/SSLCipher.c
-@@ -23,7 +23,7 @@ static const CK_MECHANISM_TYPE auth_alg_defs[] = {
- };
- PR_STATIC_ASSERT(PR_ARRAY_SIZE(auth_alg_defs) == ssl_auth_size);
- 
--/* Copied from NSS's ssl3con.c. */
-+/* Copied from NSS 3.97's ssl3con.c. */
- static const CK_MECHANISM_TYPE kea_alg_defs[] = {
-     CKM_INVALID_MECHANISM, /* ssl_kea_null */
-     CKM_RSA_PKCS,          /* ssl_kea_rsa */
-@@ -33,8 +33,9 @@ static const CK_MECHANISM_TYPE kea_alg_defs[] = {
-     CKM_ECDH1_DERIVE,      /* ssl_kea_ecdh_psk */
-     CKM_DH_PKCS_DERIVE,    /* ssl_kea_dh_psk */
-     CKM_INVALID_MECHANISM, /* ssl_kea_tls13_any */
-+    CKM_INVALID_MECHANISM, /* ssl_kea_ecdh_hybrid */
-+    CKM_INVALID_MECHANISM, /* ssl_kea_ecdh_hybrid_psk */
- };
--PR_STATIC_ASSERT(PR_ARRAY_SIZE(kea_alg_defs) == ssl_kea_size);
- 
- #ifdef HAVE_NSS_CIPHER_SUITE_INFO_KDFHASH
- /* Not present in ssl3con.c. */
diff --git a/jss.spec b/jss.spec
index c9947c7..4768197 100644
--- a/jss.spec
+++ b/jss.spec
@@ -13,13 +13,13 @@ Name:           jss
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global         release_number 0.5
+%global         release_number 1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%global         phase beta4
+#global         phase
 
 %if 0%{?rhel} && 0%{?rhel} >= 10
 %global enable_nss_version_pqc_def_flag -DENABLE_NSS_VERSION_PQC_DEF=ON
@@ -314,7 +314,7 @@ touch %{_vpath_builddir}/.targets/finished_generate_javadocs
     --lib-dir=%{_libdir} \
     --sysconf-dir=%{_sysconfdir} \
     --share-dir=%{_datadir} \
-    --cmake=%{__cmake} \
+    --cmake="%{__cmake} %{?enable_nss_version_pqc_def_flag}" \
     --java-home=%{java_home} \
     --jni-dir=%{_jnidir} \
     --version=%{version} \
@@ -397,6 +397,9 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
+* Tue Nov 04 2025 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.8.0-1
+- Rebase to JSS 5.8.0-1
+
 * Mon Aug 11 2025 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.8.0-0.5.beta4
 - Rebuild for Fedora 43
 
diff --git a/sources b/sources
index fc75bdf..f69b2ec 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (jss-5.6.0-alpha1.tar.gz) = 239952d7b1fc9d005760e9234aec84a84a02becefffa525853e9cccd5cfc88e6e0d9d2ea2eea59f43e3b6d1686878081eae1e615ed68d759b3c5aef7397a5472
-SHA512 (jss-5.8.0-beta1.tar.gz) = 7890b416218260d215ae80082a05a6c59b3671603ed64afd3ed1e20da20577c34674f53622a075073c568003f3f8dcb05b7b447bd1e32d39292e5e613cbfe894
-SHA512 (jss-5.8.0-beta3.tar.gz) = 6647ff938d69e39d2ad5f9bb00e03f7fee25c37ba6e4d13700266bdc6c82770927e87ebe486b6bc3378c3368b25db70481ad9d63fd1dd6c9a76e7affd8a127e6
-SHA512 (jss-5.8.0-beta4.tar.gz) = cec7515c4496926303c3b1835d301174588298c8ef1c1cb2bc8fd95683833765d88de5b77af44e418fa953643d2a2d38cc2bd8888abadfc1bd1553e2b33c6268
+SHA512 (jss-5.8.0.tar.gz) = 10f5727d78f8b466062396e47c25b7fdac4b70c6862e6857f8aef49b633c43c4485c1d3cd535006ecd090e8dfe787000fb40d8748ed381c4ac4d1d39312e6c3d