sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9eff806a0a13118fd98d58d38c87a042ab3d0ff6)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9eff806a0a13118fd98d58d38c87a042ab3d0ff6)
- Date: Tue, 22 Jul 2014 03:19:35 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
crypto/nss/HISTORY | 3 +++
crypto/nss/PRE_BUILD | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 9eff806a0a13118fd98d58d38c87a042ab3d0ff6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
nss - fix 3.16 patching
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 6a89dc9..3c0c110 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2014-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix 3.16 aptching
+
2014-07-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.16.3
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 9571ca8..543ad0e 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -12,7 +12,7 @@ else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
fi &&
-if [[ "$NSS_PEM" == "y" && $NSS_BRANCH != "3.15" ]]; then
+if [[ "$NSS_PEM" == "y" && $NSS_BRANCH == "3.14" ]]; then
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
if [[ $NSS_BRANCH == "3.14" ]]; then
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9eff806a0a13118fd98d58d38c87a042ab3d0ff6), Treeve Jelbert, 07/22/2014
Archive powered by MHonArc 2.6.24.