[nss] Update to NSS_3_14_1_RTM

[Elio Maldonado]

commit 5a0d6572e19561f14b2b83d380003587744959df
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Dec 16 22:25:51 2012 -0800

    Update to NSS_3_14_1_RTM
    
    - added a patch to not compile the softoken/freebl tests
    - needed due to upstream changes to coreconf
    - to be addjusted or removed if patch to enabled building nss without softoken is accepted upstream

 .gitignore                            |    2 +-
 Bug-872124-fix-pk11wrap-locking.patch |  393 ---------------------------------
 no-softoken-freebl-tests.patch        |   35 +++
 nss.spec                              |   15 +-
 sources                               |    2 +-
 5 files changed, 46 insertions(+), 401 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d6796a..a948d04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@ blank-cert9.db
 blank-key4.db
 PayPalEE.cert
 /nss-pem-20120811.tar.bz2
-/nss-3.14-stripped.tar.bz2
 /dummy-sources-for-testing
+/nss-3.14.1-stripped.tar.bz2
diff --git a/no-softoken-freebl-tests.patch b/no-softoken-freebl-tests.patch
new file mode 100644
index 0000000..e146f55
--- /dev/null
+++ b/no-softoken-freebl-tests.patch
@@ -0,0 +1,35 @@
+diff -up ./mozilla/security/nss/cmd/Makefile.nosoftokentests ./mozilla/security/nss/cmd/Makefile
+--- ./mozilla/security/nss/cmd/Makefile.nosoftokentests	2012-12-16 21:47:35.412350822 -0800
++++ ./mozilla/security/nss/cmd/Makefile	2012-12-16 21:49:13.138963897 -0800
+@@ -19,6 +19,10 @@ ifeq ($(FREEBL_LOWHASH),1)
+ LOWHASHTEST_SRCDIR = lowhashtest  # Add the lowhashtest directory to DIRS.
+ endif
+ 
++# These test were compiled as part of the nss-softoken build
++BLTEST_SRCDIR=
++FIPSTEST_SRCDIR=
++
+ INCLUDES += \
+ 	-I$(DIST)/../public/security \
+ 	-I./include \
+diff -up ./mozilla/security/nss/cmd/manifest.mn.nosoftokentests ./mozilla/security/nss/cmd/manifest.mn
+--- ./mozilla/security/nss/cmd/manifest.mn.nosoftokentests	2012-12-16 21:45:18.693489564 -0800
++++ ./mozilla/security/nss/cmd/manifest.mn	2012-12-16 21:47:15.443225712 -0800
+@@ -11,7 +11,7 @@ REQUIRES = nss nspr libdbm
+ DIRS = lib  \
+  addbuiltin \
+  atob  \
+- bltest \
++ $(BLTEST_SRCDIR) \
+  btoa  \
+  certcgi \
+  certutil  \
+@@ -23,7 +23,7 @@ DIRS = lib  \
+  derdump  \
+  digest  \
+  httpserv  \
+- fipstest  \
++ $(FIPSTEST_SRCDIR)  \
+  $(LOWHASHTEST_SRCDIR)  \
+  listsuites \
+  makepqg  \
diff --git a/nss.spec b/nss.spec
index cddd066..58dde5e 100644
--- a/nss.spec
+++ b/nss.spec
@@ -6,8 +6,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.14
-Release:          12%{?dist}
+Version:          3.14.1
+Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -69,11 +69,11 @@ Patch39:          nss-ssl-enforce-no-pkcs11-bypass.path
 # TODO: Remove this patch when the ocsp test are fixed
 Patch40:          nss-3.14.0.0-disble-ocsp-test.patch
 
-# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=357025
-Patch41:          Bug-872124-fix-pk11wrap-locking.patch
 # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=807890
 Patch42:          0001-Add-extended-key-usage-for-MS-Authenticode-Code-Sign.patch
 
+Patch43:          no-softoken-freebl-tests.patch
+
 %description
 Network Security Services (NSS) is a set of libraries designed to
 support cross-platform development of security-enabled client and
@@ -150,14 +150,14 @@ low level services.
 %patch6 -p0 -b .libpem
 %patch16 -p0 -b .539183
 %patch18 -p0 -b .646045
-# link pem against buildroot's freebl, esential wen mixing and matching
+# link pem against buildroot's freebl, essential when mixing and matching
 %patch25 -p0 -b .systemfreebl
 # activate for stable and beta branches
 #%patch29 -p0 -b .770682
 %patch39 -p1 -b .nobypass
 %patch40 -p1 -b .noocsptest
-%patch41 -p0 -b .872124
 %patch42 -p0 -b .870864
+%patch43 -p0 -b .nosoftokentests
 
 %build
 
@@ -603,6 +603,9 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-1
+- Update to NSS_3_14_1_RTM
+
 * Wed Dec 12 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-12
 - Bug 879978 - Install the nssck.api header template where mod_revocator can access it
 - Install nssck.api in /usr/includes/nss3/templates
diff --git a/sources b/sources
index 6b775e9..5e6526f 100644
--- a/sources
+++ b/sources
@@ -5,5 +5,5 @@ a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 2ec9e0606ba40fe65196545564b7cc2a  blank-key4.db
 bf47cecad861efa77d1488ad4a73cb5b  PayPalEE.cert
 2a06bf7b815d1a666cc3587b895506ce  nss-pem-20120811.tar.bz2
-2844d502638ac84097d5a9affa6d1c3a  nss-3.14-stripped.tar.bz2
 0be54f196b5da7e9008eb13a71bc2cb0  dummy-sources-for-testing
+78b4c196af29ef5e7851447029f947c0  nss-3.14.1-stripped.tar.bz2