X-Git-Url: https://git.pld-linux.org/?p=packages%2Fnss.git;a=blobdiff_plain;f=nss.spec;h=0e94f6be1564f3a5ec204d197d0ac7011ee1b67c;hp=3d93519d42836d22073a7b2e9b97a38384de0226;hb=33b9a2c;hpb=e193c86f2b78b1e9926a365307dda297930350e2

diff --git a/nss.spec b/nss.spec
index 3d93519..0e94f6b 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,25 +1,28 @@
-%define	nspr_ver	1:4.12
+# Conditional build:
+%bcond_with	bootstrap	# avoid dependency on nss-tools
+%bcond_with	tests		# enable tests
+
+%define	nspr_ver	1:4.29
 %define	foover	%(echo %{version} | tr . _)
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.22.1
+Version:	3.59
 Release:	1
 Epoch:		1
 License:	MPL v2.0
 Group:		Libraries
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5:	66175367b13bbe41295d62fce4efb88b
+Source0:	http://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
+# Source0-md5:	1fa8c74a6a761e4b87c782ef0b52d5ec
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
 Source3:	http://www.cacert.org/certs/root.der
 # Source3-md5:	a61b375e390d9c3654eebd2031461f6b
 Source4:	nss-softokn.pc.in
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
-Patch0:		x32.patch
-URL:		http://www.mozilla.org/projects/security/pki/nss/
+URL:		https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 BuildRequires:	nspr-devel >= %{nspr_ver}
-BuildRequires:	nss-tools
+%{!?with_bootstrap:BuildRequires:	nss-tools}
 BuildRequires:	perl-base
 BuildRequires:	sqlite3-devel
 BuildRequires:	zlib-devel
@@ -27,6 +30,12 @@ BuildConflicts:	mozilla < 0.9.6-3
 Requires:	%{name}-softokn-freebl = %{epoch}:%{version}-%{release}
 Requires:	nspr >= %{nspr_ver}
 Obsoletes:	libnss3
+# needs http2 code update: https://bugzilla.mozilla.org/show_bug.cgi?id=1323209
+Conflicts:	firefox < 50.1.0-2
+Conflicts:	iceape < 2.46-1
+Conflicts:	iceweasel < 51
+Conflicts:	mozilla-firefox < 51
+Conflicts:	seamonkey < 2.47
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
@@ -97,7 +106,6 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if 0%{!?debug:1}
 # strip before signing
@@ -105,10 +113,12 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %endif
 
 %build
+%if %{without bootstrap}
 # http://wiki.cacert.org/wiki/NSSLib
 addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> nss/lib/ckfw/builtins/certdata.txt
+%endif
 
-%ifarch %{x8664} ppc64 sparc64
+%ifarch %{x8664} ppc64 sparc64 aarch64
 export USE_64=1
 %endif
 
@@ -129,6 +139,7 @@ export ZLIB_LIBS="-lz"
 %ifarch x32
 export USE_X32=1
 %endif
+%{!?with_tests:export NSS_DISABLE_GTESTS=1}
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1084623
 
@@ -136,14 +147,18 @@ export USE_X32=1
 # Thus we also build noecc version (which doesn't require hack) and use these
 # libs from there.
 %{__sed} -i -e 's|#error|//error|g' ecc/nss/lib/freebl/ecl/ecl-curve.h
-%{__make} -j1 -C ecc/nss \
+%{__make} -C ecc/nss all \
 	NSS_ECC_MORE_THAN_SUITE_B=1 \
 	CC="%{__cc}" \
 	OPTIMIZER="%{rpmcflags} %{rpmcppflags}" \
+	OS_TEST="%{_target_cpu}" \
+	NS_USE_GCC=1
 
-%{__make} -j1 -C noecc/nss \
+%{__make} -C noecc/nss all \
 	CC="%{__cc}" \
-	OPTIMIZER="%{rpmcflags} %{rpmcppflags}"
+	OPTIMIZER="%{rpmcflags} %{rpmcppflags}" \
+	OS_TEST="%{_target_cpu}" \
+	NS_USE_GCC=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -154,8 +169,6 @@ cp -p ecc/dist/public/dbm/*	$RPM_BUILD_ROOT%{_includedir}/nss
 cp -p ecc/dist/public/nss/*	$RPM_BUILD_ROOT%{_includedir}/nss
 install -p ecc/dist/Linux*/bin/*	$RPM_BUILD_ROOT%{_bindir}
 install -p ecc/dist/Linux*/lib/*	$RPM_BUILD_ROOT%{_libdir}
-# exclude unit tests
-%{__rm} $RPM_BUILD_ROOT{%{_bindir}/ssl_gtest,%{_libdir}/libgtest*}
 
 # non-ECC version, we need only libnssdbm3, libsoftokn3, libfreebl3
 install -p noecc/dist/Linux*/lib/libnssdbm3.*	$RPM_BUILD_ROOT%{_libdir}
