diff options
| -rw-r--r-- | community/mozjs68/APKBUILD | 11 | ||||
| -rw-r--r-- | community/mozjs68/fix-rust-target.patch | 32 |
2 files changed, 20 insertions, 23 deletions
diff --git a/community/mozjs68/APKBUILD b/community/mozjs68/APKBUILD index 91e9fd71037..80413b19950 100644 --- a/community/mozjs68/APKBUILD +++ b/community/mozjs68/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=mozjs68 -pkgver=68.8.0 +pkgver=68.9.0 pkgrel=0 pkgdesc="Standalone Mozilla JavaScript engine" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" @@ -40,6 +40,11 @@ builddir="$srcdir"/firefox-$pkgver _builddir="$builddir/js/src" # secfixes: +# 68.9.0-r0: +# - CVE-2020-12399 +# - CVE-2020-12405 +# - CVE-2020-12406 +# - CVE-2020-12410 # 68.8.0-r0: # - CVE-2020-12387 # - CVE-2020-12388 @@ -129,9 +134,9 @@ package() { rm -f "$pkgdir"/usr/lib/*.ajs } -sha512sums="139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3 firefox-68.8.0esr.source.tar.xz +sha512sums="98431800d80f7c680aef9eede29df8217810912a319a7f7f8c2e637c43ecd4f4e29223a417afb2a6315e825f979453ff6e6b5a575649aba5cc63ce5956375bb8 firefox-68.9.0esr.source.tar.xz 4d30f4b64b6d9ba03099831aef18f6dffa7f0ff537d71502b8975329c9fa5025f02a43f45cf1311116d917fb507d5961163d659bb4c9f43c22bd61d14d0afb2f 0001-silence-sandbox-violations.patch 6e9e7d811b92e32af29cebec6cb59763004f30b990842b8dd036f971f10d6659e8dbd771f0d61c8a42ea0ac4a6937466c1e6fd450a08efab8a0c7bab4ef3a1ec disable-jslint.patch bc91c2fb15eb22acb8acc36d086fb18fbf6f202b4511d138769b5ecaaed4a673349c55f808270c762616fafa42e3b01e74dc0af1dcbeea1289e043926e2750c8 fix-musl-build.patch -1bf1f579ced0ca47d156eb45962114f9867cf224c2ba34dfc106227648322ecf729243d2a6e84b72cb011abadc36ed84990960bded764fd4243fc9cb22084ce5 fix-rust-target.patch +c397bd594428b009d1533922a3728a0ec74403714417f4b90c38c1b7751749b0585d48e77c79efa05c6c22a0d9a8ac04d535eb5bb8deb51684852c03c05d94cd fix-rust-target.patch 60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1 fd6847c9416f9eebde636e21d794d25d1be8791d.patch" diff --git a/community/mozjs68/fix-rust-target.patch b/community/mozjs68/fix-rust-target.patch index d2d638b9eae..f1a98dfd53f 100644 --- a/community/mozjs68/fix-rust-target.patch +++ b/community/mozjs68/fix-rust-target.patch @@ -1,23 +1,15 @@ ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -278,9 +280,10 @@ - die("Don't know how to translate {} for rustc".format( - host_or_target.alias)) - -+ fixed_alias = os.environ['RUST_TARGET'] - # Check to see whether our rustc has a reasonably functional stdlib - # for our chosen target. -- target_arg = '--target=' + rustc_target.alias -+ target_arg = '--target=' + fixed_alias - in_fd, in_path = mkstemp(prefix='conftest', suffix='.rs') - out_fd, out_path = mkstemp(prefix='conftest', suffix='.rlib') - os.close(out_fd) -@@ -317,7 +320,7 @@ - os.remove(out_path) +Allow us to just set RUST_TARGEt ourselves instead of hacking around in mozilla's +weird custom build system... + +diff -upr firefox-68.9.0.orig/build/moz.configure/rust.configure firefox-68.9.0/build/moz.configure/rust.configure +--- firefox-68.9.0.orig/build/moz.configure/rust.configure 2020-06-02 22:54:39.982616128 +0200 ++++ firefox-68.9.0/build/moz.configure/rust.configure 2020-06-02 23:08:37.656332899 +0200 +@@ -345,7 +345,7 @@ def rust_triple_alias(host_or_target): - # This target is usable. -- return rustc_target.alias -+ return fixed_alias + return None - return rust_target +- 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( |