sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (102db8b91b403515c2e6af198d9fd6865bf069ec)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (102db8b91b403515c2e6af198d9fd6865bf069ec)
- Date: Mon, 21 Oct 2019 00:46:11 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
crypto/nss/DETAILS | 4 ++++
crypto/nss/HISTORY | 5 +++++
crypto/nss/PREPARE | 2 +-
crypto/nss/PRE_BUILD | 4 ++--
crypto/nss/nss-enable-pem.patch | 12 ------------
5 files changed, 12 insertions(+), 15 deletions(-)
New commits:
commit 102db8b91b403515c2e6af198d9fd6865bf069ec
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/nss: added 3.47 branch
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 8c629b3..9342d34 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -16,6 +16,10 @@ case $NSS_BRANCH in
3.46)
VERSION=3.46.1
SOURCE_HASH=sha512:f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b
+ ;;
+ 3.47)
+ VERSION=3.47
+
SOURCE_HASH=sha512:99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247
esac
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 713ae8b..de506e5 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2019-10-20 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE: added 3.47 branch
+ * PRE_BUILD, nss-enable-pem.patch: transformed the patch into sed
+ script
+
2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PREPARE, PRE_BUILD,
nss-3.14-config-1.patch,
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index cbbb53e..aafff70 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 &&
+prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 &&
if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
NSS_BRANCH=3.46
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index b795ac2..7515b70 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -11,10 +11,10 @@ if [[ "$NSS_PEM" == "y" ]]; then
# New or old source trees are easy to tell apart.
if test -e nss; then
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20140808.tar.bz2 &&
- patch -p3 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
+ sed "/DIRS/s;builtins;& pem;" -i nss/lib/ckfw/manifest.mn
else
# Playing safe with old stuff, no new PEM source there.
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
- patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
+ sed "/DIRS/s;builtins;& pem;" -i
mozilla/security/nss/lib/ckfw/manifest.mn
fi
fi
diff --git a/crypto/nss/nss-enable-pem.patch b/crypto/nss/nss-enable-pem.patch
deleted file mode 100644
index 665a148..0000000
--- a/crypto/nss/nss-enable-pem.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem
./mozilla/security/nss/lib/ckfw/manifest.mn
---- ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem 2008-08-05
16:34:23.000000000 -0700
-+++ ./mozilla/security/nss/lib/ckfw/manifest.mn 2008-08-05
16:34:30.000000000 -0700
-@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
-
- CORE_DEPTH = ../../..
-
--DIRS = builtins
-+DIRS = builtins pem
-
- PRIVATE_EXPORTS = \
- ck.h \
- [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (102db8b91b403515c2e6af198d9fd6865bf069ec), Pavel Vinogradov, 10/20/2019
Archive powered by MHonArc 2.6.24.