[nss-softokn/private-nss-softokn-rebasework4fedora] Update patches to waht we have approved usptream

[Elio Maldonado]

commit d640ccf7510ca06e1da1e2289aee124d40a799ea
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Jun 17 18:09:45 2014 -0700

    Update patches to waht we have approved usptream

 determineLastFileBuilt.patch    |   21 +++++++++++++++++
 nss-softokn.spec                |    7 +++++-
 nss-versus-softoken-tests.patch |   47 +++++++++++---------------------------
 3 files changed, 41 insertions(+), 34 deletions(-)
---
diff --git a/determineLastFileBuilt.patch b/determineLastFileBuilt.patch
new file mode 100644
index 0000000..e8732f7
--- /dev/null
+++ b/determineLastFileBuilt.patch
@@ -0,0 +1,21 @@
+diff -up ./tests/all.sh.lastbuild ./tests/all.sh
+--- ./tests/all.sh.lastbuild	2014-06-17 15:34:41.624628370 -0700
++++ ./tests/all.sh	2014-06-17 15:38:49.692101477 -0700
+@@ -299,9 +299,15 @@ fi
+ # created, we check for modutil to know whether the build
+ # is complete. If a new file is created after that, the 
+ # following test for modutil should check for that instead.
++# Exception: when building softoken only, shlibsign is the
++# last file created.
++if [ ${NSS_BUILD_SOFTOKEN_ONLY} -eq "1" ]; then
++  LAST_FILE_BUILT=shlibsign
++else
++  LAST_FILE_BUILT=modutil
++fi
+ 
+-if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a  \
+-     ! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
++if [ ! -f ${DIST}/${OBJDIR}/bin/${LAST_FILE_BUILT}${PROG_SUFFIX} ]; then
+     echo "Build Incomplete. Aborting test." >> ${LOGFILE}
+     html_head "Testing Initialization"
+     Exit "Checking for build"
diff --git a/nss-softokn.spec b/nss-softokn.spec
index f982bf1..fce5bfe 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -60,6 +60,8 @@ Source3:          nss-softokn-config.in
 Patch1:           build-nss-softoken-only.patch
 # Build only the softoken and freebl related tools
 Patch8:           softoken-minimal-test-dependencies.patch
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1020395
+Patch12:          determineLastFileBuilt.patch
 # Select the tests to run based on the type of build
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=902171
 Patch9:           nss-versus-softoken-tests.patch
@@ -124,7 +126,10 @@ Header and library files for doing development with Network Security Services.
 
 %patch1 -p0 -b .softokenonly
 %patch8 -p0 -b .crypto
-%patch9 -p0 -b .cryptotests
+pushd nss
+%patch12 -p1 -b .lastbuilt
+%patch9 -p1 -b .cryptotests
+popd
 # activate if needed when doing a major update with new apis
 %patch10 -p0 -b .iquote
 pushd nss
diff --git a/nss-versus-softoken-tests.patch b/nss-versus-softoken-tests.patch
index 40b1808..5bfc70c 100644
--- a/nss-versus-softoken-tests.patch
+++ b/nss-versus-softoken-tests.patch
@@ -1,42 +1,23 @@
-diff -up nss/tests/all.sh.cryptotests nss/tests/all.sh
---- nss/tests/all.sh.cryptotests	2013-05-28 14:43:24.000000000 -0700
-+++ nss/tests/all.sh	2013-06-17 11:11:49.626902227 -0700
-@@ -299,9 +299,13 @@ fi
- # created, we check for modutil to know whether the build
- # is complete. If a new file is created after that, the 
- # following test for modutil should check for that instead.
--
--if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a  \
--     ! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
-+# Except when building softoken only where shlibsign is the last one built.
-+if [ "${NSS_BUILD_SOFTOKEN_ONLY}" -eq "1" ]; then
-+    LAST_BUILT=shlibsign || modutil
-+else
-+    LAST_BUILT=modutil
-+fi
-+if [ ! -x ${DIST}/${OBJDIR}/bin/${LAST_BUILT}${PROG_SUFFIX} ]; then
-     echo "Build Incomplete. Aborting test." >> ${LOGFILE}
-     html_head "Testing Initialization"
-     Exit "Checking for build"
-diff -up nss/tests/cipher/cipher.sh.cryptotests nss/tests/cipher/cipher.sh
---- nss/tests/cipher/cipher.sh.cryptotests	2013-05-28 14:43:24.000000000 -0700
-+++ nss/tests/cipher/cipher.sh	2013-06-17 11:10:18.946049972 -0700
-@@ -129,6 +129,16 @@ if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${
+diff --git a/tests/cipher/cipher.sh b/tests/cipher/cipher.sh
+--- a/tests/cipher/cipher.sh
++++ b/tests/cipher/cipher.sh
+@@ -124,11 +124,17 @@ cipher_cleanup()
+ # built and the cipher suite run as part of an nss-softoken build. 
+ if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${PROG_SUFFIX} ]; then
+     echo "bltest not built, skipping this test." >> ${LOGFILE}
+     res = 0
+     html_msg $res $EXP_RET "$TESTNAME"
      return 0
  fi
  cipher_init
 -cipher_main
 -cipher_gcm
-+if [ "${NSS_BUILD_SOFTOKEN_ONLY}" = "1" ]; then
-+    echo "Skipping cipher_gcm because this is a softoken only build"
-+    cipher_main
-+elif [ "${NSS_BUILD_WITHOUT_SOFTOKEN}" = "1" ]; then
-+    echo "Skipping cipher_main because this an nss without softoken build"
-+    cipher_gcm
-+else
-+    # default is to run both
-+    cipher_init
++# Skip cipher_main if this an NSS without softoken build.
++if [ "${NSS_BUILD_WITHOUT_SOFTOKEN}" != "1" ]; then
 +    cipher_main
++fi
++# Skip cipher_gcm if this is a softoken only build.
++if [ "${NSS_BUILD_SOFTOKEN_ONLY}" != "1" ]; then
 +    cipher_gcm
 +fi
  cipher_cleanup