Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1098e74597f4cf36be9e2fe92d6ee7c7395304e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (1098e74597f4cf36be9e2fe92d6ee7c7395304e8)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1098e74597f4cf36be9e2fe92d6ee7c7395304e8)
  • Date: Wed, 23 Dec 2015 22:52:36 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

crypto/nss/DETAILS | 5 ++++-
crypto/nss/HISTORY | 4 ++++
crypto/nss/PREPARE | 4 ++--
crypto/nss/PRE_BUILD | 2 +-
crypto/nss/PRE_SUB_DEPENDS | 1 +
crypto/nss/SUB_DEPENDS | 3 +++
http/firefox/CONFIGURE | 2 +-
http/firefox/DEPENDS | 2 +-
http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 2 ++
mail/thunderbird/BUILD | 11 ++++++-----
mail/thunderbird/CONFIGURE | 9 ++++++---
mail/thunderbird/DEPENDS | 2 +-
mail/thunderbird/DETAILS | 6 +++---
mail/thunderbird/HISTORY | 7 +++++++
mail/thunderbird/PRE_BUILD | 14 ++++++++++----
16 files changed, 55 insertions(+), 25 deletions(-)

New commits:
commit 1098e74597f4cf36be9e2fe92d6ee7c7395304e8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox: update to 43.0.2

commit 9fa886486ddde673af964ca584050e665e63c57a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

thunderbird: update to 38.5.0

commit df9695bea80b41c26b7bff4a9bc4b09cb69ef6b1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nss: add version 3.20.2

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 3c6374f..98ef212 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -27,9 +27,12 @@ case $NSS_BRANCH in
VERSION=3.19.4

