From 93f351e889d45fa47ff0bec20f84d57a4e2d08dd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 18 2014 10:51:00 +0000
Subject: import nss-softokn-3.16.2-1.el7_0


---

diff --git a/.gitignore b/.gitignore
index 78b89a3..8764b3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/nss-softokn-3.15.4.tar.gz
+SOURCES/nss-softokn-3.16.2.tar.gz
diff --git a/.nss-softokn.metadata b/.nss-softokn.metadata
index fdaff3b..c363d24 100644
--- a/.nss-softokn.metadata
+++ b/.nss-softokn.metadata
@@ -1 +1 @@
-34c16520e458a5e12ef31428e8b63998a6a0071b SOURCES/nss-softokn-3.15.4.tar.gz
+a35640b6fd1de5e59e70c3ebfe34d532d1aeec0e SOURCES/nss-softokn-3.16.2.tar.gz
diff --git a/SPECS/nss-softokn.spec b/SPECS/nss-softokn.spec
index df9b187..b730764 100644
--- a/SPECS/nss-softokn.spec
+++ b/SPECS/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.10.2
+%global nspr_version 4.10.6
 %global nss_name nss
-%global nss_util_version 3.15.4
+%global nss_util_version 3.16.2
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -24,8 +24,8 @@
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
-Version:          3.15.4
-Release:          2%{?dist}
+Version:          3.16.2
+Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -84,7 +84,7 @@ Conflicts:        prelink < 0.4.3
 Conflicts:        filesystem < 3
 
 %description freebl
-NSS Softoken Cryptographic Module Freelb Library
+NSS Softoken Cryptographic Module Freebl Library
 
 Install the nss-softokn-freebl package if you need the freebl 
 library.
@@ -96,7 +96,7 @@ Provides:         nss-softokn-freebl-static = %{version}-%{release}
 Requires:         nss-softokn-freebl%{?_isa} = %{version}-%{release}
 
 %description freebl-devel
-NSS Softoken Cryptographic Module Freelb Library Development Tools
+NSS Softoken Cryptographic Module Freebl Library Development Tools
 This package supports special needs of some PKCS #11 module developers and
 is otherwise considered private to NSS. As such, the programming interfaces
 may change and the usual NSS binary compatibility commitments do not apply.
@@ -123,7 +123,6 @@ Header and library files for doing development with Network Security Services.
 
 %patch1 -p0 -b .softokenonly
 %patch8 -p0 -b .crypto
-%patch9 -p0 -b .cryptotests
 # activate if needed when doing a major update with new apis
 %patch10 -p0 -b .iquote
 %patch11 -p0 -b .allow_level1
@@ -183,15 +182,18 @@ USE_64=1
 export USE_64
 %endif
 
-# freebl supports ecc
-export NSS_ENABLE_ECC=1
-
 # uncomment if the iquote patch is activated
 export IN_TREE_FREEBL_HEADERS_FIRST=1
 
 # Use only the basicutil subset for sectools.a
 export NSS_BUILD_SOFTOKEN_ONLY=1
 
+# display processor information
+CPU_INFO=`cat /proc/cpuinfo`
+echo "############## CPU INFO ##################"
+echo "${CPU_INFO}"
+echo "##########################################"
+
 # Compile softokn plus needed support
 %{__make} -C ./nss/coreconf
 %{__make} -C ./nss/lib/dbm
@@ -247,9 +249,6 @@ export USE_64
 # to test for the last tool built correctly
 export NSS_BUILD_SOFTOKEN_ONLY=1
 
-# let the tests know that freebl supports ecc
-export NSS_ENABLE_ECC=1
-
 # End -- copied from the build section
 
 # enable the following line to force a test failure
@@ -390,6 +389,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Wed Jul 30 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.2-1
+- Update to nss-3.16.2
+- Resolves: Bug 1124659 - Rebase RHEL 7.1 to at least NSS-SOFTOKN 3.16.1 (FF 31)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 3.15.4-2
 - Mass rebuild 2014-01-24