[nss/f20] Update to nss-3.16.0

Elio Maldonado emaldonado at fedoraproject.org
Fri Mar 21 13:33:57 UTC 2014 

commit 4fbd81e39ee5c47d5d2b7ed4c569cce5aeeea606
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Mar 20 11:49:06 2014 -0700

    Update to nss-3.16.0
    
    - Cherry-pick merge from master
    - Cleanup the copying of the tools man pages
    - Update the iquote.patch on account of the rebase

 .gitignore   |    2 +-
 iquote.patch |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nss.spec     |   26 ++++++++++++-----------
 sources      |    2 +-
 4 files changed, 79 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 200ad2e..c78c5da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
 /nss-pem-20140125.tar.bz2
-/nss-3.15.5.tar.gz
+/nss-3.16.0.tar.gz
diff --git a/iquote.patch b/iquote.patch
index 90e7914..586d37b 100644
--- a/iquote.patch
+++ b/iquote.patch
@@ -22,6 +22,69 @@ diff -up nss/cmd/lib/Makefile.iquote nss/cmd/lib/Makefile
  
  #######################################################################
  # (7) Execute "local" rules. (OPTIONAL).                              #
+diff -up nss/cmd/selfserv/Makefile.iquote nss/cmd/selfserv/Makefile
+--- nss/cmd/selfserv/Makefile.iquote	2014-03-14 13:31:59.000000000 -0700
++++ nss/cmd/selfserv/Makefile	2014-03-18 14:48:16.065834825 -0700
+@@ -35,7 +35,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL)                           #
+ #######################################################################
+ 
+-
++INCLUDES += -iquote $(DIST)/../public/nss
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ #######################################################################
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+diff -up nss/cmd/ssltap/Makefile.iquote nss/cmd/ssltap/Makefile
+--- nss/cmd/ssltap/Makefile.iquote	2014-03-14 13:31:59.000000000 -0700
++++ nss/cmd/ssltap/Makefile	2014-03-18 14:48:16.065834825 -0700
+@@ -39,7 +39,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/cmd/strsclnt/Makefile.iquote nss/cmd/strsclnt/Makefile
+--- nss/cmd/strsclnt/Makefile.iquote	2014-03-14 13:31:59.000000000 -0700
++++ nss/cmd/strsclnt/Makefile	2014-03-18 14:48:16.065834825 -0700
+@@ -36,7 +36,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL)                           #
+ #######################################################################
+ 
+-
++INCLUDES += -iquote $(DIST)/../public/nss
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ #######################################################################
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+diff -up nss/cmd/tstclnt/Makefile.iquote nss/cmd/tstclnt/Makefile
+--- nss/cmd/tstclnt/Makefile.iquote	2014-03-14 13:31:59.000000000 -0700
++++ nss/cmd/tstclnt/Makefile	2014-03-18 14:48:16.065834825 -0700
+@@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ #######################################################################
+ 
+ #include ../platlibs.mk
++INCLUDES += -iquote $(DIST)/../public/nss
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ #######################################################################
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+diff -up nss/cmd/vfyserv/Makefile.iquote nss/cmd/vfyserv/Makefile
+--- nss/cmd/vfyserv/Makefile.iquote	2014-03-18 14:49:25.794897961 -0700
++++ nss/cmd/vfyserv/Makefile	2014-03-18 14:50:03.817477638 -0700
+@@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ #######################################################################
+ 
+ #include ../platlibs.mk
++INCLUDES += -iquote $(DIST)/../public/nss
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ #######################################################################
+ # (7) Execute "local" rules. (OPTIONAL).                              #
 diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
 --- nss/coreconf/location.mk.iquote	2014-01-03 11:59:10.000000000 -0800
 +++ nss/coreconf/location.mk	2014-01-07 13:30:04.465429623 -0800
diff --git a/nss.spec b/nss.spec
index c8c7881..db4aeca 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.10.2
-%global nss_util_version 3.15.5
-%global nss_softokn_version 3.15.5
+%global nspr_version 4.10.4
+%global nss_util_version 3.16.0
+%global nss_softokn_version 3.16.0
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
 
@@ -18,7 +18,7 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.15.5
+Version:          3.16.0
 Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -274,9 +274,7 @@ export IN_TREE_FREEBL_HEADERS_FIRST=1
 %{__rm} -rf ./mozilla/security/nss/cmd/rsaperf_low
 
 ##### phase 2: build the rest of nss
-# nss supports pluggable ecc
-NSS_ENABLE_ECC=1
-export NSS_ENABLE_ECC
+# nss supports pluggable ecc with more than suite-b
 NSS_ECC_MORE_THAN_SUITE_B=1
 export NSS_ECC_MORE_THAN_SUITE_B
 
@@ -291,10 +289,9 @@ pushd ./nss
 %{__make} clean_docs build_docs
 popd
 
-# and copy them here
-for m in "%{allTools}"; do 
-  cp ./nss/doc/nroff/${m}.1 .
-done
+# and copy them to the dist directory
+%{__mkdir_p} ./dist/docs/nroff
+%{__cp} ./nss/doc/nroff/* ./dist/docs/nroff
 
 # Set up our package file
 # The nspr_version and nss_{util|softokn}_version globals used
@@ -527,7 +524,7 @@ for f in nss-config setup-nsssysinit; do
 done
 # Copy the man pages for the nss tools
 for f in "%{allTools}"; do 
-   install -c -m 644 ${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
+   install -c -m 644 ./dist/docs/nroff/${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
 done
 # Copy the man pages for the configuration files
 for f in pkcs11.txt; do 
@@ -737,6 +734,11 @@ fi
 
 
 %changelog
+* Tue Mar 18 2014 Elio Maldonado <emaldona at redhat.com> - 3.16.0-1
+- Update to nss-3.16.0
+- Cleanup the copying of the tools man pages
+- Update the iquote.patch on account of the rebase
+
 * Fri Feb 28 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.5-1
 - Update to nss-3.15.5 - Resolves: Bug 1066877
 - Pick fix for same files in two packages that can create rpm conflict
diff --git a/sources b/sources
index aa1bed1..8c21e07 100644
--- a/sources
+++ b/sources
@@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
 b8a94e863c852e1f8b75e930e76f8640  nss-pem-20140125.tar.bz2
-7a8cb5418ac8aa15d91d7bc549698268  nss-3.15.5.tar.gz
+6a60df5c01f6c4ed8dbdbe85cf818a28  nss-3.16.0.tar.gz

More information about the scm-commits mailing list