X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nss.spec;h=d0f04751af3b4ae3d1cf941e439c655afdace637;hb=91d11840f1a2010ee80d4502d9d5c85194dbe5c5;hp=03b2b508472ad706cb8c0298789f9898c6151932;hpb=6dc30b4e884a2ab54caf032d1ddf94bf0aaf4958;p=packages%2Fnss.git

diff --git a/nss.spec b/nss.spec
index 03b2b50..d0f0475 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,34 +1,40 @@
-# TODO
-# - check if the signed nss lib data (*.chk) is still valid after rpm stripping
-#
 %define	foover	%(echo %{version} | tr . _)
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.11.5
+Version:	3.12.5
 Release:	1
 Epoch:		1
-License:	GPL
+License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		Libraries
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/dbm -r DBM_1_61_RTM
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/dbm -r DBM_1_61_RTM
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/coreconf -r NSS_3_9_4_RTM
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/nss -r NSS_3_9_4_RTM
 #Source0:	%{name}-%{version}.tar.bz2
-Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5:	1add44e6a41dbf5091cfd000f19ad6b9
+Source0:	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
+# Source0-md5:	894b455601e41c6c782efb55c4c28b61
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
+Source3:	http://www.cacert.org/certs/root.der
+# Source3-md5:	a61b375e390d9c3654eebd2031461f6b
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.mozilla.org/projects/security/pki/nss/
-BuildRequires:	nspr-devel >= 1:4.6.6
+BuildRequires:	nspr-devel >= 1:4.7.4
+BuildRequires:	nss-tools
+BuildRequires:	perl-base
+BuildRequires:	sqlite3-devel
 BuildRequires:	zlib-devel
 BuildConflicts:	mozilla < 0.9.6-3
-Requires:	nspr >= 1:4.6.6
+Requires:	nspr >= 1:4.7.4
+Requires:	%{name}-softokn-freebl = %{epoch}:%{version}-%{release}
 Obsoletes:	libnss3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
+# signed -  stripped before signing
+%define		_noautostrip	.*%{_libdir}/libfreebl3.so\\|.*%{_libdir}/libsoftokn3.so
+%define		_noautochrpath	.*%{_libdir}/libfreebl3.so\\|.*%{_libdir}/libsoftokn3.so
 
 %description
 NSS supports cross-platform development of security-enabled server
@@ -44,7 +50,7 @@ i wiele innych bezpiecznych standardów.
 
 %package tools
 Summary:	NSS command line tools and utilities
-Summary(pl.UTF-8):	Narzędzia NSS
+Summary(pl.UTF-8):	Narzędzia NSS obsługiwane z linii poleceń
 Group:		Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -59,7 +65,7 @@ Summary:	NSS - header files
 Summary(pl.UTF-8):	NSS - pliki nagłówkowe
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	nspr-devel >= 1:4.6.6
+Requires:	nspr-devel >= 1:4.7.4
 Obsoletes:	libnss3-devel
 
 %description devel
@@ -80,18 +86,39 @@ Static NSS Toolkit libraries.
 %description static -l pl.UTF-8
 Statyczne wersje bibliotek z NSS.
 
+%package softokn-freebl
+Summary:	Freebl library for the Network Security Services
+Summary(pl.UTF-8):	Biblioteka freebl dla bibliotek NSS
+Group:		Libraries
+
+%description softokn-freebl
+Freebl cryptographic library for the Network Security Services.
+
+%description softokn-freebl -l pl.UTF-8
+Biblioteka kryptograficzna freebl dla bibliotek NSS.
+
 %prep
-%setup -q
+%setup -q -c 
 %patch0 -p1
 
+%if 0%{!?debug:1}
+# strip before signing
+sed -i -e '/export ADDON_PATH$/a\    echo STRIP \; %{__strip} --strip-unneeded -R.comment -R.note ${5}' mozilla/security/nss/cmd/shlibsign/sign.sh
+%endif
+
 %build
 cd mozilla/security/nss
 
