[nss-softokn/f16] Update patch on account of new sources

[Elio Maldonado]

commit 41212f371018389ebf0274c91a54493b8f43426a
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Dec 17 20:30:24 2012 -0800

    Update patch on account of new sources

 softoken-minimal-test-dependencies.patch |   41 ++++++++++++-----------------
 1 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/softoken-minimal-test-dependencies.patch b/softoken-minimal-test-dependencies.patch
index 51e0cd2..1ebc33e 100644
--- a/softoken-minimal-test-dependencies.patch
+++ b/softoken-minimal-test-dependencies.patch
@@ -1,6 +1,6 @@
 diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cmd/manifest.mn
---- ./mozilla/security/nss/cmd/manifest.mn.crypto	2012-09-01 18:29:28.000000000 +0000
-+++ ./mozilla/security/nss/cmd/manifest.mn	2012-10-02 15:59:32.213547057 +0000
+--- ./mozilla/security/nss/cmd/manifest.mn.crypto	2012-12-17 20:05:50.871366822 -0800
++++ ./mozilla/security/nss/cmd/manifest.mn	2012-12-17 20:07:55.174200116 -0800
 @@ -9,52 +9,10 @@ DEPTH	= ../..
  REQUIRES = nss nspr libdbm
  
@@ -54,10 +54,10 @@ diff -up ./mozilla/security/nss/cmd/manifest.mn.crypto ./mozilla/security/nss/cm
   $(NULL)
  
  TEMPORARILY_DONT_BUILD = \
-diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/platlibs.mk
---- mozilla/security/nss/cmd/platlibs.mk.crypto	2010-06-11 17:58:33.000000000 -0700
-+++ mozilla/security/nss/cmd/platlibs.mk	2011-10-11 10:40:37.319478239 -0700
-@@ -92,44 +92,13 @@ DEFINES += -DNSS_USE_STATIC_LIBS
+diff -up ./mozilla/security/nss/cmd/platlibs.mk.crypto ./mozilla/security/nss/cmd/platlibs.mk
+--- ./mozilla/security/nss/cmd/platlibs.mk.crypto	2012-12-17 20:08:40.894283652 -0800
++++ ./mozilla/security/nss/cmd/platlibs.mk	2012-12-17 20:23:33.086389792 -0800
+@@ -38,44 +38,13 @@ DEFINES += -DNSS_USE_STATIC_LIBS
  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
  CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  
@@ -102,7 +102,7 @@ diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/pl
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
-@@ -143,30 +112,9 @@ EXTRA_LIBS += \
+@@ -89,30 +58,9 @@ EXTRA_LIBS += \
  else
  
  EXTRA_LIBS += \
@@ -133,7 +133,7 @@ diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/pl
  	$(NULL)
  
  ifeq ($(OS_ARCH), AIX) 
-@@ -199,9 +147,6 @@ ifeq (,$(filter-out WINNT WINCE,$(OS_ARC
+@@ -145,9 +93,6 @@ ifeq (,$(filter-out WINNT WINCE,$(OS_ARC
  EXTRA_LIBS += \
  	$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
  	$(DIST)/lib/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \
@@ -143,7 +143,7 @@ diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/pl
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
-@@ -227,9 +172,6 @@ endif
+@@ -173,9 +118,6 @@ endif
  # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
  EXTRA_SHARED_LIBS += \
  	-L$(DIST)/lib \
@@ -153,10 +153,10 @@ diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/pl
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
-diff -up mozilla/security/nss/tests/all.sh.crypto mozilla/security/nss/tests/all.sh
---- mozilla/security/nss/tests/all.sh.crypto	2010-01-29 11:58:40.000000000 -0800
-+++ mozilla/security/nss/tests/all.sh	2011-10-11 11:06:41.884531933 -0700
-@@ -303,18 +303,18 @@ run_cycles()
+diff -up ./mozilla/security/nss/tests/all.sh.crypto ./mozilla/security/nss/tests/all.sh
+--- ./mozilla/security/nss/tests/all.sh.crypto	2012-12-17 20:14:39.404324192 -0800
++++ ./mozilla/security/nss/tests/all.sh	2012-12-17 20:19:42.205035836 -0800
+@@ -270,18 +270,18 @@ run_cycles()
  
  ############################## main code ###############################
  
@@ -164,22 +164,22 @@ diff -up mozilla/security/nss/tests/all.sh.crypto mozilla/security/nss/tests/all
 +cycles="standard"
  CYCLES=${NSS_CYCLES:-$cycles}
  
--tests="cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
+-tests="cipher lowhash libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
 +tests="cipher"
  TESTS=${NSS_TESTS:-$tests}
  
  ALL_TESTS=${TESTS}
  
 -nss_ssl_tests="crl bypass_normal normal_bypass fips_normal normal_fips iopr"
-+nss_ssl_tests=""
++nss_ssl_tests=" "
  NSS_SSL_TESTS="${NSS_SSL_TESTS:-$nss_ssl_tests}"
  
 -nss_ssl_run="cov auth stress"
-+nss_ssl_run=""
++nss_ssl_run=" "
  NSS_SSL_RUN="${NSS_SSL_RUN:-$nss_ssl_run}"
  
  SCRIPTNAME=all.sh
-@@ -328,13 +328,20 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
+@@ -295,13 +295,13 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
  fi
  
  # NOTE:
@@ -192,13 +192,6 @@ diff -up mozilla/security/nss/tests/all.sh.crypto mozilla/security/nss/tests/all
  
 -if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a  \
 -     ! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
-+########################################################################
-+# -- testing softoken module --
-+# This modified copy of all.sh runs a reduced set of directories.
-+# We check for the latest item being built.
-+# See variable DIRS in security/nss/cmd/manifest.mn
-+########################################################################
-+
 +if [ ! -f ${DIST}/${OBJDIR}/bin/shlibsign -a  \
 +     ! -f ${DIST}/${OBJDIR}/bin/shlibsign.exe ]; then
      echo "Build Incomplete. Aborting test." >> ${LOGFILE}