4.6.2

3 files changed, 78 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c37064ab8b9..d772e2e73033 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = jss
-	pkgdesc = Network Security Services for Java (JSS) is a Java interface to NSS
-	pkgver = 4.6.0
+	pkgdesc = Java interface to NSS
+	pkgver = 4.6.2
 	pkgrel = 1
 	url = https://www.dogtagpki.org/wiki/JSS
 	arch = x86_64
-	arch = i686
 	license = GPL
 	makedepends = java-environment
 	makedepends = cmake
@@ -16,9 +15,12 @@ pkgbase = jss
 	depends = java-commons-lang
 	depends = jaxb-api
 	depends = junit
-	source = https://github.com/dogtagpki/jss/archive/v4.6.0.tar.gz
+	depends = zip
+	source = https://github.com/dogtagpki/jss/archive/v4.6.2.tar.gz
+	source = lang3.patch
 	source = paths.patch
-	sha512sums = 9568f783a75e7fa994ea2a0a85dee02000146b19fd4270dff844c6edbefe04f4ddc0886d6c19450b8d33a4595e67f8ab45a4e8f5194c383fc0ee5344243577c2
+	sha512sums = 53c12822b980f6dcaf5616366834fe4eaee07d84feae53096aa0ea142146e90d375910456d8192068cde5e63c3b60ded87862af50ea89c6b64224e8c105e00dd
+	sha512sums = 8542994a2fc908e8aef73556753cfd0b7afe92200987654a8290c7aa5aa7dd1dbca618859891f5c5f02147d950ef5f00a3cd2fe40ed2d1b37c0da982e9720ee6
 	sha512sums = 93a5ad83c590d82283fe83d08e9c9b2bb489b0b89361aed9eb86163d59cc74dd07b63905d36c11e3181f01377b270839ce68600fcec7f31d2ce59c780a181499
 
 pkgname = jss
diff --git a/PKGBUILD b/PKGBUILD
index 7c11cbf80d2c..e5a8db5dcb0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,26 @@
 # Contributor: Yonathan Dossow <ydossow@archlinux.cl>
 
 pkgname=jss
-pkgver=4.6.0
+pkgver=4.6.2
 pkgrel=1
-pkgdesc="Network Security Services for Java (JSS) is a Java interface to NSS"
-arch=('x86_64' 'i686')
+pkgdesc='Java interface to NSS'
+arch=('x86_64')
 url="https://www.dogtagpki.org/wiki/JSS"
 license=(GPL)
-depends=('java-runtime' 'nspr' 'nss' 'slf4j' 'java-commons-codec' 'java-commons-lang' 'jaxb-api' 'junit')
+depends=('java-runtime' 'nspr' 'nss' 'slf4j' 'java-commons-codec' 'java-commons-lang' 'jaxb-api' 'junit' 'zip')
 makedepends=('java-environment' 'cmake')
 source=("https://github.com/dogtagpki/jss/archive/v${pkgver}.tar.gz"
+        'lang3.patch'
         'paths.patch')
-sha512sums=('9568f783a75e7fa994ea2a0a85dee02000146b19fd4270dff844c6edbefe04f4ddc0886d6c19450b8d33a4595e67f8ab45a4e8f5194c383fc0ee5344243577c2'
+sha512sums=('53c12822b980f6dcaf5616366834fe4eaee07d84feae53096aa0ea142146e90d375910456d8192068cde5e63c3b60ded87862af50ea89c6b64224e8c105e00dd'
+            '8542994a2fc908e8aef73556753cfd0b7afe92200987654a8290c7aa5aa7dd1dbca618859891f5c5f02147d950ef5f00a3cd2fe40ed2d1b37c0da982e9720ee6'
             '93a5ad83c590d82283fe83d08e9c9b2bb489b0b89361aed9eb86163d59cc74dd07b63905d36c11e3181f01377b270839ce68600fcec7f31d2ce59c780a181499')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}/cmake"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < "../lang3.patch"
 
+  cd "${srcdir}/${pkgname}-${pkgver}/cmake"
   patch < "${srcdir}/paths.patch"
 }
 
diff --git a/lang3.patch b/lang3.patch
new file mode 100644
index 000000000000..b92137183e81
--- /dev/null
+++ b/lang3.patch
@@ -0,0 +1,61 @@
+diff -Naur jss-4.6.2-orig jss-4.6.2
+diff -Naur jss-4.6.2-orig/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java jss-4.6.2/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java
+--- jss-4.6.2-orig/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java	2020-02-11 09:12:00.240403878 -0500
++++ jss-4.6.2/org/mozilla/jss/netscape/security/pkcs/PKCS12Util.java	2020-02-11 09:12:44.051524409 -0500
+@@ -35,7 +35,7 @@
+ import java.util.ArrayList;
+ 
+ import org.apache.commons.codec.binary.Hex;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.mozilla.jss.CryptoManager;
+ import org.mozilla.jss.asn1.ANY;
+ import org.mozilla.jss.asn1.ASN1Value;
+diff -Naur jss-4.6.2-orig/org/mozilla/jss/netscape/security/util/Cert.java jss-4.6.2/org/mozilla/jss/netscape/security/util/Cert.java
+--- jss-4.6.2-orig/org/mozilla/jss/netscape/security/util/Cert.java	2020-02-11 09:12:00.240403878 -0500
++++ jss-4.6.2/org/mozilla/jss/netscape/security/util/Cert.java	2020-02-11 09:12:44.051524409 -0500
+@@ -28,7 +28,7 @@
+ import java.util.List;
+ import java.util.Map;
+ 
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+ import org.mozilla.jss.crypto.SignatureAlgorithm;
+ import org.mozilla.jss.netscape.security.pkcs.PKCS7;
+ import org.mozilla.jss.netscape.security.x509.X509CRLImpl;
+diff -Naur jss-4.6.2-orig/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java jss-4.6.2/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java
+--- jss-4.6.2-orig/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java	2020-02-11 09:12:00.250404134 -0500
++++ jss-4.6.2/org/mozilla/jss/netscape/security/x509/RevocationReasonAdapter.java	2020-02-11 09:12:44.051524409 -0500
+@@ -19,7 +19,7 @@
+ 
+ import javax.xml.bind.annotation.adapters.XmlAdapter;
+ 
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ 
+ /**
+  * The RevocationReasonAdapter class provides custom marshaling for RevocationReason.
+diff -Naur jss-4.6.2-orig/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java jss-4.6.2/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java
+--- jss-4.6.2-orig/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java	2020-02-11 09:12:00.260404387 -0500
++++ jss-4.6.2/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.java	2020-02-11 09:12:44.051524409 -0500
+@@ -24,7 +24,7 @@
+ import java.util.List;
+ import java.util.Set;
+ 
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.mozilla.jss.CryptoManager;
+ import org.mozilla.jss.NoSuchTokenException;
+ import org.mozilla.jss.NotInitializedException;
+diff -Naur jss-4.6.2-orig/org/mozilla/jss/tests/UTF8ConverterTest.java jss-4.6.2/org/mozilla/jss/tests/UTF8ConverterTest.java
+--- jss-4.6.2-orig/org/mozilla/jss/tests/UTF8ConverterTest.java	2020-02-11 09:12:00.270404646 -0500
++++ jss-4.6.2/org/mozilla/jss/tests/UTF8ConverterTest.java	2020-02-11 09:12:44.051524409 -0500
+@@ -6,7 +6,7 @@
+ import java.io.ByteArrayOutputStream;
+ import java.io.OutputStreamWriter;
+ 
+-import org.apache.commons.lang.RandomStringUtils;
++import org.apache.commons.lang3.RandomStringUtils;
+ import org.mozilla.jss.util.Assert;
+ import org.mozilla.jss.util.UTF8Converter;
+