Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (e681e6c269b026fa67d24426ae5442a9058a492a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (e681e6c269b026fa67d24426ae5442a9058a492a)
  • Date: Sun, 9 May 2010 19:14:56 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

crypto/nss/HISTORY | 7 +++++++
crypto/nss/PRE_BUILD | 5 ++---
crypto/nss/nss-pem-20080124.tar.bz2 | 0
crypto/nss/nss-pem-20100412.tar.bz2 |binary
crypto/nss/nss-pem-bug429175.patch | 12 ------------
dev/null |binary
6 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit e681e6c269b026fa67d24426ae5442a9058a492a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

nss: Updated with latest pem enabling source from Fedora Project.
Removed bug patch that was incorporated upstream. Now nss
builds with PEM enabled. Fixes Bug #15629

diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index cfdd68e..c37d0e6 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,10 @@
+2010-05-09 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Updated to most recent Fedora source for PEM.
+ Removed uneeded patch. Fixes Bug #15629
+ * nss-pem-20100412.tar.bz2: Add. Most recent Fedora source for PEM
+ * nss-pem-20080124.tar.bz2: Removed old source
+ * nss-pem-bug429175.patch: Incorporated upstream
+
2010-04-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: fixed location.mk sedit to only apply to 3.11, not DEFAULT
branch, fixes bug #15680
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 8bb47d3..9c1a176 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -10,7 +10,6 @@ cd $SOURCE_DIRECTORY &&
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch &&

if [[ "$NSS_PEM" == "y" ]]; then
-tar jxvf $SCRIPT_DIRECTORY/nss-pem-20080124.tar.bz2 &&
-patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/nss-pem-bug429175.patch
+tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
+patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
fi
diff --git a/crypto/nss/nss-pem-20080124.tar.bz2
b/crypto/nss/nss-pem-20080124.tar.bz2
deleted file mode 100644
index b977ece..0000000
Binary files a/crypto/nss/nss-pem-20080124.tar.bz2 and /dev/null differ
diff --git a/crypto/nss/nss-pem-20100412.tar.bz2
b/crypto/nss/nss-pem-20100412.tar.bz2
new file mode 100644
index 0000000..77ebe82
Binary files /dev/null and b/crypto/nss/nss-pem-20100412.tar.bz2 differ
diff --git a/crypto/nss/nss-pem-bug429175.patch
b/crypto/nss/nss-pem-bug429175.patch
deleted file mode 100644
index 6732c04..0000000
--- a/crypto/nss/nss-pem-bug429175.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u --recursive mozilla.orig/security/nss/lib/ckfw/pem/pobject.c
mozilla/security/nss/lib/ckfw/pem/pobject.c
---- mozilla.orig/security/nss/lib/ckfw/pem/pobject.c 2007-09-06
16:46:30.000000000 -0400
-+++ mozilla/security/nss/lib/ckfw/pem/pobject.c 2008-08-13
21:08:43.000000000 -0400
-@@ -160,7 +160,7 @@
- (void *) &ck_false, (PRUint32) sizeof(CK_BBOOL)
- };
- static const NSSItem pem_x509Item = {
-- (void *) &ckc_x509, (PRUint32) sizeof(CKC_X_509)
-+ (void *) &ckc_x509, (PRUint32) sizeof(CK_ULONG)
- };
- static const NSSItem pem_rsaItem = {
- (void *) &ckk_rsa, (PRUint32) sizeof(CK_KEY_TYPE)



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (e681e6c269b026fa67d24426ae5442a9058a492a), George Sherwood, 05/09/2010

Archive powered by MHonArc 2.6.24.

Top of Page