diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-08-15 20:28:05 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-08-15 20:28:05 +0000 |
| commit | 2c57634be3dfb83d76cc63e6fddb486fc725ecb7 (patch) | |
| tree | 610afdd6036831458db468e283b1710083c3aa6d /package/busybox/patches/300-netmsg.patch | |
| parent | 26f323dcf5afee0a88f1545aba04556aec6b9ae1 (diff) | |
| download | upstream-2c57634be3dfb83d76cc63e6fddb486fc725ecb7.tar.gz upstream-2c57634be3dfb83d76cc63e6fddb486fc725ecb7.tar.bz2 upstream-2c57634be3dfb83d76cc63e6fddb486fc725ecb7.zip | |
package/busybox: add missing bits from 1.17.1 update (mostly config stuff), rename upstream patches so they're applied first
SVN-Revision: 22665
Diffstat (limited to 'package/busybox/patches/300-netmsg.patch')
| -rw-r--r-- | package/busybox/patches/300-netmsg.patch | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch index 7e48930bbc..b7dd5d9869 100644 --- a/package/busybox/patches/300-netmsg.patch +++ b/package/busybox/patches/300-netmsg.patch @@ -8,18 +8,6 @@ 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)) ---- a/include/usage.src.h -+++ b/include/usage.src.h -@@ -2961,6 +2961,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" \ --- a/networking/Config.src +++ b/networking/Config.src @@ -623,6 +623,12 @@ config FEATURE_NAMEIF_EXTENDED @@ -30,7 +18,7 @@ + bool "netmsg" + default n + help -+ simple program for sending udp broadcast messages ++ simple program for sending udp broadcast messages + config NETSTAT bool "netstat" @@ -111,3 +99,20 @@ + 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" \ |