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         |    3 +++
 crypto/nss/PREPARE         |    2 +-
 crypto/nss/PRE_BUILD       |    2 +-
 python-pypi/django/DETAILS |    6 +++---
 python-pypi/django/HISTORY |    4 ++++
 6 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 5b91e0fed6c552fe52ff691e5b11e260b266113b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    python-pypi/django: stable version 2.0.3, SECURITY_PATCH++

commit b4872c6fc154d6281c4022e3e86ee41ee38e21ef
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    crypto/nss: added 3.36 branch

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index da736f4..52f5a4c 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -86,6 +86,10 @@ case $NSS_BRANCH in
   3.35)
           VERSION=3.35
       
SOURCE_HASH=sha512:8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d
+  ;;
+  3.36)
+          VERSION=3.36
+      
SOURCE_HASH=sha512:e4d5cc475f1fcca9a42a139a890b70dbc3fadf5ed8a626c8d6bf929a97bb91ca9a42fe967df95784e5d997a3ec5c5a87684256ddf91b8dafa827103a98ad39ae
 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 22abb4d..38221fc 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2018-03-07 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS, PRE_BUILD, PREPARE: added 3.36 branch
+
 2018-01-20 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS, PRE_BUILD, PREPARE: added 3.35 branch
 
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 9fef946..3974cac 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 &&
+                             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 &&
 
 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 41e7ec1..3eb9ecb 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -11,7 +11,7 @@ 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-5] ]]; then
+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
diff --git a/python-pypi/django/DETAILS b/python-pypi/django/DETAILS
index 52e5387..d99c043 100755
--- a/python-pypi/django/DETAILS
+++ b/python-pypi/django/DETAILS
@@ -21,12 +21,12 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL^}-${VERSION}"
   ;;
   # stable (also handled for `gaze')
   stable|*)
-         VERSION=2.0.1
-  SECURITY_PATCH=5
+         VERSION=2.0.3
+  SECURITY_PATCH=6
           SOURCE=${SPELL^}-${VERSION}.tar.gz
    
SOURCE_URL[0]="https://www.djangoproject.com/m/releases/${VERSION%.*}/${SOURCE}";
    SOURCE_URL[1]="https://www.djangoproject.com/download/${VERSION}/tarball/";
-     
SOURCE_HASH=sha256:d96b804be412a5125a594023ec524a2010a6ffa4d408e5482ab6ff3cb97ec12f:UPSTREAM_HASH
+     
SOURCE_HASH=sha256:769f212ffd5762f72c764fa648fca3b7f7dd4ec27407198b68e7c4abf4609fd0:UPSTREAM_HASH
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL^}-${VERSION}"
   ;;
 esac
diff --git a/python-pypi/django/HISTORY b/python-pypi/django/HISTORY
index 0df711d..d2e186f 100644
--- a/python-pypi/django/HISTORY
+++ b/python-pypi/django/HISTORY
@@ -1,3 +1,7 @@
+2018-03-07 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: stable version 2.0.3, SECURITY_PATCH++,
+         (CVE-2018-7536, CVE-2018-7537)
+
 2018-01-29 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: readded old url, http -> https