diff options
Diffstat (limited to 'package')
3 files changed, 39 insertions, 1 deletions
diff --git a/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch new file mode 100644 index 000000000..1dfd6f379 --- /dev/null +++ b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch @@ -0,0 +1,37 @@ +From 34d331d642c3312e1c04e4650f547f1a67abee24 Mon Sep 17 00:00:00 2001 +From: Andrej Valek <andrej.v@skyrain.eu> +Date: Wed, 16 Oct 2024 10:15:08 +0200 +Subject: [PATCH] syslogd: fix wrong OPT_locallog flag detection + +The OPT_locallog was set on "option_mask32" but checked on local +"opts" variable. While this flag it's used on multiple places can't be +has to be used with "option_mask32". Without this change syslogd +is more-less unusable while no messages are logged locally. + +Signed-off-by: Andrej Valek <andrej.v@skyrain.eu> +Upstream: https://lists.busybox.net/pipermail/busybox/2024-October/090969.html +[Thomas: this was reported as beeing needed by Bernd Kuhls at +https://lore.kernel.org/buildroot/pan$de0bb$35c5a64$ca9b6f21$2408ff40@ID-313208.user.individual.net/, +but also on the Busybox mailing list at +https://lists.busybox.net/pipermail/busybox/2023-September/090499.html] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +--- + sysklogd/syslogd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c +index 7558051f0..fa03aa280 100644 +--- a/sysklogd/syslogd.c ++++ b/sysklogd/syslogd.c +@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv) + } + } + #endif +- if (!ENABLE_FEATURE_REMOTE_LOG || (opts & OPT_locallog)) { ++ if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) { + recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */ + split_escape_and_log(recvbuf, sz); + } +-- +2.48.1 + diff --git a/package/etrax-tools/src/e100boot/Makefile b/package/etrax-tools/src/e100boot/Makefile index 828b40221..f8e4ced02 100644 --- a/package/etrax-tools/src/e100boot/Makefile +++ b/package/etrax-tools/src/e100boot/Makefile @@ -11,7 +11,7 @@ INSTALL_PATH = /usr/local INSTALL_PATH_BIN = $(INSTALL_PATH)/bin INSTALL_PATH_DOC = $(INSTALL_PATH)/man/man1 -DIRS = libpcap-0.4 sbl doc +DIRS = libpcap-0.4 sbl -include $(AXIS_TOP_DIR)/tools/build/Rules.axis ifdef prefix diff --git a/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c b/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c index 089ea0ab8..1adc8ef95 100644 --- a/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c +++ b/package/etrax-tools/src/e100boot/libpcap-0.4/pcap-linux.c @@ -37,6 +37,7 @@ static const char rcsid[] = #include <linux/if_ether.h> #include <netinet/in.h> +#include <linux/sockios.h> #include <errno.h> #include <malloc.h> |