Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dc5a14b798faab12a3eab23c9f4e80d3955ff72e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dc5a14b798faab12a3eab23c9f4e80d3955ff72e)
  • Date: Fri, 3 Jul 2015 08:03:56 +0000

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

crypto/nss/DETAILS | 4 ++++
crypto/nss/HISTORY | 3 +++
crypto/nss/PREPARE | 4 ++--
crypto/nss/PRE_BUILD | 4 +++-
crypto/nss/PRE_SUB_DEPENDS | 1 +
crypto/nss/SUB_DEPENDS | 3 +++
6 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit dc5a14b798faab12a3eab23c9f4e80d3955ff72e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

nss 3.19.2

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index b4fcea7..f874fa6 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -23,6 +23,10 @@ case $NSS_BRANCH in
VERSION=3.18.1

SOURCE_HASH=sha512:00c2893b5aa74038661f7353ebc8200746de1757cec61072717a89ec10292040a1dd954aaf688fbcf68261031ec30e85e6fe9ab46283e202e8b62b06e05fa616
;;
+ 3.19)
+ VERSION=3.19.2
+
SOURCE_HASH=sha512:d3c45010f8dace58f9da9efe0f9792f8b8a69384e100663f33c949685cdd1ce70e5131f279bc82336622841c41dbc0a4d70a7cc6839a1782dbe8b3c3fd8bc59d
+ ;;
esac
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 23cdb20..e411c39 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2015-07-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: version
3.19.2
+
2015-05-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.18.1

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index d2de368..0c79af8 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 3.18 &&
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
- NSS_BRANCH=3.18
+ NSS_BRANCH=3.19
fi
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 088795d..ea1f31b 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $NSS_BRANCH == "3.18" ]]; then
+if [[ $NSS_BRANCH == "3.19" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
+elif [[ $NSS_BRANCH == "3.18" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
elif [[ $NSS_BRANCH == "3.17" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index 322b8f6..f7338f7 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -4,6 +4,7 @@ case $THIS_SUB_DEPENDS in
3.16.x) if [ $NSS_BRANCH == "3.16" ]; then return 0; fi;;
3.17.x) if [ $NSS_BRANCH == "3.17" ]; then return 0; fi;;
3.18.x) if [ $NSS_BRANCH == "3.18" ]; then return 0; fi;;
+ 3.19.x) if [ $NSS_BRANCH == "3.19" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index c68dd33..0af8933 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -14,6 +14,9 @@ case $THIS_SUB_DEPENDS in
3.18.x) message "${MESSAGE_COLOR}3.18.x release needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_BRANCH="3.18"
;;
+ 3.19.x) message "${MESSAGE_COLOR}3.19.x release needed, forcing
it.${DEFAULT_COLOR}" &&
+ NSS_BRANCH="3.19"
+ ;;
PEM) message "${MESSAGE_COLOR}nss with PEM support needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_PEM="y"
;;



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dc5a14b798faab12a3eab23c9f4e80d3955ff72e), Ladislav Hagara, 07/03/2015

Archive powered by MHonArc 2.6.24.

Top of Page