Merge branch 'f20' into f19
- Update to nss-3.15.2 - Update iquote.patch on account of modified prototype on cert.h installed by nss-devel - Keep the nss-ssl-cbc-random-iv-off-by-default.patch enabled
This commit is contained in:
Elio Maldonado
commit
824235c319
|
|
@ -7,5 +7,5 @@ PayPalEE.cert
|
|||
TestCA.ca.cert
|
||||
TestUser50.cert
|
||||
TestUser51.cert
|
||||
/nss-pem-20130405.tar.bz2
|
||||
/nss-3.15.1-stripped.tar.bz2
|
||||
/nss-pem-20130828.tar.bz2
|
||||
/nss-3.15.2-stripped.tar.bz2
|
||||
|
|
|
|||
24
iquote.patch
24
iquote.patch
|
|
@ -36,3 +36,27 @@ diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
|
|||
endif
|
||||
|
||||
ifndef NSS_LIB_DIR
|
||||
diff -up nss/lib/certhigh/Makefile.iquote nss/lib/certhigh/Makefile
|
||||
--- nss/lib/certhigh/Makefile.iquote 2013-09-27 11:13:55.158689314 -0700
|
||||
+++ nss/lib/certhigh/Makefile 2013-09-27 11:14:38.181042336 -0700
|
||||
@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
# (6) Execute "component" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
-
|
||||
+INCLUDES += -iquote $(DIST)/../public/nss
|
||||
|
||||
#######################################################################
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
diff -up nss/lib/cryptohi/Makefile.iquote nss/lib/cryptohi/Makefile
|
||||
--- nss/lib/cryptohi/Makefile.iquote 2013-09-27 11:11:30.117494489 -0700
|
||||
+++ nss/lib/cryptohi/Makefile 2013-09-27 11:12:54.704194915 -0700
|
||||
@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
# (6) Execute "component" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
-
|
||||
+INCLUDES += -iquote $(DIST)/../public/nss
|
||||
|
||||
#######################################################################
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
|
|
|
|||
29
nss.spec
29
nss.spec
|
|
@ -1,7 +1,7 @@
|
|||
%global nspr_version 4.10
|
||||
%global nss_util_version 3.15.1
|
||||
%global nspr_version 4.10.1
|
||||
%global nss_util_version 3.15.2
|
||||
%global nss_softokn_fips_version 3.12.9
|
||||
%global nss_softokn_version 3.15.1
|
||||
%global nss_softokn_version 3.15.2
|
||||
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
||||
%global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
|
||||
|
||||
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: 3.15.1
|
||||
Release: 5%{?dist}
|
||||
Version: 3.15.2
|
||||
Release: 1%{?dist}
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -71,7 +71,7 @@ Source7: blank-key4.db
|
|||
Source8: system-pkcs11.txt
|
||||
Source9: setup-nsssysinit.sh
|
||||
Source10: PayPalEE.cert
|
||||
Source12: %{name}-pem-20130405.tar.bz2
|
||||
Source12: %{name}-pem-20130828.tar.bz2
|
||||
Source17: TestCA.ca.cert
|
||||
Source18: TestUser50.cert
|
||||
Source19: TestUser51.cert
|
||||
|
|
@ -110,8 +110,6 @@ Patch48: nss-versus-softoken-tests.patch
|
|||
# TODO remove when we switch to building nss without softoken
|
||||
Patch49: nss-skip-bltest-and-fipstest.patch
|
||||
Patch50: iquote.patch
|
||||
# Upstream: https://bugzilla.mozilla.org/show_bug_cgi?id=836477
|
||||
Patch51: manpages-fixes.patch
|
||||
|
||||
%description
|
||||
Network Security Services (NSS) is a set of libraries designed to
|
||||
|
|
@ -206,9 +204,6 @@ low level services.
|
|||
%patch48 -p0 -b .crypto
|
||||
%patch49 -p0 -b .skipthem
|
||||
%patch50 -p0 -b .iquote
|
||||
pushd nss
|
||||
%patch51 -p1 -b .948495
|
||||
popd
|
||||
|
||||
#########################################################
|
||||
# Higher-level libraries and test tools need access to
|
||||
|
|
@ -760,6 +755,18 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Sep 26 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.2-1
|
||||
- Update to NSS_3_15_2_RTM
|
||||
- Update iquote.patch on account of modified prototype on cert.h installed by nss-devel
|
||||
- Keep the nss-ssl-cbc-random-iv-off-by-default.patch enabled
|
||||
|
||||
* Wed Aug 28 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-7
|
||||
- Update pem sources to pick up a patch applied upstream which a faulty merge had missed
|
||||
- The pem module should not require unique file basenames
|
||||
|
||||
* Tue Aug 27 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-6
|
||||
- Update pem sources to the latest from interim upstream
|
||||
|
||||
* Mon Aug 19 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-5
|
||||
- Resolves: rhbz#996639 - Minor bugs in nss man pages
|
||||
- Fix some typos and improve description and see also sections
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -7,5 +7,5 @@ a5ae49867124ac75f029a9a33af31bad blank-cert8.db
|
|||
f998b70c1be25e8bb9f5fdb5d50eb6f2 TestCA.ca.cert
|
||||
1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert
|
||||
ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert
|
||||
ee649aa333d24c8e364140cc24860ff6 nss-3.15.1-stripped.tar.bz2
|
||||
8b9cf94e7ed23586ab3f618366b6acb6 nss-pem-20130405.tar.bz2
|
||||
e82dd2b9520f9d0f5d101e7710d59656 nss-pem-20130828.tar.bz2
|
||||
b402f7062b1c0c0ee9d0f223d03b4d6a nss-3.15.2-stripped.tar.bz2
|
||||
|
|
|
|||
Loading…
Reference in New Issue