diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-24 22:07:48 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-24 22:07:48 +0200 |
| commit | 9218305c96277675f539997d6d3b4462293329df (patch) | |
| tree | 6a281c7544488c95cefca3e523a9067b0489bd05 | |
| parent | 06d086c54ea533dd835497251b0913d89fde5f76 (diff) | |
| download | aports-9218305c96277675f539997d6d3b4462293329df.tar.bz2 aports-9218305c96277675f539997d6d3b4462293329df.tar.xz | |
testing/firefox: upgrade to 41.0
| -rw-r--r-- | testing/firefox/APKBUILD | 21 | ||||
| -rw-r--r-- | testing/firefox/fix-linux-include.patch | 10 | ||||
| -rw-r--r-- | testing/firefox/fix-seccomp-bpf.patch | 14 |
3 files changed, 25 insertions, 20 deletions
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD index ece6fd2385..ba88dbda26 100644 --- a/testing/firefox/APKBUILD +++ b/testing/firefox/APKBUILD @@ -1,10 +1,10 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=firefox -pkgver=40.0.3 +pkgver=41.0 _pkgver=$pkgver _xulver=$pkgver -pkgrel=2 +pkgrel=0 pkgdesc="Firefox web browser" url="http://www.firefox.com" arch="all" @@ -14,6 +14,7 @@ depends_dev=" alsa-lib-dev bzip2-dev dbus-glib-dev + gconf-dev gst-plugins-base1-dev gstreamer1-dev gtk+2.0-dev @@ -50,7 +51,7 @@ makedepends="$depends_dev install="" subpackages="$pkgname-dev" -source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 +source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz mozconfig vendor.js @@ -58,7 +59,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg fix-arm-atomics-grsec.patch fix-toolkit.patch fix-tools.patch - fix-linux-include.patch + fix-seccomp-bpf.patch getchar.patch mozilla-build-arm.patch stat.patch @@ -166,14 +167,14 @@ dev() { default_dev } -md5sums="26a64a80cbd5b77d3b0d9734bff5bbad firefox-40.0.3.source.tar.bz2 +md5sums="81324515c2f562db8c4800ebafaa5d25 firefox-41.0.source.tar.xz 1f4c60e662ed93784431bd06c5141719 mozconfig 99b27aeac58923f318d083e5e71879ba vendor.js 6ab77b80c8c7d6fd07ab53c54561f4df 0002-Use-C99-math-isfinite.patch b18bd948aae828e5c8f5f63e440c96d6 fix-arm-atomics-grsec.patch 94ae976a54d1f84bf13d059c1e44ddf5 fix-toolkit.patch e64688ad989c22559bed2163dd4d908f fix-tools.patch -2f0b995b1313884b10e4a61c2ce2cd01 fix-linux-include.patch +aed3b88014fbfbe73db79851e52ca7fa fix-seccomp-bpf.patch 507742325de8687529e4e81e31132ddf getchar.patch 308ba5b54116a035fe68d0d5c3974857 mozilla-build-arm.patch d9a2245b93a7f5855ee029b5fa44e4e9 stat.patch @@ -184,14 +185,14 @@ f29e0036edc7b3a4158a82fa97bde500 fix-fortify-inline.patch 1feef5ea2fd5acc2a71a29350754d006 allow-utf8-fallback.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" -sha256sums="56ab32bfa070a1d86d356ad14ce74252b38dab9307948de8e4a3a2b7f3f22634 firefox-40.0.3.source.tar.bz2 +sha256sums="18abb95e93770ab1cc0794349125aacf073eb04fd8b8a93c7a58312c94bf16fd firefox-41.0.source.tar.xz 23c2b4535ce83c92ba978e15ce328c9f140def155d12523c00df30baf41b98dc mozconfig afecb8c17a2bedafe600dd572d24eff24e540cda02f675705d11168040379ce6 vendor.js 080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e 0002-Use-C99-math-isfinite.patch ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5 fix-arm-atomics-grsec.patch 195cc0b2008f6728e9d85ca787960bb47d7fba723e10d29e255baaa3bd5dd4dc fix-toolkit.patch b05ab3f79d6f4c4e0b81db4279b4ef8bd65b9ecf8667d3711c73fafc83f25d8e fix-tools.patch -a3a6291888819e0f10e3ca05b2979093b32c723c4bf67b19ea1ab14555085236 fix-linux-include.patch +517d95225b3323c373c11da6ab867deb76ffdb0b50c1762bdd893abd9b39d4c9 fix-seccomp-bpf.patch d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4 getchar.patch 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3 mozilla-build-arm.patch a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc stat.patch @@ -202,14 +203,14 @@ cd19195cb4c316ad9f7d377cd8581218c888863b1bc4d112c97f48a4425fb946 fix-fortify-sy a1ba79ec0c50c19edcfb24bb2686a718a77b02035e412989b9208b9b818abe14 allow-utf8-fallback.patch b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop" -sha512sums="8f0f3f3a38378b4a5c30e2a41888564f9eed3e8ec3571654849afbd8e8b46532777e15e148eb4820d14647b51adadf86ed77d80b359ebb289431ea31abfc5748 firefox-40.0.3.source.tar.bz2 +sha512sums="d280bd3ee4d8e63e9f0585c4c23241945da4fdc1fb4dba853c116aa96671ca3626bef03f2f50b83cbdeb851c82c11bcefec7763b702cc5cc0e0a166dd7173379 firefox-41.0.source.tar.xz e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5 mozconfig cc10dba32d9c7faf1d99b8fdebc71bf0200ad10b976105edb45df696bf64a668b2b7aa8c3892a8056eb71fb071b0e0ae51c3ce2fb75acfb7e7035104c0e4fce3 vendor.js 7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8 0002-Use-C99-math-isfinite.patch 4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d fix-arm-atomics-grsec.patch d3f2ec8684aa485e1d08df325281629adb120f2e79c0065b96e14b99ca2968a3c701d18dda1fd1cab482aec2bc4ee8f294b9fda970ae159f8dab655f2c91aca9 fix-toolkit.patch fbd0e61b6a6cd656075e9b2bf30903ef33d2db09109811752b862ad50dbe3371346eaf0399ad16948f04d97827335ab4102be50d3532ef08ab37101ddc02070e fix-tools.patch -2c3319fd625c5d183e310ce6a27ec35e91caafd2206b7b992a539924f9bdb001b0340f1f4451650d4d968134ad35ba1f955cacfff10cb58980f27c42c90d280d fix-linux-include.patch +70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520 getchar.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch 1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7 stat.patch diff --git a/testing/firefox/fix-linux-include.patch b/testing/firefox/fix-linux-include.patch deleted file mode 100644 index d625557cf9..0000000000 --- a/testing/firefox/fix-linux-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./xpcom/io/nsLocalFileUnix.cpp.orig -+++ ./xpcom/io/nsLocalFileUnix.cpp -@@ -28,6 +28,7 @@ - #define USE_LINUX_QUOTACTL - #include <sys/mount.h> - #include <sys/quota.h> -+#include <linux/fs.h> - #endif - - #include "xpcom-private.h" diff --git a/testing/firefox/fix-seccomp-bpf.patch b/testing/firefox/fix-seccomp-bpf.patch new file mode 100644 index 0000000000..47cde56c74 --- /dev/null +++ b/testing/firefox/fix-seccomp-bpf.patch @@ -0,0 +1,14 @@ +--- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig 2015-09-23 09:10:08.812740571 +0200 ++++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-09-23 09:11:38.404746155 +0200 +@@ -23,6 +23,11 @@ + #include "sandbox/linux/services/android_ucontext.h" + #endif + ++// musl libc defines siginfo_t __si_fields instead of _sifields ++#if defined(OS_LINUX) && !defined(__GLIBC__) ++#define _sifields __si_fields ++#endif ++ + namespace { + + struct arch_sigsys { |