diff options
Diffstat (limited to 'user/firefox-esr/APKBUILD')
| -rw-r--r-- | user/firefox-esr/APKBUILD | 58 |
1 files changed, 41 insertions, 17 deletions
diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 3d0594f99..649a95029 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=firefox-esr -pkgver=68.2.0 +pkgver=68.6.0 pkgrel=0 pkgdesc="Firefox web browser (extended support release)" url="https://www.mozilla.org/firefox/" @@ -15,7 +15,7 @@ depends="" # actual deps makedepends=" autoconf2.13 cargo cbindgen clang llvm8-dev node ncurses-dev - perl rust rust-stdlib cmd:which + perl rust rust-std cmd:which ncurses-dev openssl-dev @@ -43,9 +43,11 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f rust-32bit.patch rust-config.patch shut-up-warning.patch + skia-sucks1.patch + skia-sucks2.patch + skia-sucks3.patch stackwalk-x86-ppc.patch webrtc-broken.patch - yuv-be.patch firefox.desktop firefox-safe.desktop @@ -84,6 +86,35 @@ ldpath="$_mozappdir" # - CVE-2019-11762 # - CVE-2019-11763 # - CVE-2019-11764 +# 68.3.0-r0: +# - CVE-2019-11745 +# - CVE-2019-13722 +# - CVE-2019-17005 +# - CVE-2019-17008 +# - CVE-2019-17009 +# - CVE-2019-17010 +# - CVE-2019-17011 +# - CVE-2019-17012 +# 68.4.1-r0: +# - CVE-2019-17016 +# - CVE-2019-17017 +# - CVE-2019-17022 +# - CVE-2019-17024 +# - CVE-2019-17026 +# 68.5.0-r0: +# - CVE-2020-6796 +# - CVE-2020-6797 +# - CVE-2020-6798 +# - CVE-2020-6799 +# 68.6.0-r0: +# - CVE-2019-20503 +# - CVE-2020-6805 +# - CVE-2020-6806 +# - CVE-2020-6807 +# - CVE-2020-6811 +# - CVE-2020-6812 +# - CVE-2020-6814 + unpack() { default_unpack @@ -113,16 +144,11 @@ unpack() { } prepare() { - cd "$builddir" default_prepare cp "$srcdir"/mozconfig "$builddir"/mozconfig echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig - # too much memory - if [ -z "$JOBS" ] || [ $JOBS -ge 32 ]; then - JOBS=32 - fi echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig case "$CARCH" in @@ -133,6 +159,9 @@ prepare() { echo "ac_add_options --disable-webrtc" >> "$builddir"/mozconfig; export LDFLAGS="$LDFLAGS -latomic" ;; + s390x) + echo "ac_add_options --disable-startupcache" >> "$builddir"/mozconfig + ;; esac rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl @@ -142,8 +171,6 @@ prepare() { } build() { - cd "$builddir" - export SHELL=/bin/sh export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 @@ -156,9 +183,6 @@ build() { export UNIXCONFDIR="$srcdir" - local extra_flags="" - [ "$CARCH" = "s390x" ] && extra_flags="--disable-startupcache" - export PATH="$srcdir/python/bin:$PATH" ./mach build } @@ -170,14 +194,12 @@ run() { } package() { - cd "$builddir" export PATH="$srcdir/python/bin:$PATH" DESTDIR="$pkgdir" ./mach install install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - local png for png in browser/branding/official/default*.png; do local i="${_png%.png}" i=${i##*/default} @@ -208,7 +230,7 @@ package() { EOF } -sha512sums="f6522ca6b9efa3fdeb866912ab9cb904eaace5806c606d5721cba23aebd679885670011c743ca8d381b579b728077182dc766f9b6d3b31ccf51c3eb583c547ee firefox-68.2.0esr.source.tar.xz +sha512sums="84565d654ed8bd2d036d08de4d16e41ae8881f0b20b34424ab347d50a37384acf50c04f74269720e79db28028569dff79f2b910848939ff87c078f36684a75a3 firefox-68.6.0esr.source.tar.xz 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz f82758d279cd12a1b30a9b36ac3c265cfb137df3db7ae185f2c538504e46fa70ace1b051fce847356851062b5cc9cd741a6d33d54f8cd103aa0c8272cb19ccc4 mozconfig ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch @@ -221,8 +243,10 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1 7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch 45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch +e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9 skia-sucks1.patch +9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4 skia-sucks2.patch +7a1fa27e060b2f025eaebbd39fb5c62960b62450241437e6d057d58cef9faf1cd1a85efe3b6a37b865d686ff18e90605ebea3089b26243f2d14876c2107106a6 skia-sucks3.patch 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8 webrtc-broken.patch -2dfb986089c9afcd6a895302c8a5a1d299cffa4cc3c73fce784c29d348f362c1e7570109c4f09d328275d8549a96531736dd976411c15956b385d7fb211b8af2 yuv-be.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" |