mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-24 05:53:30 +08:00
b6871f9d93
Bump to the latest git commit as this will fix the following CVEs: git log|grep CVE sox-fmt: validate comments_bytes before use (CVE-2019-13590) [bug #325] fix possible null pointer deref in lsx_make_lpf() (CVE-2019-8357) fft4g: bail if size too large (CVE-2019-8356) fix possible overflow in lsx_(re)valloc() size calculation (CVE-2019-8355) fix possible buffer size overflow in lsx_make_lpf() (CVE-2019-8354) xa: validate channel count (CVE-2017-18189) aiff: fix crash on empty comment chunk (CVE-2017-15642) adpcm: fix stack overflow with >4 channels (CVE-2017-15372) flac: fix crash on corrupt metadata (CVE-2017-15371) wav: ima_adpcm: fix buffer overflow on corrupt input (CVE-2017-15370) wav: fix crash writing header when channel count >64k (CVE-2017-11359) hcom: fix crash on input with corrupt dictionary (CVE-2017-11358) wav: fix crash if channel count is zero (CVE-2017-11332) - Tweak configuration options due to6ff0e9322f- libgsm is now an optional dependency sincee548827ffc- Add patch to put back --disable-stack-protector Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From 18ace560a15207503805d4df25b90c7a756bcbf6 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Tue, 2 Feb 2021 23:53:39 +0100
|
|
Subject: [PATCH] configure.ac: put back --disable-stack-protector
|
|
|
|
Put back --disable-stack-protector which has been removed by commit
|
|
70c85915eace83142b84e4f65f5db421cf0c09e3. This will allow the user to
|
|
disable it or to let a higher buildsystem such as buildroot to finely
|
|
configure it.
|
|
|
|
Indeed, without this patch, build can fail as some compilers (such as
|
|
uclibc) could missed the needed library (-lssp or -lssp_nonshared) at
|
|
linking step:
|
|
|
|
CCLD libsox.la
|
|
/home/fabrice/br-test-pkg/br-arm-full/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/5.5.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp_nonshared
|
|
/home/fabrice/br-test-pkg/br-arm-full/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/5.5.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://sourceforge.net/p/sox/patches/122/]
|
|
---
|
|
configure.ac | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 39306398..a1665467 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -32,7 +32,12 @@ AC_PROG_LN_S
|
|
PKG_PROG_PKG_CONFIG
|
|
PKG_INSTALLDIR
|
|
|
|
-AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong])
|
|
+AC_ARG_ENABLE([stack-protector],
|
|
+ AS_HELP_STRING([--disable-stack-protector], [Disable -fstack-protector-strong]),
|
|
+ [enable_stack_protector=$enableval], [enable_stack_protector=yes])
|
|
+AS_IF([test x"$enable_stack_protector" = "xyes"],
|
|
+ [AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong])])
|
|
+
|
|
AX_APPEND_COMPILE_FLAGS([-Wall -Wmissing-prototypes -Wstrict-prototypes])
|
|
AX_APPEND_LINK_FLAGS([-Wl,--as-needed])
|
|
|
|
--
|
|
2.29.2
|
|
|