summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-11-16 00:48:02 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-11-16 00:48:02 +0000
commit032d4ce8dfbf86b3d18d9d91aec917b5824f1aad (patch)
tree6c14f0882f4fe90f15c0e2f26468a1e728c09e69
parent6c396377a366df48d4d9a87c522bd3f237819d7c (diff)
downloadpackages-032d4ce8dfbf86b3d18d9d91aec917b5824f1aad.tar.gz
packages-032d4ce8dfbf86b3d18d9d91aec917b5824f1aad.tar.bz2
packages-032d4ce8dfbf86b3d18d9d91aec917b5824f1aad.tar.xz
packages-032d4ce8dfbf86b3d18d9d91aec917b5824f1aad.zip
user/firefox-esr: Dynamically link libjpeg-turbo to prevent future CVE catastrophes
-rw-r--r--user/firefox-esr/APKBUILD2
-rw-r--r--user/firefox-esr/jpeg-link.patch15
2 files changed, 17 insertions, 0 deletions
diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index 02c4e1ff7..3d0594f99 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -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
@@ -214,6 +215,7 @@ ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53
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=[