New version of Firefox has various security fixes [1]. I didn't dig deep into
new "surprises" that Mozilla constantly brings to us. And of course, Iceweasel
is far from polished state. But it looks like getting a new working build is
better security-wise. Please find patches in the attachments.
List of changes:
1. Update version to 70.0 in PKGBUILD.
2. Update depends to reflect the changes from Arch firefox (see commit [1] in
Arch).
3. Add 0001-Use-remoting-name-for-GDK-application-names.patch from Arch firefox.
Although this patch is already used in PKGBUILD, it's missing in abslibre for
some reason.
4. Update version of branding package archive and root folder version inside
to 70.0. Was not able to find git repo of these files, so created the patch that
has to be applied to the tar.xz archive the PKGBUILD downloads. Do not use
'patch' to apply it, because it won't handle symlink renaming; use 'git apply'
instead.
5. Update Determine-which-phishing-shavar-to-use.patch in branding archive,
otherwise it won't apply.
6. Update branding config files to be more inline with what Tor Browser Bundle
9.0 does for rebranding. Did this to avoid the following crash on launch of the
built package:
Marionette FATAL XML Parsing Error: undefined entity
Location: chrome://browser/content/browser.xhtml
Line Number 1918, Column 9: <toolbaritem id="appMenu-fxa-status"
Not sure which of the changed lines fixed that issue though.
7. Add prefs to fix [3] about nonfree recommendations in about:addons page.
8. Update checksums in PKGBUILD. Please note that they still need to be updated
for the branding archive, as I sent only a patch to it and not the archive
itself.
[1] https://www.mozilla.org/en-US/security/advisories/mfsa2019-34/
[2]
https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/firefox&id=243fb0e99fb0a66f1e0bb9990ce67c0e082025ea
[3] https://labs.parabola.nu/issues/2409
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
new file mode 100644
index 0000000..8cc3786
--- /dev/null
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -0,0 +1,56 @@
+From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001
+Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Mon, 25 Mar 2019 20:30:11 +0100
+Subject: [PATCH] Use remoting name for GDK application names
+
+---
+ toolkit/xre/nsAppRunner.cpp | 6 +-----
+ widget/gtk/nsAppShell.cpp | 7 +++----
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 0b808ef215f06..28911c0ffeaec 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+ // consistently.
+
+ // Set program name to the one defined in application.ini.
+- {
+- nsAutoCString program(gAppData->name);
+- ToLowerCase(program);
+- g_set_prgname(program.get());
+- }
++ g_set_prgname(gAppData->remotingName);
+
+ // Initialize GTK here for splash.
+
+diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
+index 0686ff814916b..ae4a4ea55f420 100644
+--- a/widget/gtk/nsAppShell.cpp
++++ b/widget/gtk/nsAppShell.cpp
+@@ -24,6 +24,7 @@
+ # include "WakeLockListener.h"
+ #endif
+ #include "gfxPlatform.h"
++#include "nsAppRunner.h"
+ #include "ScreenHelperGTK.h"
+ #include "HeadlessScreenHelper.h"
+ #include "mozilla/widget/ScreenManager.h"
+@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() {
+ // option when program uses gdk_set_program_class().
+ //
+ // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
+- nsAutoString brandName;
+- mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
+- if (!brandName.IsEmpty()) {
+- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
++ if (gAppData) {
++ gdk_set_program_class(gAppData->remotingName);
+ }
+ }
+
+--
+2.21.0
+
diff --git a/PKGBUILD b/PKGBUILD
index fecf3d8..ea72e83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,17 +41,17 @@
pkgname=iceweasel
replaces=('firefox')
epoch=1
-pkgver=69.0
+pkgver=70.0
pkgrel=1
pkgrel+=.parabola1
-_brandingver=69.0
+_brandingver=70.0
_brandingrel=1
pkgdesc="Libre standalone web browser based on Mozilla Firefox"
arch=(x86_64)
arch+=(i686 armv7h)
license=(MPL GPL LGPL)
url="https://wiki.parabola.nu/$pkgname";
-depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib
+depends=(gtk3 libxt startup-notification mime-types dbus-glib
ffmpeg nss ttf-font libpulse)
depends+=(sqlite icu)
makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
@@ -73,7 +73,7 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
build-arm-libopus.patch
libre.patch
searchengines.patch)
-sha256sums=('413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5'
+sha256sums=('cd9f2902753831c07c4b2ee64f7826f33ca1123add6440dc34abe3ff173a0cc6'
'SKIP'
'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
'e439117380218898cd5c60a8da8947847efbd0fe64cc06b129d6ca20a392cb3d'
@@ -616,6 +616,11 @@ pref("dom.input.dirpicker", false);
// fix alsa sound sandbox issue for iceweasel-58
// https://labs.parabola.nu/issues/1628
pref("security.sandbox.content.syscall_whitelist", "16");
+
+// Disable recommendations of extensions and themes on about:addons page
+// https://labs.parabola.nu/issues/2409
+pref("extensions.htmlaboutaddons.discover.enabled", false);
+pref("extensions.htmlaboutaddons.recommendations.enabled", false);
END
_distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
diff --git a/iceweasel-69.0/branding/Makefile.in b/iceweasel-70.0/branding/Makefile.in
similarity index 100%
rename from iceweasel-69.0/branding/Makefile.in
rename to iceweasel-70.0/branding/Makefile.in
diff --git a/iceweasel-69.0/branding/aboutIce.js b/iceweasel-70.0/branding/aboutIce.js
similarity index 100%
rename from iceweasel-69.0/branding/aboutIce.js
rename to iceweasel-70.0/branding/aboutIce.js
diff --git a/iceweasel-69.0/branding/aboutIce.manifest b/iceweasel-70.0/branding/aboutIce.manifest
similarity index 100%
rename from iceweasel-69.0/branding/aboutIce.manifest
rename to iceweasel-70.0/branding/aboutIce.manifest
diff --git a/iceweasel-69.0/branding/configure.sh b/iceweasel-70.0/branding/configure.sh
similarity index 100%
rename from iceweasel-69.0/branding/configure.sh
rename to iceweasel-70.0/branding/configure.sh
diff --git a/iceweasel-69.0/branding/content/Makefile.in b/iceweasel-70.0/branding/content/Makefile.in
similarity index 100%
rename from iceweasel-69.0/branding/content/Makefile.in
rename to iceweasel-70.0/branding/content/Makefile.in
diff --git a/iceweasel-69.0/branding/content/about-base.png b/iceweasel-70.0/branding/content/about-base.png
similarity index 100%
rename from iceweasel-69.0/branding/content/about-base.png
rename to iceweasel-70.0/branding/content/about-base.png
diff --git a/iceweasel-69.0/branding/content/aboutCredits-base.png b/iceweasel-70.0/branding/content/aboutCredits-base.png
similarity index 100%
rename from iceweasel-69.0/branding/content/aboutCredits-base.png
rename to iceweasel-70.0/branding/content/aboutCredits-base.png
diff --git a/iceweasel-69.0/branding/content/aboutDialog.css b/iceweasel-70.0/branding/content/aboutDialog.css
similarity index 100%
rename from iceweasel-69.0/branding/content/aboutDialog.css
rename to iceweasel-70.0/branding/content/aboutDialog.css
diff --git a/iceweasel-69.0/branding/content/horizontal-lockup.svg b/iceweasel-70.0/branding/content/horizontal-lockup.svg
similarity index 100%
rename from iceweasel-69.0/branding/content/horizontal-lockup.svg
rename to iceweasel-70.0/branding/content/horizontal-lockup.svg
diff --git a/iceweasel-69.0/branding/content/jar.mn b/iceweasel-70.0/branding/content/jar.mn
similarity index 100%
rename from iceweasel-69.0/branding/content/jar.mn
rename to iceweasel-70.0/branding/content/jar.mn
diff --git a/iceweasel-69.0/branding/content/moz.build b/iceweasel-70.0/branding/content/moz.build
similarity index 100%
rename from iceweasel-69.0/branding/content/moz.build
rename to iceweasel-70.0/branding/content/moz.build
diff --git a/iceweasel-69.0/branding/content/wordmark.xsl b/iceweasel-70.0/branding/content/wordmark.xsl
similarity index 100%
rename from iceweasel-69.0/branding/content/wordmark.xsl
rename to iceweasel-70.0/branding/content/wordmark.xsl
diff --git a/iceweasel-69.0/branding/defs.mk b/iceweasel-70.0/branding/defs.mk
similarity index 100%
rename from iceweasel-69.0/branding/defs.mk
rename to iceweasel-70.0/branding/defs.mk
diff --git a/iceweasel-69.0/branding/drm-free.png b/iceweasel-70.0/branding/drm-free.png
similarity index 100%
rename from iceweasel-69.0/branding/drm-free.png
rename to iceweasel-70.0/branding/drm-free.png
diff --git a/iceweasel-69.0/branding/firefox-branding.js b/iceweasel-70.0/branding/firefox-branding.js
similarity index 100%
rename from iceweasel-69.0/branding/firefox-branding.js
rename to iceweasel-70.0/branding/firefox-branding.js
diff --git a/iceweasel-69.0/branding/gnu_headshadow.png b/iceweasel-70.0/branding/gnu_headshadow.png
similarity index 100%
rename from iceweasel-69.0/branding/gnu_headshadow.png
rename to iceweasel-70.0/branding/gnu_headshadow.png
diff --git a/iceweasel-69.0/branding/ice.dtd b/iceweasel-70.0/branding/ice.dtd
similarity index 100%
rename from iceweasel-69.0/branding/ice.dtd
rename to iceweasel-70.0/branding/ice.dtd
diff --git a/iceweasel-69.0/branding/ice.xhtml b/iceweasel-70.0/branding/ice.xhtml
similarity index 100%
rename from iceweasel-69.0/branding/ice.xhtml
rename to iceweasel-70.0/branding/ice.xhtml
diff --git a/iceweasel-69.0/branding/iceweasel_icon.svg b/iceweasel-70.0/branding/iceweasel_icon.svg
similarity index 100%
rename from iceweasel-69.0/branding/iceweasel_icon.svg
rename to iceweasel-70.0/branding/iceweasel_icon.svg
diff --git a/iceweasel-69.0/branding/iceweasel_logo.svg b/iceweasel-70.0/branding/iceweasel_logo.svg
similarity index 100%
rename from iceweasel-69.0/branding/iceweasel_logo.svg
rename to iceweasel-70.0/branding/iceweasel_logo.svg
diff --git a/iceweasel-69.0/branding/jar.mn b/iceweasel-70.0/branding/jar.mn
similarity index 100%
rename from iceweasel-69.0/branding/jar.mn
rename to iceweasel-70.0/branding/jar.mn
diff --git a/iceweasel-69.0/branding/locales/Makefile.in b/iceweasel-70.0/branding/locales/Makefile.in
similarity index 100%
rename from iceweasel-69.0/branding/locales/Makefile.in
rename to iceweasel-70.0/branding/locales/Makefile.in
diff --git a/iceweasel-69.0/branding/locales/browserconfig.properties b/iceweasel-70.0/branding/locales/browserconfig.properties
similarity index 100%
rename from iceweasel-69.0/branding/locales/browserconfig.properties
rename to iceweasel-70.0/branding/locales/browserconfig.properties
diff --git a/iceweasel-69.0/branding/locales/en-US/brand.dtd b/iceweasel-70.0/branding/locales/en-US/brand.dtd
similarity index 82%
rename from iceweasel-69.0/branding/locales/en-US/brand.dtd
rename to iceweasel-70.0/branding/locales/en-US/brand.dtd
index c83e6d0..fc0c674 100644
--- a/iceweasel-69.0/branding/locales/en-US/brand.dtd
+++ b/iceweasel-70.0/branding/locales/en-US/brand.dtd
@@ -1,5 +1,6 @@
<!ENTITY brandShorterName "Iceweasel">
<!ENTITY brandShortName "Iceweasel">
<!ENTITY brandFullName "Iceweasel">
+<!ENTITY brandProductName "Iceweasel">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY trademarkInfo.part1 " ">
diff --git a/iceweasel-69.0/branding/locales/en-US/brand.ftl b/iceweasel-70.0/branding/locales/en-US/brand.ftl
similarity index 33%
rename from iceweasel-69.0/branding/locales/en-US/brand.ftl
rename to iceweasel-70.0/branding/locales/en-US/brand.ftl
index ca180e0..ec13ee3 100644
--- a/iceweasel-69.0/branding/locales/en-US/brand.ftl
+++ b/iceweasel-70.0/branding/locales/en-US/brand.ftl
@@ -1,2 +1,6 @@
+-brand-shorter-name = Iceweasel
-brand-short-name = Iceweasel
+-brand-full-name = Iceweasel
+-brand-product-name = Iceweasel
-vendor-short-name = Mozilla
+trademarkInfo = { " " }
diff --git a/iceweasel-69.0/branding/locales/en-US/brand.properties b/iceweasel-70.0/branding/locales/en-US/brand.properties
similarity index 82%
rename from iceweasel-69.0/branding/locales/en-US/brand.properties
rename to iceweasel-70.0/branding/locales/en-US/brand.properties
index ea073d6..2276bc3 100644
--- a/iceweasel-69.0/branding/locales/en-US/brand.properties
+++ b/iceweasel-70.0/branding/locales/en-US/brand.properties
@@ -1,6 +1,7 @@
brandShorterName=Iceweasel
brandShortName=Iceweasel
brandFullName=Iceweasel
+brandProductName=Iceweasel
vendorShortName=Mozilla
syncBrandShortName=Sync
diff --git a/iceweasel-69.0/branding/locales/jar.mn b/iceweasel-70.0/branding/locales/jar.mn
similarity index 100%
rename from iceweasel-69.0/branding/locales/jar.mn
rename to iceweasel-70.0/branding/locales/jar.mn
diff --git a/iceweasel-69.0/branding/locales/moz.build b/iceweasel-70.0/branding/locales/moz.build
similarity index 100%
rename from iceweasel-69.0/branding/locales/moz.build
rename to iceweasel-70.0/branding/locales/moz.build
diff --git a/iceweasel-69.0/branding/moz.build b/iceweasel-70.0/branding/moz.build
similarity index 100%
rename from iceweasel-69.0/branding/moz.build
rename to iceweasel-70.0/branding/moz.build
diff --git a/iceweasel-69.0/branding/parabola-banner.png b/iceweasel-70.0/branding/parabola-banner.png
similarity index 100%
rename from iceweasel-69.0/branding/parabola-banner.png
rename to iceweasel-70.0/branding/parabola-banner.png
diff --git a/iceweasel-69.0/branding/watermark.svg b/iceweasel-70.0/branding/watermark.svg
similarity index 100%
rename from iceweasel-69.0/branding/watermark.svg
rename to iceweasel-70.0/branding/watermark.svg
diff --git a/iceweasel-69.0/license.txt b/iceweasel-70.0/license.txt
similarity index 100%
rename from iceweasel-69.0/license.txt
rename to iceweasel-70.0/license.txt
diff --git a/iceweasel-69.0/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/iceweasel-70.0/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
similarity index 100%
rename from iceweasel-69.0/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
rename to iceweasel-70.0/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
diff --git a/iceweasel-69.0/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch b/iceweasel-70.0/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
similarity index 67%
rename from iceweasel-69.0/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
rename to iceweasel-70.0/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
index b120020..bb5c9ef 100644
--- a/iceweasel-69.0/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
+++ b/iceweasel-70.0/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
@@ -1,18 +1,18 @@
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index e205cd4c55..d12adbb558 100644
+index b18f379..73c2600 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
-@@ -5206,9 +5206,7 @@ pref("dom.mapped_arraybuffer.enabled", true);
+@@ -4962,9 +4962,7 @@ pref("captivedetect.maxRetryCount", 5);
// The tables used for Safebrowsing phishing and malware checks
pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,moztest-harmful-simple,moztest-malware-simple,moztest-unwanted-simple");
-#ifdef MOZILLA_OFFICIAL
--// In official builds, we are allowed to use Google's private phishing
--// list (see bug 1288840).
+- // In official builds, we are allowed to use Google's private phishing
+- // list (see bug 1288840).
+#ifdef MOZ_OFFICIAL_BRANDING
- pref("urlclassifier.phishTable", "goog-phish-proto,moztest-phish-simple");
+ pref("urlclassifier.phishTable", "goog-phish-proto,moztest-phish-simple");
#else
- pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple");
+ pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple");
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
index 9b7620dbca..877ebf9034 100644
--- a/modules/libpref/moz.build
diff --git a/iceweasel-69.0/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch b/iceweasel-70.0/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch
similarity index 100%
rename from iceweasel-69.0/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch
rename to iceweasel-70.0/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch
diff --git a/iceweasel-69.0/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch b/iceweasel-70.0/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch
similarity index 100%
rename from iceweasel-69.0/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch
rename to iceweasel-70.0/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch
diff --git a/iceweasel-69.0/patches/iceweasel-branding/enable-object-directory-paths.patch b/iceweasel-70.0/patches/iceweasel-branding/enable-object-directory-paths.patch
similarity index 100%
rename from iceweasel-69.0/patches/iceweasel-branding/enable-object-directory-paths.patch
rename to iceweasel-70.0/patches/iceweasel-branding/enable-object-directory-paths.patch
diff --git a/iceweasel-69.0/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch b/iceweasel-70.0/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
similarity index 100%
rename from iceweasel-69.0/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
rename to iceweasel-70.0/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
diff --git a/iceweasel-69.0/patches/series b/iceweasel-70.0/patches/series
similarity index 100%
rename from iceweasel-69.0/patches/series
rename to iceweasel-70.0/patches/series
_______________________________________________
Dev mailing list
[email protected]
https://lists.parabola.nu/mailman/listinfo/dev
