diff --git a/nss-moz-1151037.patch b/nss-moz-1151037.patch deleted file mode 100644 index 8910d91..0000000 --- a/nss-moz-1151037.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/tests/chains/scenarios/realcerts.cfg b/tests/chains/scenarios/realcerts.cfg ---- a/tests/chains/scenarios/realcerts.cfg -+++ b/tests/chains/scenarios/realcerts.cfg -@@ -16,14 +16,14 @@ import BrAirWaysBadSig:x: - - verify TestUser50:x - result pass - - verify TestUser51:x - result pass - - verify PayPalEE:x -- policy OID.2.16.840.1.113733.1.7.23.6 -+ policy OID.2.16.840.1.114412.1.1 - result pass - - verify BrAirWaysBadSig:x - result fail - -diff --git a/tests/libpkix/vfychain_test.lst b/tests/libpkix/vfychain_test.lst ---- a/tests/libpkix/vfychain_test.lst -+++ b/tests/libpkix/vfychain_test.lst -@@ -1,4 +1,4 @@ - # Status | Leaf Cert | Policies | Others(undef) - 0 TestUser50 undef - 0 TestUser51 undef --0 PayPalEE OID.2.16.840.1.113733.1.7.23.6 -+0 PayPalEE OID.2.16.840.1.114412.1.1 - diff --git a/nss.spec b/nss.spec index 6e0e852..59c2ece 100644 --- a/nss.spec +++ b/nss.spec @@ -1,6 +1,6 @@ %global nspr_version 4.10.8 -%global nss_util_version 3.18.0 -%global nss_softokn_version 3.18.0 +%global nss_util_version 3.19.0 +%global nss_softokn_version 3.19.0 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv" @@ -18,7 +18,9 @@ Summary: Network Security Services Name: nss -Version: 3.18.0 +Version: 3.19.0 +# for Rawhide, please always use release >= 2 +# for Fedora release branches, please use release < 2 (1.0, 1.1, ...) Release: 2%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ @@ -56,13 +58,7 @@ Source6: blank-cert9.db Source7: blank-key4.db Source8: system-pkcs11.txt Source9: setup-nsssysinit.sh -Source10: PayPalEE.cert Source12: %{name}-pem-20140125.tar.bz2 -Source13: PayPalICA.cert -Source14: PayPalRootCA.cert -Source17: TestCA.ca.cert -Source18: TestUser50.cert -Source19: TestUser51.cert Source20: nss-config.xml Source21: setup-nsssysinit.xml Source22: pkcs11.txt.xml @@ -95,7 +91,6 @@ Patch50: iquote.patch Patch52: disableSSL2libssl.patch Patch53: disableSSL2tests.patch # fix upstream bug 1151037, until we rebase to 3.19 -Patch60: nss-moz-1151037.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -166,12 +161,6 @@ low level services. %prep %setup -q -%{__cp} %{SOURCE10} -f ./nss/tests/libpkix/certs -%{__cp} %{SOURCE13} -f ./nss/tests/libpkix/certs -%{__cp} %{SOURCE14} -f ./nss/tests/libpkix/certs -%{__cp} %{SOURCE17} -f ./nss/tests/libpkix/certs -%{__cp} %{SOURCE18} -f ./nss/tests/libpkix/certs -%{__cp} %{SOURCE19} -f ./nss/tests/libpkix/certs %setup -q -T -D -n %{name}-%{version} -a 12 %patch2 -p0 -b .relro @@ -187,7 +176,6 @@ low level services. pushd nss %patch52 -p1 -b .disableSSL2libssl %patch53 -p1 -b .disableSSL2tests -%patch60 -p1 -b .testcert-1151037 popd ######################################################### @@ -795,6 +783,9 @@ fi %changelog +* Tue May 19 2015 Kai Engert - 3.19.0-2 +- Update to NSS 3.19 + * Fri May 15 2015 Kai Engert - 3.18.0-2 - Replace expired test certificates, upstream bug 1151037