X-Git-Url: https://git.pld-linux.org/?p=packages%2Fnss.git;a=blobdiff_plain;f=nss.spec;h=30faaec241e57c96f16e9b633bbb387ca517346e;hp=429638251478696067dc22981d571148323afae8;hb=ad5fded;hpb=90e078f8454490974b56f36a54a93e049e14a5bd

diff --git a/nss.spec b/nss.spec
index 4296382..30faaec 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,25 +1,28 @@
-%define	nspr_ver	1:4.13.1
+# 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.28.1
+Version:	3.62
 Release:	1
 Epoch:		1
 License:	MPL v2.0
 Group:		Libraries
 Source0:	http://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5:	e98d48435cee5792f97ef7fc35a602c3
+# Source0-md5:	00573eaf97be1580c32ad967ed221784
 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:		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
@@ -29,7 +32,7 @@ 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.47
+Conflicts:	iceape < 2.46-1
 Conflicts:	iceweasel < 51
 Conflicts:	mozilla-firefox < 51
 Conflicts:	seamonkey < 2.47
@@ -103,7 +106,6 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if 0%{!?debug:1}
 # strip before signing
@@ -111,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
 
@@ -128,6 +132,7 @@ export BUILD_OPT=1
 export MOZILLA_CLIENT=1
 export NSDISTMODE=copy
 export NSPR_INCLUDE_DIR=/usr/include/nspr
+export NSS_ENABLE_WERROR=0
 export NSS_USE_SYSTEM_SQLITE=1
 export USE_PTHREADS=1
 export USE_SYSTEM_ZLIB=1
@@ -135,6 +140,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
 
@@ -142,14 +148,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
@@ -213,15 +223,18 @@ ln -s /%{_lib}/libfreeblpriv3.chk $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a
 
 # unit tests
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/der_gtest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/gtests
+%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%{_bindir}/pk11_gtest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11ectest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/ssl_gtest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/util_gtest
 %{__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"
@@ -269,7 +282,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
@@ -291,6 +303,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