X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nss.spec;h=420c9fa44e5b19116d4c7829b9501011310ee1e9;hb=394e04c;hp=0c2f1f93963a128819e8fa00b9c50f1a02595ad6;hpb=4df145fabd9c8cda72c89810e0e9931deafe7a39;p=packages%2Fnss.git diff --git a/nss.spec b/nss.spec index 0c2f1f9..420c9fa 100644 --- a/nss.spec +++ b/nss.spec @@ -1,22 +1,22 @@ -%define nspr_ver 1:4.10.7 +%define nspr_ver 1:4.13 %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.27 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: d11b3038db57b2acaf9a638cd41ce8d8 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,13 @@ 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} # 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 @@ -182,7 +180,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) @@ -197,13 +194,27 @@ 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 +%{__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 +%{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a + +# unit tests +%{__rm} $RPM_BUILD_ROOT%{_bindir}/der_gtest +%{__rm} $RPM_BUILD_ROOT%{_bindir}/ectest +%{__rm} $RPM_BUILD_ROOT%{_bindir}/gtests +%{__rm} $RPM_BUILD_ROOT%{_bindir}/nss_bogo_shim +%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11_gtest +%{__rm} $RPM_BUILD_ROOT%{_bindir}/ssl_gtest +%{__rm} $RPM_BUILD_ROOT%{_bindir}/util_gtest +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest* if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then echo >&2 "ERROR: %{_includedir}/nss/nsslowhash.h not installed. Needed by glibc" @@ -221,6 +232,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 +241,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 @@ -251,7 +264,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 @@ -261,6 +273,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 @@ -348,4 +361,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