[nss] Rebase pem sources to fedora-hosted upstream to pick up two fixes from rhel-6.3

[Elio Maldonado]

commit ab9d6706922c70953048fce3b8775a46b36e20b6
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Aug 27 16:19:41 2012 -0700

    Rebase pem sources to fedora-hosted upstream to pick up two fixes from rhel-6.3
    
    - Resolves: rhbz#847460 - Fix invalid read and free on invalid cert load
    - Resolves: rhbz#847462 - PEM module may attempt to free uninitialized pointer
    - Remove unneeded fix gcc 4.7 c++ issue in secmodt.h that actually undoes the upstream fix

 .gitignore |    2 +-
 nss.spec   |   14 ++++++++------
 sources    |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 64a2e0b..ece0056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ blank-cert9.db
 blank-key4.db
 PayPalEE.cert
 /nss-3.13.5-stripped.tar.bz2
-/nss-pem-20120402.tar.bz2
+/nss-pem-20120811.tar.bz2
diff --git a/nss.spec b/nss.spec
index daeb7b1..84fce30 100644
--- a/nss.spec
+++ b/nss.spec
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.13.5
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -52,7 +52,7 @@ Source7:          blank-key4.db
 Source8:          system-pkcs11.txt
 Source9:          setup-nsssysinit.sh
 Source10:         PayPalEE.cert
-Source12:         %{name}-pem-20120402.tar.bz2
+Source12:         %{name}-pem-20120811.tar.bz2
 
 Patch2:           add-relro-linker-option.patch
 Patch3:           renegotiate-transitional.patch
@@ -69,9 +69,6 @@ Patch29:          nss-ssl-cbc-random-iv-off-by-default.patch
 
 # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
 Patch30:          bz784672-protect-against-calls-before-nss_init.patch
-# Fix gcc 4.7 c++ issue in secmodt.h
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50917
-Patch31:          nss-fix-gcc47-secmodt.patch
 
 # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734484
 Patch32:          Bug-800674-Unable-to-contact-LDAP-Server-during-winsync.patch
@@ -164,7 +161,6 @@ low level services.
 # activate only if requested for this branch
 #%patch29 -p0 -b .770682
 %patch30 -p0 -b .784672
-%patch31 -p0 -b .gcc47
 %patch32 -p0 -b .800674
 %patch33 -p0 -b .800682
 %patch34 -p1 -b .772628
@@ -598,6 +594,12 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Mon Aug 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-8
+- Rebase pem sources to fedora-hosted upstream to pick up two fixes from rhel-6.3
+- Resolves: rhbz#847460 - Fix invalid read and free on invalid cert load
+- Resolves: rhbz#847462 - PEM module may attempt to free uninitialized pointer 
+- Remove unneeded fix gcc 4.7 c++ issue in secmodt.h that actually undoes the upstream fix
+
 * Mon Aug 13 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-7
 - Fix pluggable ecc support
 
diff --git a/sources b/sources
index 0191743..67c4cd8 100644
--- a/sources
+++ b/sources
@@ -4,5 +4,5 @@ a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 691e663ccc07b7a1eaa6f088e03bf8e2  blank-cert9.db
 2ec9e0606ba40fe65196545564b7cc2a  blank-key4.db
 bf47cecad861efa77d1488ad4a73cb5b  PayPalEE.cert
-d19159b7f91b94afaf7fa78bba006c13  nss-pem-20120402.tar.bz2
+2a06bf7b815d1a666cc3587b895506ce  nss-pem-20120811.tar.bz2
 658daa72d8a79589ba9e3712591939e9  nss-3.13.5-stripped.tar.bz2