-%ifarch %{x8664} ppc64
+# http://wiki.cacert.org/wiki/NSSLib
+addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> lib/ckfw/builtins/certdata.txt
+%{__make} -C lib/ckfw/builtins generate
+
+%ifarch %{x8664} ppc64 sparc64
 export USE_64=1
 %endif
 
 %{__make} -j1 build_coreconf \
+	FREEBL_NO_DEPEND=1 \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -102,6 +129,7 @@ export USE_64=1
 	OPTIMIZER="%{rpmcflags}"
 
 %{__make} -j1 build_dbm \
+	FREEBL_NO_DEPEND=1 \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -113,6 +141,7 @@ export USE_64=1
 	PLATFORM="pld"
 
 %{__make} -j1 all \
+	FREEBL_NO_DEPEND=1 \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -127,7 +156,7 @@ export USE_64=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/nss,%{_libdir},%{_pkgconfigdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/nss,/%{_lib},%{_libdir},%{_pkgconfigdir}}
 
 install mozilla/dist/private/nss/*	$RPM_BUILD_ROOT%{_includedir}/nss
 install mozilla/dist/public/dbm/*	$RPM_BUILD_ROOT%{_includedir}/nss
@@ -156,8 +185,10 @@ NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' mozilla/security/nss/lib/nss
 " %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/nss-config
 chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 
-# resolve conflict with squid
-mv -f $RPM_BUILD_ROOT%{_bindir}/{,nss-}client
+mv $RPM_BUILD_ROOT%{_libdir}/libfreebl3.so $RPM_BUILD_ROOT/%{_lib}
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -167,15 +198,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.chk
+%attr(755,root,root) %{_libdir}/libfreebl3.so
+%attr(755,root,root) %{_libdir}/libnss3.so
+%attr(755,root,root) %{_libdir}/libnssckbi.so
+%attr(755,root,root) %{_libdir}/libnssdbm3.so
+%attr(755,root,root) %{_libdir}/libnssutil3.so
+%attr(755,root,root) %{_libdir}/libsmime3.so
+%attr(755,root,root) %{_libdir}/libsoftokn3.so
+%attr(755,root,root) %{_libdir}/libssl3.so
+%{_libdir}/libfreebl3.chk
+%{_libdir}/libnssdbm3.chk
+%{_libdir}/libsoftokn3.chk
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/nss
-%{_libdir}/libcrmf.a
-%{_pkgconfigdir}/*.pc
 %attr(755,root,root) %{_bindir}/nss-config
+%{_libdir}/libcrmf.a
+%{_includedir}/nss
+%{_pkgconfigdir}/mozilla-nss.pc
+%{_pkgconfigdir}/nss.pc
 
 %files tools
 %defattr(644,root,root,755)
@@ -184,5 +225,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
-%exclude %{_libdir}/libcrmf.a
+%{_libdir}/libcertdb.a
+%{_libdir}/libcerthi.a
+%{_libdir}/libcryptohi.a
+%{_libdir}/libdbm.a
+%{_libdir}/libfreebl3.a
+%{_libdir}/libjar.a
+%{_libdir}/libnss3.a
+%{_libdir}/libnssb.a
+%{_libdir}/libnssckfw.a
+%{_libdir}/libnssdbm3.a
+%{_libdir}/libnssdev.a
+%{_libdir}/libnsspki3.a
+%{_libdir}/libnssutil3.a
+%{_libdir}/libpk11wrap3.a
+%{_libdir}/libpkcs12.a
+%{_libdir}/libpkcs7.a
+%{_libdir}/libpkixcertsel.a
+%{_libdir}/libpkixchecker.a
+%{_libdir}/libpkixcrlsel.a
+%{_libdir}/libpkixmodule.a
+%{_libdir}/libpkixparams.a
+%{_libdir}/libpkixpki.a
+%{_libdir}/libpkixresults.a
+%{_libdir}/libpkixstore.a
+%{_libdir}/libpkixsystem.a
+%{_libdir}/libpkixtop.a
+%{_libdir}/libpkixutil.a
+%{_libdir}/libsectool.a
+%{_libdir}/libsmime3.a
+%{_libdir}/libsoftokn3.a
+%{_libdir}/libssl3.a
+
+%files softokn-freebl
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk