Merge branch 'master' into f19
- Update to NSS_3_15_1_RTM - Enable the iquote.patch to access newly introduced types
This commit is contained in:
Elio Maldonado
commit
862bb14082
|
|
@ -8,4 +8,4 @@ TestCA.ca.cert
|
|||
TestUser50.cert
|
||||
TestUser51.cert
|
||||
/nss-pem-20130405.tar.bz2
|
||||
/nss-3.15-stripped.tar.bz2
|
||||
/nss-3.15.1-stripped.tar.bz2
|
||||
|
|
|
|||
21
iquote.patch
21
iquote.patch
|
|
@ -1,6 +1,6 @@
|
|||
diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile
|
||||
--- nss/cmd/bltest/Makefile.iquote 2013-04-04 21:56:59.329249213 -0700
|
||||
+++ nss/cmd/bltest/Makefile 2013-04-04 21:57:47.583579084 -0700
|
||||
--- nss/cmd/bltest/Makefile.iquote 2013-06-27 10:58:08.000000000 -0700
|
||||
+++ nss/cmd/bltest/Makefile 2013-07-02 15:02:26.656643246 -0700
|
||||
@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
# (6) Execute "component" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
|
@ -9,9 +9,22 @@ diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile
|
|||
|
||||
|
||||
#######################################################################
|
||||
diff -up nss/cmd/lib/Makefile.iquote nss/cmd/lib/Makefile
|
||||
--- nss/cmd/lib/Makefile.iquote 2013-07-02 15:07:47.260622471 -0700
|
||||
+++ nss/cmd/lib/Makefile 2013-07-02 15:08:47.219179157 -0700
|
||||
@@ -38,7 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
# (6) Execute "component" rules. (OPTIONAL) #
|
||||
#######################################################################
|
||||
|
||||
-
|
||||
+INCLUDES += -iquote $(DIST)/../private/nss
|
||||
+INCLUDES += -iquote $(DIST)/../public/nss
|
||||
|
||||
#######################################################################
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
|
||||
--- nss/coreconf/location.mk.iquote 2013-04-04 21:54:59.710477106 -0700
|
||||
+++ nss/coreconf/location.mk 2013-04-04 21:56:21.091163121 -0700
|
||||
--- nss/coreconf/location.mk.iquote 2013-06-27 10:58:08.000000000 -0700
|
||||
+++ nss/coreconf/location.mk 2013-07-02 15:02:26.656643246 -0700
|
||||
@@ -45,6 +45,10 @@ endif
|
||||
|
||||
ifdef NSS_INCLUDE_DIR
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
diff -up nss/tests/chains/scenarios/scenarios.noocsptest nss/tests/chains/scenarios/scenarios
|
||||
--- nss/tests/chains/scenarios/scenarios.noocsptest 2013-01-06 19:56:15.000000000 -0800
|
||||
+++ nss/tests/chains/scenarios/scenarios 2013-02-01 08:38:28.140615299 -0800
|
||||
@@ -50,6 +50,5 @@ bridgewithpolicyextensionandmapping.cfg
|
||||
--- 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
|
||||
|
|
|
|||
16
nss.spec
16
nss.spec
|
|
@ -1,7 +1,7 @@
|
|||
%global nspr_version 4.10
|
||||
%global nss_util_version 3.15
|
||||
%global nss_util_version 3.15.1
|
||||
%global nss_softokn_fips_version 3.12.9
|
||||
%global nss_softokn_version 3.15
|
||||
%global nss_softokn_version 3.15.1
|
||||
%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
|
||||
Release: 5%{?dist}
|
||||
Version: 3.15.1
|
||||
Release: 1%{?dist}
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -197,7 +197,7 @@ low level services.
|
|||
%patch47 -p0 -b .templates
|
||||
%patch48 -p0 -b .crypto
|
||||
%patch49 -p0 -b .skipthem
|
||||
#%patch50 -p0 -b .iquote
|
||||
%patch50 -p0 -b .iquote
|
||||
|
||||
#########################################################
|
||||
# Higher-level libraries and test tools need access to
|
||||
|
|
@ -277,7 +277,7 @@ export USE_64
|
|||
%endif
|
||||
|
||||
# uncomment if the iquote patch is activated
|
||||
#export IN_TREE_FREEBL_HEADERS_FIRST=1
|
||||
export IN_TREE_FREEBL_HEADERS_FIRST=1
|
||||
|
||||
##### phase 1: remove util/freebl/softoken and low level tools
|
||||
#
|
||||
|
|
@ -723,6 +723,10 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 02 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-1
|
||||
- Update to NSS_3_15_1_RTM
|
||||
- Enable the iquote.patch to access newly introduced types
|
||||
|
||||
* Wed Jun 19 2013 Elio Maldonado <emaldona@redhat.com> - 3.15-5
|
||||
- Install man pages for nss-tools and the nss-config and setup-nsssysinit scripts
|
||||
- Resolves: rhbz#606020 - nss security tools lack man pages
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -7,5 +7,5 @@ a5ae49867124ac75f029a9a33af31bad blank-cert8.db
|
|||
f998b70c1be25e8bb9f5fdb5d50eb6f2 TestCA.ca.cert
|
||||
1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert
|
||||
ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert
|
||||
496ef1cf07cf38bf0c1a8dae2d880a5e nss-3.15-stripped.tar.bz2
|
||||
ee649aa333d24c8e364140cc24860ff6 nss-3.15.1-stripped.tar.bz2
|
||||
8b9cf94e7ed23586ab3f618366b6acb6 nss-pem-20130405.tar.bz2
|
||||
|
|
|
|||
Loading…
Reference in New Issue