Remove patch preventing building

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

.gitignore

@@ -23,3 +23,12 @@ jss-4.2.6.tar.gz
 /jss-4.5.3.tar.gz
 /jss-4.6.1.tar.gz
 /jss-4.6.2.tar.gz
+/jss-4.6.3.tar.gz
+/jss-4.6.4.tar.gz
+/jss-4.7.0-b2.tar.gz
+/jss-4.7.0-b4.tar.gz
+/jss-4.7.0.tar.gz
+/jss-4.7.2.tar.gz
+/jss-4.7.3.tar.gz
+/jss-4.8.0.tar.gz
+/jss-4.8.1.tar.gz

0001-Fix-NativeProxy-reference-tracker.patch

@@ -1,53 +0,0 @@
-From 91514ca0a2979ba778d27220ced0cd312e2cd2d2 Mon Sep 17 00:00:00 2001
-From: Alexander Scheel <ascheel@redhat.com>
-Date: Tue, 29 Oct 2019 10:43:56 -0400
-Subject: [PATCH] Fix NativeProxy reference tracker
-
-In eb5df01003d74b57473eacb84e538d31f5bb06ca, I introduced a bug by
-setting mPointer after trying to add NativeProxy to the registry. In
-most instances this won't matter, however, if another instance exists in
-the HashSet with the same hash value, the equals comparator will be
-used, triggering a NPE.
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
----
- org/mozilla/jss/util/NativeProxy.java | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/org/mozilla/jss/util/NativeProxy.java b/org/mozilla/jss/util/NativeProxy.java
-index 1c6d1aa5..a0811f76 100644
---- a/org/mozilla/jss/util/NativeProxy.java
-+++ b/org/mozilla/jss/util/NativeProxy.java
-@@ -40,8 +40,8 @@ public abstract class NativeProxy implements AutoCloseable
-      */
-     public NativeProxy(byte[] pointer) {
- 		assert(pointer!=null);
--        registry.add(this);
-         mPointer = pointer;
-+        registry.add(this);
- 
-         if (saveStacktraces) {
-             mTrace = Arrays.toString(Thread.currentThread().getStackTrace());
-@@ -61,15 +61,12 @@ public abstract class NativeProxy implements AutoCloseable
-         if( ! (obj instanceof NativeProxy) ) {
-             return false;
-         }
--        if( ((NativeProxy)obj).mPointer.length != mPointer.length) {
-+        if (((NativeProxy)obj).mPointer == null) {
-+            /* If mPointer is null, we have no way to compare the values
-+             * of the pointers, so assume they're unequal. */
-             return false;
-         }
--        for(int i=0; i < mPointer.length; i++) {
--            if(mPointer[i] != ((NativeProxy)obj).mPointer[i]) {
--                return false;
--            }
--        }
--        return true;
-+        return Arrays.equals(((NativeProxy)obj).mPointer, mPointer);
-     }
- 
-     /**
--- 
-2.21.0
-

jss.spec

@@ -6,9 +6,9 @@ Summary:        Java Security Services (JSS)
 URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
-Version:        4.6.2
-Release:        3%{?_timestamp}%{?_commit_id}%{?dist}
-# global         _phase -a1
+Version:        4.8.1
+Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
+#global         _phase -a1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -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
-Patch: 0001-Fix-NativeProxy-reference-tracker.patch
 
 ################################################################################
 # Build Dependencies
@@ -34,12 +33,14 @@ Patch: 0001-Fix-NativeProxy-reference-tracker.patch
 # autosetup
 BuildRequires:  git
 BuildRequires:  make
-BuildRequires:  cmake
+BuildRequires:  cmake >= 3.14
+BuildRequires:  zip
+BuildRequires:  unzip
 
 BuildRequires:  gcc-c++
 BuildRequires:  nspr-devel >= 4.13.1
-BuildRequires:  nss-devel >= 3.30
-BuildRequires:  nss-tools >= 3.30
+BuildRequires:  nss-devel >= 3.44
+BuildRequires:  nss-tools >= 3.44
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  slf4j
@@ -49,12 +50,11 @@ BuildRequires:  glassfish-jaxb-api
 %else
 BuildRequires:  slf4j-jdk14
 %endif
-BuildRequires:  apache-commons-lang
-BuildRequires:  apache-commons-codec
+BuildRequires:  apache-commons-lang3
 
 BuildRequires:  junit
 
-Requires:       nss >= 3.30
+Requires:       nss >= 3.44
 Requires:       java-headless
 Requires:       jpackage-utils
 Requires:       slf4j
@@ -64,13 +64,12 @@ Requires:       glassfish-jaxb-api
 %else
 Requires:       slf4j-jdk14
 %endif
-Requires:       apache-commons-lang
-Requires:       apache-commons-codec
+Requires:       apache-commons-lang3
 
 Conflicts:      ldapjdk < 4.20
 Conflicts:      idm-console-framework < 1.2
-Conflicts:      tomcatjss < 7.3.4
-Conflicts:      pki-base < 10.6.5
+Conflicts:      tomcatjss < 7.6.0
+Conflicts:      pki-base < 10.10.0
 
 %description
 Java Security Services (JSS) is a java native interface which provides a bridge
@@ -110,14 +109,14 @@ export CFLAGS
 modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1
 
 # The Makefile is not thread-safe
-rm -rf build && mkdir -p build && cd build
 %cmake \
     -DJAVA_HOME=%{java_home} \
     -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-    ..
+    -B %{_vpath_builddir}
 
+cd %{_vpath_builddir}
 %{__make} all
-%{__make} javadoc || true
+%{__make} javadoc
 ctest --output-on-failure
 
 ################################################################################
@@ -127,19 +126,19 @@ ctest --output-on-failure
 
 # jars
 install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
-install -m 644 build/jss4.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
+install -m 644 %{_vpath_builddir}/jss4.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
 
 # We have to use the name libjss4.so because this is dynamically
 # loaded by the jar file.
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/jss
-install -m 0755 build/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
+install -m 0755 %{_vpath_builddir}/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
 pushd  ${RPM_BUILD_ROOT}%{_libdir}/jss
     ln -fs %{_jnidir}/jss4.jar jss4.jar
 popd
 
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp %{_vpath_builddir}/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
@@ -148,7 +147,8 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 %files
 
 %defattr(-,root,root,-)
-%doc jss.html MPL-1.1.txt gpl.txt lgpl.txt
+%doc jss.html
+%license MPL-1.1.txt gpl.txt lgpl.txt
 %{_libdir}/*
 %{_jnidir}/*
 
@@ -160,6 +160,42 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 ################################################################################
 %changelog
+* Thu Jan 14 2021 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.1-1
+- Rebase to upstream stable JSS v4.8.1
+
+* Thu Nov 05 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.0-2
+- Add Conflicts on older PKI versions due to missing ACL3
+
+* Wed Oct 21 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.0-1
+- Rebase to upstream stable release JSS v4.8.0
+
+* Fri Sep 11 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.3-1
+- Rebase to upstream stable release JSS v4.7.3
+
+* Tue Aug 18 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.2-1
+- Rebase to upstream stable release JSS v4.7.2 ; fixes FTBFS
+
+* Thu Jul 09 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-1
+- Rebase to upstream stable release JSS v4.7.0
+
+* Tue Jun 30 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-0.4
+- Rebase to latest upstream JSS v4.7.0-b4
+
+* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-0.2
+- Rebase to latest upstream JSS 4.7.0
+- JSS Provided SSLEngine
+
+* Mon Apr 27 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.4-1
+- Rebase to JSS 4.6.4
+- Fixes memory leak present since v4.6.2
+
+* Thu Mar 5 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.3-1
+- Rebase to JSS 4.6.3
+- Fixes base64 encoding of CSRs
+
+* Wed Mar 04 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.2-4
+- Fix for PBE errors
+
 * Tue Jan 28 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.2-3
 - Rebuild with new NSS to fix rhbz#1794814
 

sources

@@ -1 +1 @@
-SHA512 (jss-4.6.2.tar.gz) = 53c12822b980f6dcaf5616366834fe4eaee07d84feae53096aa0ea142146e90d375910456d8192068cde5e63c3b60ded87862af50ea89c6b64224e8c105e00dd
+SHA512 (jss-4.8.1.tar.gz) = d18ef995cba627de68077bbd8dc25640b6444c4674e29ec83a05296ac1f18289e1ada35229baafbf5c5e4f1ae712a46e48d9d6dcead935e0f4d3d72b5208cf40