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 +++
 http/firefox/DETAILS           |    4 ++--
 http/firefox/HISTORY           |    4 ++++
 http/firefox/PRE_BUILD         |    5 ++---
 http/firefox/install_dir.patch |   31 -------------------------------
 libs/nspr/DETAILS              |    4 ++--
 libs/nspr/HISTORY              |    3 +++
 8 files changed, 18 insertions(+), 40 deletions(-)

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

    http/firefox: version 45.0

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

    crypto/nss: version 3.21.1

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

    libs/nspr: version 4.12

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index d21ff51..a2f2468 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -32,8 +32,8 @@ case $NSS_BRANCH in
       
SOURCE_HASH=sha512:030cd019a43f326b06d5524390c166a1a6be52a3f5f05e2e4a651677d6031659cbfca6ddb5d492ba95e816672ac289a4d09da14fd54131aad6967496f471a7e7
   ;;
   3.21)
-          VERSION=3.21
-      
SOURCE_HASH=sha512:0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53
+          VERSION=3.21.1
+      
SOURCE_HASH=sha512:7a9354148f1c2ce47ab8e43c7db16e0cf755e5e3a8b4db53e846c65e4f7b7373e6340cf2a1f18ca3f49ff582fb7b35620800fa68fa4170cf4b83ce241f55f59e
 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 113ccbc..fa64d08 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2016-03-08 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated to 3.21.1
+
 2016-02-09 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS, PREPARE, *SUB_DEPENDS: added 3.21.x branch
        * BUILD: disabled -Werror flag
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index e07cb91..2a1aa57 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,7 +1,7 @@
            SPELL=firefox
-         VERSION=44.0.2
+         VERSION=45.0
           SOURCE=$SPELL-$VERSION.source.tar.xz
-     
SOURCE_HASH=sha512:03bcb796577a416d3267f3dbadf4cdbaf6f4ee0b2e4fde3b0f6d47ccbaeaadcc7e2eb997b569e5b14aa38e2e7c0ef0a19749b9a448a89d0d335f7510ba06dd1a
+     
SOURCE_HASH=sha512:d75c7bf1f70183b7237b77b99845a6b7daa41014ee75a7977575af345b343a8053dbb993337d24933df23f9600db7c0e936543e57f3f039430ca5c252fe3c4b5
    
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
    
SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
   SECURITY_PATCH=92
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 1a84e1d..a54091c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2016-03-08 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 45.0
+       * PRE_BUILD, install_dir.patch: converted patch to a sed expression
+
 2016-02-12 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: updated spell to 44.0.2, SECURITY_PATCH++, (CVE-2016-1949)
 
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 06e8c94..1000704 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,9 +1,8 @@
 default_pre_build  &&
 cd  $SOURCE_DIRECTORY &&
 
-# Archlinux patch to drop release point from install path
-# 
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
-patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
+# To remove version suffix from some directories
+sed 's;-$(MOZ_APP_VERSION);;g' -i config/baseconfig.mk &&
 
 cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&
 
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
deleted file mode 100644
index df0e7f8..0000000
--- a/http/firefox/install_dir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f08c2e802224e5824b6f251553aa46c9c23dbcfc Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Mon, 28 Apr 2014 22:34:23 +0200
-Subject: [PATCH] fix install path
-
----
- config/baseconfig.mk | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/config/baseconfig.mk b/config/baseconfig.mk
-index b4723a9..8417918 100644
---- a/config/baseconfig.mk
-+++ b/config/baseconfig.mk
-@@ -2,10 +2,10 @@
- # directly in python/mozbuild/mozbuild/base.py for gmake validation.
- # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
- # whether a normal build is happening or whether the check is running.
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- ifndef TOP_DIST
- TOP_DIST = dist
- endif
--- 
-1.9.1
-
diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 8e8d390..8ab1004 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,8 +1,8 @@
             SPELL=nspr
-          VERSION=4.11
+          VERSION=4.12
            SOURCE=$SPELL-$VERSION.tar.gz
     
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/v$VERSION/src/$SOURCE
-      
SOURCE_HASH=sha512:26c47ba618f5a7748cacc5152348b6fd37bdcc82806bbff485ed4d485aecad13d202270a837c735670030e96380ec3177f3bc8a47e0dca359cfb097a84242c02
+      
SOURCE_HASH=sha512:138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460
  SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
          WEB_SITE=http://www.mozilla.org/projects/nspr/
           ENTERED=20050512
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index cf838a0..9ddef0f 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2016-03-08 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 4.12
+
 2016-02-09 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.11