sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4604ef57655552079ae8d8166696ee4100116573)
- 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 (4604ef57655552079ae8d8166696ee4100116573)
- Date: Tue, 7 Jun 2016 17:42:44 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
crypto/gnutls/DETAILS | 4 ++--
crypto/gnutls/HISTORY | 4 ++++
crypto/nss/DETAILS | 4 ++++
crypto/nss/HISTORY | 6 +++++-
crypto/nss/PRE_BUILD | 4 +++-
http/firefox/DEPENDS | 3 ++-
http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 5 +++++
8 files changed, 28 insertions(+), 8 deletions(-)
New commits:
commit 4604ef57655552079ae8d8166696ee4100116573
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
http/firefox: version 47.0, SECURITY_PATCH++
commit 3b5bf3c25afccaf6c27dcef4ccb38b40519678c7
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/nss: added 3.23 branch
commit 397260caad3256748e61ce48daa32c1a0651e5cf
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/gnutls: version 3.4.13 for stable branch, SECURITY_PATCH++
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 1faac22..4558001 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -6,8 +6,8 @@ fi
case $GNUTLS_BRANCH in
stable)
- VERSION=3.4.11
- SECURITY_PATCH=15
+ VERSION=3.4.13
+ SECURITY_PATCH=16
;;
stable-old)
VERSION=3.3.22
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 86c1c04..7fa5e17 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2016-06-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 3.4.13 for stable branch, SECURITY_PATCH++,
+ GNUTLS-SA-2016-1
+
2016-05-10 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, PREPARE: added stable-next branch, version 3.5.0
* BUILD: only enable openssl compatibility if branch is not
stable-next
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 458e42c..f4f11aa 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -38,6 +38,10 @@ case $NSS_BRANCH in
3.22)
VERSION=3.22.3
SOURCE_HASH=sha512:eaffe0061f2d99d8cd69db267acfad443ce2123862d612b26d3b641c982b6e80b18d4e9e6c97d4115f030040390fff7579af35c73f225c278b84c17e3ac1853d
+ ;;
+ 3.23)
+ VERSION=3.23
+
SOURCE_HASH=sha512:f3e388a415493685faa6df932e9e968af41ea2e8e4cba3fbd539c60177443e4042e8d2e2bfe74183552e14522d49048be2f80fbe038bdbd499971e82abf2cc32
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 b2c3d4e..ba8d211 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,7 +1,11 @@
+2016-06-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE: added 3.23 branch
+ * PRE_BUILD: 3.23.x needs the patch from 3.21.x branch too
+
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
+ * PRE_BUILD: 3.22.x needs the patch from 3.21.x branch
2016-03-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated to 3.21.1
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 581e31c..b395b61 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -8,7 +8,9 @@ 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" ]] || [[ $NSS_BRANCH == "3.22" ]]; then
+elif [[ $NSS_BRANCH == "3.21" ]] ||
+ [[ $NSS_BRANCH == "3.22" ]] ||
+ [[ $NSS_BRANCH == "3.23" ]]; 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/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 8ccb531..71eb1c7 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,3 +1,4 @@
+depends autoconf-2.13 &&
depends -sub CXX gcc &&
depends perl &&
depends python &&
@@ -24,7 +25,7 @@ depends -sub APNG libpng "--enable-system-png"
&&
depends librsvg2 "--enable-svg" &&
depends nspr "--with-system-nspr" &&
-depends -sub "3.22.x" nss "--with-system-nss" &&
+depends -sub "3.23.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 3dcba95..6b1abe9 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox
- VERSION=46.0.1
+ VERSION=47.0
SOURCE=$SPELL-$VERSION.source.tar.xz
-
SOURCE_HASH=sha512:c58642774f93ceaef4f99bc3fe578db6e4f6de7f1d23080da97b61bc4fc6b516ce99fa04368893c0fa2cb9cd0b36e96955656daa97d0bd0d8f4da6a2d364cb98
+
SOURCE_HASH=sha512:35275e5595e7f01a232e5ea6d7899857d0a1d7eab640fe614ef66c865abedae3e08bc6c0cde13165d53140ccf6f721bbcd583d091032e119d44884287393c223
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
- SECURITY_PATCH=93
+ SECURITY_PATCH=94
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 f1a8c92..393a2fb 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2016-06-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 47.0, SECURITY_PATCH++,
+ (MFSA-2016-[49-60] and MFSA-2016-62)
+ * DEPENDS: needs autoconf-2.13 and 3.23.x branch of nss as well
+
2016-05-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, firefox-gtk3-20.patch: fix broken scrollbars
- [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4604ef57655552079ae8d8166696ee4100116573), Pavel Vinogradov, 06/07/2016
Archive powered by MHonArc 2.6.24.