From fa7e6507101f95950c66ef776ed12c30d135b8ca Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 16 Sep 2011 11:29:17 -0300 Subject: busybox: add new 1.19.2 fixes and drop stale config Drop stale config file for busybox 1.13.x Add build system and syslogd fixes for 1.19.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../busybox-1.19.2/busybox-1.19.2-buildsys.patch | 19 +++++++++++++++++++ .../busybox-1.19.2/busybox-1.19.2-syslogd.patch | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch create mode 100644 package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch (limited to 'package/busybox/busybox-1.19.2') diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch new file mode 100644 index 000000000..8e0c4c33e --- /dev/null +++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-buildsys.patch @@ -0,0 +1,19 @@ +--- busybox-1.19.2/applets/applet_tables.c ++++ busybox-1.19.2-buildsys/applets/applet_tables.c +@@ -80,8 +80,15 @@ int main(int argc, char **argv) + + printf("#define NUM_APPLETS %u\n", NUM_APPLETS); + if (NUM_APPLETS == 1) { ++ char *dash_to_underscore, *p; + printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name); +- printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name); ++ /* Example: "ether-wake" -> "ether_wake" */ ++ p = dash_to_underscore = strdup(applets[0].name); ++ p--; ++ while (*++p) ++ if (*p == '-') ++ *p = '_'; ++ printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore); + } + printf("\n"); + diff --git a/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch b/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch new file mode 100644 index 000000000..d54f5d430 --- /dev/null +++ b/package/busybox/busybox-1.19.2/busybox-1.19.2-syslogd.patch @@ -0,0 +1,20 @@ +--- busybox-1.19.2/sysklogd/syslogd.c ++++ busybox-1.19.2-syslogd/sysklogd/syslogd.c +@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char + parser_t *parser; + + parser = config_open2(file ? file : "/etc/syslog.conf", +- file ? xfopen_for_read : fopen_or_warn_stdin); ++ file ? xfopen_for_read : fopen_for_read); + if (!parser) + /* didn't find default /etc/syslog.conf */ + /* proceed as if we built busybox without config support */ +@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c + if (LOG_PRI(pri) < G.logLevel) { + #if ENABLE_FEATURE_IPC_SYSLOG + if ((option_mask32 & OPT_circularlog) && G.shbuf) { +- log_to_shmem(msg); ++ log_to_shmem(G.printbuf); + return; + } + #endif -- cgit v1.2.3