Rebase to upstream JSS v4.6.2

Fixes CVE-2019-14823

Signed-off-by: Alexander Scheel <ascheel@redhat.com>

.gitignore

@@ -22,3 +22,4 @@ jss-4.2.6.tar.gz
 /jss-4.5.2.tar.gz
 /jss-4.5.3.tar.gz
 /jss-4.6.1.tar.gz
+/jss-4.6.2.tar.gz

0001-Disable-buffer-based-tests.patch

@@ -1,78 +0,0 @@
-From ab1ba593ac9965607e60a16f3e5e75ba9ccfb505 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Thu, 8 Aug 2019 12:35:28 -0400
-Subject: [PATCH] Disable failing tests on special arches
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
----
- cmake/JSSTests.cmake | 40 ----------------------------------------
- 1 file changed, 40 deletions(-)
-
-diff --git a/cmake/JSSTests.cmake b/cmake/JSSTests.cmake
-index 9397f45d..ae6b0d22 100644
---- a/cmake/JSSTests.cmake
-+++ b/cmake/JSSTests.cmake
-@@ -78,19 +78,6 @@ macro(jss_tests)
-         NAME "BigObjectIdentifier"
-         COMMAND "org.mozilla.jss.tests.BigObjectIdentifier"
-     )
--    jss_test_java(
--        NAME "JSS_Test_PR_FileDesc"
--        COMMAND "org.mozilla.jss.tests.TestPRFD"
--    )
--    jss_test_java(
--        NAME "JSS_Test_Raw_SSL"
--        COMMAND "org.mozilla.jss.tests.TestRawSSL" "${RESULTS_NSSDB_OUTPUT_DIR}"
--        DEPENDS "Setup_DBs"
--    )
--    jss_test_java(
--        NAME "JSS_Test_Buffer"
--        COMMAND "org.mozilla.jss.tests.TestBuffer"
--    )
-     if ((${Java_VERSION_MAJOR} EQUAL 1) AND (${Java_VERSION_MINOR} LESS 9))
-         jss_test_java(
-             NAME "Test_PKCS11Constants.java_for_Sun_compatibility"
-@@ -121,16 +108,6 @@ macro(jss_tests)
-         NAME "JUnit_UTF8StringTest"
-         COMMAND "org.junit.runner.JUnitCore" "org.mozilla.jss.tests.UTF8StringTest"
-     )
--    jss_test_exec(
--        NAME "buffer_size_1"
--        COMMAND "${BIN_OUTPUT_DIR}/buffer_size_1"
--        DEPENDS "generate_c_buffer_size_1"
--    )
--    jss_test_exec(
--        NAME "buffer_size_4"
--        COMMAND "${BIN_OUTPUT_DIR}/buffer_size_4"
--        DEPENDS "generate_c_buffer_size_4"
--    )
-     jss_test_java(
-         NAME "JUnit_ChainSortingTest"
-         COMMAND "org.junit.runner.JUnitCore" "org.mozilla.jss.tests.ChainSortingTest"
-@@ -253,23 +230,6 @@ macro(jss_tests)
-             DEPENDS "Setup_DBs"
-         )
- 
--        # SSL Engine related tests
--        jss_test_exec(
--            NAME "TestBufferPRFD_RSA"
--            COMMAND "${BIN_OUTPUT_DIR}/TestBufferPRFD" "${RESULTS_NSSDB_OUTPUT_DIR}" "${DB_PWD}" "Server_RSA"
--            DEPENDS "List_CA_certs" "generate_c_TestBufferPRFD"
--        )
--        jss_test_exec(
--            NAME "TestBufferPRFD_ECDSA"
--            COMMAND "${BIN_OUTPUT_DIR}/TestBufferPRFD" "${RESULTS_NSSDB_OUTPUT_DIR}" "${DB_PWD}" "Server_ECDSA"
--            DEPENDS "List_CA_certs" "generate_c_TestBufferPRFD"
--        )
--        jss_test_java(
--            NAME "JSS_Test_BufferPRFD"
--            COMMAND "org.mozilla.jss.tests.TestBufferPRFD" "${RESULTS_NSSDB_OUTPUT_DIR}" "${DB_PWD}"
--            DEPENDS "List_CA_certs"
--        )
--
-         # FIPS-related tests
-         jss_test_java(
-             NAME "Enable_FipsMODE"
--- 
-2.21.0
-

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.6.1
-Release:        2%{?_timestamp}%{?_commit_id}%{?dist}
+Version:        4.6.2
+Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
 # global         _phase -a1
 
 # To generate the source tarball:
@@ -25,7 +25,6 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 #     <version tag> \
 #     > jss-VERSION-RELEASE.patch
 # Patch: jss-VERSION-RELEASE.patch
-Patch0: 0001-Disable-buffer-based-tests.patch
 
 ################################################################################
 # Build Dependencies
@@ -160,6 +159,10 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 ################################################################################
 %changelog
+* Tue Oct 15 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.2-1
+- Rebase to JSS 4.6.2
+- Fixes CVE-2019-14823
+
 * Thu Aug 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.1-2
 - Disable unnecessary tests to fix broken s390x
 

sources

@@ -1 +1 @@
-SHA512 (jss-4.6.1.tar.gz) = 7a7eb02e98a22d0817aec34cff32ac942545885c84992812d116b683fa31c12d0fb9b8aa3b8757ab234f9980993fb933d6556c959935cd5e09ca7468d8729c8a
+SHA512 (jss-4.6.2.tar.gz) = 53c12822b980f6dcaf5616366834fe4eaee07d84feae53096aa0ea142146e90d375910456d8192068cde5e63c3b60ded87862af50ea89c6b64224e8c105e00dd