SOURCE_HASH=sha512:1876d908b52403776bcdb42a1a3e67582aa71af9182ed78cbb8d1907b4c620b7e0fafa0ea95106d527212d253903e2ef77f31e5c76adf376db1bb05c10d6384c
;;
+ 3.20)
+ VERSION=3.20.2
+
SOURCE_HASH=sha512:030cd019a43f326b06d5524390c166a1a6be52a3f5f05e2e4a651677d6031659cbfca6ddb5d492ba95e816672ac289a4d09da14fd54131aad6967496f471a7e7
esac
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/security/pki/nss/
ENTERED=20030919
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 3f9b284..599b307 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2015-12-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, SUB_DEPENDS, PRE_SUB_DEPENDS, PREPARE: new 3.20 branch,
+ with version 3.20.2
+
2015-11-03 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated 3.19 branch to 3.19.4

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 0c79af8..ad8d5cf 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 &&
+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 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
- NSS_BRANCH=3.19
+ NSS_BRANCH=3.20
fi
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index ea1f31b..ec206bf 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $NSS_BRANCH == "3.19" ]]; then
+if [[ $NSS_BRANCH == "3.19" ]] || [[ $NSS_BRANCH == "3.20" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
elif [[ $NSS_BRANCH == "3.18" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index f7338f7..b5c5a27 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -5,6 +5,7 @@ case $THIS_SUB_DEPENDS in
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;;
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 0af8933..d9f4749 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -17,6 +17,9 @@ case $THIS_SUB_DEPENDS in
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"
+ ;;
PEM) message "${MESSAGE_COLOR}nss with PEM support needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_PEM="y"
;;
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index 8de4865..72c136f 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -7,7 +7,7 @@ config_query FIREFOX_SAFE "Enable safe browsing
(anti-phishing) implementation?"

config_query FIREFOX_STRIP \
'Remove debugging symbols (they are BIG, stripped by
upstream default)?' \
- y
+ y &&
config_query FIREFOX_SDK \
'Install SDK (including a non-stripped huge copy of
libxul.so)?' \
n &&
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 73eac4d..bddd46d 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -23,7 +23,7 @@ depends -sub APNG libpng '--enable-system-png'
&&
depends librsvg2 '--enable-svg' &&

depends nspr '--with-system-nspr' &&
-depends -sub "3.19.x" nss '--with-system-nss' &&
+depends -sub "3.20.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 7f15355..b3ed40b 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox
- VERSION=42.0
+ VERSION=43.0.2
SOURCE=$SPELL-$VERSION.source.tar.xz
-
SOURCE_HASH=sha512:d38f48047233bf68929bd05276165266d341c0186214687405010cac7ccbb266618eec43849b05fa12358eb43a106494d8dce9683bae62e133b7f990bb4c8aaf
+
SOURCE_HASH=sha512:17380bd4f10601b015e7812cc11ea23b4880fe9909ebed03d59b6476f5d05a2a6d0baafb6cccc66d79b141abf8eea15f7c36ed6b59e4dc7279a3512ae0776ee9

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=90
+ SECURITY_PATCH=91
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 2c18499..23feb10 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,4 +1,6 @@
+
2015-12-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: upgrade to 43.0.2, SECURITY_PATCH++ (as always)
* CONFIGURE, PRE_BUILD: revisit the stripping mozconfig, including
a switch to disable the installation of a huge unstripped copy in
form of
the SDK regardless of FIREFOX_STRIP. Now my Firefox is about 90
MiB, not
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 9720651..0baff90 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -5,11 +5,12 @@ export MOZ_THUNDERBIRD="1" &&

#
# No fast optimization for Mozilla, bit us so many times...
-#
-CFLAGS="${CFLAGS//-Os/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-Os/-O2}" &&
-CFLAGS="${CFLAGS//-O3/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
+# This used to default to -O2, but that produces crashing firefox for
+# sobukus with gcc-5.2.0; -Os seems more safe for Mozilla stuff.
+CFLAGS="${CFLAGS//-O2/-Os}" &&
+CXXFLAGS="${CXXFLAGS//-O2/-Os}" &&
+CFLAGS="${CFLAGS//-O3/-Os}" &&
+CXXFLAGS="${CXXFLAGS//-O3/-Os}" &&

#
# Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
diff --git a/mail/thunderbird/CONFIGURE b/mail/thunderbird/CONFIGURE
index c765ac5..4cc4107 100755
--- a/mail/thunderbird/CONFIGURE
+++ b/mail/thunderbird/CONFIGURE
@@ -1,6 +1,9 @@
config_query THUNDERBIRD_OFFICIAL "Enable official branding? If enabled, you
may \
be restricted in distributing these binaries IAW mozilla policies" n &&

-config_query THUNDERBIRD_STRIP \
- 'Remove debugging symbols?' \
- n
+config_query THUNDERBIRD_STRIP \
+ 'Remove debugging symbols (they are BIG, stripped by
upstream default)?' \
+ y &&
+config_query THUNDERBIRD_SDK \
+ 'Install SDK (including a non-stripped huge copy of
libxul.so)?' \
+ n
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 24df179..74638c7 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -15,7 +15,7 @@ depends libxext &&
depends libxrender &&
depends libxt &&
depends nspr '--with-system-nspr' &&
-depends -sub "3.17.x" nss '--with-system-nss' &&
+depends -sub "3.20.x" nss '--with-system-nss' &&
depends pango &&
depends perl &&
depends pysqlite &&
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 4f8feb0..76344af 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,11 +1,11 @@
SPELL=thunderbird
- VERSION=38.0.1
+ VERSION=38.5.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:009e60035973bbbd44826ac29d281058941cc87fa28a497b106168e8e18e82e42634d2ffbedaa0695328a7f339284a7f39de7cc9ab71c02bed385dc57d372305:UPSTREAM_HASH
+
SOURCE_HASH=sha512:fed8376375c3ad7df8b773ced7944fb07edbd28e82c907dc6451ad538b8944d6f2a1d5632399f255ab1c7f74a40a9170912fefdbb2fdf423d7dc35108d1baa65

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
TMPFS=off
- SECURITY_PATCH=40
+ SECURITY_PATCH=41
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 3f727bf..85ceed5 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,10 @@
+2015-12-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 38.5.0, SECURITY_PATCH++ as always
+ * DEPENDS: sync nss branch with firefox
+ * CONFIGURE, PRE_BUILD: port over debugging/sdk install changes
+ from firefox
+ * BUILD: also revert to -Os as with firefox, to play safe
+
2015-06-24 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to 38.0.1
no signature anymore, signed hashes instead
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index cad3470..5c54d0b 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -7,11 +7,17 @@ patch -p1 <
$SPELL_DIRECTORY/0001-remove-version-number-from-thunderbird-s-insta

cp -v "${SPELL_DIRECTORY}"/mozconfig .mozconfig &&

+# Be explicit: stripped install is the default.
if [[ "$THUNDERBIRD_STRIP" == "y" ]]; then
- sed -i '27iac_add_options --enable-strip' .mozconfig
+ echo 'ac_add_options --enable-install-strip' >> .mozconfig
+else
+ echo 'ac_add_options --disable-install-strip' >> .mozconfig
fi &&

-if [[ $THUNDERBIRD_OFFICIAL == y ]]; then
- sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
-fi
+if [[ "$THUNDERBIRD_SDK" == "n" ]]; then
+ sed -i 's/^\(INSTALL_SDK = .*\)$/#\1/' mail/installer/Makefile.in
+fi &&

+if [[ "$THUNDERBIRD_OFFICIAL" == y ]]; then
+ echo 'ac_add_options --enable-official-branding' >> .mozconfig
+fi


  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1098e74597f4cf36be9e2fe92d6ee7c7395304e8), Thomas Orgis, 12/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page