aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2021-10-14 14:03:43 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2021-10-14 14:03:43 +0200
commit610dcfb9bd2dce54ae2d8a1a26fc77ff15b780a4 (patch)
tree9cdd37c7083b8eb49c38d37b8e95bb1d81e77044
parent2c05da46f1fa2a0f2852a300c8a6e937634d6edc (diff)
downloadaports-610dcfb9bd2dce54ae2d8a1a26fc77ff15b780a4.tar.gz
aports-610dcfb9bd2dce54ae2d8a1a26fc77ff15b780a4.tar.bz2
aports-610dcfb9bd2dce54ae2d8a1a26fc77ff15b780a4.tar.xz
community/firefox-esr: upgrade to 91.2.0
-rw-r--r--community/firefox-esr/APKBUILD81
-rw-r--r--community/firefox-esr/avoid-redefinition.patch15
-rw-r--r--community/firefox-esr/disable-neon-in-aom.patch8
-rw-r--r--community/firefox-esr/fd6847c9416f9eebde636e21d794d25d1be8791d.patch37
-rw-r--r--community/firefox-esr/fix-rust-target.patch42
-rw-r--r--community/firefox-esr/fix-webrtc-glibcisms.patch4
-rw-r--r--community/firefox-esr/remove-faulty-libvpx-check.patch13
-rw-r--r--community/firefox-esr/sandbox-fork.patch4
-rw-r--r--community/firefox-esr/sandbox-largefile.patch17
9 files changed, 103 insertions, 118 deletions
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index ca417afa2c..015ba30bdb 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -2,31 +2,28 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox-esr
-pkgver=78.13.0
+pkgver=91.2.0
# Date of release, YY-MM-DD for metainfo file (see package())
-_releasedate=2021-08-10
-pkgrel=1
+_releasedate=2021-10-05
+pkgrel=0
pkgdesc="Firefox web browser - Extended Support Release"
url="https://www.mozilla.org/en-US/firefox/organizations/"
# s390x, mips64 and riscv64 blocked by rust and cargo
-# armhf: build failure on armhf due to wasm
-# ppc64le: Rust SIGSEGVs when compiling gkrust
-arch="all !s390x !armhf !mips64 !ppc64le !riscv64"
+# armhf: https://bugzilla.mozilla.org/show_bug.cgi?id=1680495
+arch="x86_64 armv7 aarch64 x86 ppc64le"
license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
makedepends="
alsa-lib-dev
- autoconf2.13
automake
bsd-compat-headers
cargo
- cbindgen>=0.14.1
+ cbindgen>=0.18.0
clang-dev
dbus-glib-dev
ffmpeg-dev
- gtk+2.0-dev
gtk+3.0-dev
hunspell-dev
- icu-dev>=64.2
+ icu-dev>=69.1
libevent-dev
libidl-dev
libjpeg-turbo-dev
@@ -39,11 +36,12 @@ makedepends="
libxt-dev
libxcomposite-dev
llvm-dev
+ m4
mesa-dev
nasm
nodejs
nspr-dev
- nss-dev>=3.54
+ nss-dev>=3.44.1
nss-static
python3
sed
@@ -52,7 +50,9 @@ makedepends="
zip
libffi-dev
libwebp-dev
+ pipewire-dev
gettext
+ pulseaudio-dev
"
source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
@@ -65,18 +65,17 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
disable-moz-stackwalk.patch
fix-rust-target.patch
fix-webrtc-glibcisms.patch
- fd6847c9416f9eebde636e21d794d25d1be8791d.patch
allow-custom-rust-vendor.patch
firefox.desktop
firefox-safe.desktop
- remove-faulty-libvpx-check.patch
disable-neon-in-aom.patch
sandbox-fork.patch
sandbox-sched_setscheduler.patch
- "
+ sandbox-largefile.patch
-subpackages="$pkgname-npapi"
+ avoid-redefinition.patch
+ "
builddir="$srcdir/firefox-$pkgver"
_mozappdir=/usr/lib/firefox
@@ -85,6 +84,16 @@ _mozappdir=/usr/lib/firefox
ldpath="$_mozappdir"
# secfixes:
+# 91.2.0-r0:
+# - CVE-2021-32810
+# - CVE-2021-38492
+# - CVE-2021-38493
+# - CVE-2021-38495
+# - CVE-2021-38496
+# - CVE-2021-38497
+# - CVE-2021-38498
+# - CVE-2021-38500
+# - CVE-2021-38501
# 78.13.0-r0:
# - CVE-2021-29980
# - CVE-2021-29984
@@ -333,8 +342,12 @@ build() {
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
export USE_SHORT_LIBNAME=1
+ export MACH_USE_SYSTEM_PYTHON=1
# Find our triplet JSON
export RUST_TARGET="$CTARGET"
+ # Build with Clang, takes less RAM
+ export CC="clang"
+ export CXX="clang++"
# set rpath so linker finds the libs
export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir"
@@ -346,12 +359,10 @@ build() {
;;
esac
- # SIMD broken with rustc >= 1.48
- _rust_simd="--disable-rust-simd"
-
# FF doesn't have SIMD available on these arches.
case "$CARCH" in
armhf|armv7)
+ _rust_simd="--disable-rust-simd"
_low_mem_flags="--disable-debug-symbols --disable-debug"
export RUSTFLAGS="$RUSTFLAGS -C debuginfo=0"
;;
@@ -359,9 +370,10 @@ build() {
_low_mem_flags="--disable-debug-symbols --disable-debug"
export RUSTFLAGS="$RUSTFLAGS -C debuginfo=0"
;;
+ *) _rust_simd="--enable-rust-simd" ;;
esac
- ../configure \
+ ../mach configure \
--prefix=/usr \
$_arch_config \
$_low_mem_flags \
@@ -372,13 +384,11 @@ build() {
--disable-install-strip \
--disable-jemalloc \
--disable-profiling \
- --disable-pulseaudio \
--disable-strip \
--disable-tests \
--disable-updater \
\
--enable-alsa \
- --enable-cdp \
--enable-dbus \
--enable-default-toolkit=cairo-gtk3-wayland \
--enable-ffmpeg \
@@ -386,7 +396,8 @@ build() {
--enable-necko-wifi \
--enable-official-branding \
--enable-optimize="$CFLAGS -O2" \
- --enable-smoosh \
+ --enable-pulseaudio \
+ --disable-smoosh \
--enable-system-ffi \
--enable-system-pixman \
\
@@ -403,15 +414,13 @@ build() {
--with-system-zlib \
--with-clang-path=/usr/bin/clang \
--with-libclang-path=/usr/lib
- make
+ ../mach build
}
package() {
cd "$builddir"/objdir
- make install \
- DESTDIR="$pkgdir" \
- MOZ_MAKE_FLAGS="$MAKEOPTS"
+ DESTDIR="$pkgdir" MOZ_MAKE_FLAGS="$MAKEOPTS" ../mach install
install -m755 -d "$pkgdir"/usr/share/applications
install -m755 -d "$pkgdir"/usr/share/pixmaps
@@ -457,27 +466,21 @@ package() {
cat "$builddir"/taskcluster/docker/firefox-flatpak/org.mozilla.firefox.appdata.xml.in | envsubst > "$pkgdir"/usr/share/metainfo/org.mozilla.firefox.appdata.xml
}
-npapi() {
- pkgdesc="$pkgdesc: GTK+ 2 support for NPAPI plugins"
- install_if="adobe-flashplayer"
- amove usr/lib/firefox/gtk2
-}
-
sha512sums="
-78a5dc8713ab879ebfc3b8fd7a8219844d06f0d897342fdf9a11471633d98e148ff85cf10e561899df4910b94a33b57709b64788df4621a8c0b83eb9a7102cef firefox-78.13.0esr.source.tar.xz
+f4cff7e43ff9927cbab3f02d37d360ee8bb0dbe988e280cb0638ee67bfe3c76e3a0469336de1b212fba66c958d58594b1739aafee1ebb84695d098c1e5c77b9d firefox-91.2.0esr.source.tar.xz
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
4510fb92653d0fdcfbc6d30e18087c0d22d4acd5eb53be7d0a333abe087a9e0bf9e58e56bafe96e1e1b28ebd1fd33b8926dbb70c221007e335b33d1468755c66 fix-tools.patch
a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0 mallinfo.patch
454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch
-089c97e6011e86a9b9d9e7b0c8ba3af0519d1ce4e2b1e9ab7719762d6968388bfa47dad3bf23a6d41c3d66fdcc6c15e2c926e3ff9500bfd4fbf1b53e6d19dc57 fix-rust-target.patch
-d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79 fix-webrtc-glibcisms.patch
-60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1 fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch
+47c2c2428c3598a42f6241705179642b3378a86ace39c8c3cbef4954e6d220b42e6c76f3d71731d65f67ce2c8597259122ac44bbd45e20993bb8bc70c0c8a010 fix-webrtc-glibcisms.patch
4e584621145cf8add069c6dac18e805b3274a1ee402d84e924df2341f7d3c5be261a93ef51283bacbd606f47fbdc628c4323ecc31efc5b403b8d224b18dc278f allow-custom-rust-vendor.patch
f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop
5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop
-bb75b2abda86e455d81571052a2cfec5a9d858ffa91c50a7217b4b6c02cbfc0400e9114a27bd54ce78d7d3a44e9b03927cf0317654d98c0f39d26c63c9670117 remove-faulty-libvpx-check.patch
-f963fcdba7307a0b1712dfb95ceba4ab49f449f60e550bb69d15d50272e6df9add90862251ee561e4ea5fd171a2703552ffa7aade92996f5f0b3e577f1544a6d disable-neon-in-aom.patch
-4911ddb41bef8d9f6d6200159cde465627e940fe1c09099be55769d21a5a52a3f737e1bf803daa96126c035b091aea880fbc5d2e6cf5da96ddd17322461a72d6 sandbox-fork.patch
+55eab1a02e19a19a1ee0e36b11097ab48a44200e07e543d91469967206854f39709c7c0bc31855559528e64642d610868140e9533f1c0e3bebc953353c142fa8 disable-neon-in-aom.patch
+2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch
db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb sandbox-sched_setscheduler.patch
+b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch
+b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch
"
diff --git a/community/firefox-esr/avoid-redefinition.patch b/community/firefox-esr/avoid-redefinition.patch
new file mode 100644
index 0000000000..af11c50384
--- /dev/null
+++ b/community/firefox-esr/avoid-redefinition.patch
@@ -0,0 +1,15 @@
+Author: Rasmus Thomsen <oss@cogitri.dev>
+Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
+(linux/if.h), leading to redefinitions. We need to include net/if.h before
+linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
+Upstream: No
+--- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.orig 2020-07-28 19:24:32.359751046 +0200
++++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:37.856343751 +0200
+@@ -31,6 +31,7 @@
+ */
+
+ #if defined(LINUX)
++#include <net/if.h>
+ #include "addrs-netlink.h"
+ #include <csi_platform.h>
+ #include <assert.h>
diff --git a/community/firefox-esr/disable-neon-in-aom.patch b/community/firefox-esr/disable-neon-in-aom.patch
index 01be79c047..6df05a1e8a 100644
--- a/community/firefox-esr/disable-neon-in-aom.patch
+++ b/community/firefox-esr/disable-neon-in-aom.patch
@@ -8,7 +8,7 @@ In file included from /home/buildozer/aports/community/firefox/src/firefox-75.0/
| ^~~~~~~
--- a/media/libaom/moz.build 2020-04-09 08:20:14.608439591 +0200
+++ b/media/libaom/moz.build 2020-04-09 08:20:21.801745246 +0200
-@@ -42,30 +42,6 @@
+@@ -42,26 +42,6 @@
ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ]
@@ -32,10 +32,8 @@ In file included from /home/buildozer/aports/community/firefox/src/firefox-75.0/
- LOCAL_INCLUDES += [
- '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'],
- ]
-- if CONFIG['CC_TYPE'] == 'clang':
-- ASFLAGS += [
-- '-no-integrated-as',
-- ]
else:
# Generic C-only configuration
EXPORTS.aom += files['GENERIC_EXPORTS']
+
+
diff --git a/community/firefox-esr/fd6847c9416f9eebde636e21d794d25d1be8791d.patch b/community/firefox-esr/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
deleted file mode 100644
index 1af68d93c6..0000000000
--- a/community/firefox-esr/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-See https://bugzilla.mozilla.org/show_bug.cgi?id=1539739
-
-From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 1 Jun 2019 09:06:01 +0900
-Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
- user_vfp_exc.
-
----
- js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f8478..383c380f04c 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
- #endif
-
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--# include <sys/user.h>
-+struct user_vfp {
-+ unsigned long long fpregs[32];
-+ unsigned long fpscr;
-+};
-+
-+struct user_vfp_exc {
-+ unsigned long fpexc;
-+ unsigned long fpinst;
-+ unsigned long fpinst2;
-+};
- #endif
-
- #if defined(ANDROID)
---
-2.20.1
-
diff --git a/community/firefox-esr/fix-rust-target.patch b/community/firefox-esr/fix-rust-target.patch
index 14f39691cf..9342063c33 100644
--- a/community/firefox-esr/fix-rust-target.patch
+++ b/community/firefox-esr/fix-rust-target.patch
@@ -3,29 +3,29 @@ weird custom build system...
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
-@@ -224,6 +224,8 @@
- rust_supported_targets, arm_target, when=rust_compiler)
- @checking('for rust %s triplet' % host_or_target_str)
- @imports('os')
-+ @imports(_from='mozbuild.util', _import='ensure_unicode')
-+ @imports(_from='mozbuild.util', _import='system_encoding')
- @imports(_from='mozbuild.configure.util', _import='LineIO')
- @imports(_from='mozbuild.shellutil', _import='quote')
- @imports(_from='tempfile', _import='mkstemp')
-@@ -328,7 +330,7 @@
+@@ -225,7 +225,9 @@
+ data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+ return data
- return None
+-
++@imports('os')
++@imports(_from='mozbuild.util', _import='ensure_unicode')
++@imports(_from='mozbuild.util', _import='system_encoding')
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -340,13 +342,13 @@
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ['RUST_TARGET']
+ return None
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
-@@ -373,7 +375,7 @@
- os.remove(out_path)
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ['RUST_TARGET']
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
+
+- return rustc_target
++ return ensure_unicode(rustc_target, system_encoding)
- # This target is usable.
-- return rustc_target
-+ return ensure_unicode(rustc_target, system_encoding)
- return rust_target
+ @imports('os')
diff --git a/community/firefox-esr/fix-webrtc-glibcisms.patch b/community/firefox-esr/fix-webrtc-glibcisms.patch
index 658b076dc8..7533d94b91 100644
--- a/community/firefox-esr/fix-webrtc-glibcisms.patch
+++ b/community/firefox-esr/fix-webrtc-glibcisms.patch
@@ -1,5 +1,5 @@
---- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2018-05-09 23:48:44.677389171 +0200
-+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2018-05-09 23:48:56.254373557 +0200
+--- ./third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2018-05-09 23:48:44.677389171 +0200
++++ ./third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c 2018-05-09 23:48:56.254373557 +0200
@@ -14,7 +14,7 @@
#ifndef __GLIBC_PREREQ
#define __GLIBC_PREREQ(a, b) 0
diff --git a/community/firefox-esr/remove-faulty-libvpx-check.patch b/community/firefox-esr/remove-faulty-libvpx-check.patch
deleted file mode 100644
index 3fc5fb4c0f..0000000000
--- a/community/firefox-esr/remove-faulty-libvpx-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/toolkit/moz.configure.orig 2020-04-07 18:04:13.886159258 +0200
-+++ b/toolkit/moz.configure 2020-04-07 18:04:37.905834036 +0200
-@@ -1422,11 +1422,6 @@
- "with system libvpx. Use --without-system-libvpx to build "
- "with in-tree libvpx."))
-
-- check_symbol('vpx_codec_dec_init_ver', flags=vpx.libs, onerror=lambda: die(
-- "--with-system-libvpx requested but symbol vpx_codec_dec_init_ver "
-- "not found"
-- ))
--
- set_config('MOZ_SYSTEM_LIBVPX', True)
-
diff --git a/community/firefox-esr/sandbox-fork.patch b/community/firefox-esr/sandbox-fork.patch
index 328943cb00..c7222ab494 100644
--- a/community/firefox-esr/sandbox-fork.patch
+++ b/community/firefox-esr/sandbox-fork.patch
@@ -2,12 +2,14 @@ make SYS_fork non-fatal, musl uses it for fork(2)
--- a/security/sandbox/linux/SandboxFilter.cpp
+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -1253,6 +1253,8 @@
+@@ -1253,6 +1253,10 @@
// usually do something reasonable on error.
case __NR_clone:
return ClonePolicy(Error(EPERM));
++#ifdef __NR_fork
+ case __NR_fork:
+ return Error(ENOSYS);
++#endif
# ifdef __NR_fadvise64
case __NR_fadvise64:
diff --git a/community/firefox-esr/sandbox-largefile.patch b/community/firefox-esr/sandbox-largefile.patch
new file mode 100644
index 0000000000..f1cf28b51b
--- /dev/null
+++ b/community/firefox-esr/sandbox-largefile.patch
@@ -0,0 +1,17 @@
+--- a/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100
++++ b/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100
+@@ -68,7 +68,13 @@
+
+ // The headers define O_LARGEFILE as 0 on x86_64, but we need the
+ // actual value because it shows up in file flags.
+-#define O_LARGEFILE_REAL 00100000
++#if defined(__x86_64__) || defined(__i386__) || defined(__mips__)
++#define O_LARGEFILE_REAL 0100000
++#elif defined(__powerpc__)
++#define O_LARGEFILE_REAL 0200000
++#else
++#define O_LARGEFILE_REAL O_LARGEFILE
++#endif
+
+ // Not part of UAPI, but userspace sees it in F_GETFL; see bug 1650751.
+ #define FMODE_NONOTIFY 0x4000000