sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1370e943626a84acb501ba94e00c62021c33a894)

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 (1370e943626a84acb501ba94e00c62021c33a894)
Date: Tue, 26 Apr 2016 18:07:43 +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 | 2 +-
crypto/nss/PRE_SUB_DEPENDS | 9 +--------
crypto/nss/SUB_DEPENDS | 38 ++++++++------------------------------
http/firefox/DEPENDS | 2 +-
http/firefox/DETAILS | 8 ++++----
http/firefox/HISTORY | 5 +++++
9 files changed, 30 insertions(+), 45 deletions(-)

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

http/firefox: version 46.0

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

crypto/nss: added 3.22.x branch + some code cleanup

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index a2f2468..458e42c 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -34,6 +34,10 @@ case $NSS_BRANCH in
3.21)
VERSION=3.21.1

SOURCE_HASH=sha512:7a9354148f1c2ce47ab8e43c7db16e0cf755e5e3a8b4db53e846c65e4f7b7373e6340cf2a1f18ca3f49ff582fb7b35620800fa68fa4170cf4b83ce241f55f59e
+ ;;
+ 3.22)
+ VERSION=3.22.3
+
SOURCE_HASH=sha512:eaffe0061f2d99d8cd69db267acfad443ce2123862d612b26d3b641c982b6e80b18d4e9e6c97d4115f030040390fff7579af35c73f225c278b84c17e3ac1853d
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 fa64d08..b2c3d4e 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2016-04-26 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE: added 3.22.x branch
+ * *SUB_DEPENDS: shortened case checks
+ * PRE_BUILD: 3.22.xX needs patch from 2.21.x branch
+
2016-03-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated to 3.21.1

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 16c9a48..ec3c786 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,4 +1,4 @@
-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 &&
+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 &&

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 21aa5c4..581e31c 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -8,7 +8,7 @@ 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.21" ]]; then
+elif [[ $NSS_BRANCH == "3.21" ]] || [[ $NSS_BRANCH == "3.22" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.21-standalone-1.patch
else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index 899ec73..cc41008 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -1,12 +1,5 @@
case $THIS_SUB_DEPENDS in
- 3.14.x) if [ $NSS_BRANCH == "3.14" ]; then return 0; fi;;
- 3.15.x) if [ $NSS_BRANCH == "3.15" ]; then return 0; fi;;
- 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;;
- 3.20.x) if [ $NSS_BRANCH == "3.20" ]; then return 0; fi;;
- 3.21.x) if [ $NSS_BRANCH == "3.21" ]; then return 0; fi;;
+ 3.*) if [ $NSS_BRANCH == ${THIS_SUB_DEPENDS:0:4} ]; 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 d202509..24f2568 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -1,32 +1,10 @@
case $THIS_SUB_DEPENDS in
- 3.14.x) message "${MESSAGE_COLOR}3.14.x release needed, forcing
it.${DEFAULT_COLOR}" &&
- NSS_BRANCH="3.14"
- ;;
- 3.15.x) message "${MESSAGE_COLOR}3.15.x release needed, forcing
it.${DEFAULT_COLOR}" &&
- NSS_BRANCH="3.15"
- ;;
- 3.16.x) message "${MESSAGE_COLOR}3.16.x release needed, forcing
it.${DEFAULT_COLOR}" &&
- NSS_BRANCH="3.16"
- ;;
- 3.17.x) message "${MESSAGE_COLOR}3.17.x release needed, forcing
it.${DEFAULT_COLOR}" &&
- NSS_BRANCH="3.17"
- ;;
- 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"
- ;;
- 3.20.x) message "${MESSAGE_COLOR}3.20.x release needed, forcing
it.${DEFAULT_COLOR}" &&
- NSS_BRANCH="3.20"
- ;;
- 3.21.x) message "${MESSAGE_COLOR}3.21.x release needed, forcing
it.${DEFAULT_COLOR}" &&
- NSS_BRANCH="3.21"
- ;;
- PEM) message "${MESSAGE_COLOR}nss with PEM support needed, forcing
it.${DEFAULT_COLOR}" &&
- NSS_PEM="y"
- ;;
- *) message "${PROBLEM_COLOR}Unknown sub-depends!${DEFAULT_COLOR}" &&
- return 1
- ;;
+ 3.*) message "${MESSAGE_COLOR}${THIS_SUB_DEPENDS} release needed, forcing
it.${DEFAULT_COLOR}" &&
+ NSS_BRANCH=${THIS_SUB_DEPENDS:0:4}
+ ;;
+ PEM) message "${MESSAGE_COLOR}nss with PEM support needed, forcing
it.${DEFAULT_COLOR}" &&
+ NSS_PEM="y"
+ ;;
+ *) message "${PROBLEM_COLOR}Unknown sub-depends!${DEFAULT_COLOR}" &&
+ return 1
esac
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 0a7f10b..7ed3f6b 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -24,7 +24,7 @@ depends -sub APNG libpng "--enable-system-png"
&&
depends librsvg2 "--enable-svg" &&

depends nspr "--with-system-nspr" &&
-depends -sub "3.21.x" nss "--with-system-nss" &&
+depends -sub "3.22.x" nss "--with-system-nss" &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB"
sqlite "--enable-system-sqlite" &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c9f0954..9a01c02 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox
- VERSION=45.0.2
+ VERSION=46.0
SOURCE=$SPELL-$VERSION.source.tar.xz
-
SOURCE_HASH=sha512:8c0b7afb41a1a405fe499299d1a8b1138dac52b9ad67bfc8761b70a26f330581c2aa1d76d67075896ec3a0c3f5367b8b58365ebc8b3a01f801fa37071b3de526
+
SOURCE_HASH=sha512:f5a652e25fa74e3cb271af04d50cc7b63ca73fde9d2ff350e84b3dda55352bac2b28b567aed12164285d992414ad475da9d2555ab972e5c5d7b8f5226591036b

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
+
SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
+ SECURITY_PATCH=93
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 93fb106..c870052 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2016-04-26 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 46.0, fixed SOURCE_URL[1].
+ SECURITY_PATCH++, (MFSA-2016-[39-48])
+ * DEPENDS: needs 3.22.x branch of nss
+
2016-04-12 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 45.0.2
* DEPENDS: expanded bash shortcuts, ' -> "

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (1370e943626a84acb501ba94e00c62021c33a894), Pavel Vinogradov, 04/26/2016