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

Update to NSS 3.32.0

This commit is contained in:
Daiki Ueno 2017-08-09 10:16:16 +02:00
parent 10a811eb16
commit b0d9716431
5 changed files with 24 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ TestUser51.cert
/nss-3.29.3.tar.gz /nss-3.29.3.tar.gz
/nss-3.30.2.tar.gz /nss-3.30.2.tar.gz
/nss-3.31.0.tar.gz /nss-3.31.0.tar.gz
/nss-3.32.0.tar.gz

36
nss-devslot-lock.patch
View File

@ -1,36 +0,0 @@
# HG changeset patch
# User Daiki Ueno <dueno@redhat.com>
# Date 1500370430 -7200
# Tue Jul 18 11:33:50 2017 +0200
# Branch wip/dueno/devslot-lock
# Node ID 421c812e3143b3f7e62825cb5749e5239412c56b
# Parent 4c1358d767de5da9a5f34afc2821b281fb37ca57
Avoid deadlock in nssSlot_IsTokenPresent
diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c
--- a/lib/dev/devslot.c
+++ b/lib/dev/devslot.c
@@ -226,15 +226,17 @@ nssSlot_GetToken(
NSSSlot *slot)
{
NSSToken *rvToken = NULL;
- nssSlot_EnterMonitor(slot);
- /* Even if a token should be present, check `slot->token` too as it
- * might be gone already. This would happen mostly on shutdown. */
- if (nssSlot_IsTokenPresent(slot) && slot->token) {
- rvToken = nssToken_AddRef(slot->token);
+ if (nssSlot_IsTokenPresent(slot)) {
+ /* Even if a token should be present, check `slot->token` too as it
+ * might be gone already. This would happen mostly on shutdown. */
+ nssSlot_EnterMonitor(slot);
+ if (slot->token) {
+ rvToken = nssToken_AddRef(slot->token);
+ }
+ nssSlot_ExitMonitor(slot);
}
- nssSlot_ExitMonitor(slot);
return rvToken;
}

20
nss-skip-util-gtest.patch
View File

@ -1,12 +1,10 @@
diff -up nss/gtests/manifest.mn.skip_util_gtest nss/gtests/manifest.mn diff -up nss/gtests/manifest.mn.skip_util_gtest nss/gtests/manifest.mn
--- nss/gtests/manifest.mn.skip_util_gtest 2017-06-21 17:40:39.997865113 +0200 --- nss/gtests/manifest.mn.skip_util_gtest 2017-08-08 12:45:57.598801125 +0200
+++ nss/gtests/manifest.mn 2017-06-21 17:40:52.554579498 +0200 +++ nss/gtests/manifest.mn 2017-08-08 12:46:59.682419852 +0200
@@ -10,8 +10,6 @@ DIRS = \ @@ -31,6 +31,5 @@ endif
common \
certdb_gtest \ DIRS = \
certhigh_gtest \ $(LIB_SRCDIRS) \
- der_gtest \ - $(UTIL_SRCDIRS) \
- util_gtest \ $(NSS_SRCDIRS) \
pk11_gtest \ $(NULL)
ssl_gtest \
nss_bogo_shim \

28
nss.spec
View File

@ -1,6 +1,6 @@
%global nspr_version 4.15.0 %global nspr_version 4.16.0
%global nss_util_version 3.31.0 %global nss_util_version 3.32.0
%global nss_softokn_version 3.31.0 %global nss_softokn_version 3.32.0
%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"
@ -18,10 +18,10 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.31.0 Version: 3.32.0
# 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.1%{?dist} Release: 1.0%{?dist}
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -43,7 +43,7 @@ BuildRequires: zlib-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: gawk BuildRequires: gawk
BuildRequires: psmisc BuildRequires: psmisc
BuildRequires: perl BuildRequires: perl-interpreter
# nss-pem used to be bundled with the nss package on Fedora -- make sure that # nss-pem used to be bundled with the nss package on Fedora -- make sure that
# programs relying on that continue to work until they are fixed to require # programs relying on that continue to work until they are fixed to require
@ -111,9 +111,6 @@ Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1279520 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1279520
Patch59: nss-check-policy-file.patch Patch59: nss-check-policy-file.patch
Patch62: nss-skip-util-gtest.patch Patch62: nss-skip-util-gtest.patch
Patch66: nss-gtests-split.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1381784
Patch67: nss-devslot-lock.patch
%description %description
Network Security Services (NSS) is a set of libraries designed to Network Security Services (NSS) is a set of libraries designed to
@ -197,8 +194,6 @@ low level services.
pushd nss pushd nss
%patch59 -p1 -b .check_policy_file %patch59 -p1 -b .check_policy_file
%patch62 -p1 -b .skip_util_gtest %patch62 -p1 -b .skip_util_gtest
%patch66 -p1 -b .gtests-split
%patch67 -p1 -b .devslot-lock
popd popd
######################################################### #########################################################
@ -558,13 +553,13 @@ do
done done
# Copy the binaries we want # Copy the binaries we want
for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap for file in certutil cmsutil crlutil modutil pk12util signver ssltap
do do
%{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir} %{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
done done
# Copy the binaries we ship as unsupported # Copy the binaries we ship as unsupported
for file in atob btoa derdump listsuites ocspclnt pp selfserv strsclnt symkeyutil tstclnt vfyserv vfychain for file in atob btoa derdump listsuites ocspclnt pp selfserv signtool strsclnt symkeyutil tstclnt vfyserv vfychain
do do
%{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory} %{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done done
@ -690,7 +685,6 @@ fi
%{_bindir}/crlutil %{_bindir}/crlutil
%{_bindir}/modutil %{_bindir}/modutil
%{_bindir}/pk12util %{_bindir}/pk12util
%{_bindir}/signtool
%{_bindir}/signver %{_bindir}/signver
%{_bindir}/ssltap %{_bindir}/ssltap
%{unsupported_tools_directory}/atob %{unsupported_tools_directory}/atob
@ -700,6 +694,7 @@ fi
%{unsupported_tools_directory}/ocspclnt %{unsupported_tools_directory}/ocspclnt
%{unsupported_tools_directory}/pp %{unsupported_tools_directory}/pp
%{unsupported_tools_directory}/selfserv %{unsupported_tools_directory}/selfserv
%{unsupported_tools_directory}/signtool
%{unsupported_tools_directory}/strsclnt %{unsupported_tools_directory}/strsclnt
%{unsupported_tools_directory}/symkeyutil %{unsupported_tools_directory}/symkeyutil
%{unsupported_tools_directory}/tstclnt %{unsupported_tools_directory}/tstclnt
@ -712,10 +707,10 @@ fi
%attr(0644,root,root) %doc %{_mandir}/man1/crlutil.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/crlutil.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/modutil.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/modutil.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/pk12util.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/pk12util.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/signtool.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/signver.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/signver.1.gz
# unsupported tools # unsupported tools
%attr(0644,root,root) %doc %{_mandir}/man1/derdump.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/derdump.1.gz
%attr(0644,root,root) %doc %{_mandir}/man1/signtool.1.gz
%if %{defined rhel} %if %{defined rhel}
%attr(0644,root,root) %doc %{_mandir}/man1/pp.1.gz %attr(0644,root,root) %doc %{_mandir}/man1/pp.1.gz
%else %else
@ -800,6 +795,9 @@ fi
%changelog %changelog
* Mon Aug 7 2017 Daiki Ueno <dueno@redhat.com> - 3.32.0-1.0
- Update to NSS 3.32.0
* Tue Jul 18 2017 Daiki Ueno <dueno@redhat.com> - 3.31.0-1.1 * Tue Jul 18 2017 Daiki Ueno <dueno@redhat.com> - 3.31.0-1.1
- Backport mozbz#1381784 to avoid deadlock in dnf - Backport mozbz#1381784 to avoid deadlock in dnf

2
sources
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.31.0.tar.gz) = 9f59c5013021c2718b7132b47610a63414e53ccc99054a405383e7d980c4e03634daea6e9cb04424ba7c1e52dc416f651059d2909c232cccefc85c54c38994ad SHA512 (nss-3.32.0.tar.gz) = c2947b7e12ab840bba1c591255d037a0c838bc1b36bd7ea00a94c447bf0e95fe4415da284c172acd8c04e3c0d583fcbc900a523230f42558c93692bfde5ba500