rpms
/
nss
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Selective merge fom f20 to pick up various fixes 

- Update pem sources to latest from nss-pem upstream
- Pick up pem fixes verified on RHEL and applied upstream
- Fix a problem where same files in two rpms created rpm conflict
- All man pages are listed by name so there shouldn't be wildcard inclusion
This commit is contained in:
Elio Maldonado 2014-02-02 15:50:44 -08:00
parent 4ff485b097
commit 6f605c6ce4
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,5 +7,5 @@ PayPalEE.cert
TestCA.ca.cert
TestUser50.cert
TestUser51.cert
/nss-pem-20131226.tar.bz2
/nss-pem-20140125.tar.bz2
/nss-3.15.4.tar.gz

20
nss.spec
View File

@ -19,7 +19,7 @@
Summary: Network Security Services
Name: nss
Version: 3.15.4
Release: 1%{?dist}
Release: 2%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@ -57,7 +57,7 @@ Source7: blank-key4.db
Source8: system-pkcs11.txt
Source9: setup-nsssysinit.sh
Source10: PayPalEE.cert
Source12: %{name}-pem-20131226.tar.bz2
Source12: %{name}-pem-20140125.tar.bz2
Source17: TestCA.ca.cert
Source18: TestUser50.cert
Source19: TestUser51.cert
@ -82,7 +82,6 @@ Patch25: nsspem-use-system-freebl.patch
Patch29: nss-ssl-cbc-random-iv-off-by-default.patch
# TODO: Remove this patch when the ocsp test are fixed
Patch40: nss-3.14.0.0-disble-ocsp-test.patch
Patch44: 0039-Sync-up-with-nss-3.15.4-changes-in-freebl-and-softok.patch
# Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
Patch47: utilwrap-include-templates.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=902171
@ -182,7 +181,6 @@ low level services.
# activate for stable branches
%patch29 -p0 -b .cbcrandomivoff
%patch40 -p0 -b .noocsptest
%patch44 -p3 -b .syncupwithupstream
%patch47 -p0 -b .templates
%patch48 -p0 -b .crypto
%patch49 -p0 -b .skipthem
@ -613,10 +611,12 @@ fi
%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
%attr(0644,root,root) %doc /usr/share/man/man5/*
%attr(0644,root,root) %doc /usr/share/man/man5/cert8.db.5.gz
%attr(0644,root,root) %doc /usr/share/man/man5/key3.db.5.gz
%attr(0644,root,root) %doc /usr/share/man/man5/secmod.db.5.gz
%attr(0644,root,root) %doc /usr/share/man/man5/cert9.db.5.gz
%attr(0644,root,root) %doc /usr/share/man/man5/key4.db.5.gz
%attr(0644,root,root) %doc /usr/share/man/man5/pkcs11.txt.5.gz
%files sysinit
%defattr(-,root,root)
@ -624,9 +624,6 @@ fi
%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
%attr(0644,root,root) %doc /usr/share/man/man5/cert9.db.5.gz
%attr(0644,root,root) %doc /usr/share/man/man5/key4.db.5.gz
%attr(0644,root,root) %doc /usr/share/man/man5/pkcs11.txt.5.gz
%{_bindir}/setup-nsssysinit.sh
# symbolic link to setup-nsssysinit.sh
%{_bindir}/setup-nsssysinit
@ -744,6 +741,13 @@ fi
%changelog
* Sun Feb 02 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.4-2
- Selective merge fom f20 to pick up various fixes
- Update pem sources to latest from nss-pem upstream
- Pick up pem fixes verified on RHEL and applied upstream
- Fix a problem where same files in two rpms created rpm conflict
- All man pages are listed by name so there shouldn't be wildcard inclusion
* Fri Jan 17 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.4-1
- Update to nss-3.15.4 (hg tag NSS_3_15_4_RTM)
- Resolves: Bug 1049229 - nss-3.15.4 is available

2
sources
View File

@ -7,5 +7,5 @@ a5ae49867124ac75f029a9a33af31bad blank-cert8.db
f998b70c1be25e8bb9f5fdb5d50eb6f2 TestCA.ca.cert
1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert
ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert
cb247307632f7673b32c71009ba7b660 nss-pem-20131226.tar.bz2
b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2
74738d89615665e3547dc2c0602ab0e6 nss-3.15.4.tar.gz