From 1f7c424246791868a40aeb6e134801ca625bd048 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Sun, 21 Feb 2016 02:33:19 +1000
Subject: [PATCH] New version 3.21

---
 .abf.yml |  2 +-
 nss.spec | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 3a5d9c8..1af15bf 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -4,4 +4,4 @@ sources:
   blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50
   certificadoACRaiz.crt: 8efdcabc93e61e925d4d1ded181a4320a467a139
   verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5
-  nss-3.16.2.tar.gz: c4e7f007723cfafcf7fe743000e3960cc5086642
+  nss-3.21.tar.gz: d4bbbd72b967443e8b65f504cdd157e3df93a84a
diff --git a/nss.spec b/nss.spec
index faab83c..17d8854 100644
--- a/nss.spec
+++ b/nss.spec
@@ -5,7 +5,7 @@
 %define libfreebl %mklibname freebl %{major}
 %define develname %mklibname -d %{name}
 %define sdevelname %mklibname -d -s %{name}
-%define cvsver 3_16_2
+%define cvsver 3_21
 
 %define nspr_libname %mklibname nspr 4
 %define	nspr_version 4.10.0
@@ -20,13 +20,13 @@
 
 Name:		nss
 Epoch:		2
-Version:	3.16.2
-Release:	3
+Version:	3.21
+Release:	1
 Summary:	Netscape Security Services
 Group:		System/Libraries
 License:	MPL or GPLv2+ or LGPLv2+
 URL:		http://www.mozilla.org/projects/security/pki/nss/index.html
-Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{cvsver}_RTM/src/nss-%{version}.tar.gz
+Source0:	http://ftp.mozilla.org/pub/security/nss/releases/NSS_%{cvsver}_RTM/src/nss-%{version}.tar.gz
 Source1:	nss.pc.in
 Source2:	nss-config.in
 Source3:	blank-cert8.db
@@ -69,7 +69,6 @@ libraries.
 Summary:	Netscape Security Services - shlibsign
 Group:		System/Libraries
 Conflicts:	%{name} < 2:3.13.1-2
-Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description shlibsign
 This package contains the binary shlibsign needed by libfreebl3
@@ -79,7 +78,6 @@ and libsoftokn3.
 %package -n %{libname}
 Summary:	Network Security Services (NSS)
 Group:		System/Libraries
-Requires:	%{libfreebl} >= %{epoch}:%{version}-%{release}
 
 %description -n %{libname}
 This package contains the shared libraries libnss3, libnssckbi, libnssdbm3,
@@ -137,7 +135,7 @@ find . -name '*.c' -executable -exec chmod -x {} \;
 %setup_compile_flags
 export BUILD_OPT=1
 export OPTIMIZER="%{optflags}"
-export XCFLAGS="%{optflags}"
+export XCFLAGS="%{optflags} -Wno-error"
 export ARCHFLAG="$LDFLAGS"
 export LIBDIR=%{_libdir}
 export USE_SYSTEM_ZLIB=1
@@ -150,6 +148,11 @@ export MOZILLA_CLIENT=1
 export NS_USE_GCC=1
 export NSS_USE_SYSTEM_SQLITE=1
 export NSS_ENABLE_ECC=1
+
+# external tests are causing build problems because they access ssl internal types
+# TODO: Investigate as there may be a better solution
+export NSS_DISABLE_GTESTS=1
+
 %ifarch x86_64 ppc64 ia64 s390x
 export USE_64=1
 %endif
@@ -421,6 +424,7 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
 %attr(0755,root,root) %{multiarch_bindir}/nss-config
 %_libdir/*.so
 %dir %{_includedir}/nss
+%{_includedir}/nss/pkcs1sig.h
 %{_includedir}/nss/base64.h
 %{_includedir}/nss/blapit.h
 %{_includedir}/nss/certdb.h