OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=20

malloc.patch

@@ -0,0 +1,15 @@
+Index: security/nss/tests/ssl/ssl.sh
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/tests/ssl/ssl.sh,v
+retrieving revision 1.100
+diff -u -r1.100 ssl.sh
+--- security/nss/tests/ssl/ssl.sh	26 Mar 2009 23:14:34 -0000	1.100
++++ security/nss/tests/ssl/ssl.sh	6 Jun 2009 06:21:07 -0000
+@@ -974,6 +974,7 @@
+ 
+ ################################# main #################################
+ 
++unset MALLOC_CHECK_
+ ssl_init
+ ssl_run_tests
+ ssl_cleanup

mozilla-nss.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jun  6 15:37:13 CEST 2009 - wr@rosenauer.org
+
+- Temporary testsuite fix for Factory (bnc#509308) (malloc.patch)
+- remove the post scriptlet which created the *.chk files and
+  use a RPM feature to create them after debuginfo stuff
+
 -------------------------------------------------------------------
 Tue Jun  2 09:41:34 CEST 2009 - wr@rosenauer.org
 

mozilla-nss.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package mozilla-nss (Version 3.12.3)
 #
-# Copyright (c) 2006-2009 Wolfgang Rosenauer
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006-2009 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@ BuildRequires:  sqlite3-devel
 %endif
 License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Version:        3.12.3
-Release:        3
+Release:        4
 # bug437293
 %ifarch ppc64
 Obsoletes:      mozilla-nss-64bit
@@ -53,6 +53,7 @@ Patch5:         nss-no-rpath.patch
 Patch6:         nss-noexec.patch
 Patch7:         bmo488646-oscp-test.patch
 Patch8:         bmo485145-libjar.patch.bz2
+Patch9:         malloc.patch
 # Remove remnant traces from the package split.
 Provides:       libnss3 = %{version}-%{release}
 Obsoletes:      libnss3 <= %{version}-%{release}
@@ -62,7 +63,7 @@ PreReq:         libfreebl3 >= %{version}
 Requires(post): coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define nssdbdir %{_sysconfdir}/pki/nssdb
-%define run_testsuite 0
+%define run_testsuite 1
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -149,6 +150,9 @@ cd mozilla
 %patch6
 %patch7
 %patch8
+%if %suse_version > 1110
+%patch9
+%endif
 # additional CA certificates
 #cd security/nss/lib/ckfw/builtins
 #cat %{SOURCE2} >> certdata.txt
@@ -260,29 +264,16 @@ cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
                      -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
                      > $RPM_BUILD_ROOT/%{_bindir}/nss-config
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
+# create shlib sigs after extracting debuginfo
+%define __spec_install_post \
+  %{?__debug_package:%{__debug_install_post}} \
+  %{__arch_install_post} \
+  %{__os_install_post} \
+  LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/nss/shlibsign -i $RPM_BUILD_ROOT%{_libdir}/libsoftokn3.so \
+  LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/nss/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+%{nil}
 
-%post 
+%post -p /sbin/ldconfig
-/sbin/ldconfig
-# sign
-# removal of libfreebl3.so is a special needed case:
-# with this package it moves to %_lib and therefore is still
-# installed when %post runs disturbing the shlibsign tool
-rm -f %{_libdir}/libfreebl3.so
-rm -f %{_libdir}/libsoftokn3.chk
-rm -f /%{_lib}/libfreebl3.chk
-%{_libdir}/nss/shlibsign -i %{_libdir}/libsoftokn3.so
-%{_libdir}/nss/shlibsign -i /%{_lib}/libfreebl3.so
-# sign existing baselibs as well (FIXME other multiarchs)
-%ifarch x86_64
-if [ -e /lib/libfreebl3.so ]; then
-  rm -f /lib/libfreebl3.chk
-  %{_libdir}/nss/shlibsign -i /lib/libfreebl3.so
-fi
-if [ -e /usr/lib/libsoftokn3.so ]; then
-  rm -f /usr/lib/libsoftokn3.chk
-  %{_libdir}/nss/shlibsign -i /usr/lib/libsoftokn3.so
-fi
-%endif
 
 %postun -p /sbin/ldconfig
 
@@ -315,8 +306,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnsssqlite3.so
 %endif
 %{_libdir}/nss/shlibsign
-%ghost %verify(not md5 mtime size) %{_libdir}/libsoftokn3.chk
+%{_libdir}/libsoftokn3.chk
-%ghost %verify(not md5 mtime size) /%{_lib}/libfreebl3.chk
+/%{_lib}/libfreebl3.chk
 
 %files devel
 %defattr(644, root, root, 755)
@@ -337,6 +328,10 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libfreebl3.so
 
 %changelog
+* Sat Jun 06 2009 wr@rosenauer.org
+- Temporary testsuite fix for Factory (bnc#509308) (malloc.patch)
+- remove the post scriptlet which created the *.chk files and
+  use a RPM feature to create them after debuginfo stuff
 * Tue Jun 02 2009 wr@rosenauer.org
 - updated builtin root certs by updating to
   NSS_3_12_3_WITH_CKBI_1_75_RTM tag which is supposed to be the