[nss] Update pem sources to pick up a patch applied upstream which a faulty merge had missed

Elio Maldonado emaldonado at fedoraproject.org
Wed Aug 28 19:59:59 UTC 2013


commit da85237acea73745727067c56e2949a4e37bf1f2
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 28 12:59:23 2013 -0700

    Update pem sources to pick up a patch applied upstream which a faulty merge had missed
    
    - The pem module should not require unique file basenames

 .gitignore |    2 +-
 nss.spec   |    6 +++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 01e9c65..71d69f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
 /nss-3.15.1-stripped.tar.bz2
-/nss-pem-20130827.tar.bz2
+/nss-pem-20130828.tar.bz2
diff --git a/nss.spec b/nss.spec
index e78c8db..c141092 100644
--- a/nss.spec
+++ b/nss.spec
@@ -71,7 +71,7 @@ Source7:          blank-key4.db
 Source8:          system-pkcs11.txt
 Source9:          setup-nsssysinit.sh
 Source10:         PayPalEE.cert
-Source12:         %{name}-pem-20130827.tar.bz2
+Source12:         %{name}-pem-20130828.tar.bz2
 Source17:         TestCA.ca.cert
 Source18:         TestUser50.cert
 Source19:         TestUser51.cert
@@ -760,6 +760,10 @@ fi
 
 
 %changelog
+* Wed Aug 28 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.1-7
+- Update pem sources to pick up a patch applied upstream which a faulty merge had missed
+- The pem module should not require unique file basenames
+
 * Tue Aug 27 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.1-6
 - Update pem sources to the latest from interim upstream
 
diff --git a/sources b/sources
index 4c7ac5d..d8e52c3 100644
--- a/sources
+++ b/sources
@@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
 ee649aa333d24c8e364140cc24860ff6  nss-3.15.1-stripped.tar.bz2
-a7ace9cdd56ed8033962c2c09b3cbd7e  nss-pem-20130827.tar.bz2
+e82dd2b9520f9d0f5d101e7710d59656  nss-pem-20130828.tar.bz2


More information about the scm-commits mailing list