From 89045d8452707faa7031486ff304a06ada500d27 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Sun, 1 Apr 2012 16:35:48 -0700
Subject: [PATCH] Update to NSS_3_13.4_BETA1

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

diff --git a/.gitignore b/.gitignore
index abf5f25..cde141e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-nss-3.13.3-stripped.tar.bz2
 nss-pem-20101125.tar.bz2
 blank-cert8.db
 blank-key3.db
@@ -6,3 +5,4 @@ blank-secmod.db
 blank-cert9.db
 blank-key4.db
 PayPalEE.cert
+/nss-3.13.4-stripped.tar.bz2
diff --git a/nss.spec b/nss.spec
index 29cf342..bab57aa 100644
--- a/nss.spec
+++ b/nss.spec
@@ -6,8 +6,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.13.3
-Release:          4%{?dist}
+Version:          3.13.4
+Release:          0.1%{?dist}.beta.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -84,7 +84,9 @@ Patch32:          Bug-800674-Unable-to-contact-LDAP-Server-during-winsync.patch
 # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
 Patch33:          Bug-800682-Qpid-AMQP-daemon-fails-to-load-after-nss-update.patch
 
-# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734441
+# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=723740
+# Fixed on freel for 3.13.4, disable the patch for now
+# TODO: Remove patch when we verify that it's not needed
 Patch34:          Bug-800676-nss-workaround-for-freebl-bug-that-causes-openswan-to-drop-connections.patch
 
 # Activate when verified in RHEL
@@ -182,7 +184,8 @@ low level services.
 %patch31 -p0 -b .gcc47
 %patch32 -p0 -b .800674
 %patch33 -p0 -b .800682
-%patch34 -p0 -b .800676
+# disabling to test the fix
+#%patch34 -p0 -b .800676
 
 
 %build
@@ -601,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Sun Apr 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.4-0.1.beta1.1
+- Update to NSS_3_13.4_BETA1
+
 * Wed Mar 21 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.3-4
 - Resolves: Bug 805723 - Library needs partial RELRO support added
 
diff --git a/sources b/sources
index e9123b8..1619a2b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-3d211ab803585d449f94e67cbeca8502  nss-3.13.3-stripped.tar.bz2
 e63cddf74c07f0d818d1052ecc6fbb1f  nss-pem-20101125.tar.bz2
 a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 9315689bbd9f28ceebd47894f99fccbd  blank-key3.db
@@ -6,3 +5,4 @@ a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 691e663ccc07b7a1eaa6f088e03bf8e2  blank-cert9.db
 2ec9e0606ba40fe65196545564b7cc2a  blank-key4.db
 bf47cecad861efa77d1488ad4a73cb5b  PayPalEE.cert
+13717d6132b9cba15062ee34020ecd5a  nss-3.13.4-stripped.tar.bz2