[nss-softokn/f16] Resolves: Bug 801975 Restore use of NSS_NoDB_Init or alternate to fipstest

[Elio Maldonado]

commit 582eb78f8f055754b9dfea3701415c225da784d7
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Wed Apr 11 10:45:28 2012 -0700

    Resolves: Bug 801975 Restore use of NSS_NoDB_Init or alternate to fipstest

 ...Restore-use-of-NSS_NoDB_Init-or-alternate.patch |   13 +++++++++++++
 nss-softokn.spec                                   |   11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/Bug-801975-Restore-use-of-NSS_NoDB_Init-or-alternate.patch b/Bug-801975-Restore-use-of-NSS_NoDB_Init-or-alternate.patch
new file mode 100644
index 0000000..6fab7c2
--- /dev/null
+++ b/Bug-801975-Restore-use-of-NSS_NoDB_Init-or-alternate.patch
@@ -0,0 +1,13 @@
+diff -up ./mozilla/security/nss/cmd/fipstest/fipstest.c.801975 ./mozilla/security/nss/cmd/fipstest/fipstest.c
+--- ./mozilla/security/nss/cmd/fipstest/fipstest.c.801975	2011-09-17 14:10:05.000000000 -0700
++++ ./mozilla/security/nss/cmd/fipstest/fipstest.c	2012-04-10 11:14:55.700732586 -0700
+@@ -4940,6 +4940,9 @@ loser:
+ int main(int argc, char **argv)
+ {
+     if (argc < 2) exit (-1);
++	
++    RNG_RNGInit();
++    SECOID_Init();
+ 
+     /*************/
+     /*   TDEA    */
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 8dd03de..15473d0 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.13.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -70,6 +70,11 @@ Patch8:           softoken-minimal-test-dependencies.patch
 # NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers. 
 # Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
 Patch9:           iquote.patch
+# Upstream bug numbers:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=679814
+# https://bugzilla.mozilla.org/show_bug.cgi?id=698049
+# https://bugzilla.mozilla.org/show_bug.cgi?id=475578
+Patch11:          Bug-801975-Restore-use-of-NSS_NoDB_Init-or-alternate.patch
 
 %description
 Network Security Services Softoken Cryptographic Module
@@ -124,6 +129,7 @@ Header and library files for doing development with Network Security Services.
 %patch8 -p0 -b .crypto
 # activate if needed when doing a major update with new apis
 #%patch9 -p0 -b .iquote
+%patch11 -p0 -b .801975
 
 %build
 
@@ -402,6 +408,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Apr 10 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-2
+- Resolves: Bug 801975 Restore use of NSS_NoDB_Init or alternate to fipstest
+
 * Sat Apr 07 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-1
 - Update to NSS_3_13_4