diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-04-03 18:31:00 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-04-03 18:31:00 +0000 |
| commit | 03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79 (patch) | |
| tree | 138dd3337ab4da580067379a45074ea7e7cf7b11 /package/busybox/patches/300-netmsg.patch | |
| parent | 1bda5f253040898869baba09a04008ef51009cca (diff) | |
| download | upstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.tar.gz upstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.tar.bz2 upstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.zip | |
update busybox to 1.18.4, patch from Peter Wagner
SVN-Revision: 26455
Diffstat (limited to 'package/busybox/patches/300-netmsg.patch')
| -rw-r--r-- | package/busybox/patches/300-netmsg.patch | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch index b7dd5d9869..d9d2f14a87 100644 --- a/package/busybox/patches/300-netmsg.patch +++ b/package/busybox/patches/300-netmsg.patch @@ -1,6 +1,8 @@ +diff --git a/include/applets.src.h b/include/applets.src.h +index f4fab53..f97f2d8 100644 --- a/include/applets.src.h +++ b/include/applets.src.h -@@ -278,6 +278,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D +@@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_DROP)) IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP)) IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP)) @@ -8,9 +10,30 @@ IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP)) IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP)) IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP)) +diff --git a/include/usage.src.h b/include/usage.src.h +index 30fef24..ac78992 100644 +--- a/include/usage.src.h ++++ b/include/usage.src.h +@@ -1,3 +1,4 @@ ++ + /* vi: set sw=8 ts=8: */ + /* + * This file suffers from chronically incorrect tabification +@@ -2706,6 +2707,9 @@ INSERT + " or\n" \ + "$ nameif -c /etc/my_mactab_file\n" \ + ++#define netmsg_trivial_usage NOUSAGE_STR ++#define netmsg_full_usage "" ++ + #define nmeter_trivial_usage \ + "format_string" + #define nmeter_full_usage "\n\n" \ +diff --git a/networking/Config.src b/networking/Config.src +index 6dd7df7..4682dd3 100644 --- a/networking/Config.src +++ b/networking/Config.src -@@ -623,6 +623,12 @@ config FEATURE_NAMEIF_EXTENDED +@@ -640,6 +640,12 @@ config FEATURE_NAMEIF_EXTENDED new_interface_name mac=00:80:C8:38:91:B5 new_interface_name 00:80:C8:38:91:B5 @@ -23,6 +46,8 @@ config NETSTAT bool "netstat" default y +diff --git a/networking/Kbuild.src b/networking/Kbuild.src +index f41a2df..6070a40 100644 --- a/networking/Kbuild.src +++ b/networking/Kbuild.src @@ -27,6 +27,7 @@ lib-$(CONFIG_IP) += ip.o @@ -33,6 +58,9 @@ lib-$(CONFIG_NETSTAT) += netstat.o lib-$(CONFIG_NSLOOKUP) += nslookup.o lib-$(CONFIG_NTPD) += ntpd.o +diff --git a/networking/netmsg.c b/networking/netmsg.c +new file mode 100644 +index 0000000..43aba0d --- /dev/null +++ b/networking/netmsg.c @@ -0,0 +1,63 @@ @@ -99,20 +127,3 @@ + close(s); + exit(1); +} ---- a/include/usage.src.h -+++ b/include/usage.src.h -@@ -1,3 +1,4 @@ -+ - /* vi: set sw=8 ts=8: */ - /* - * This file suffers from chronically incorrect tabification -@@ -2961,6 +2962,9 @@ INSERT - " or\n" \ - "$ nameif -c /etc/my_mactab_file\n" \ - -+#define netmsg_trivial_usage NOUSAGE_STR -+#define netmsg_full_usage "" -+ - #define netstat_trivial_usage \ - "[-laentuwxr"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]" - #define netstat_full_usage "\n\n" \ |