From dca01dcb645fc7af25842d3bd32b669de8863173 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 21 2021 06:24:11 +0000
Subject: import jss-4.8.1-1.module+el8.4.0+9456+88377f87


---

diff --git a/.gitignore b/.gitignore
index 65f18ab..799ca53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/jss-4.8.0.tar.gz
+SOURCES/jss-4.8.1.tar.gz
diff --git a/.jss.metadata b/.jss.metadata
index 54dcef4..d3c9489 100644
--- a/.jss.metadata
+++ b/.jss.metadata
@@ -1 +1 @@
-699bb5ba93dada5e513212dedbf456371448eca8 SOURCES/jss-4.8.0.tar.gz
+5bf724d866e8fd7e577ffdecb06dbb679b113ce3 SOURCES/jss-4.8.1.tar.gz
diff --git a/SOURCES/0001-Only-check-PKCS11Constants-on-beta-builds.patch b/SOURCES/0001-Only-check-PKCS11Constants-on-beta-builds.patch
deleted file mode 100644
index 5a99e54..0000000
--- a/SOURCES/0001-Only-check-PKCS11Constants-on-beta-builds.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From eb6086840f5c79ba2ff5b1ccac3fe78ad2482e06 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Thu, 5 Nov 2020 11:07:13 -0500
-Subject: [PATCH] Only check PKCS11Constants on beta builds
-
-Recent errors with PKCS11Constants have shown that we shouldn't be
-running these tests on release builds for backports: only for
-pre-release content. Only run them when the beta bit is set.
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
----
- cmake/JSSTests.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/JSSTests.cmake b/cmake/JSSTests.cmake
-index a0fe36e2..7384bdc0 100644
---- a/cmake/JSSTests.cmake
-+++ b/cmake/JSSTests.cmake
-@@ -112,7 +112,7 @@ macro(jss_tests)
-         COMMAND "org.mozilla.jss.tests.TestGlobalReference"
-         MODE "NONE"
-     )
--    if ((${Java_VERSION_MAJOR} EQUAL 1) AND (${Java_VERSION_MINOR} LESS 9))
-+    if ((${Java_VERSION_MAJOR} EQUAL 1) AND (${Java_VERSION_MINOR} LESS 9) AND (${JSS_VERSION_BETA} EQUAL 1))
-         jss_test_java(
-             NAME "Test_PKCS11Constants.java_for_Sun_compatibility"
-             COMMAND "org.mozilla.jss.tests.TestPKCS11Constants"
--- 
-2.25.4
-
diff --git a/SPECS/jss.spec b/SPECS/jss.spec
index 41121cf..646b509 100644
--- a/SPECS/jss.spec
+++ b/SPECS/jss.spec
@@ -6,8 +6,8 @@ Summary:        Java Security Services (JSS)
 URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
-Version:        4.8.0
-Release:        2%{?_timestamp}%{?_commit_id}%{?dist}
+Version:        4.8.1
+Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
 #global         _phase -a1
 
 # To generate the source tarball:
@@ -26,8 +26,6 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 #     > jss-VERSION-RELEASE.patch
 # Patch: jss-VERSION-RELEASE.patch
 
-Patch: 0001-Only-check-PKCS11Constants-on-beta-builds.patch
-
 ################################################################################
 # Build Dependencies
 ################################################################################
@@ -35,7 +33,7 @@ Patch: 0001-Only-check-PKCS11Constants-on-beta-builds.patch
 # autosetup
 BuildRequires:  git
 BuildRequires:  make
-BuildRequires:  cmake
+BuildRequires:  cmake >= 3.14
 BuildRequires:  zip
 BuildRequires:  unzip
 
@@ -162,6 +160,11 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 ################################################################################
 %changelog
+* Thu Jan 14 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.8.1-1
+- Rebase to upstream JSS v4.8.1
+- Red Hat Bugilla #1908541 - jss broke SCEP - missing PasswordChallenge class
+- Red Hat Bugilla #1489256 - [RFE] jss should support RSA with OAEP padding
+
 * Wed Nov 18 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.8.0-2
 - Only check PKCS11Constants on beta builds
 - Bump tomcatjss, pki-core conflicts due to lang3