diff options
Diffstat (limited to 'libre/iceweasel')
6 files changed, 35 insertions, 123 deletions
diff --git a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch index b1dcee50f..bb0fff9a3 100644 --- a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch +++ b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Use remoting name for GDK application names --- toolkit/xre/nsAppRunner.cpp | 6 +----- - widget/gtk/nsAppShell.cpp | 11 ++++------- - 2 files changed, 5 insertions(+), 12 deletions(-) + widget/gtk/nsAppShell.cpp | 12 +++++------- + 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 49e2c73986ab..43ebcac381c7 100644 +index 40e4dae574dc5..cc22fc3f5edaf 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3822,11 +3822,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4176,11 +4176,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -26,18 +26,19 @@ index 49e2c73986ab..43ebcac381c7 100644 // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index cfe022e65d82..06325264dbb1 100644 +index 24bdd5083375b..74dd54a5ae0e6 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp -@@ -24,6 +24,7 @@ +@@ -24,6 +24,8 @@ # include "WakeLockListener.h" #endif #include "gfxPlatform.h" +#include "nsAppRunner.h" ++#include "mozilla/XREAppData.h" #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" -@@ -159,13 +160,9 @@ nsresult nsAppShell::Init() { +@@ -153,13 +155,9 @@ nsresult nsAppShell::Init() { // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 // // Only bother doing this for the parent process, since it's the one diff --git a/libre/iceweasel/0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch b/libre/iceweasel/0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch deleted file mode 100644 index 427dfcdc1..000000000 --- a/libre/iceweasel/0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jed Davis <jld@mozilla.com> -Date: Fri, 28 Aug 2020 09:23:58 +0000 -Subject: [PATCH] Bug 1660901 - Support the fstat-like subset of fstatat in the - Linux sandbox policies. r=gcp - -Differential Revision: https://phabricator.services.mozilla.com/D88499 ---- - security/sandbox/linux/SandboxFilter.cpp | 6 ++++++ - security/sandbox/linux/broker/SandboxBrokerUtils.h | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp -index e522d61e065c..4087bdc07e01 100644 ---- a/security/sandbox/linux/SandboxFilter.cpp -+++ b/security/sandbox/linux/SandboxFilter.cpp -@@ -243,6 +243,12 @@ class SandboxPolicyCommon : public SandboxPolicyBase { - auto path = reinterpret_cast<const char*>(aArgs.args[1]); - auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]); - auto flags = static_cast<int>(aArgs.args[3]); -+ -+ if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 && -+ strcmp(path, "") == 0) { -+ return ConvertError(fstatsyscall(fd, buf)); -+ } -+ - if (fd != AT_FDCWD && path[0] != '/') { - SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, %d)", - fd, path, buf, flags); -diff --git a/security/sandbox/linux/broker/SandboxBrokerUtils.h b/security/sandbox/linux/broker/SandboxBrokerUtils.h -index 85a006740c2c..db33b5028e77 100644 ---- a/security/sandbox/linux/broker/SandboxBrokerUtils.h -+++ b/security/sandbox/linux/broker/SandboxBrokerUtils.h -@@ -19,10 +19,12 @@ - typedef struct stat64 statstruct; - # define statsyscall stat64 - # define lstatsyscall lstat64 -+# define fstatsyscall fstat64 - #elif defined(__NR_stat) - typedef struct stat statstruct; - # define statsyscall stat - # define lstatsyscall lstat -+# define fstatsyscall fstat - #else - # error Missing stat syscall include. - #endif diff --git a/libre/iceweasel/0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch b/libre/iceweasel/0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch deleted file mode 100644 index dd5a53535..000000000 --- a/libre/iceweasel/0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@mozilla.com> -Date: Sun, 6 Sep 2020 20:20:39 +0000 -Subject: [PATCH] Bug 1660901 - ignore AT_NO_AUTOMOUNT in fstatat system call. - r=jld - -Per the manpage "Both stat() and lstat() act as though AT_NO_AUTOMOUNT -was set.", so don't bail if it's set in a call to fstatat. - -Differential Revision: https://phabricator.services.mozilla.com/D89121 ---- - security/sandbox/linux/SandboxFilter.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp -index 4087bdc07e01..c4f6c318ad1c 100644 ---- a/security/sandbox/linux/SandboxFilter.cpp -+++ b/security/sandbox/linux/SandboxFilter.cpp -@@ -254,9 +254,10 @@ class SandboxPolicyCommon : public SandboxPolicyBase { - fd, path, buf, flags); - return BlockedSyscallTrap(aArgs, nullptr); - } -- if ((flags & ~AT_SYMLINK_NOFOLLOW) != 0) { -+ if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)) != 0) { - SANDBOX_LOG_ERROR("unsupported flags %d in fstatat(%d, \"%s\", %p, %d)", -- (flags & ~AT_SYMLINK_NOFOLLOW), fd, path, buf, flags); -+ (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)), fd, -+ path, buf, flags); - return BlockedSyscallTrap(aArgs, nullptr); - } - return (flags & AT_SYMLINK_NOFOLLOW) == 0 ? broker->Stat(path, buf) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 9fc8b3125..fe53ac039 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -44,10 +44,10 @@ pkgname=iceweasel epoch=1 -pkgver=81.0.2 +pkgver=84.0.1 pkgrel=1 pkgrel+=.parabola1 -_brandingver=80.0 +_brandingver=84.0 _brandingrel=1 pkgdesc="Standalone web browser derived from Mozilla Firefox" arch=(x86_64) @@ -70,9 +70,6 @@ replaces=('firefox') options=(!emptydirs !makeflags !strip) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} 0001-Use-remoting-name-for-GDK-application-names.patch - 0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch - 0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch - 0004-Bug-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch $pkgname.desktop) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} libre.patch @@ -82,7 +79,7 @@ source_armv7h=(arm.patch build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch') -sha256sums=('91b6482de9b193b19d1fd9a8b99015a001646a48429297bbb7fe41784f9f9b44' +sha256sums=('ae5500d270a199f9a10674fbd4ba7a6beac1f260a4c009bbca8ea39967592243' 'SKIP' 'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442' 'c2489a4ad3bfb65c064e07180a1de9a2fbc3b1b72d6bc4cd3985484d1b6b7b29' @@ -146,14 +143,6 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch - # https://bugs.archlinux.org/task/67978 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1660901 - patch -Np1 -i ../0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch - patch -Np1 -i ../0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 - patch -Np1 -i ../0004-Bug-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch - cat >../mozconfig <<END ac_add_options --enable-application=browser mk_add_options MOZ_OBJDIR=${PWD@Q}/obj @@ -230,7 +219,7 @@ END ;; i686) # disable LTO and use gcc toolchain (clang has issues on IA32) - # disable SIMD (SSE20 for i686) + # disable SIMD (SSE2 for i686) export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" cat >>../mozconfig <<END ac_add_options --disable-linker=lld diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch index caefbe08f..632281134 100644 --- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch +++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch @@ -1,7 +1,7 @@ -diff -rauN firefox-79.0/config/rules.mk firefox-79.0-avoid-libxul-OOM-python-check-patch/config/rules.mk ---- firefox-79.0/config/rules.mk 2020-07-21 00:49:36.000000000 +0200 -+++ firefox-79.0-avoid-libxul-OOM-python-check-patch/config/rules.mk 2020-08-02 14:04:30.846204786 +0200 -@@ -470,7 +470,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) +diff -rauN a/config/rules.mk b/config/rules.mk +--- a/config/rules.mk 2020-10-13 20:28:50.994026769 +0200 ++++ b/config/rules.mk 2020-10-13 20:29:06.594023940 +0200 +@@ -470,7 +470,7 @@ $(LINKER) -OUT:$@ -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS) else # !WINNT || GNU_CC $(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS) @@ -10,7 +10,7 @@ diff -rauN firefox-79.0/config/rules.mk firefox-79.0-avoid-libxul-OOM-python-che endif # WINNT && !GNU_CC ifdef ENABLE_STRIP -@@ -514,7 +514,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) +@@ -514,7 +514,7 @@ $(LINKER) -out:$@ -pdb:$(LINK_PDBFILE) $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS) else $(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) -o $@ $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS) @@ -19,7 +19,7 @@ diff -rauN firefox-79.0/config/rules.mk firefox-79.0-avoid-libxul-OOM-python-che endif # WINNT && !GNU_CC ifdef ENABLE_STRIP -@@ -594,7 +594,7 @@ ifndef INCREMENTAL_LINKER +@@ -594,7 +594,7 @@ $(RM) $@ endif $(MKSHLIB) $($@_OBJS) $(filter %.res,$^) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) diff --git a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch index 95c2df7e5..81d536cd9 100644 --- a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch +++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch @@ -1,15 +1,14 @@ -diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk -index 58606db50f..9c4d5b9279 100644 ---- a/config/makefiles/rust.mk -+++ b/config/makefiles/rust.mk -@@ -305,17 +305,17 @@ $(RUST_LIBRARY_FILE): force-cargo-library-build +diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk +--- a/config/makefiles/rust.mk 2020-10-13 20:23:09.920635480 +0200 ++++ b/config/makefiles/rust.mk 2020-10-13 20:24:02.273994137 +0200 +@@ -310,17 +310,17 @@ # the chance of proxy bypasses originating from rust code. - # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST. + # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS. # Sanitizers and sancov also fail because compiler-rt hooks network functions. -ifndef MOZ_PROFILE_GENERATE -ifeq ($(OS_ARCH), Linux) -ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) --ifndef MOZ_LTO_RUST +-ifndef MOZ_LTO_RUST_CROSS -ifneq (,$(filter -Clto,$(cargo_rustc_flags))) - $(call py_action,check_binary,--target --networking $@) -endif @@ -17,17 +16,17 @@ index 58606db50f..9c4d5b9279 100644 -endif -endif -endif -+# ifndef MOZ_PROFILE_GENERATE -+# ifeq ($(OS_ARCH), Linux) -+# ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) -+# ifndef MOZ_LTO_RUST -+# ifneq (,$(filter -Clto,$(cargo_rustc_flags))) -+# $(call py_action,check_binary,--target --networking $@) -+# endif -+# endif -+# endif -+# endif -+# endif ++#ifndef MOZ_PROFILE_GENERATE ++#ifeq ($(OS_ARCH), Linux) ++#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) ++#ifndef MOZ_LTO_RUST_CROSS ++#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) ++# $(call py_action,check_binary,--target --networking $@) ++#endif ++#endif ++#endif ++#endif ++#endif force-cargo-library-check: $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) |