diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 8801912..841e15f 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Sat Sep 25 08:18:59 CEST 2010 - wr@rosenauer.org - -- update to 3.12.8 RTM release - * support TLS false start (needed for Firefox4) (bmo#525092) - * fix wildcard matching for IP addresses (bnc#637290, bmo#578697) - (CVE-2010-3170) - * bugfixes - ------------------------------------------------------------------- Fri Jul 23 21:18:30 CEST 2010 - wr@rosenauer.org diff --git a/mozilla-nss.spec b/mozilla-nss.spec index a83831a..139f104 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -1,5 +1,5 @@ # -# spec file for package mozilla-nss (Version 3.12.8) +# spec file for package mozilla-nss (Version 3.12.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006-2010 Wolfgang Rosenauer @@ -29,7 +29,7 @@ BuildRequires: sqlite-devel BuildRequires: sqlite3-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPL -Version: 3.12.8 +Version: 3.12.7 Release: 1 # bug437293 %ifarch ppc64 @@ -288,15 +288,6 @@ cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \ chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config # setup-nsssysinfo.sh install -m 744 %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/ -# create empty NSS database -#LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/modutil -force -dbdir "sql:$RPM_BUILD_ROOT%{nssdbdir}" -create -#LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/certutil -N -d "sql:$RPM_BUILD_ROOT%{nssdbdir}" -f /dev/null 2>&1 > /dev/null -#chmod 644 "$RPM_BUILD_ROOT%{nssdbdir}"/* -#sed "s:%{buildroot}::g -#s/^library=$/library=libnsssysinit.so/ -#/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/" \ -# $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt > $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt.sed -# mv $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt{.sed,} # copy empty NSS database install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{nssdbdir} install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{nssdbdir} diff --git a/nss-3.12.7.tar.bz2 b/nss-3.12.7.tar.bz2 new file mode 100644 index 0000000..f846cab --- /dev/null +++ b/nss-3.12.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ba8bb3c75f2c33d58e4e64a81b265aab234cdde5028766e4352edc1ea0dd288 +size 4501354 diff --git a/nss-3.12.8.tar.bz2 b/nss-3.12.8.tar.bz2 deleted file mode 100644 index c43a975..0000000 --- a/nss-3.12.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:332a65a13f963699b65f1815bda5533546b886be05cc6e63c9f96b8c5a40f23d -size 4505566 diff --git a/nss-opt.patch b/nss-opt.patch index 38e6136..91e66e1 100644 --- a/nss-opt.patch +++ b/nss-opt.patch @@ -1,11 +1,11 @@ Index: security/coreconf/Linux.mk =================================================================== RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v -retrieving revision 1.45.2.1 -diff -u -r1.45.2.1 Linux.mk ---- security/coreconf/Linux.mk 31 Jul 2010 04:23:37 -0000 1.45.2.1 -+++ security/coreconf/Linux.mk 5 Aug 2010 07:35:06 -0000 -@@ -112,11 +112,7 @@ +retrieving revision 1.41 +diff -u -r1.41 Linux.mk +--- security/coreconf/Linux.mk 29 Jul 2009 23:43:41 -0000 1.41 ++++ security/coreconf/Linux.mk 31 Jul 2009 08:02:50 -0000 +@@ -119,11 +119,7 @@ endif ifdef BUILD_OPT @@ -16,5 +16,5 @@ diff -u -r1.45.2.1 Linux.mk -endif + OPTIMIZER = $(OPT_FLAGS) ifdef MOZ_DEBUG_SYMBOLS - ifdef MOZ_DEBUG_FLAGS - OPTIMIZER += $(MOZ_DEBUG_FLAGS) + OPTIMIZER += -gstabs+ + endif diff --git a/renegotiate-transitional.patch b/renegotiate-transitional.patch index 176480e..bf63c70 100644 --- a/renegotiate-transitional.patch +++ b/renegotiate-transitional.patch @@ -1,16 +1,16 @@ Index: security/nss/lib/ssl/sslsock.c =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslsock.c,v -retrieving revision 1.67.2.1 -diff -u -p -r1.67.2.1 sslsock.c ---- security/nss/lib/ssl/sslsock.c 31 Jul 2010 04:33:52 -0000 1.67.2.1 -+++ security/nss/lib/ssl/sslsock.c 5 Aug 2010 07:38:13 -0000 +retrieving revision 1.66 +diff -u -p -r1.66 sslsock.c +--- security/nss/lib/ssl/sslsock.c 26 Feb 2010 20:44:54 -0000 1.66 ++++ security/nss/lib/ssl/sslsock.c 1 Mar 2010 18:05:10 -0000 @@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* noLocks */ PR_FALSE, /* enableSessionTickets */ PR_FALSE, /* enableDeflate */ - 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ ++ 3, /* enableRenegotiation (default: transitional) PR_FALSE, /* requireSafeNegotiation */ - PR_FALSE, /* enableFalseStart */ }; +