[nss] - Update to NSS_3_13_3_RTM

[Elio Maldonado]

commit ca7f73c317b34b339ce0865472b3e7ecb4203120
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Feb 29 19:20:40 2012 -0800

    - Update to NSS_3_13_3_RTM
    
    - Keeping the requires on nss-softokn at 3.13.1 temporarily
    - Removed nss-ckbi-1.88.rtm.patch which we no longer need due to the update

 .gitignore                  |    2 +-
 nss-ckbi-1.88.rtm.patch     |  637 -------------------------------------------
 nss-fix-gcc47-secmodt.patch |    8 +-
 nss.spec                    |   13 +-
 sources                     |    2 +-
 5 files changed, 13 insertions(+), 649 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 101e14e..abf5f25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-nss-3.13.1-stripped.tar.bz2
+nss-3.13.3-stripped.tar.bz2
 nss-pem-20101125.tar.bz2
 blank-cert8.db
 blank-key3.db
diff --git a/nss-fix-gcc47-secmodt.patch b/nss-fix-gcc47-secmodt.patch
index 361555e..9ed6e5e 100644
--- a/nss-fix-gcc47-secmodt.patch
+++ b/nss-fix-gcc47-secmodt.patch
@@ -1,11 +1,11 @@
 diff -up ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47 ./mozilla/security/nss/lib/softoken/secmodt.h
---- ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47	2012-01-30 16:14:41.179494528 -0500
-+++ ./mozilla/security/nss/lib/softoken/secmodt.h	2012-01-30 16:14:48.287424482 -0500
-@@ -338,7 +338,7 @@ typedef PRUint32 PK11AttrFlags;
+--- ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47	2012-02-29 16:27:58.474061098 -0800
++++ ./mozilla/security/nss/lib/softoken/secmodt.h	2012-02-29 16:30:55.604349312 -0800
+@@ -342,7 +342,7 @@ typedef PRUint32 PK11AttrFlags;
  #define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
  
  #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \
--"Flags=internal,critical"fips" slotparams=("#slot"={"SECMOD_SLOT_FLAGS"})"
+-"Flags=internal,critical" fips " slotparams=(" #slot "={" SECMOD_SLOT_FLAGS "})"
 +"Flags=internal,critical" fips" slotparams=("#slot"={" SECMOD_SLOT_FLAGS"})"
  
  #define SECMOD_INT_NAME "NSS Internal PKCS #11 Module"
diff --git a/nss.spec b/nss.spec
index 82e851b..bd6e144 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,13 +1,13 @@
-%global nspr_version 4.8.9
-%global nss_util_version 3.13.1
+%global nspr_version 4.9
+%global nss_util_version 3.13.3
 %global nss_softokn_fips_version 3.12.9
 %global nss_softokn_version 3.13.1
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.13.1
-Release:          13%{?dist}
+Version:          3.13.3
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -63,7 +63,6 @@ Patch18:          nss-646045.patch
 Patch20:          nsspem-createobject-initialize-pointer.patch
 Patch21:          0001-libnsspem-rhbz-734760.patch
 Patch22:          nsspem-init-inform-not-thread-safe.patch
-Patch23:          nss-ckbi-1.88.rtm.patch
 # must statically link pem against the 3.12.x system freebl in the buildroot
 Patch25:          nsspem-use-system-freebl.patch
 # don't compile the fipstest application
@@ -159,7 +158,6 @@ low level services.
 %patch20 -p1 -b .717338
 %patch21 -p1 -b .734760
 %patch22 -p0 -b .736410
-%patch23 -p0 -b .ckbi188
 # link pem against buildroot's 3.12 freebl
 %patch25 -p0 -b .systemfreebl
 %patch26 -p0 -b .nofipstest
@@ -582,6 +580,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Thu Mar 01 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-1
+- Update to NSS_3_13_3_RTM
+
 * Mon Jan 30 2012 Tom Callaway <spot at fedoraproject.org> - 3.13.1-13
 - fix issue with gcc 4.7 in secmodt.h and C++11 user-defined literals
 
diff --git a/sources b/sources
index 38ac629..e9123b8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-5e92ca8e516fd7f6a566e1690f313106  nss-3.13.1-stripped.tar.bz2
+3d211ab803585d449f94e67cbeca8502  nss-3.13.3-stripped.tar.bz2
 e63cddf74c07f0d818d1052ecc6fbb1f  nss-pem-20101125.tar.bz2
 a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 9315689bbd9f28ceebd47894f99fccbd  blank-key3.db