From 7a71d2922d2838965a97a6912d405960a02828fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Tue, 15 Nov 2016 23:28:09 +0300 Subject: [PATCH] Updated to 3.27.1 --- .abf.yml | 2 +- nss-fixrandom.patch | 11 +- nss.rpmlintrc | 1 - nss.spec | 346 +++++++++++++++++--------------------------- 4 files changed, 136 insertions(+), 224 deletions(-) delete mode 100644 nss.rpmlintrc diff --git a/.abf.yml b/.abf.yml index 4fc31a3..e2e022f 100644 --- a/.abf.yml +++ b/.abf.yml @@ -3,5 +3,5 @@ sources: blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5 blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50 certificadoACRaiz.crt: 8efdcabc93e61e925d4d1ded181a4320a467a139 + nss-3.27.1.tar.gz: 04d517723d2adf27b00ece58304f26cd389e4d13 verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5 - nss-3.26.tar.gz: 4c61b8ce9b0e23950392f669b703aa5e2939ce0b diff --git a/nss-fixrandom.patch b/nss-fixrandom.patch index 1b6d84d..674a086 100644 --- a/nss-fixrandom.patch +++ b/nss-fixrandom.patch @@ -1,11 +1,12 @@ ---- nss/lib/freebl/unix_rand.c.orig 2006-12-16 09:38:48.000000000 +0100 -+++ nss/lib/freebl/unix_rand.c 2006-12-16 09:38:59.000000000 +0100 -@@ -876,7 +876,7 @@ +diff -Naur nss-orig/lib/freebl/unix_rand.c nss/lib/freebl/unix_rand.c +--- nss-orig/lib/freebl/unix_rand.c 2016-10-03 17:55:58.000000000 +0300 ++++ nss/lib/freebl/unix_rand.c 2016-11-15 23:00:31.307850797 +0300 +@@ -820,7 +820,7 @@ /* Fork netstat to collect its output by default. Do not unset this unless * another source of entropy is available */ -#define DO_NETSTAT 1 +#define DO_NETSTAT 0 - void RNG_SystemInfoForRNG(void) - { + void + RNG_SystemInfoForRNG(void) diff --git a/nss.rpmlintrc b/nss.rpmlintrc deleted file mode 100644 index ef0372b..0000000 --- a/nss.rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("E: non-readable.*/usr/src/debug/.*") \ No newline at end of file diff --git a/nss.spec b/nss.spec index 82326e5..70129ff 100644 --- a/nss.spec +++ b/nss.spec @@ -1,10 +1,10 @@ -%bcond_without lib -%define url_ver %(echo %{version}| sed -e "s|\\.|_|g") +%bcond_without lib +%define url_ver %(echo %{version}| sed -e "s|\\.|_|g") -%define major 3 -%define libname %mklibname %{name} %{major} +%define major 3 +%define libname %mklibname %{name} %{major} %define libfreebl %mklibname freebl %{major} -%define devname %mklibname -d %{name} +%define devname %mklibname -d %{name} %define sdevname %mklibname -d -s %{name} %define _disable_lto 1 @@ -21,8 +21,8 @@ Summary: Netscape Security Services Name: nss Epoch: 2 -Version: 3.26 -Release: 2 +Version: 3.27.1 +Release: 1 Group: System/Libraries License: MPL or GPLv2+ or LGPLv2+ Url: http://www.mozilla.org/projects/security/pki/nss/index.html @@ -69,6 +69,71 @@ libraries have been not been included due to conflicts with the Mozilla libraries. %endif +%files +%doc docs/* +%attr(0755,root,root) %{_bindir}/addbuiltin +%attr(0755,root,root) %{_bindir}/atob +%attr(0755,root,root) %{_bindir}/baddbdir +%attr(0755,root,root) %{_bindir}/bltest +%attr(0755,root,root) %{_bindir}/btoa +%attr(0755,root,root) %{_bindir}/certcgi +%attr(0755,root,root) %{_bindir}/certutil +%attr(0755,root,root) %{_bindir}/chktest +%attr(0755,root,root) %{_bindir}/cmsutil +%attr(0755,root,root) %{_bindir}/conflict +%attr(0755,root,root) %{_bindir}/crlutil +%attr(0755,root,root) %{_bindir}/crmftest +%attr(0755,root,root) %{_bindir}/dbtest +%attr(0755,root,root) %{_bindir}/derdump +%attr(0755,root,root) %{_bindir}/dertimetest +%attr(0755,root,root) %{_bindir}/digest +%attr(0755,root,root) %{_bindir}/ecperf +%attr(0755,root,root) %{_bindir}/ectest +%attr(0755,root,root) %{_bindir}/encodeinttest +%attr(0755,root,root) %{_bindir}/fipstest +%attr(0755,root,root) %{_bindir}/httpserv +%attr(0755,root,root) %{_bindir}/listsuites +%attr(0755,root,root) %{_bindir}/lowhashtest +%attr(0755,root,root) %{_bindir}/makepqg +%attr(0755,root,root) %{_bindir}/mangle +%attr(0755,root,root) %{_bindir}/modutil +%attr(0755,root,root) %{_bindir}/multinit +%attr(0755,root,root) %{_bindir}/nonspr10 +%attr(0755,root,root) %{_bindir}/ocspclnt +%attr(0755,root,root) %{_bindir}/ocspresp +%attr(0755,root,root) %{_bindir}/oidcalc +%attr(0755,root,root) %{_bindir}/p7content +%attr(0755,root,root) %{_bindir}/p7env +%attr(0755,root,root) %{_bindir}/p7sign +%attr(0755,root,root) %{_bindir}/p7verify +%attr(0755,root,root) %{_bindir}/pk11gcmtest +%attr(0755,root,root) %{_bindir}/pk11mode +%attr(0755,root,root) %{_bindir}/pk12util +%attr(0755,root,root) %{_bindir}/pk1sign +%attr(0755,root,root) %{_bindir}/pkix-errcodes +%attr(0755,root,root) %{_bindir}/pp +%attr(0755,root,root) %{_bindir}/pwdecrypt +%attr(0755,root,root) %{_bindir}/remtest +%attr(0755,root,root) %{_bindir}/rsaperf +%attr(0755,root,root) %{_bindir}/sdrtest +%attr(0755,root,root) %{_bindir}/secmodtest +%attr(0755,root,root) %{_bindir}/selfserv +%attr(0755,root,root) %{_bindir}/signtool +%attr(0755,root,root) %{_bindir}/signver +%attr(0755,root,root) %{_bindir}/smime +%attr(0755,root,root) %{_bindir}/ssltap +%attr(0755,root,root) %{_bindir}/strsclnt +%attr(0755,root,root) %{_bindir}/symkeyutil +%attr(0755,root,root) %{_bindir}/tstclnt +%attr(0755,root,root) %{_bindir}/vfychain +%attr(0755,root,root) %{_bindir}/vfyserv +%dir %{_sysconfdir}/pki/nssdb +%config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db +%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db +%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db + +#------------------------------------------------------------------------- + %package shlibsign Summary: Netscape Security Services - shlibsign Group: System/Libraries @@ -78,6 +143,11 @@ Conflicts: %{name} < 2:3.13.1-2 This package contains the binary shlibsign needed by libfreebl3 and libsoftokn3. +%files shlibsign +%attr(0755,root,root) %{_bindir}/shlibsign + +#------------------------------------------------------------------------- + %if %with lib %package -n %{libname} Summary: Network Security Services (NSS) @@ -87,6 +157,19 @@ Group: System/Libraries This package contains the shared libraries libnss3, libnssckbi, libnssdbm3, libnssutil3, libsmime3, and libssl3. +%files -n %{libname} +/%{_lib}/libnss%{major}.so +/%{_lib}/libnssckbi.so +%if %{build_empty} +/%{_lib}/libnssckbi_empty.so +%endif +/%{_lib}/libnssutil%{major}.so +/%{_lib}/libnssdbm%{major}.so +/%{_lib}/libsmime%{major}.so +/%{_lib}/libssl%{major}.so + +#------------------------------------------------------------------------- + %package -n %{libfreebl} Summary: Network Security Services (NSS) Group: System/Libraries @@ -97,29 +180,62 @@ Conflicts: %{_lib}nss3 < 2:3.13.1-5 %description -n %{libfreebl} This package contains the shared libraries libfreebl3 and libsoftokn3. +%files -n %{libfreebl} +/%{_lib}/libfreebl%{major}.so +/%{_lib}/libfreeblpriv%{major}.so +/%{_lib}/libsoftokn%{major}.so +%defattr(0644,root,root,0755) +%ghost /%{_lib}/libfreebl%{major}.chk +%ghost /%{_lib}/libsoftokn%{major}.chk + +#------------------------------------------------------------------------- + %package -n %{devname} Summary: Network Security Services (NSS) - development files Group: Development/C++ -Requires: %{libname} >= %{epoch}:%{version}-%{release} -Requires: %{libfreebl} >= %{epoch}:%{version}-%{release} -Provides: nss-devel = %{epoch}:%{version}-%{release} +Requires: %{libname} >= %{EVRD} +Requires: %{libfreebl} >= %{EVRD} +Provides: nss-devel = %{EVRD} %rename %{libname}-devel %description -n %{devname} Header files to doing development with Network Security Services. +%files -n %{devname} +%attr(0755,root,root) %{_bindir}/nss-config +%attr(0755,root,root) %{multiarch_bindir}/nss-config +%_libdir/*.so +%dir %{_includedir}/nss +%{_includedir}/nss/*.h +%{_includedir}/nss/nssck.api +%{_libdir}/pkgconfig/nss.pc +%{_libdir}/libsoftokn%{major}.chk +%{_libdir}/libfreebl%{major}.chk + +#------------------------------------------------------------------------- + %package -n %{sdevname} Summary: Network Security Services (NSS) - static libraries Group: Development/C++ -Requires: %{libname} >= %{epoch}:%{version}-%{release} -Requires: %{devname} >= %{epoch}:%{version}-%{release} -Provides: nss-static-devel = %{epoch}:%{version}-%{release} +Requires: %{libname} >= %{EVRD} +Requires: %{devname} >= %{EVRD} +Provides: nss-static-devel = %{EVRD} Conflicts: libopenssl-static-devel %rename %{libname}-static-devel %description -n %{sdevname} Static libraries for doing development with Network Security Services. + +%files -n %{sdevname} +%{_libdir}/libcrmf.a +%{_libdir}/libnss.a +%{_libdir}/libnssutil.a +%{_libdir}/libnssb.a +%{_libdir}/libnssckfw.a +%{_libdir}/libsmime.a +%{_libdir}/libssl.a %endif +#------------------------------------------------------------------------- %prep %setup -q @@ -356,207 +472,3 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %{_bindir}/shlibsign -i /%{_lib}/libsoftokn%{major}.so >/dev/null 2>/dev/null %{_bindir}/shlibsign -i /%{_lib}/libfreebl%{major}.so >/dev/null 2>/dev/null %endif - -%files -%doc docs/* -%attr(0755,root,root) %{_bindir}/addbuiltin -%attr(0755,root,root) %{_bindir}/atob -%attr(0755,root,root) %{_bindir}/baddbdir -%attr(0755,root,root) %{_bindir}/bltest -%attr(0755,root,root) %{_bindir}/btoa -%attr(0755,root,root) %{_bindir}/certcgi -%attr(0755,root,root) %{_bindir}/certutil -%attr(0755,root,root) %{_bindir}/chktest -%attr(0755,root,root) %{_bindir}/cmsutil -%attr(0755,root,root) %{_bindir}/conflict -%attr(0755,root,root) %{_bindir}/crlutil -%attr(0755,root,root) %{_bindir}/crmftest -%attr(0755,root,root) %{_bindir}/dbtest -%attr(0755,root,root) %{_bindir}/derdump -%attr(0755,root,root) %{_bindir}/dertimetest -%attr(0755,root,root) %{_bindir}/digest -%attr(0755,root,root) %{_bindir}/ecperf -%attr(0755,root,root) %{_bindir}/ectest -%attr(0755,root,root) %{_bindir}/encodeinttest -%attr(0755,root,root) %{_bindir}/fipstest -%attr(0755,root,root) %{_bindir}/httpserv -%attr(0755,root,root) %{_bindir}/listsuites -%attr(0755,root,root) %{_bindir}/lowhashtest -%attr(0755,root,root) %{_bindir}/makepqg -%attr(0755,root,root) %{_bindir}/mangle -%attr(0755,root,root) %{_bindir}/modutil -%attr(0755,root,root) %{_bindir}/multinit -%attr(0755,root,root) %{_bindir}/nonspr10 -%attr(0755,root,root) %{_bindir}/ocspclnt -%attr(0755,root,root) %{_bindir}/ocspresp -%attr(0755,root,root) %{_bindir}/oidcalc -%attr(0755,root,root) %{_bindir}/p7content -%attr(0755,root,root) %{_bindir}/p7env -%attr(0755,root,root) %{_bindir}/p7sign -%attr(0755,root,root) %{_bindir}/p7verify -%attr(0755,root,root) %{_bindir}/pk11gcmtest -%attr(0755,root,root) %{_bindir}/pk11mode -%attr(0755,root,root) %{_bindir}/pk12util -%attr(0755,root,root) %{_bindir}/pk1sign -%attr(0755,root,root) %{_bindir}/pkix-errcodes -%attr(0755,root,root) %{_bindir}/pp -%attr(0755,root,root) %{_bindir}/pwdecrypt -%attr(0755,root,root) %{_bindir}/remtest -%attr(0755,root,root) %{_bindir}/rsaperf -%attr(0755,root,root) %{_bindir}/sdrtest -%attr(0755,root,root) %{_bindir}/secmodtest -%attr(0755,root,root) %{_bindir}/selfserv -%attr(0755,root,root) %{_bindir}/signtool -%attr(0755,root,root) %{_bindir}/signver -%attr(0755,root,root) %{_bindir}/smime -%attr(0755,root,root) %{_bindir}/ssltap -%attr(0755,root,root) %{_bindir}/strsclnt -%attr(0755,root,root) %{_bindir}/symkeyutil -%attr(0755,root,root) %{_bindir}/tstclnt -%attr(0755,root,root) %{_bindir}/vfychain -%attr(0755,root,root) %{_bindir}/vfyserv -%dir %{_sysconfdir}/pki/nssdb -%config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db -%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db -%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db - -%files shlibsign -%attr(0755,root,root) %{_bindir}/shlibsign - -%if %with lib -%files -n %{libfreebl} -/%{_lib}/libfreebl%{major}.so -/%{_lib}/libfreeblpriv%{major}.so -/%{_lib}/libsoftokn%{major}.so -%defattr(0644,root,root,0755) -%ghost /%{_lib}/libfreebl%{major}.chk -%ghost /%{_lib}/libsoftokn%{major}.chk - -%files -n %{libname} -/%{_lib}/libnss%{major}.so -/%{_lib}/libnssckbi.so -%if %{build_empty} -/%{_lib}/libnssckbi_empty.so -%endif -/%{_lib}/libnssutil%{major}.so -/%{_lib}/libnssdbm%{major}.so -/%{_lib}/libsmime%{major}.so -/%{_lib}/libssl%{major}.so - -%files -n %{devname} -%attr(0755,root,root) %{_bindir}/nss-config -%attr(0755,root,root) %{multiarch_bindir}/nss-config -%_libdir/*.so -%dir %{_includedir}/nss -%{_includedir}/nss/base64.h -%{_includedir}/nss/blapit.h -%{_includedir}/nss/certdb.h -%{_includedir}/nss/cert.h -%{_includedir}/nss/certt.h -%{_includedir}/nss/ciferfam.h -%{_includedir}/nss/cmmf.h -%{_includedir}/nss/cmmft.h -%{_includedir}/nss/cms.h -%{_includedir}/nss/cmsreclist.h -%{_includedir}/nss/cmst.h -%{_includedir}/nss/crmf.h -%{_includedir}/nss/crmft.h -%{_includedir}/nss/cryptohi.h -%{_includedir}/nss/cryptoht.h -%{_includedir}/nss/ecl-exp.h -%{_includedir}/nss/hasht.h -%{_includedir}/nss/jar-ds.h -%{_includedir}/nss/jarfile.h -%{_includedir}/nss/jar.h -%{_includedir}/nss/key.h -%{_includedir}/nss/keyhi.h -%{_includedir}/nss/keyt.h -%{_includedir}/nss/keythi.h -%{_includedir}/nss/lowkeyi.h -%{_includedir}/nss/lowkeyti.h -%{_includedir}/nss/nssb64.h -%{_includedir}/nss/nssb64t.h -%{_includedir}/nss/nssbase.h -%{_includedir}/nss/nssbaset.h -%{_includedir}/nss/nssck.api -%{_includedir}/nss/nssckbi.h -%{_includedir}/nss/nssckepv.h -%{_includedir}/nss/nssckft.h -%{_includedir}/nss/nssckfwc.h -%{_includedir}/nss/nssckfw.h -%{_includedir}/nss/nssckfwt.h -%{_includedir}/nss/nssckg.h -%{_includedir}/nss/nssckmdt.h -%{_includedir}/nss/nssckt.h -%{_includedir}/nss/nss.h -%{_includedir}/nss/nssilckt.h -%{_includedir}/nss/nssilock.h -%{_includedir}/nss/nsslocks.h -%{_includedir}/nss/nsslowhash.h -%{_includedir}/nss/nssrwlk.h -%{_includedir}/nss/nssrwlkt.h -%{_includedir}/nss/nssutil.h -%{_includedir}/nss/ocsp.h -%{_includedir}/nss/ocspt.h -%{_includedir}/nss/p12.h -%{_includedir}/nss/p12plcy.h -%{_includedir}/nss/p12t.h -%{_includedir}/nss/pk11func.h -%{_includedir}/nss/pk11pqg.h -%{_includedir}/nss/pk11priv.h -%{_includedir}/nss/pk11pub.h -%{_includedir}/nss/pk11sdr.h -%{_includedir}/nss/pkcs11f.h -%{_includedir}/nss/pkcs11.h -%{_includedir}/nss/pkcs11n.h -%{_includedir}/nss/pkcs11p.h -%{_includedir}/nss/pkcs11t.h -%{_includedir}/nss/pkcs11u.h -%{_includedir}/nss/pkcs12.h -%{_includedir}/nss/pkcs12t.h -%{_includedir}/nss/pkcs1sig.h -%{_includedir}/nss/pkcs7t.h -%{_includedir}/nss/portreg.h -%{_includedir}/nss/preenc.h -%{_includedir}/nss/secasn1.h -%{_includedir}/nss/secasn1t.h -%{_includedir}/nss/seccomon.h -%{_includedir}/nss/secder.h -%{_includedir}/nss/secdert.h -%{_includedir}/nss/secdig.h -%{_includedir}/nss/secdigt.h -%{_includedir}/nss/secerr.h -%{_includedir}/nss/sechash.h -%{_includedir}/nss/secitem.h -%{_includedir}/nss/secmime.h -%{_includedir}/nss/secmod.h -%{_includedir}/nss/secmodt.h -%{_includedir}/nss/secoid.h -%{_includedir}/nss/secoidt.h -%{_includedir}/nss/secpkcs5.h -%{_includedir}/nss/secpkcs7.h -%{_includedir}/nss/secport.h -%{_includedir}/nss/shsign.h -%{_includedir}/nss/smime.h -%{_includedir}/nss/sslerr.h -%{_includedir}/nss/ssl.h -%{_includedir}/nss/sslproto.h -%{_includedir}/nss/sslt.h -%{_includedir}/nss/utilmodt.h -%{_includedir}/nss/utilpars.h -%{_includedir}/nss/utilparst.h -%{_includedir}/nss/utilrename.h -%{_libdir}/pkgconfig/nss.pc -%{_libdir}/libsoftokn%{major}.chk -%{_libdir}/libfreebl%{major}.chk - -%files -n %{sdevname} -%{_libdir}/libcrmf.a -%{_libdir}/libnss.a -%{_libdir}/libnssutil.a -%{_libdir}/libnssb.a -%{_libdir}/libnssckfw.a -%{_libdir}/libsmime.a -%{_libdir}/libssl.a -%endif -