@@ -182,7 +195,6 @@ sed -e "s,%%libdir%%,%{_libdir},g" \
 	-e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
 	$RPM_BUILD_ROOT%{_pkgconfigdir}/nss-softokn.pc
 
-
 NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' nss/lib/nss/nss.h)
 NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' nss/lib/nss/nss.h)
 NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h)
@@ -201,10 +213,28 @@ chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 ln -s /%{_lib}/libfreebl3.so $RPM_BUILD_ROOT%{_libdir}/libfreebl3.so
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk $RPM_BUILD_ROOT/%{_lib}
 ln -s /%{_lib}/libfreebl3.chk $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.so $RPM_BUILD_ROOT/%{_lib}
+ln -s /%{_lib}/libfreeblpriv3.so $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.so
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk $RPM_BUILD_ROOT/%{_lib}
+ln -s /%{_lib}/libfreeblpriv3.chk $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk
 
 # conflict with openssl-static
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a
 
+# unit tests
+%if %{with tests}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{certdb,certhigh,cryptohi,der,pk11,softoken,smime,ssl,util}_gtest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/nss_bogo_shim
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpkcs11testmodule.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcpputil.*
+%endif
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11ectest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11importtest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/rsapoptst
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnss*-testlib.so
+
 if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then
 	echo >&2 "ERROR: %{_includedir}/nss/nsslowhash.h not installed. Needed by glibc"
 	exit 1
@@ -221,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT
 # COPYING beside MPL v2.0 text contains GPL/LGPL compatibility notes
 %doc nss/{COPYING,trademarks.txt}
 %attr(755,root,root) %{_libdir}/libfreebl3.so
+%attr(755,root,root) %{_libdir}/libfreeblpriv3.so
 %attr(755,root,root) %{_libdir}/libnss3.so
 %attr(755,root,root) %{_libdir}/libnssckbi.so
 %attr(755,root,root) %{_libdir}/libnssdbm3.so
@@ -229,6 +260,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libsoftokn3.so
 %attr(755,root,root) %{_libdir}/libssl3.so
 %{_libdir}/libfreebl3.chk
+%{_libdir}/libfreeblpriv3.chk
 %{_libdir}/libnssdbm3.chk
 %{_libdir}/libsoftokn3.chk
 
@@ -249,7 +281,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/baddbdir
 %attr(755,root,root) %{_bindir}/bltest
 %attr(755,root,root) %{_bindir}/btoa
-%attr(755,root,root) %{_bindir}/certcgi
 %attr(755,root,root) %{_bindir}/certutil
 %attr(755,root,root) %{_bindir}/chktest
 %attr(755,root,root) %{_bindir}/cmsutil
@@ -260,6 +291,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/derdump
 %attr(755,root,root) %{_bindir}/dertimetest
 %attr(755,root,root) %{_bindir}/digest
+%attr(755,root,root) %{_bindir}/ecperf
 %attr(755,root,root) %{_bindir}/encodeinttest
 %attr(755,root,root) %{_bindir}/fipstest
 %attr(755,root,root) %{_bindir}/httpserv
@@ -270,6 +302,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/modutil
 %attr(755,root,root) %{_bindir}/multinit
 %attr(755,root,root) %{_bindir}/nonspr10
+%attr(755,root,root) %{_bindir}/nss-policy-check
 %attr(755,root,root) %{_bindir}/ocspclnt
 %attr(755,root,root) %{_bindir}/ocspresp
 %attr(755,root,root) %{_bindir}/oidcalc
@@ -277,7 +310,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/p7env
 %attr(755,root,root) %{_bindir}/p7sign
 %attr(755,root,root) %{_bindir}/p7verify
-%attr(755,root,root) %{_bindir}/pk11_gtest
 %attr(755,root,root) %{_bindir}/pk11gcmtest
 %attr(755,root,root) %{_bindir}/pk11mode
 %attr(755,root,root) %{_bindir}/pk12util
@@ -348,4 +380,6 @@ rm -rf $RPM_BUILD_ROOT
 %files softokn-freebl
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libfreebl3.so
+%attr(755,root,root) /%{_lib}/libfreeblpriv3.so
 /%{_lib}/libfreebl3.chk
+/%{_lib}/libfreeblpriv3.chk