From f78be8f9b20a7e7dfb197ebf86b036a21470ebce Mon Sep 17 00:00:00 2001
From: Kai Engert <kengert@fedoraproject.org>
Date: Tue, 24 Jun 2008 18:23:59 +0000
Subject: [PATCH] - nss package should own /etc/prelink.conf.d folder,
 rhbz#452062 - use upstream patch to fix test suite abort

---
 nss-fix-tests.patch | 56 ++++++++++++---------------------------------
 nss.spec            |  6 ++++-
 2 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/nss-fix-tests.patch b/nss-fix-tests.patch
index f56559f..ae7dc68 100644
--- a/nss-fix-tests.patch
+++ b/nss-fix-tests.patch
@@ -1,44 +1,18 @@
-diff -up ./mozilla/security/nss/tests/header.prex ./mozilla/security/nss/tests/header
---- ./mozilla/security/nss/tests/header.prex	2008-03-17 21:36:11.000000000 +0100
-+++ ./mozilla/security/nss/tests/header	2008-03-17 21:36:47.000000000 +0100
-@@ -1114,8 +1114,8 @@ qa_stat_get_sysinfo()
- set_objdir()
- {
-     Debug "set object dir"
--    OBJDIR=`cd ${TESTSCRIPTDIR}/common; gmake objdir_name`
--    OS_ARCH=`cd ${TESTSCRIPTDIR}/common; gmake os_arch`
-+    OBJDIR=`cd ${TESTSCRIPTDIR}/common; gmake --no-print-directory objdir_name`
-+    OS_ARCH=`cd ${TESTSCRIPTDIR}/common; gmake --no-print-directory os_arch`
-     
-     #at this point $MASTERBUILD needs to be either NT or unix
+? mozilla/security/nss/tests/mylog
+? mozilla/security/nss/tests/cert/mylog
+? mozilla/security/nss/tests/fips/mylog
+Index: mozilla/security/nss/tests/common/init.sh
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/tests/common/init.sh,v
+retrieving revision 1.63
+diff -u -u -r1.63 init.sh
+--- mozilla/security/nss/tests/common/init.sh	4 Apr 2008 07:39:05 -0000	1.63
++++ mozilla/security/nss/tests/common/init.sh	11 Jun 2008 15:53:21 -0000
+@@ -265,6 +265,7 @@
+     MAKE=gmake
+     $MAKE -v >/dev/null 2>&1 || MAKE=make
+     $MAKE -v >/dev/null 2>&1 || { echo "You are missing make."; exit 5; }
++    MAKE="$MAKE --no-print-directory"
  
-diff -up ./mozilla/security/nss/tests/nsspath.prex ./mozilla/security/nss/tests/nsspath
---- ./mozilla/security/nss/tests/nsspath.prex	2008-03-17 21:37:10.000000000 +0100
-+++ ./mozilla/security/nss/tests/nsspath	2008-03-17 21:37:23.000000000 +0100
-@@ -2,7 +2,7 @@
- 
- set PWD=`pwd`
- source /u/sonmi/bin/nssdir $*
--set OBJDIR=`(cd mozilla/security/nss/tests/common; gmake objdir_name)`
-+set OBJDIR=`(cd mozilla/security/nss/tests/common; gmake --no-print-directory objdir_name)`
- setenv PATH `perl /u/sonmi/bin/path_uniq -s "${PATH}:${UXDIST}/${OBJDIR}/bin"`
- if ( `uname -n` == "iws-perf" ) then
-     setenv LD_LIBRARY_PATH "${UXDIST}/${OBJDIR}/lib:/opt/nfast/toolkits/pkcs11"
-diff -up ./mozilla/security/nss/tests/common/init.sh.prex ./mozilla/security/nss/tests/common/init.sh
---- ./mozilla/security/nss/tests/common/init.sh.prex	2008-03-17 21:37:32.000000000 +0100
-+++ ./mozilla/security/nss/tests/common/init.sh	2008-03-17 21:38:52.000000000 +0100
-@@ -269,10 +269,10 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
      DIST=${DIST-${MOZILLA_ROOT}/dist}
      SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss}
-     TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security}
--    OBJDIR=`(cd $COMMON; $MAKE objdir_name)`
--    OS_ARCH=`(cd $COMMON; $MAKE os_arch)`
--    DLL_PREFIX=`(cd $COMMON; $MAKE dll_prefix)`
--    DLL_SUFFIX=`(cd $COMMON; $MAKE dll_suffix)`
-+    OBJDIR=`(cd $COMMON; $MAKE --no-print-directory objdir_name)`
-+    OS_ARCH=`(cd $COMMON; $MAKE --no-print-directory os_arch)`
-+    DLL_PREFIX=`(cd $COMMON; $MAKE --no-print-directory dll_prefix)`
-+    DLL_SUFFIX=`(cd $COMMON; $MAKE --no-print-directory dll_suffix)`
-     OS_NAME=`uname -s | sed -e "s/-[0-9]*\.[0-9]*//" | sed -e "s/-WOW64//"`
- 
-     BINDIR="${DIST}/${OBJDIR}/bin"
diff --git a/nss.spec b/nss.spec
index 67fdae0..d05fbe2 100644
--- a/nss.spec
+++ b/nss.spec
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.0.3
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -297,6 +297,7 @@ done
 %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
 %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
+%dir %{_sysconfdir}/prelink.conf.d
 %{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
 %files tools
@@ -440,6 +441,9 @@ done
 
 
 %changelog
+* Tue Jun 24 2008 Kai Engert <kengert@redhat.com> - 3.12.0.3-3
+- nss package should own /etc/prelink.conf.d folder, rhbz#452062
+- use upstream patch to fix test suite abort
 * Mon Jun 02 2008 Kai Engert <kengert@redhat.com> - 3.12.0.3-2
 - Update to NSS_3_12_RC4
 * Mon Apr 14 2008 Kai Engert <kengert@redhat.com> - 3.12.0.1-1