Verified Commit ec76b660 authored by J0WI's avatar J0WI Committed by Rasmus Thomsen
Browse files

community/firefox: security upgrade to 84.0.1

Cherry picked from commit 51da4407
parent 2714ce37
......@@ -2,10 +2,10 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=firefox
pkgver=83.0
pkgver=84.0.1
# Date of release, YY-MM-DD for metainfo file (see package())
_releasedate=2020-11-10
pkgrel=1
_releasedate=2020-12-22
pkgrel=0
pkgdesc="Firefox web browser"
url="https://www.firefox.com/"
# Limited on:
......@@ -74,15 +74,12 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg
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
firefox-pipewire-0-3.patch
avoid-redefinition.patch
fix-gcc10-build.patch
"
_mozappdir=/usr/lib/firefox
......@@ -91,6 +88,21 @@ _mozappdir=/usr/lib/firefox
ldpath="$_mozappdir"
# secfixes:
# 84.0.1-r0:
# - CVE-2020-16042
# - CVE-2020-26971
# - CVE-2020-26972
# - CVE-2020-26973
# - CVE-2020-26974
# - CVE-2020-26975
# - CVE-2020-26976
# - CVE-2020-26977
# - CVE-2020-26978
# - CVE-2020-26979
# - CVE-2020-35111
# - CVE-2020-35112
# - CVE-2020-35113
# - CVE-2020-35114
# 83.0-r0:
# - CVE-2020-15999
# - CVE-2020-16012
......@@ -257,6 +269,7 @@ 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"
......@@ -284,7 +297,7 @@ build() {
*) _rust_simd="--enable-rust-simd" ;;
esac
../configure \
../mach configure \
--prefix=/usr \
$_arch_config \
$_low_mem_flags \
......@@ -326,15 +339,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
......@@ -380,23 +391,20 @@ package() {
cat "$builddir"/taskcluster/docker/firefox-flatpak/org.mozilla.firefox.appdata.xml.in | envsubst > "$pkgdir"/usr/share/metainfo/org.mozilla.firefox.appdata.xml
}
sha512sums="4ac49cefed278d1f898907bbedacf81ea4bb4e5784f567d4c0971d9cbc2cf4a2e4472de81a7ded620bc3a516bc972d600b516b7674319cdfc9734c3824a9a2f6 firefox-83.0.source.tar.xz
sha512sums="e5fc2f4aa8cff2f34dcfae83c040ab0ffc23194840d1b00944c5293849f82be48c638112dec55f158002f2c6b6cc626a11a06ab55b0c327b29fba3bc078e4435 firefox-84.0.1.source.tar.xz
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
4510fb92653d0fdcfbc6d30e18087c0d22d4acd5eb53be7d0a333abe087a9e0bf9e58e56bafe96e1e1b28ebd1fd33b8926dbb70c221007e335b33d1468755c66 fix-tools.patch
a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0 mallinfo.patch
454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch
799468ee635a51c64856651c5f15a021383e50b4ef95a3fa0f0b503e9ce5b4f66400368890b0e4a8b4e7364dc66430cf9844a73ff200a6fd75dbdbf7dfee0067 fix-rust-target.patch
cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch
47c2c2428c3598a42f6241705179642b3378a86ace39c8c3cbef4954e6d220b42e6c76f3d71731d65f67ce2c8597259122ac44bbd45e20993bb8bc70c0c8a010 fix-webrtc-glibcisms.patch
60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1 fd6847c9416f9eebde636e21d794d25d1be8791d.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
2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch
db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb sandbox-sched_setscheduler.patch
b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch
4fc9187e6ee5a09a70e89c7213e0682615befc1a22ef9fd27ccb2227ad7c720e06a60a55615573451fd6bf38083e2ed293320322797d83becd605e16ede192fb firefox-pipewire-0-3.patch
b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch
a8d696ccb649a6f206ce5feec1ec3a265ad5072d259411d9e6058f17a1b62aa8e371de936345e98cf82bcb36def41660046b180d42618b7e9a447cd7e81116aa fix-gcc10-build.patch"
b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch"
This diff is collapsed.
diff --git a/js/src/wasm/WasmBaselineCompile.cpp b/js/src/wasm/WasmBaselineCompile.cpp
--- a/js/src/wasm/WasmBaselineCompile.cpp
+++ b/js/src/wasm/WasmBaselineCompile.cpp
@@ -650,25 +650,26 @@ class BaseRegAlloc {
bool available = !availGPR.empty();
freeGPR(r);
return available;
#endif
}
template <MIRType t>
bool hasFPU() {
- return availFPU.hasAny<RegTypeOf<t>::value>();
- }
-
#ifdef RABALDR_SIDEALLOC_V128
- template <>
- bool hasFPU<MIRType::Simd128>() {
- MOZ_CRASH("Should not happen");
- }
-#endif
+ // Workaround for GCC problem, bug 1677690
+ if constexpr (t == MIRType::Simd128) {
+ MOZ_CRASH("Should not happen");
+ } else
+#endif
+ {
+ return availFPU.hasAny<RegTypeOf<t>::value>();
+ }
+ }
bool isAvailableGPR(Register r) { return availGPR.has(r); }
bool isAvailableFPU(FloatRegister r) {
#ifdef RABALDR_SIDEALLOC_V128
MOZ_ASSERT(!r.isSimd128());
#endif
return availFPU.has(r);
@@ -741,25 +742,26 @@ class BaseRegAlloc {
MOZ_ASSERT(!r.isSimd128());
#endif
MOZ_ASSERT(isAvailableFPU(r));
availFPU.take(r);
}
template <MIRType t>
FloatRegister allocFPU() {
- return availFPU.takeAny<RegTypeOf<t>::value>();
- }
-
#ifdef RABALDR_SIDEALLOC_V128
- template <>
- FloatRegister allocFPU<MIRType::Simd128>() {
- MOZ_CRASH("Should not happen");
- }
-#endif
+ // Workaround for GCC problem, bug 1677690
+ if constexpr (t == MIRType::Simd128) {
+ MOZ_CRASH("Should not happen");
+ } else
+#endif
+ {
+ return availFPU.takeAny<RegTypeOf<t>::value>();
+ }
+ }
void freeGPR(Register r) { availGPR.add(r); }
void freeInt64(Register64 r) {
#ifdef JS_PUNBOX64
freeGPR(r.reg);
#else
freeGPR(r.low);
......@@ -11,9 +11,9 @@ weird custom build system...
+@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):
# Rust's --target options are similar to, but not exactly the same
# as, the autoconf-derived targets we use. An example would be that
def detect_rustc_target(
host_or_target, compiler_info, arm_target, rust_supported_targets
):
@@ -340,13 +342,13 @@
return None
......@@ -22,9 +22,8 @@ weird custom build system...
+ 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))
die("Don't know how to translate {} for rustc".format(host_or_target.alias))
- return rustc_target
+ return ensure_unicode(rustc_target, system_encoding)
......
--- 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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment