- updated to 3.22.1

[packages/nss.git] / nss.spec

diff --git a/nss.spec b/nss.spec
index 0c2f1f93963a128819e8fa00b9c50f1a02595ad6..3d93519d42836d22073a7b2e9b97a38384de0226 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,22 +1,22 @@
-%define        nspr_ver        1:4.10.7
+%define        nspr_ver        1:4.12
 %define        foover  %(echo %{version} | tr . _)
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.17.3
+Version:       3.22.1
 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: fba7489e1b26f2a0bfe5527430fd61e1
+# Source0-md5: 66175367b13bbe41295d62fce4efb88b
 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:                tls12.patch
+Patch0:                x32.patch
 URL:           http://www.mozilla.org/projects/security/pki/nss/
 BuildRequires: nspr-devel >= %{nspr_ver}
 BuildRequires: nss-tools
@@ -97,9 +97,7 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
-cd nss
 %patch0 -p1
-cd ..
 
 %if 0%{!?debug:1}
 # strip before signing
@@ -137,7 +135,7 @@ export USE_X32=1
 # Forcing ecc with this hack would produce broken librares (softoken, freebl etc).
 # Thus we also build noecc version (which doesn't require hack) and use these
 # libs from there.
-sed -i -e 's|#error|#warning|g' ecc/nss/lib/freebl/ecl/ecl-curve.h
+%{__sed} -i -e 's|#error|//error|g' ecc/nss/lib/freebl/ecl/ecl-curve.h
 %{__make} -j1 -C ecc/nss \
        NSS_ECC_MORE_THAN_SUITE_B=1 \
        CC="%{__cc}" \
@@ -154,13 +152,15 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_includedir}/nss,/%{_lib
 cp -p ecc/dist/private/nss/*   $RPM_BUILD_ROOT%{_includedir}/nss
 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/*/bin/*            $RPM_BUILD_ROOT%{_bindir}
-install -p ecc/dist/*/lib/*            $RPM_BUILD_ROOT%{_libdir}
+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/*/lib/libnssdbm3.*       $RPM_BUILD_ROOT%{_libdir}
-install -p noecc/dist/*/lib/libsoftokn3.*      $RPM_BUILD_ROOT%{_libdir}
-install -p noecc/dist/*/lib/libfreebl3.*       $RPM_BUILD_ROOT%{_libdir}
+install -p noecc/dist/Linux*/lib/libnssdbm3.*  $RPM_BUILD_ROOT%{_libdir}
+install -p noecc/dist/Linux*/lib/libsoftokn3.* $RPM_BUILD_ROOT%{_libdir}
+install -p noecc/dist/Linux*/lib/libfreebl3.*  $RPM_BUILD_ROOT%{_libdir}
 
 cp -p nss/doc/nroff/*.1                $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -197,13 +197,13 @@ NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h)
 " %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/nss-config
 chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 
-mv $RPM_BUILD_ROOT%{_libdir}/libfreebl3.so $RPM_BUILD_ROOT/%{_lib}
+%{__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}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk $RPM_BUILD_ROOT/%{_lib}
 ln -s /%{_lib}/libfreebl3.chk $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk
 
 # conflict with openssl-static
-mv $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a
 
 if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then
        echo >&2 "ERROR: %{_includedir}/nss/nsslowhash.h not installed. Needed by glibc"
@@ -251,7 +251,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/btoa
 %attr(755,root,root) %{_bindir}/certcgi
 %attr(755,root,root) %{_bindir}/certutil
-%attr(755,root,root) %{_bindir}/checkcert
 %attr(755,root,root) %{_bindir}/chktest
 %attr(755,root,root) %{_bindir}/cmsutil
 %attr(755,root,root) %{_bindir}/conflict
@@ -278,6 +277,7 @@ 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