4.4.2

2 files changed, 58 insertions, 119 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ae3174b19b5..03ad86ed35d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,55 +1,29 @@
 pkgbase = jss
 	pkgdesc = Network Security Services for Java (JSS) is a Java interface to NSS
-	pkgver = 4.3.1
+	pkgver = 4.4.2
 	pkgrel = 1
 	url = https://developer.mozilla.org/En/JSS
 	arch = x86_64
 	arch = i686
 	license = GPL
-	makedepends = java-environment
+	makedepends = java-environment=7
 	depends = java-runtime
 	depends = nspr
 	depends = nss
-	source = https://ftp.mozilla.org/pub/mozilla.org/security/jss/releases/JSS_4_3_1_RTM/src/jss-4.3.1.tar.bz2
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/pull_coreconf
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ipv6.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-loadlibrary.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ocspSettings.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ECC_keygen_byCurveName.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-VerifyCertificate.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-bad-error-string-pointer.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-VerifyCertificateReturnCU.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ECC-HSM-FIPS.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-eliminate-native-compiler-warnings.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-eliminate-java-compiler-warnings.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-PKCS12-FIPS.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-eliminate-native-coverity-defects.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-PBE-PKCS5-V2-secure-P12.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-wrapInToken.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-HSM-manufacturerID.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ECC-Phase2KeyArchivalRecovery.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-undo-JCA-deprecations.patch
-	source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-undo-BadPaddingException-deprecation.patch
-	sha512sums = 4b15e81e433aa222fa98cf92d55604dab8385a4a06368f0adeb4bf3b30517462ed58093f92c9f35f9ffc7775eed7718958f4d530bb107356dd433af8737859d7
-	sha512sums = 736c62514333a039a8b5c2689bb0314b66bb82e22f256230c2bd8df395befa17787b708a5d2ac72a0a4dce427ebf883e8dba9abb8f321dab8efd5a77a352deb6
-	sha512sums = f14e7a07f77de48c447196b9d5c41515b88a6f987a0f66a06970e3f9eddf173a80a0d9b458eca69f61ee5edec2c4765681831f2dfa0a5771e4e22086a5212ae1
-	sha512sums = 0e8f2e7d644cf63aeaefb13df570d6843492600541a55fad8fef1a5a605db976259cae6fc2707f3ebabbb88e7b9c9789a5261bbe9bc5a0e3e5db84dbebced389
-	sha512sums = 3aaacb77f83db44d38da8368bdcc8dc46796c29c146d6b72fc46863c926fdfc378f219e9c8d235ac0e3637560a5f1fab3ec9b9e9ff061486ce7826ffcc840689
-	sha512sums = 68dba6bb5f38b44548bbe0c0f3d027cb4aa1c07f2ee5c4704c6c663a34f932251da7523824e5f59e99f11a0b789b0ae3404a036e31efd80158189bd4a03e298d
-	sha512sums = bb0c6e51573d44252811d9a100d77d2401a4e7775e57fc290b819d8358270cb0401198d731ba7e550968525f9e9a4ba1e2ebaac834116c09d39805b48fac5f7c
-	sha512sums = 952467fd90d3f63b7d366452506567fb58850744f172b0fb3b180ed0cf07f3968d6eec80de7bc90f8e255576a3d4d8ca7f0cc982b4e0ca042984df02ff579be6
-	sha512sums = a4c4f34c8f2c417afbfd6b474923b2a817c9b160d264da6b9a6ad8c993aee60eb2448e18f906094eda8eeae1df844adfd751e2cccd00a3fa626d6f73f978b8ca
-	sha512sums = 53f919e2ed5db9a1ecb6f1bbbde1f829d81a88f7a9747a167fb30359f86e9f60bc5f3b109e803c435cbb58f9c1c7337875da8f22cc5f063bae2a3b24266fc3d2
-	sha512sums = f3c9bafdcbd030dc7317d48e4b3ca17d86debdbb7236f823851ff5beb70f1ed3fb2adbcc3a448eb1c24552663febdf143644140f4955feecc80b61e612490661
-	sha512sums = d1ee98a29f2794688a91c870fcfc2265f9b5af21b7a7e54941c71946392d8a6ede1d757ed682af043a921474e308171ea88c91a93cbdec915b6812e3fda0e70c
-	sha512sums = ab3784b500b8a968aed1eb2002e4212ff8559650bf6bbc899f86160d711aad2ddf40241f957f599f348486465ed43fdc237bcff72e82306427d2ba0230bbcf3e
-	sha512sums = 65d7a239d36895b26f0e655989d6155d58c0266b2ee1b752f6b4e0a26d46614a64e61375e54c1ffc2301e786f92f2813a035384c3ae1cff0b560175ebd27a405
-	sha512sums = cc7345976cfd74b6364e6246e9a5acaa53c46d89ed8d1a63160894a5580c105fe796828454f2a691fc891385f49a20a6bebbfe9c3eeec3796fa94696f8958a9c
-	sha512sums = 8feac906f3c85a9f91509a246e045ec60d47efbbac548f3add9d0747ba46c0970014d0b9386eaf509821145db9721846635559817bd5ba6554936fdba6e52ca5
-	sha512sums = b28c55abb822ec96b681f7519148432c5cbcfecdd384ab0168897a8ce500f692d1ff40624ed537de2632b28825d9d3acf4fcb3637dae646bdb39886f2ff66aec
-	sha512sums = f14f4389f569efd39c3474c0c77530a6ea81377e882b6eaa7c4af04c2b8f34b2a1af06f6437691bf862878aa13364b8e5f92e02f959623e706076c9911a48fe6
-	sha512sums = d8e757784a3f7f38830f857f9ed3b2247271289b7afa9e532d56a960398e9fa11c579652181ee68533774ddabcb0facb35980536df2379a0f295d86e388a68e7
-	sha512sums = bbbf458f5536562b7bd24340b24be960d71cdf6720a19d1b0df25bacfb8e5c9a3ac19176820da86e77eeb5e53952c1c343f3e8d61956d5dc8a69cfa8e44b6ba2
+	source = http://pki.fedoraproject.org/pki/sources/jss/4.4.2/jss-4.4.2.tar.gz
+	source = http://pki.fedoraproject.org/pki/sources/jss/4.4.2/jss-HMAC-test-for-AES-encrypt-unwrap.patch
+	source = http://pki.fedoraproject.org/pki/sources/jss/4.4.2/jss-HMAC-unwrap-keywrap-FIPSMODE.patch
+	source = http://pki.fedoraproject.org/pki/sources/jss/4.4.2/jss-ObjectNotFoundException-message.patch
+	source = http://pki.fedoraproject.org/pki/sources/jss/4.4.2/jss-PBE-padded-block-cipher-enhancements.patch
+	source = http://pki.fedoraproject.org/pki/sources/jss/4.4.2/jss-SignatureAlgorithm.patch
+	source = http://pki.fedoraproject.org/pki/sources/jss/4.4.2/jss-fix-PK11Store-getEncryptedPrivateKeyInfo-segfault.patch
+	sha512sums = 71f76aef2905c374a0d87b25a73db2498562fe16cef1489c5859271d2ae264695dd2b00880539c35b21f4e0b19856abc5028b813fe05b33352304b538182b251
+	sha512sums = 31b59225baa57dd2c50cff027f654320dc0d77dc6c147654af1d693bd970bc8657a52f1981fff9172fd903abc800268101f3d1ee0a89fdd319a87e46ed9d1dc3
+	sha512sums = bc7a67d9fe9f6b7fb6a5b8e88941310cc744c01d5686217321220dce7cc3fcfca5d9842a8b86e4807d58684e5f24355b191b91e8755cb34612615c8a9a0cd7fb
+	sha512sums = 063e1cb7d541c59a6c77cfc36475fd292448e76b78473d5f9708b511399a13876644ebe07d4600eeecb01c23e784324523c17b3adff25f4a7f75120e79e926c7
+	sha512sums = 21a2dedb5e02cca376f7f7c327cc7a78a563786744702ee470e12f69025ab37a48f21536a095fd4670179a5634a4c787c6eb7fcf5742b9ed46b26286d3c06d9c
+	sha512sums = 66fb4d6bb34c40c6e0b604dd49da38d789ab54dc1711632341afcb1d56c2b8ff0158b7f63465e53d7eeba1dceeb78ae25bc65d23fb685db2669fd379b96b4512
+	sha512sums = 1759ff2b113bf6c23c207ac25323d66e00b415732a1c35fac6768d5497e9c80fc8750d42fd6bc711dab03e7f69b88d8cd42e3c4b31fc957cdafa90f7b8abc4c9
 
 pkgname = jss
 
diff --git a/PKGBUILD b/PKGBUILD
index 1dee730f9b4d..843fa6304b44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,83 +1,33 @@
-# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-# Original Maintainer: Yonathan Dossow <ydossow@archlinux.cl>
+# Maintainer: Jameson Pugh <imntreal@gmail.com>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 # Contributor: Yonathan Dossow <ydossow@archlinux.cl>
 
-# Many build commands are from Fedora
-
 pkgname=jss
-pkgver=4.3.1
+pkgver=4.4.2
 pkgrel=1
 pkgdesc="Network Security Services for Java (JSS) is a Java interface to NSS"
-arch=(x86_64 i686)
+arch=('x86_64' 'i686')
 url="https://developer.mozilla.org/En/JSS"
 license=(GPL)
-depends=(java-runtime nspr nss)
-makedepends=(java-environment)
-source=(#"ftp://ftp.mozilla.org/pub/mozilla.org/security/jss/releases/JSS_${pkgver//./_}_RTM/src/jss-${pkgver}.tar.bz2"
-        https://ftp.mozilla.org/pub/mozilla.org/security/jss/releases/JSS_${pkgver//./_}_RTM/src/jss-${pkgver}.tar.bz2
-        # Patches from Fedora refreshed for 4.3.1 by Ubuntu
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/pull_coreconf
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ipv6.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-loadlibrary.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ocspSettings.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ECC_keygen_byCurveName.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-VerifyCertificate.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-bad-error-string-pointer.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-VerifyCertificateReturnCU.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ECC-HSM-FIPS.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-eliminate-native-compiler-warnings.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-eliminate-java-compiler-warnings.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-PKCS12-FIPS.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-eliminate-native-coverity-defects.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-PBE-PKCS5-V2-secure-P12.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-wrapInToken.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-HSM-manufacturerID.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-ECC-Phase2KeyArchivalRecovery.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-undo-JCA-deprecations.patch
-        https://raw.githubusercontent.com/chenxiaolong/AUR-Files/caf78878d672c45118248bf94e581d21fb6254eb/jss/jss-undo-BadPaddingException-deprecation.patch)
-sha512sums=('4b15e81e433aa222fa98cf92d55604dab8385a4a06368f0adeb4bf3b30517462ed58093f92c9f35f9ffc7775eed7718958f4d530bb107356dd433af8737859d7'
-            '736c62514333a039a8b5c2689bb0314b66bb82e22f256230c2bd8df395befa17787b708a5d2ac72a0a4dce427ebf883e8dba9abb8f321dab8efd5a77a352deb6'
-            'f14e7a07f77de48c447196b9d5c41515b88a6f987a0f66a06970e3f9eddf173a80a0d9b458eca69f61ee5edec2c4765681831f2dfa0a5771e4e22086a5212ae1'
-            '0e8f2e7d644cf63aeaefb13df570d6843492600541a55fad8fef1a5a605db976259cae6fc2707f3ebabbb88e7b9c9789a5261bbe9bc5a0e3e5db84dbebced389'
-            '3aaacb77f83db44d38da8368bdcc8dc46796c29c146d6b72fc46863c926fdfc378f219e9c8d235ac0e3637560a5f1fab3ec9b9e9ff061486ce7826ffcc840689'
-            '68dba6bb5f38b44548bbe0c0f3d027cb4aa1c07f2ee5c4704c6c663a34f932251da7523824e5f59e99f11a0b789b0ae3404a036e31efd80158189bd4a03e298d'
-            'bb0c6e51573d44252811d9a100d77d2401a4e7775e57fc290b819d8358270cb0401198d731ba7e550968525f9e9a4ba1e2ebaac834116c09d39805b48fac5f7c'
-            '952467fd90d3f63b7d366452506567fb58850744f172b0fb3b180ed0cf07f3968d6eec80de7bc90f8e255576a3d4d8ca7f0cc982b4e0ca042984df02ff579be6'
-            'a4c4f34c8f2c417afbfd6b474923b2a817c9b160d264da6b9a6ad8c993aee60eb2448e18f906094eda8eeae1df844adfd751e2cccd00a3fa626d6f73f978b8ca'
-            '53f919e2ed5db9a1ecb6f1bbbde1f829d81a88f7a9747a167fb30359f86e9f60bc5f3b109e803c435cbb58f9c1c7337875da8f22cc5f063bae2a3b24266fc3d2'
-            'f3c9bafdcbd030dc7317d48e4b3ca17d86debdbb7236f823851ff5beb70f1ed3fb2adbcc3a448eb1c24552663febdf143644140f4955feecc80b61e612490661'
-            'd1ee98a29f2794688a91c870fcfc2265f9b5af21b7a7e54941c71946392d8a6ede1d757ed682af043a921474e308171ea88c91a93cbdec915b6812e3fda0e70c'
-            'ab3784b500b8a968aed1eb2002e4212ff8559650bf6bbc899f86160d711aad2ddf40241f957f599f348486465ed43fdc237bcff72e82306427d2ba0230bbcf3e'
-            '65d7a239d36895b26f0e655989d6155d58c0266b2ee1b752f6b4e0a26d46614a64e61375e54c1ffc2301e786f92f2813a035384c3ae1cff0b560175ebd27a405'
-            'cc7345976cfd74b6364e6246e9a5acaa53c46d89ed8d1a63160894a5580c105fe796828454f2a691fc891385f49a20a6bebbfe9c3eeec3796fa94696f8958a9c'
-            '8feac906f3c85a9f91509a246e045ec60d47efbbac548f3add9d0747ba46c0970014d0b9386eaf509821145db9721846635559817bd5ba6554936fdba6e52ca5'
-            'b28c55abb822ec96b681f7519148432c5cbcfecdd384ab0168897a8ce500f692d1ff40624ed537de2632b28825d9d3acf4fcb3637dae646bdb39886f2ff66aec'
-            'f14f4389f569efd39c3474c0c77530a6ea81377e882b6eaa7c4af04c2b8f34b2a1af06f6437691bf862878aa13364b8e5f92e02f959623e706076c9911a48fe6'
-            'd8e757784a3f7f38830f857f9ed3b2247271289b7afa9e532d56a960398e9fa11c579652181ee68533774ddabcb0facb35980536df2379a0f295d86e388a68e7'
-            'bbbf458f5536562b7bd24340b24be960d71cdf6720a19d1b0df25bacfb8e5c9a3ac19176820da86e77eeb5e53952c1c343f3e8d61956d5dc8a69cfa8e44b6ba2')
+depends=('java-runtime' 'nspr' 'nss')
+makedepends=('java-environment=7')
+source=("http://pki.fedoraproject.org/pki/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        "http://pki.fedoraproject.org/pki/sources/${pkgname}/${pkgver}/jss-HMAC-test-for-AES-encrypt-unwrap.patch"
+        "http://pki.fedoraproject.org/pki/sources/${pkgname}/${pkgver}/jss-HMAC-unwrap-keywrap-FIPSMODE.patch"
+        "http://pki.fedoraproject.org/pki/sources/${pkgname}/${pkgver}/jss-ObjectNotFoundException-message.patch"
+        "http://pki.fedoraproject.org/pki/sources/${pkgname}/${pkgver}/jss-PBE-padded-block-cipher-enhancements.patch"
+        "http://pki.fedoraproject.org/pki/sources/${pkgname}/${pkgver}/jss-SignatureAlgorithm.patch"
+	"http://pki.fedoraproject.org/pki/sources/${pkgname}/${pkgver}/jss-fix-PK11Store-getEncryptedPrivateKeyInfo-segfault.patch")
+sha512sums=('71f76aef2905c374a0d87b25a73db2498562fe16cef1489c5859271d2ae264695dd2b00880539c35b21f4e0b19856abc5028b813fe05b33352304b538182b251'
+            '31b59225baa57dd2c50cff027f654320dc0d77dc6c147654af1d693bd970bc8657a52f1981fff9172fd903abc800268101f3d1ee0a89fdd319a87e46ed9d1dc3'
+            'bc7a67d9fe9f6b7fb6a5b8e88941310cc744c01d5686217321220dce7cc3fcfca5d9842a8b86e4807d58684e5f24355b191b91e8755cb34612615c8a9a0cd7fb'
+            '063e1cb7d541c59a6c77cfc36475fd292448e76b78473d5f9708b511399a13876644ebe07d4600eeecb01c23e784324523c17b3adff25f4a7f75120e79e926c7'
+            '21a2dedb5e02cca376f7f7c327cc7a78a563786744702ee470e12f69025ab37a48f21536a095fd4670179a5634a4c787c6eb7fcf5742b9ed46b26286d3c06d9c'
+            '66fb4d6bb34c40c6e0b604dd49da38d789ab54dc1711632341afcb1d56c2b8ff0158b7f63465e53d7eeba1dceeb78ae25bc65d23fb685db2669fd379b96b4512'
+            '1759ff2b113bf6c23c207ac25323d66e00b415732a1c35fac6768d5497e9c80fc8750d42fd6bc711dab03e7f69b88d8cd42e3c4b31fc957cdafa90f7b8abc4c9')
 
 build() {
-  cd mozilla
-
-  patch -p1 -i ../pull_coreconf
-  patch -p1 -i ../jss-ipv6.patch
-  patch -p1 -i ../jss-loadlibrary.patch
-  patch -p1 -i ../jss-ocspSettings.patch
-  patch -p1 -i ../jss-ECC_keygen_byCurveName.patch
-  patch -p1 -i ../jss-VerifyCertificate.patch
-  patch -p1 -i ../jss-bad-error-string-pointer.patch
-  patch -p1 -i ../jss-VerifyCertificateReturnCU.patch
-  patch -p1 -i ../jss-ECC-HSM-FIPS.patch
-  patch -p1 -i ../jss-eliminate-native-compiler-warnings.patch
-  patch -p1 -i ../jss-eliminate-java-compiler-warnings.patch
-  patch -p1 -i ../jss-PKCS12-FIPS.patch
-  patch -p1 -i ../jss-eliminate-native-coverity-defects.patch
-  patch -p1 -i ../jss-PBE-PKCS5-V2-secure-P12.patch
-  patch -p1 -i ../jss-wrapInToken.patch
-  patch -p1 -i ../jss-HSM-manufacturerID.patch
-  patch -p1 -i ../jss-ECC-Phase2KeyArchivalRecovery.patch
-  patch -p1 -i ../jss-undo-JCA-deprecations.patch
-  patch -p1 -i ../jss-undo-BadPaddingException-deprecation.patch
+  cd "${srcdir}/${pkgname}-${pkgver}/jss"
 
   # Enable compiler optimizations and disable debugging code
   export BUILD_OPT=1
@@ -85,11 +35,17 @@ build() {
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
+  export USE_INSTALLED_NSPR=1
   export NSPR_INCLUDE_DIR=$(pkg-config --cflags-only-I nspr | sed 's/-I//')
-  export NSPR_LIB_DIR=$(pkg-config --libs-only-L nspr | sed 's/-L//')
+  #export NSPR_LIB_DIR=$(pkg-config --libs-only-L nspr | sed 's/-L//')
+  export NSPR_LIB_DIR=/usr/lib
 
+  export USE_INSTALLED_NSS=1
   export NSS_INCLUDE_DIR=$(pkg-config --cflags-only-I nss | sed 's/-I//')
-  export NSS_LIB_DIR=$(pkg-config --libs-only-L nss | sed 's/-L//')
+  #export NSS_LIB_DIR=$(pkg-config --libs-only-L nss | sed 's/-L//')
+  export NSS_LIB_DIR=/usr/lib
+
+  export XCFLAGS="-g"
 
   if [[ -z "${JAVA_HOME}" ]]; then
     export JAVA_HOME=/usr/lib/jvm/default
@@ -99,14 +55,23 @@ build() {
     export USE_64=1
   fi
 
+  msg2 "Fedora patches..."
+
+  patch -p1 -i ../../jss-HMAC-test-for-AES-encrypt-unwrap.patch
+  patch -p1 -i ../../jss-PBE-padded-block-cipher-enhancements.patch
+  patch -p1 -i ../../jss-fix-PK11Store-getEncryptedPrivateKeyInfo-segfault.patch
+  patch -p1 -i ../../jss-HMAC-unwrap-keywrap-FIPSMODE.patch
+  patch -p1 -i ../../jss-SignatureAlgorithm.patch
+  patch -p1 -i ../../jss-ObjectNotFoundException-message.patch
+
   # Parallel make is not supported
-  make -j1 -C security/coreconf
-  make -j1 -C security/jss
-  make -j1 -C security/jss javadoc
+  make -j1 -C coreconf
+  make -j1 -C .
+  make -j1 -C . javadoc
 }
 
 package() {
-  cd "mozilla"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   install -dm755 "${pkgdir}/usr/lib/java/"
   install -m644 dist/xpclass.jar "${pkgdir}/usr/lib/java/jss4.jar"