Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ccf228efc15eac2e23d94da35f5bdf878ee6f186)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (ccf228efc15eac2e23d94da35f5bdf878ee6f186)
  • Date: Thu, 28 Sep 2017 19:13:58 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/firefox/DEPENDS | 2 +-
http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 12 ++++++++++++
http/firefox/PRE_BUILD | 2 ++
http/firefox/patches/2001_system_harfbuzz.patch | 22
+++++++++++-----------
http/firefox/patches/2002_system_graphite2.patch | 22
+++++++++++-----------
6 files changed, 40 insertions(+), 26 deletions(-)

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

http/firefox: version 56.0, SECURITY_PATCH++

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 2d1b000..00c8b86 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -26,7 +26,7 @@ depends -sub APNG libpng "--enable-system-png"
&&
depends librsvg2 "--enable-svg" &&

depends nspr "--with-system-nspr" &&
-depends -sub "3.32.x" nss "--with-system-nss" &&
+depends -sub "3.33.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 6bf49db..2184304 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox
- VERSION=55.0.3
+ VERSION=56.0
SOURCE=${SPELL}-${VERSION}.source.tar.xz
-
SOURCE_HASH=sha512:3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416
+
SOURCE_HASH=sha512:3aeb0ff54e10c83894f61734daa4f0801a1bb499d4667adad9c78520e588eae809d0e4d61e9227206466d62c3b453e2ce9ca8198f59f5354cd1b6804c00f0990

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=107
+ SECURITY_PATCH=108
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 42fa1f6..86f309d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,15 @@
+2017-09-28 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 56.0, SECURITY_PATCH++,
+ (CVE-2017-7793, CVE-2017-7817, CVE-2017-7818, CVE-2017-7819,
+ CVE-2017-7824, CVE-2017-7805, CVE-2017-7812, CVE-2017-7814,
+ CVE-2017-7813, CVE-2017-7825, CVE-2017-7815, CVE-2017-7816,
+ CVE-2017-7821, CVE-2017-7823, CVE-2017-7822, CVE-2017-7820,
+ CVE-2017-7811, CVE-2017-7810)
+ * DEPENDS: now needs 3.33.x branch of nss
+ * PRE_BUILD: explicitly disable DRM if said so (kudos to Thomas Orgis)
+ * patches/2001_system_harfbuzz.patch,
+ patches/2002_system_graphite2.patch: updated to current version
+
2017-08-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 55.0.3

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 2ca74e6..1306d94 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -47,4 +47,6 @@ fi &&

if [[ $FIREFOX_WIDEVINE == y ]]; then
echo "ac_add_options --enable-eme=widevine" >> .mozconfig
+else
+ echo "ac_add_options --disable-eme" >> .mozconfig
fi
diff --git a/http/firefox/patches/2001_system_harfbuzz.patch
b/http/firefox/patches/2001_system_harfbuzz.patch
index 5ae2f2b..1157b98 100644
--- a/http/firefox/patches/2001_system_harfbuzz.patch
+++ b/http/firefox/patches/2001_system_harfbuzz.patch
@@ -53,7 +53,7 @@ diff --git a/config/system-headers b/config/system-headers
diff --git a/dom/base/moz.build b/dom/base/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
-@@ -463,16 +463,19 @@ include('/ipc/chromium/chromium-config.m
+@@ -471,16 +471,19 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'

if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
@@ -172,7 +172,7 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
-@@ -266,11 +266,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
+@@ -268,11 +268,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
@@ -229,7 +229,7 @@ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -206,16 +206,19 @@ if CONFIG['SERVO_TARGET_DIR']:
+@@ -207,16 +207,19 @@ if CONFIG['SERVO_TARGET_DIR']:
OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']

if CONFIG['MOZ_SYSTEM_JPEG']:
@@ -252,14 +252,14 @@ diff --git a/toolkit/library/moz.build
b/toolkit/library/moz.build
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -351,16 +351,26 @@ def ft2_info(freetype2_combined_info, tr
- return freetype2_combined_info
-
- set_config('FT2_LIBS', ft2_info.libs)
- add_old_configure_assignment('FT2_LIBS',
- ft2_info.libs)
- add_old_configure_assignment('FT2_CFLAGS',
- ft2_info.cflags)
+@@ -309,16 +309,26 @@ def freetype2_combined_info(fontconfig_i
+ return namespace(
+ cflags=freetype2_info.cflags + fontconfig_info.cflags,
+ libs=freetype2_info.libs + fontconfig_info.libs,
+ )
+
+ add_old_configure_assignment('_HAVE_FREETYPE2',
+ depends_if(freetype2_info)(lambda _: True))

+# HarfBuzz
+# ==============================================================
diff --git a/http/firefox/patches/2002_system_graphite2.patch
b/http/firefox/patches/2002_system_graphite2.patch
index deb045c..a5431e0 100644
--- a/http/firefox/patches/2002_system_graphite2.patch
+++ b/http/firefox/patches/2002_system_graphite2.patch
@@ -131,7 +131,7 @@ diff --git a/gfx/moz.build b/gfx/moz.build
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
-@@ -264,16 +264,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
+@@ -266,16 +266,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

@@ -155,7 +155,7 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
diff --git a/old-configure.in b/old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
-@@ -4671,16 +4671,37 @@ if test "$USE_FC_FREETYPE"; then
+@@ -4378,16 +4378,37 @@ if test "$USE_FC_FREETYPE"; then
CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
[AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)],
[#include <fontconfig/fontconfig.h>])
@@ -196,7 +196,7 @@ diff --git a/old-configure.in b/old-configure.in
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -206,16 +206,19 @@ if CONFIG['SERVO_TARGET_DIR']:
+@@ -207,16 +207,19 @@ if CONFIG['SERVO_TARGET_DIR']:
OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']

if CONFIG['MOZ_SYSTEM_JPEG']:
@@ -219,14 +219,14 @@ diff --git a/toolkit/library/moz.build
b/toolkit/library/moz.build
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -351,16 +351,30 @@ def ft2_info(freetype2_combined_info, tr
- return freetype2_combined_info
-
- set_config('FT2_LIBS', ft2_info.libs)
- add_old_configure_assignment('FT2_LIBS',
- ft2_info.libs)
- add_old_configure_assignment('FT2_CFLAGS',
- ft2_info.cflags)
+@@ -309,16 +309,30 @@ def freetype2_combined_info(fontconfig_i
+ return namespace(
+ cflags=freetype2_info.cflags + fontconfig_info.cflags,
+ libs=freetype2_info.libs + fontconfig_info.libs,
+ )
+
+ add_old_configure_assignment('_HAVE_FREETYPE2',
+ depends_if(freetype2_info)(lambda _: True))

+# Graphite2
+# ==============================================================



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ccf228efc15eac2e23d94da35f5bdf878ee6f186), Pavel Vinogradov, 09/28/2017

Archive powered by MHonArc 2.6.24.

Top of Page