Actually apply all the changes in the commit previous message.

Update pem source tar with fixes for 614532 and 596674
Remove patches that we no longer need
Tell rpm not to verify md5, size, and modtime of configurations file
This commit is contained in:
Elio Maldonado 2010-11-26 12:20:17 -08:00
parent e47aa30734
commit 3aff6cd3be
3 changed files with 15 additions and 16 deletions

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
nss-3.12.8-stripped.tar.bz2
nss-pem-20100809.tar.bz2
nss-pem-20101125.tar.bz2
blank-cert8.db
blank-key3.db
blank-secmod.db

View File

@ -6,7 +6,7 @@
Summary: Network Security Services
Name: nss
Version: 3.12.8
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,14 +37,11 @@ Source7: blank-key4.db
Source8: system-pkcs11.txt
Source9: setup-nsssysinit.sh
Source10: PayPalEE.cert
Source12: %{name}-pem-20100809.tar.bz2
Source12: %{name}-pem-20101125.tar.bz2
Patch3: renegotiate-transitional.patch
Patch6: nss-enable-pem.patch
Patch7: nsspem-596674.patch
Patch8: nss-sysinit-userdb-first.patch
Patch9: 0001-Add-support-for-PKCS-8-encoded-private-keys.patch
Patch10: 0001-Do-not-define-SEC_SkipTemplate.patch
%description
Network Security Services (NSS) is a set of libraries designed to
@ -115,10 +112,7 @@ low level services.
%patch3 -p0 -b .transitional
%patch6 -p0 -b .libpem
%patch7 -p0 -b .596674
%patch8 -p0 -b .603313
%patch9 -p1 -b .pkcs8privatekey
%patch10 -p1 -b .noskiptemplate
%build
@ -386,16 +380,16 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%{_libdir}/libnssckbi.so
%{_libdir}/libnsspem.so
%dir %{_sysconfdir}/pki/nssdb
%config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert8.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key3.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/secmod.db
%files sysinit
%defattr(-,root,root)
%{_libdir}/libnsssysinit.so
%config(noreplace) %{_sysconfdir}/pki/nssdb/cert9.db
%config(noreplace) %{_sysconfdir}/pki/nssdb/key4.db
%config(noreplace) %{_sysconfdir}/pki/nssdb/pkcs11.txt
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt
%{_bindir}/setup-nsssysinit.sh
%files tools
@ -490,6 +484,11 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%{_libdir}/libnssckfw.a
%changelog
* Thu Nov 25 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-4
- Update pem source tar with fixes for 614532 and 596674
- Remove patches which we no longer need
- Tell rpm not to verify md5, size, and modtime of configurations file
* Fri Nov 05 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-3
- Update test certificate which had expired

View File

@ -1,5 +1,5 @@
248bc97cb3fd613b23d66fd1d9d8d60a nss-3.12.8-stripped.tar.bz2
765fa031d5affa91ab824dd981777ddf nss-pem-20100809.tar.bz2
e63cddf74c07f0d818d1052ecc6fbb1f nss-pem-20101125.tar.bz2
a5ae49867124ac75f029a9a33af31bad blank-cert8.db
9315689bbd9f28ceebd47894f99fccbd blank-key3.db
73bc040a0542bba387e6dd7fb9fd7d23 blank-secmod.db