nss: update to 3.16.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8552 ec354946-7b23-47d6-9f5a-488ba84defc7

n/nss/nss-vl.spec

@@ -1,11 +1,11 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define nspr_version 4.10.1
+%define nspr_version 4.10.6
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.15.2
+Version:          3.16.1
 Release:          1%{?_dist_release}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -28,11 +28,6 @@ Patch16:          nss-539183.patch
 Patch18:          nss-646045.patch
 # TODO: Remove this patch when the ocsp test are fixed
 Patch40:          nss-3.14.0.0-disble-ocsp-test.patch
-Patch44:          0001-sync-up-with-upstream-softokn-changes.patch
-Patch45:          Bug-896651-pem-dont-trash-keys-on-failed-login.patch
-# The ocsp stapling tests currently require access to the
-# kuix.de test server but koji forbids outbount connections
-Patch46:          disable-ocsp-stapling-tests.patch
 # Fedora / RHEL-only patch, the templates directory was originally 
 # introduced to support mod _revocator
 Patch47:          utilwrap-include-templates.patch
@@ -42,6 +37,8 @@ Patch48:          nss-versus-softoken-tests.patch
 Patch49:          nss-skip-bltest-and-fipstest.patch
 Patch50:          iquote.patch
 
+Patch100:	  nss-3.16.1-rsawrapr.patch
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    sqlite3-devel
@@ -121,13 +118,19 @@ v3 certificates, and other security standards.
 %patch16 -p0 -b .539183
 %patch18 -p0 -b .646045
 %patch40 -p0 -b .noocsptest
-%patch44 -p1 -b .syncupwithupstream
-%patch45 -p0 -b .notrash
-%patch46 -p0 -b .skipoutbound
 %patch47 -p0 -b .templates
 %patch48 -p0 -b .crypto
 %patch49 -p0 -b .skipthem
 %patch50 -p0 -b .iquote
+%patch100 -p0 -b .buildfix
+
+pemNeedsFromSoftoken="lowkeyi lowkeyti softoken softoknt"
+for file in ${pemNeedsFromSoftoken}; do
+    %{__cp} ./nss/lib/softoken/${file}.h ./nss/lib/ckfw/pem/
+done
+%{__cp} ./nss/lib/softoken/lowkeyi.h ./nss/cmd/rsaperf
+%{__cp} ./nss/lib/softoken/lowkeyti.h ./nss/cmd/rsaperf
+
 
 %build
 
@@ -157,9 +160,9 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
 export NSPR_INCLUDE_DIR
 export NSPR_LIB_DIR
 
-export FREEBL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-softokn | sed 's/-I//'`
-export FREEBL_LIB_DIR=%{_libdir}
-export USE_SYSTEM_FREEBL=1
+#export FREEBL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-softokn | sed 's/-I//'`
+#export FREEBL_LIB_DIR=%{_libdir}
+#export USE_SYSTEM_FREEBL=0
 
 NSS_USE_SYSTEM_SQLITE=1
 export NSS_USE_SYSTEM_SQLITE
@@ -169,6 +172,10 @@ USE_64=1
 export USE_64
 %endif
 
+# uncomment if the iquote patch is activated
+export IN_TREE_FREEBL_HEADERS_FIRST=1
+
+export NSS_BLTEST_NOT_AVAILABLE=1
 # 
 %{__make} -C ./nss/coreconf
 %{__make} -C ./nss/lib/dbm
@@ -465,8 +472,11 @@ done
 
 
 %changelog
+* Thu Jun 12 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 3.16.1-1
+- update to 3.16.1
+
 * Thu Apr 04 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 3.14.3-1
-- update to 3.24.3
+- update to 3.14.3
 - import patches from fedora package
 
 * Wed Jan 09 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 3.14.1-1