summaryrefslogtreecommitdiff
path: root/user/firefox-esr
diff options
context:
space:
mode:
Diffstat (limited to 'user/firefox-esr')
-rw-r--r--user/firefox-esr/APKBUILD21
-rw-r--r--user/firefox-esr/jpeg-link.patch15
-rw-r--r--user/firefox-esr/mozconfig2
3 files changed, 32 insertions, 6 deletions
diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index aca2f0801..3d0594f99 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.1.0
+pkgver=68.2.0
pkgrel=0
pkgdesc="Firefox web browser (extended support release)"
url="https://www.mozilla.org/firefox/"
@@ -37,6 +37,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f
disable-gecko-profiler.patch
fix-mutex-build.patch
fix-seccomp-bpf.patch
+ jpeg-link.patch
mozilla-build-arm.patch
ppc32-fix.patch
rust-32bit.patch
@@ -53,7 +54,7 @@ builddir="$srcdir/firefox-$pkgver"
_mozappdir=/usr/lib/firefox
ldpath="$_mozappdir"
-# secfixes: firefox
+# secfixes: firefox-esr
# 68.0.2-r0:
# - CVE-2019-11733
# 68.1.0-r0:
@@ -73,7 +74,16 @@ ldpath="$_mozappdir"
# - CVE-2019-11751
# - CVE-2019-11752
# - CVE-2019-11753
-
+# 68.2.0-r0:
+# - CVE-2019-15903
+# - CVE-2019-11757
+# - CVE-2019-11758
+# - CVE-2019-11759
+# - CVE-2019-11760
+# - CVE-2019-11761
+# - CVE-2019-11762
+# - CVE-2019-11763
+# - CVE-2019-11764
unpack() {
default_unpack
@@ -198,13 +208,14 @@ package() {
EOF
}
-sha512sums="a53b04b6a4fc98065596117b6bc0aee40c36f74bca02dc7486fda7e9556ad6f221f5ead94db1dc5db572f277556a21b22a0395dae107b67336ca91e33df9882c firefox-68.1.0esr.source.tar.xz
+sha512sums="f6522ca6b9efa3fdeb866912ab9cb904eaace5806c606d5721cba23aebd679885670011c743ca8d381b579b728077182dc766f9b6d3b31ccf51c3eb583c547ee firefox-68.2.0esr.source.tar.xz
16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz
-1b84e737ce9931872e0eba11d2dd1c9e66ee28f03a4d881ab8df2f7c41b6bcfc74d3dfc7dd03c0b000718ecd71492392538b8615a773e9aca62d52ceff756cbc mozconfig
+f82758d279cd12a1b30a9b36ac3c265cfb137df3db7ae185f2c538504e46fa70ace1b051fce847356851062b5cc9cd741a6d33d54f8cd103aa0c8272cb19ccc4 mozconfig
ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch
9c14041f0295682b8dbeb6d5b58a2f9dc0a2dc8bef995a0f7e30fa0b17c51aa0f6748f80fb8584169db7687e2eeb404dff68a09158ae56a5f24eef30685dd2b3 disable-gecko-profiler.patch
c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch
70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch
+de8e3b15cd7dffb0eca5a729434986e5916234914cdc5fdcdbbc67d8bb439a535ed932293518dd74c3be07555ed60c9541d6758cd2f69d27c22965f7a076e4e3 jpeg-link.patch
e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch
06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch
7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch
diff --git a/user/firefox-esr/jpeg-link.patch b/user/firefox-esr/jpeg-link.patch
new file mode 100644
index 000000000..8f27e72e4
--- /dev/null
+++ b/user/firefox-esr/jpeg-link.patch
@@ -0,0 +1,15 @@
+--- firefox-68.2.0/toolkit/moz.configure.old 2019-11-11 16:33:48.441920266 +0000
++++ firefox-68.2.0/toolkit/moz.configure 2019-11-11 16:41:36.221754664 +0000
+@@ -1482,9 +1482,9 @@
+ )
+
+ with only_when('--with-system-jpeg'):
+- check_symbol('jpeg_destroy_compress', flags=jpeg_flags.ldflags,
+- onerror=lambda: die('--with-system-jpeg requested but symbol '
+- 'jpeg_destroy_compress not found.'))
++ #check_symbol('jpeg_destroy_compress', flags=jpeg_flags.ldflags,
++ # onerror=lambda: die('--with-system-jpeg requested but symbol '
++ # 'jpeg_destroy_compress not found.'))
+
+ c_compiler.try_compile(
+ includes=[
diff --git a/user/firefox-esr/mozconfig b/user/firefox-esr/mozconfig
index 0ce38dcf6..55e1a95ce 100644
--- a/user/firefox-esr/mozconfig
+++ b/user/firefox-esr/mozconfig
@@ -17,7 +17,7 @@ ac_add_options --enable-startup-notification
ac_add_options --enable-system-ffi
ac_add_options --with-system-bz2
ac_add_options --with-system-icu
-#ac_add_options --with-system-jpeg
+ac_add_options --with-system-jpeg
ac_add_options --with-system-libevent
ac_add_options --with-system-nspr
ac_add_options --with-system-nss