diff options
| -rw-r--r-- | community/firefox-esr/APKBUILD | 29 | ||||
| -rw-r--r-- | community/firefox-esr/fix-rust-target.patch | 8 |
2 files changed, 28 insertions, 9 deletions
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD index 209ed8f831..7a83b59e85 100644 --- a/community/firefox-esr/APKBUILD +++ b/community/firefox-esr/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=firefox-esr -pkgver=68.1.0 +pkgver=68.2.0 pkgrel=0 pkgdesc="Firefox web browser - Extended Support Release" url="https://www.mozilla.org/en-US/firefox/organizations/" # limited by rust and cargo -arch="x86_64" +arch="x86_64 aarch64" license="GPL LGPL MPL" makedepends=" alsa-lib-dev @@ -33,7 +33,7 @@ makedepends=" libvorbis-dev libxt-dev libxcomposite-dev - llvm8-dev + llvm9-dev mesa-dev nasm nodejs @@ -74,6 +74,16 @@ _mozappdir=/usr/lib/firefox ldpath="$_mozappdir" # secfixes: +# 68.2.0-r0: +# - CVE-2019-11757 +# - CVE-2019-11758 +# - CVE-2019-11759 +# - CVE-2019-11760 +# - CVE-2019-11761 +# - CVE-2019-11762 +# - CVE-2019-11763 +# - CVE-2019-11764 +# - CVE-2019-15903 # 68.1.0-r0: # - CVE-2019-9812 # - CVE-2019-11740 @@ -172,11 +182,18 @@ build() { # set rpath so linker finds the libs export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}" + case "$CARCH" in + x86_64) + # disable-elf-hack: exists only on arm, x86, x86_64 + _arch_config="--disable-elf-hack" + ;; + esac + ../configure \ --prefix=/usr \ + $_arch_config \ \ --disable-crashreporter \ - --disable-elf-hack \ --disable-gold \ --disable-install-strip \ --disable-jemalloc \ @@ -265,7 +282,7 @@ __EOF__ rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so } -sha512sums="a53b04b6a4fc98065596117b6bc0aee40c36f74bca02dc7486fda7e9556ad6f221f5ead94db1dc5db572f277556a21b22a0395dae107b67336ca91e33df9882c firefox-68.1.0esr.source.tar.xz +sha512sums="f6522ca6b9efa3fdeb866912ab9cb904eaace5806c606d5721cba23aebd679885670011c743ca8d381b579b728077182dc766f9b6d3b31ccf51c3eb583c547ee firefox-68.2.0esr.source.tar.xz 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch 84b84d2d7dbc16002510bf856796ad345ac38ef6d3254670230189bba7c2d4781714d231236d5a3d70129a4597b430c3171644b01ad0f5a5bb13b55d407337a4 fix-seccomp-bpf.patch @@ -274,7 +291,7 @@ sha512sums="a53b04b6a4fc98065596117b6bc0aee40c36f74bca02dc7486fda7e9556ad6f221f5 a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0 mallinfo.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch e0df4fc649012f023443ce9165da29d36459dbca5df64a31008b28d96264fba909858de36d0cf1b1cb1aab898342413f0cd77c90ebe21d1f9a0504631d6d1d0e fix-musl.patch -676c47e3dc25b059a2efcc7bbb0e7748be7f8a908d1ed6c4d81a0930a35ed28566bdc738b84e13fd11c0e7f07ab1a1969caa06b3acf9b95002eb6b3beb30b82c fix-rust-target.patch +7903987b4b661286de03c6940bf67aaed6d78c9adc57680413407a84a1f1f26aaded35e6d53ea6ad527b474968b343d844e81e16d777c0e29b830b51aa2ca8c3 fix-rust-target.patch d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79 fix-webrtc-glibcisms.patch f85f2c19c3dafab915bcb40e580fc442fd9eab5916696849edf0b105c758dd807dfe23a6479935613c81496711eb377c73227c03eb8582204c3442a4d0e397a2 fix-sandbox-membarrier.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop diff --git a/community/firefox-esr/fix-rust-target.patch b/community/firefox-esr/fix-rust-target.patch index 8c4b6739ab..f81418efd2 100644 --- a/community/firefox-esr/fix-rust-target.patch +++ b/community/firefox-esr/fix-rust-target.patch @@ -1,10 +1,12 @@ --- a/build/moz.configure/rust.configure +++ b/build/moz.configure/rust.configure -@@ -280,9 +280,11 @@ +@@ -280,9 +280,13 @@ die("Don't know how to translate {} for rustc".format( host_or_target.alias)) -+ fixed_alias = rustc_target.alias.replace("-unknown-", "-alpine-").replace("-gnu", "-musl") ++ fixed_alias = rustc_target.alias.replace("-gnu", "-musl") ++ if host_or_target.cpu != 'aarch64': ++ fixed_alias = fixed_alias.replace("-unknown-", "-alpine-") + # Check to see whether our rustc has a reasonably functional stdlib # for our chosen target. @@ -13,7 +15,7 @@ in_fd, in_path = mkstemp(prefix='conftest', suffix='.rs') out_fd, out_path = mkstemp(prefix='conftest', suffix='.rlib') os.close(out_fd) -@@ -319,7 +321,7 @@ +@@ -319,7 +323,7 @@ os.remove(out_path) # This target is usable. |