From c45196731ab4ebefe701eba716938746ffb20c85 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Thu, 25 Nov 2010 12:43:08 -0800
Subject: [PATCH] - Update pem source tar with fixes for 614532 and 596674 -
 Remove no longer needed patches

---
 .gitignore |  2 +-
 nss.spec   | 14 ++++++--------
 sources    |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index febc09d..8fe5a3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 nss-3.12.8-stripped.tar.bz2
-nss-pem-20100809.tar.bz2
+nss-pem-20101125.tar.bz2
 blank-cert8.db
 blank-key3.db
 blank-secmod.db
diff --git a/nss.spec b/nss.spec
index df5d15b..9b4d957 100644
--- a/nss.spec
+++ b/nss.spec
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.8
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -37,13 +37,10 @@ Source7:          blank-key4.db
 Source8:          system-pkcs11.txt
 Source9:          setup-nsssysinit.sh
 Source10:         PayPalEE.cert
-Source12:         %{name}-pem-20100809.tar.bz2
+Source12:         %{name}-pem-20101125.tar.bz2
 
 Patch3:           renegotiate-transitional.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           nsspem-596674.patch
-Patch9:           0001-Add-support-for-PKCS-8-encoded-private-keys.patch
-Patch10:          0001-Do-not-define-SEC_SkipTemplate.patch
 Patch11:          nss-sysinit-fix-trustorder.patch
 Patch12:          nss-sysinit-userdb-first.patch
 
@@ -116,9 +113,6 @@ low level services.
 
 %patch3 -p0 -b .transitional
 %patch6 -p0 -b .libpem
-%patch7 -p0 -b .596674
-%patch9 -p1 -b .pkcs8privatekey
-%patch10 -p1 -b .noskiptemplate
 %patch11 -p1 -b .643134
 %patch12 -p0 -b .603313
 
@@ -492,6 +486,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 %{_libdir}/libnssckfw.a
 
 %changelog
+* Thu Nov 25 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-9
+- Update pem source tar with fixes for 614532 and 596674
+- Remove no longer needed patches
+
 * Fri Nov 05 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-8
 - Update PayPalEE.cert test certificate which had expired
 
diff --git a/sources b/sources
index 479044c..2d52749 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 248bc97cb3fd613b23d66fd1d9d8d60a  nss-3.12.8-stripped.tar.bz2
-765fa031d5affa91ab824dd981777ddf  nss-pem-20100809.tar.bz2
+e63cddf74c07f0d818d1052ecc6fbb1f  nss-pem-20101125.tar.bz2
 a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 9315689bbd9f28ceebd47894f99fccbd  blank-key3.db
 73bc040a0542bba387e6dd7fb9fd7d23  blank-secmod.db