From fa2658066ebeb56797764d38c9e5320d5f7ca276 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Thu, 8 Apr 2010 04:51:41 +0000 Subject: [PATCH] Update the test cert in the setup phase after sources have been extracted --- .cvsignore | 1 + nss.spec | 7 ++++++- sources | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3aad1a8..4036f62 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,4 @@ blank-key3.db blank-secmod.db blank-cert9.db blank-key4.db +PayPalEE.cert diff --git a/nss.spec b/nss.spec index 254bbf0..60faede 100644 --- a/nss.spec +++ b/nss.spec @@ -7,7 +7,7 @@ Summary: Network Security Services Name: nss Version: 3.12.6 -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -37,6 +37,7 @@ Source6: blank-cert9.db Source7: blank-key4.db Source8: system-pkcs11.txt Source9: setup-nsssysinit.sh +Source10: PayPalEE.cert Source12: %{name}-pem-20091210.tar.bz2 Patch2: nss-nolocalsql.patch @@ -105,6 +106,7 @@ low level services. %prep %setup -q +%{__cp} %{SOURCE10} -f ./mozilla/security/nss/tests/libpkix/certs %setup -q -T -D -n %{name}-%{version} -a 12 %patch2 -p0 -b .nolocalsql @@ -484,6 +486,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %changelog +* Wed Apr 07 2010 Elio Maldonado - 3.12.6-4 +- Update the test cert in the setup phase + * Wed Apr 07 2010 Elio Maldonado - 3.12.6-3 - Add sed to sysinit requires as setup-nsssysinit.sh requires it (#576071) - Update PayPalEE test cert with unexpired one (#580207) diff --git a/sources b/sources index 0f5bec7..b8f7b13 100644 --- a/sources +++ b/sources @@ -1,7 +1,8 @@ -087f5b7091d2d4364b9c1f62f0fa776c nss-3.12.6-stripped.tar.bz2 +3902499c8e02b02d4944f21d3c6a839f nss-3.12.6-stripped.tar.bz2 82c2c72c961f2783c8e975a42fa939cf nss-pem-20091210.tar.bz2 a5ae49867124ac75f029a9a33af31bad blank-cert8.db 9315689bbd9f28ceebd47894f99fccbd blank-key3.db 73bc040a0542bba387e6dd7fb9fd7d23 blank-secmod.db 691e663ccc07b7a1eaa6f088e03bf8e2 blank-cert9.db 2ec9e0606ba40fe65196545564b7cc2a blank-key4.db +9bbc62615e6b2b22547375b5d39ddfe7 PayPalEE.cert