Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 crypto/nss/DETAILS   |    4 ++++
 crypto/nss/HISTORY   |    4 ++++
 crypto/nss/PREPARE   |    2 +-
 crypto/nss/PRE_BUILD |   24 +++++++++---------------
 4 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 07a396b48a486b12a151002ffd3c4389e6d03804
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    crypto/nss: added 3.37 branch

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 2637036..c0976f0 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -90,6 +90,10 @@ case $NSS_BRANCH in
   3.36)
           VERSION=3.36.1
       
SOURCE_HASH=sha512:096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
+  ;;
+  3.37)
+          VERSION=3.37
+      
SOURCE_HASH=sha512:ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
 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 32e7ee6..9b6991a 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2018-05-08 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS, PRE_BUILD, PREPARE: added 3.37 branch,
+         if ... elif ... fi -> case ... esac
+
 2018-04-11 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 3.36.1 for 3.36 branch
 
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 3974cac..977ab22 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 3.19 3.20 3.21 
3.22 3.23 3.24 3.25 3.26 3.27 3.28 3.29 3.30 3.32 3.33 3.34 3.35 3.36 &&
+                             DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 3.21 
3.22 3.23 3.24 3.25 3.26 3.27 3.28 3.29 3.30 3.32 3.33 3.34 3.35 3.36 3.37 &&
 
 if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
   NSS_BRANCH=3.20
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 3eb9ecb..387051d 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,21 +1,15 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-if [[ $NSS_BRANCH =~ 3.1[7-9] ]] || [[ $NSS_BRANCH == "3.20" ]]; then
-  patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
-elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH == "3.16" ]]; then
-  patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
-elif [[ $NSS_BRANCH == "3.14" ]]; then
-  patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
-elif [[ $NSS_BRANCH =~ 3.2[1-7] ]]; then
-  patch -p1 < $SCRIPT_DIRECTORY/nss-3.21-standalone-1.patch
-elif [[ $NSS_BRANCH =~ 3.2[8,9] ]] || [[ $NSS_BRANCH == "3.30" ]]; then
-  patch -p1 < $SCRIPT_DIRECTORY/nss-3.28.1-standalone-1.patch
-elif [[ $NSS_BRANCH =~ 3.3[2-6] ]]; then
-  patch -p1 < $SCRIPT_DIRECTORY/nss-3.32-standalone-1.patch
-else
-  patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
-fi &&
+case "${NSS_BRANCH}" in
+  3.1[7-9] | 3.20) patch -p1 < 
"${SPELL_DIRECTORY}/nss-3.17.2-standalone-2.patch" ;;
+      3.15 | 3.16) patch -p1 < 
"${SCRIPT_DIRECTORY}/nss-3.15.1-standalone-2.patch" ;;
+             3.14) patch -p1 < "${SCRIPT_DIRECTORY}/nss-3.14-config-1.patch" 
;;
+         3.2[1-7]) patch -p1 < 
"${SCRIPT_DIRECTORY}/nss-3.21-standalone-1.patch" ;;
+  3.2[8,9] | 3.30) patch -p1 < 
"${SCRIPT_DIRECTORY}/nss-3.28.1-standalone-1.patch" ;;
+         3.3[2-7]) patch -p1 < 
"${SCRIPT_DIRECTORY}/nss-3.32-standalone-1.patch" ;;
+                *) patch -p1 < "${SCRIPT_DIRECTORY}/nss-3.12-config-1.patch"
+esac &&
 
 if [[ "$NSS_PEM" == "y" ]]; then
   # New or old source trees are easy to tell apart.