From b91e5f547668cc471a2e713e242f8d8386a89a06 Mon Sep 17 00:00:00 2001 From: Rosa Date: Thu, 23 Feb 2012 04:58:42 +0400 Subject: [PATCH] Automatic import for version 3.13.2 --- .abf.yml | 2 +- nss.spec | 84 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/.abf.yml b/.abf.yml index 718ad79..d091e13 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "nss-3.13.1.tar.gz": d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 + "nss-3.13.2.tar.gz": ad80109b135ebe8467ca2b2c2b9cc4b0bf885505 diff --git a/nss.spec b/nss.spec index a5aba8d..a7437cd 100644 --- a/nss.spec +++ b/nss.spec @@ -2,12 +2,13 @@ %define major 3 %define libname %mklibname %{name} %{major} +%define libfreebl %mklibname freebl %{major} %define develname %mklibname -d %{name} %define sdevelname %mklibname -d -s %{name} %define cvsver 3_13 %define nspr_libname %mklibname nspr 4 -%define nspr_version 4.8.8 +%define nspr_version 4.9 # this seems fragile, so require the exact version or later (#58754) %define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0) @@ -19,11 +20,11 @@ Name: nss Epoch: 2 -Version: 3.13.1 -Release: 4 +Version: 3.13.2 +Release: 1 Summary: Netscape Security Services Group: System/Libraries -License: MPLv1.1 or GPLv2+ or LGPLv2+ +License: MPL or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/index.html Source0: ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{cvsver}_RTM/src/nss-%{version}.tar.gz Source1: nss.pc.in @@ -70,30 +71,34 @@ Group: System/Libraries Conflicts: %{name} < 2:3.13.1-2 %description shlibsign -This package contains the binary shlibsign needed by %{libname}. +This package contains the binary shlibsign needed by libfreebl3 and libsoftokn3. %if %with lib %package -n %{libname} Summary: Network Security Services (NSS) Group: System/Libraries -Requires(post): nss-shlibsign -Requires(post): rpm-helper %description -n %{libname} -Network Security Services (NSS) is a set of libraries designed to -support cross-platform development of security-enabled server -applications. Applications built with NSS can support SSL v2 and v3, -TLS, PKCS #5, PKCS #7, PKCS #11, PKCS -#12, S/MIME, X.509 v3 certificates, and other security standards. For -detailed information on standards supported, see -http://www.mozilla.org/projects/security/pki/nss/overview.html. +This package contains the shared libraries libnss3, libnssckbi, libnssdbm3, +libnssutil3, libsmime3, and libssl3. + +%package -n %{libfreebl} +Summary: Network Security Services (NSS) +Group: System/Libraries +Requires(post): nss-shlibsign +Requires(post): rpm-helper +Conflicts: %{_lib}nss3 < 2:3.13.1-5 + +%description -n %{libfreebl} +This package contains the shared libraries libfreebl3 and libsoftokn3. %package -n %{develname} Summary: Network Security Services (NSS) - development files Group: Development/C++ -Requires: %{libname} >= %{epoch}:%{version}-%{release} -Provides: nss-devel = %{epoch}:%{version}-%{release} -Obsoletes: %{libname}-devel +Requires: %{libname} >= %{EVRD} +Requires: %{libfreebl} >= %{EVRD} +Provides: nss-devel = %{EVRD} +%rename %{libname}-devel %description -n %{develname} Header files to doing development with Network Security Services. @@ -101,11 +106,11 @@ Header files to doing development with Network Security Services. %package -n %{sdevelname} Summary: Network Security Services (NSS) - static libraries Group: Development/C++ -Requires: %{libname} >= %{epoch}:%{version}-%{release} -Requires: %{develname} >= %{epoch}:%{version}-%{release} -Provides: nss-static-devel = %{epoch}:%{version}-%{release} +Requires: %{libname} >= %{EVRD} +Requires: %{develname} >= %{EVRD} +Provides: nss-static-devel = %{EVRD} Conflicts: libopenssl-static-devel -Obsoletes: %{libname}-static-devel +%rename %{libname}-static-devel %description -n %{sdevelname} Static libraries for doing development with Network Security Services. @@ -122,6 +127,8 @@ Static libraries for doing development with Network Security Services. find . -type d -perm 0700 -exec chmod 755 {} \; find . -type f -perm 0555 -exec chmod 755 {} \; find . -type f -perm 0444 -exec chmod 644 {} \; +find . -name '*.h' -executable -exec chmod -x {} \; +find . -name '*.c' -executable -exec chmod -x {} \; %build %setup_compile_flags @@ -282,7 +289,7 @@ popd #%{__cp} -a mozilla/security/nss/cmd/SSLsample/README docs/SSLsample/ %{__mkdir_p} docs/bltest -%{__cp} -a mozilla/security/nss/cmd/bltest/tests/* docs/bltest/ +cp -a mozilla/security/nss/cmd/bltest/tests/* docs/bltest/ %{__mkdir_p} docs/certcgi %{__cp} -a mozilla/security/nss/cmd/certcgi/*.html docs/certcgi/ @@ -317,7 +324,7 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %multiarch_binaries %{buildroot}%{_bindir}/nss-config %if %with lib -%post -n %{libname} +%posttrans -n %{libfreebl} %create_ghostfile /%{_lib}/libsoftokn%{major}.chk root root 644 %create_ghostfile /%{_lib}/libfreebl%{major}.chk root root 644 %{_bindir}/shlibsign -i /%{_lib}/libsoftokn%{major}.so >/dev/null 2>/dev/null @@ -381,21 +388,23 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %attr(0755,root,root) %{_bindir}/shlibsign %if %with lib -%files -n %{libname} +%files -n %{libfreebl} /%{_lib}/libfreebl%{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}/libsmime%{major}.so -/%{_lib}/libsoftokn%{major}.so -/%{_lib}/libssl%{major}.so /%{_lib}/libnssutil%{major}.so /%{_lib}/libnssdbm%{major}.so -%defattr(0644,root,root,0755) -%ghost /%{_lib}/libsoftokn%{major}.chk -%ghost /%{_lib}/libfreebl%{major}.chk +/%{_lib}/libsmime%{major}.so +/%{_lib}/libssl%{major}.so %files -n %{develname} %attr(0755,root,root) %{_bindir}/nss-config @@ -511,9 +520,24 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %changelog +* Tue Feb 21 2012 Dmitry Mikhirev 2:3.13.2-1 ++ Revision: 778646 +- new version 3.13.2 + + + Matthew Dawkins + - split out libfreebl lib pkg + - this should address dep loop problems + - if glibc and libc ever get properly split + - used EVRD macro + - moved signing of libfreebl libs to posttrans + - updated descriptions + * Thu Jan 26 2012 Oden Eriksson 2:3.13.1-4 + Revision: 769168 - bump release + +* Thu Jan 26 2012 Oden Eriksson 2:3.13.1-3 ++ Revision: 769165 - fix deps - rebuilt to pickup the changes in rootcerts as of 2012/01/17