Djam/nss
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/nss.git synced 2025-02-23 16:32:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 3.13.1

Browse source
This commit is contained in:
Rosa 2012-02-01 17:15:04 +04:00
parent 3756aac9ec
commit cd9d526e01
4 changed files with 58 additions and 8478 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"nss-3.12.11.tar.gz": 187ae83a8368512bb8729c206da2ed34db1725ad
"nss-3.13.1.tar.gz": d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6

8418
nss-3.12.11-new_certdata.txt_format.diff
View file

File diff suppressed because it is too large Load diff

110
nss.spec
View file

@ -4,20 +4,11 @@
%define libname %mklibname %{name} %{major}
%define develname %mklibname -d %{name}
%define sdevelname %mklibname -d -s %{name}
%define cvsver 3_12
%define cvsver 3_13
%define nspr_libname %mklibname nspr 4
%define nspr_version 4.8.8
%if %mandriva_branch == Cooker
# Cooker
%define release %mkrel 1
%else
# Old distros
%define subrel 1
%define release %mkrel 0
%endif
# 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)
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null || echo 0)
@ -27,9 +18,9 @@
%{?_without_empty: %{expand: %%global build_empty 0}}
Name: nss
Version: 3.12.11
Release: %{release}
Epoch: 2
Version: 3.13.1
Release: 4
Summary: Netscape Security Services
Group: System/Libraries
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -53,17 +44,11 @@ Patch0: nss-no-rpath.patch
Patch1: nss-fixrandom.patch
Patch3: nss-3.12.7-format_not_a_string_literal_and_no_format_arguments.patch
Patch4: renegotiate-transitional.patch
Patch5: nss-3.12.11-new_certdata.txt_format.diff
%if %mdkversion >= 200700
BuildRequires: rootcerts >= 1:20110413.00
%endif
BuildRequires: libnspr-devel >= 2:4.8.8
BuildRequires: libz-devel
%if %mdkversion >= 200800
BuildRequires: libsqlite3-devel >= 3.6.22
%endif
BuildRequires: rootcerts >= 1:20120117.00
BuildRequires: nspr-devel >= 2:4.8.8
BuildRequires: zlib-devel
BuildRequires: sqlite3-devel >= 3.6.22
BuildRequires: zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
Network Security Services (NSS) is a set of libraries designed to
@ -79,17 +64,20 @@ libraries have been not been included due to conflicts with the Mozilla
libraries.
%endif
%package shlibsign
Summary: Netscape Security Services - shlibsign
Group: System/Libraries
Conflicts: %{name} < 2:3.13.1-2
%description shlibsign
This package contains the binary shlibsign needed by %{libname}.
%if %with lib
%package -n %{libname}
Summary: Network Security Services (NSS)
Group: System/Libraries
Provides: mozilla-nss = %{epoch}:%{version}-%{release}
Requires(post): nss
Requires(post): rpm-helper
%if %mdkversion >= 200800
Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
%endif
Requires: %{nspr_libname} >= 2:%{nspr_version}
Requires(post): nss-shlibsign
Requires(post): rpm-helper
%description -n %{libname}
Network Security Services (NSS) is a set of libraries designed to
@ -103,12 +91,9 @@ http://www.mozilla.org/projects/security/pki/nss/overview.html.
%package -n %{develname}
Summary: Network Security Services (NSS) - development files
Group: Development/C++
Requires: %{libname} = %{epoch}:%{version}-%{release}
Requires: libnspr-devel
Provides: libnss-devel = %{epoch}:%{version}-%{release}
Requires: %{libname} >= %{epoch}:%{version}-%{release}
Provides: nss-devel = %{epoch}:%{version}-%{release}
Obsoletes: %{libname}-devel
Conflicts: %{libname} < 2:3.12-8
%description -n %{develname}
Header files to doing development with Network Security Services.
@ -116,10 +101,8 @@ 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}
Requires: libnspr-devel
Provides: libnss-static-devel = %{epoch}:%{version}-%{release}
Requires: %{libname} >= %{epoch}:%{version}-%{release}
Requires: %{develname} >= %{epoch}:%{version}-%{release}
Provides: nss-static-devel = %{epoch}:%{version}-%{release}
Conflicts: libopenssl-static-devel
Obsoletes: %{libname}-static-devel
@ -135,16 +118,13 @@ Static libraries for doing development with Network Security Services.
%patch1 -p0
%patch3 -p1
%patch4 -p0 -b .transitional
%patch5 -p1
find . -type d -perm 0700 -exec chmod 755 {} \;
find . -type f -perm 0555 -exec chmod 755 {} \;
find . -type f -perm 0444 -exec chmod 644 {} \;
%build
%if %mdkversion >= 200900
%setup_compile_flags
%endif
export BUILD_OPT=1
export OPTIMIZER="%{optflags}"
export XCFLAGS="%{optflags}"
@ -336,27 +316,15 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
%multiarch_binaries %{buildroot}%{_bindir}/nss-config
%clean
%{__rm} -rf %{buildroot}
%if %with lib
%post -n %{libname}
%if %mdkversion < 200900
/sbin/ldconfig
%endif
%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
%{_bindir}/shlibsign -i /%{_lib}/libfreebl%{major}.so >/dev/null 2>/dev/null
%postun -n %{libname}
%if %mdkversion < 200900
/sbin/ldconfig
%endif
%endif
%files
%defattr(0644,root,root,0755)
%doc docs/*
%attr(0755,root,root) %{_bindir}/addbuiltin
%attr(0755,root,root) %{_bindir}/atob
@ -366,6 +334,7 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
%attr(0755,root,root) %{_bindir}/certcgi
%attr(0755,root,root) %{_bindir}/certutil
%attr(0755,root,root) %{_bindir}/checkcert
%attr(0755,root,root) %{_bindir}/chktest
%attr(0755,root,root) %{_bindir}/cmsutil
%attr(0755,root,root) %{_bindir}/conflict
%attr(0755,root,root) %{_bindir}/crlutil
@ -374,6 +343,7 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
%attr(0755,root,root) %{_bindir}/derdump
%attr(0755,root,root) %{_bindir}/dertimetest
%attr(0755,root,root) %{_bindir}/digest
%attr(0755,root,root) %{_bindir}/encodeinttest
%attr(0755,root,root) %{_bindir}/fipstest
%attr(0755,root,root) %{_bindir}/makepqg
%attr(0755,root,root) %{_bindir}/mangle
@ -393,7 +363,6 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
%attr(0755,root,root) %{_bindir}/rsaperf
%attr(0755,root,root) %{_bindir}/sdrtest
%attr(0755,root,root) %{_bindir}/selfserv
%attr(0755,root,root) %{_bindir}/shlibsign
%attr(0755,root,root) %{_bindir}/signtool
%attr(0755,root,root) %{_bindir}/signver
%attr(0755,root,root) %{_bindir}/smime
@ -408,9 +377,11 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
%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 %{libname}
%defattr(0755,root,root,0755)
/%{_lib}/libfreebl%{major}.so
/%{_lib}/libnss%{major}.so
/%{_lib}/libnssckbi.so
@ -427,7 +398,6 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
%ghost /%{_lib}/libfreebl%{major}.chk
%files -n %{develname}
%defattr(0644,root,root,0755)
%attr(0755,root,root) %{_bindir}/nss-config
%attr(0755,root,root) %{multiarch_bindir}/nss-config
%_libdir/*.so
@ -541,7 +511,35 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
%changelog
* Fri Aug 12 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.12.11-0.1mdv2011.0
* Thu Jan 26 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-4
+ Revision: 769168
- bump release
- fix deps
- rebuilt to pickup the changes in rootcerts as of 2012/01/17
* Tue Jan 10 2012 Matthew Dawkins <mattydaw@mandriva.org> 2:3.13.1-2
+ Revision: 759561
- fixed shlibsign description
- split out shlibsign binary
- this helps break a huge dep LOOP
- glibc<>nss<>perl
- cleaned up spec a bit
* Sat Nov 05 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-1
+ Revision: 720519
- 3.13.1
- rediff the renegotiate-transitional patch
- drop the new_certdata.txt format patch as it is fixed since 3.13
* Wed Sep 07 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.12.11-3
+ Revision: 698538
- pick up the fix for MFSA 2011-35
* Wed Aug 31 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.12.11-2
+ Revision: 697592
- pick up the fix for MFSA 2011-34
* Fri Aug 12 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.12.11-1
+ Revision: 694115
- 3.12.11
- rediffed the new_certdata.txt_format patch

6
renegotiate-transitional.patch
View file

@ -1,5 +1,5 @@
--- mozilla/security/nss/lib/ssl/sslsock.c 2010-07-31 06:33:52.000000000 +0200
+++ mozilla/security/nss/lib/ssl/sslsock.c.oden 2010-10-12 16:15:56.536434663 +0200
--- mozilla/security/nss/lib/ssl/sslsock.c 2011-10-22 18:45:40.000000000 +0200
+++ mozilla/security/nss/lib/ssl/sslsock.c.oden 2011-11-05 17:45:55.672091551 +0100
@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
PR_FALSE, /* noLocks */
PR_FALSE, /* enableSessionTickets */
@ -8,4 +8,4 @@
+ 3, /* enableRenegotiation (default: transitional) */
PR_FALSE, /* requireSafeNegotiation */
PR_FALSE, /* enableFalseStart */
};
PR_TRUE /* cbcRandomIV */