Update to NSS 3.36.1

This commit is contained in:
Daiki Ueno 2018-04-13 17:39:57 +02:00
parent a141d8c1c5
commit 7ac2515ded
4 changed files with 14 additions and 21 deletions

1
.gitignore vendored
View File

@ -25,3 +25,4 @@ TestUser51.cert
/nss-3.34.0.tar.gz /nss-3.34.0.tar.gz
/nss-3.35.0.tar.gz /nss-3.35.0.tar.gz
/nss-3.36.0.tar.gz /nss-3.36.0.tar.gz
/nss-3.36.1.tar.gz

View File

@ -1,11 +0,0 @@
diff -up nss/tests/chains/scenarios/scenarios.noocsptest nss/tests/chains/scenarios/scenarios
--- nss/tests/chains/scenarios/scenarios.noocsptest 2013-06-27 10:58:08.000000000 -0700
+++ nss/tests/chains/scenarios/scenarios 2013-07-02 16:13:27.075038930 -0700
@@ -50,7 +50,6 @@ bridgewithpolicyextensionandmapping.cfg
realcerts.cfg
dsa.cfg
revoc.cfg
-ocsp.cfg
crldp.cfg
trustanchors.cfg
nameconstraints.cfg

View File

@ -1,12 +1,12 @@
%global nspr_version 4.19.0 %global nspr_version 4.19.0
%global nss_util_version 3.36.0 %global nss_util_version 3.36.1
%global nss_softokn_version 3.36.0 %global nss_softokn_version 3.36.1
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv" %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.36.0 Version: 3.36.1
# for Rawhide, please always use release >= 2 # for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...) # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 1.0%{?dist} Release: 1.0%{?dist}
@ -68,8 +68,6 @@ Patch2: add-relro-linker-option.patch
Patch3: renegotiate-transitional.patch Patch3: renegotiate-transitional.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723
Patch16: nss-539183.patch Patch16: nss-539183.patch
# TODO: Remove this patch when the ocsp test are fixed
Patch40: nss-3.14.0.0-disble-ocsp-test.patch
# Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator # Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
Patch47: utilwrap-include-templates.patch Patch47: utilwrap-include-templates.patch
# TODO remove when we switch to building nss without softoken # TODO remove when we switch to building nss without softoken
@ -166,7 +164,6 @@ low level services.
%patch2 -p0 -b .relro %patch2 -p0 -b .relro
%patch3 -p0 -b .transitional %patch3 -p0 -b .transitional
%patch16 -p0 -b .539183 %patch16 -p0 -b .539183
%patch40 -p0 -b .noocsptest
%patch47 -p0 -b .templates %patch47 -p0 -b .templates
%patch49 -p0 -b .skipthem %patch49 -p0 -b .skipthem
%patch50 -p0 -b .iquote %patch50 -p0 -b .iquote
@ -205,9 +202,6 @@ popd
%build %build
NSS_NO_PKCS11_BYPASS=1
export NSS_NO_PKCS11_BYPASS
FREEBL_NO_DEPEND=1 FREEBL_NO_DEPEND=1
export FREEBL_NO_DEPEND export FREEBL_NO_DEPEND
@ -225,6 +219,9 @@ export BUILD_OPT=1
XCFLAGS=$RPM_OPT_FLAGS XCFLAGS=$RPM_OPT_FLAGS
export XCFLAGS export XCFLAGS
LDFLAGS=$RPM_LD_FLAGS
export LDFLAGS
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@ -747,6 +744,12 @@ done
%changelog %changelog
* Wed Apr 11 2018 Daiki Ueno <dueno@redhat.com> - 3.36.1-2
- Update to NSS 3.36.1
- Remove nss-3.14.0.0-disble-ocsp-test.patch
- Fix partial injection of LDFLAGS
- Remove NSS_NO_PKCS11_BYPASS, which is no-op in upstream
* Fri Mar 9 2018 Daiki Ueno <dueno@redhat.com> - 3.36.0-1.0 * Fri Mar 9 2018 Daiki Ueno <dueno@redhat.com> - 3.36.0-1.0
- Update to NSS 3.36.0 - Update to NSS 3.36.0
- Add gcc-c++ to BuildRequires (C++ is needed for gtests) - Add gcc-c++ to BuildRequires (C++ is needed for gtests)

View File

@ -3,4 +3,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403
SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c
SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7 SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310 SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310
SHA512 (nss-3.36.0.tar.gz) = 02559b724d1665be495e52155242a154f9d18c985ff6c180db8ee99460ead12d6a4059f13a8a0b0b6864b643f2435b2e0b45de023c678a4514833f1795c4d6fe SHA512 (nss-3.36.1.tar.gz) = 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65