Update patches to what patches to what has been approved upstream

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"

nss-versus-softoken-tests.patch

@@ -1,38 +1,23 @@
-diff -up nss/tests/all.sh.crypto nss/tests/all.sh
---- nss/tests/all.sh.crypto	2013-05-28 14:43:24.000000000 -0700
-+++ nss/tests/all.sh	2013-06-13 12:14:12.741082184 -0700
-@@ -299,9 +299,10 @@ 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.
-+# Except when building softoken only where shlibsign is the last one built.
-+export LAST_BUILT=[ ${NSS_BUILD_SOFTOKEN_ONLY} -eq "1" ] && shlibsign || modutil
- 
--if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a  \
--     ! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
-+if [ ! -f ${DIST}/${OBJDIR}/bin/${LAST_BUILT}${PROG_SUFFIX} -a ]; then
-     echo "Build Incomplete. Aborting test." >> ${LOGFILE}
-     html_head "Testing Initialization"
-     Exit "Checking for build"
-diff -up nss/tests/cipher/cipher.sh.crypto nss/tests/cipher/cipher.sh
---- nss/tests/cipher/cipher.sh.crypto	2013-05-28 14:43:24.000000000 -0700
-+++ nss/tests/cipher/cipher.sh	2013-06-13 11:58:00.956064976 -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

nss.spec

@@ -139,6 +139,8 @@ Source203:          nss-softokn-config.in
 
 Patch211:           nss-softokn-allow-level1.patch
 
+# Upstrem: https://bugzilla.mozilla.org/show_bug.cgi?id=1020395
+Patch98: determineLastFileBuilt.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -309,8 +311,11 @@ low level services.
 # link pem against buildroot's freebl, essential when mixing and matching
 %patch40 -p0 -b .noocsptest
 %patch47 -p0 -b .templates
-%patch48 -p0 -b .crypto
-%patch49 -p0 -b .skipthem
+pushd nss
+%patch98 -p1 -b .lastbuild
+%patch48 -p1 -b .crypto
+%patch49 -p1 -b .skipthem
+popd
 %patch55 -p0 -b .852023
 pushd nss
 %patch56 -p1 -b .1026677