Update to nss-3.10.0

- Selective merge from master
- Filtering out disabling of SSL2 and export cipher suites for the time being
This commit is contained in:
Elio Maldonado 2015-03-23 07:35:54 -07:00
parent 5296e318d7
commit b65cae435d
3 changed files with 9 additions and 11 deletions

2
.gitignore vendored
View File

@ -8,4 +8,4 @@ TestCA.ca.cert
TestUser50.cert
TestUser51.cert
/nss-pem-20140125.tar.bz2
/nss-3.17.4.tar.gz
/nss-3.18.0.tar.gz

View File

@ -1,6 +1,6 @@
%global nspr_version 4.10.7
%global nss_util_version 3.17.4
%global nss_softokn_version 3.17.4
%global nspr_version 4.10.8
%global nss_util_version 3.18.0
%global nss_softokn_version 3.18.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,7 @@
Summary: Network Security Services
Name: nss
Version: 3.17.4
Version: 3.18.0
Release: 1%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
@ -90,8 +90,6 @@ Patch49: nss-skip-bltest-and-fipstest.patch
# headers are older. Such is the case when starting an update with API changes or even private export changes.
# Once the buildroot aha been bootstrapped the patch may be removed but it doesn't hurt to keep it.
Patch50: iquote.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
Patch51: tls12.patch
%description
Network Security Services (NSS) is a set of libraries designed to
@ -178,9 +176,6 @@ low level services.
%patch47 -p0 -b .templates
%patch49 -p0 -b .skipthem
%patch50 -p0 -b .iquote
pushd nss
%patch51 -p1 -b .994599
popd
#########################################################
# Higher-level libraries and test tools need access to
@ -781,6 +776,9 @@ fi
%changelog
* Mon Mar 23 2015 Elio Maldonado <emaldona@redhat.com> - 3.18.0-1
- Update to nss-3.18.0
* Wed Jan 28 2015 Elio Maldonado <emaldona@redhat.com> - 3.17.4-1
- Update to nss-3.17.4

View File

@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2 TestCA.ca.cert
1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert
ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert
b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2
a77df26072cabf8afb26911b6fa9b755 nss-3.17.4.tar.gz
a21659f999a3b27c2bc69a7d0bbba2cc nss-3.18.0.tar.gz