[brcm47xx]: add vlan definitions for Siemens SE505v2

[openwrt.git] / package / busybox / patches / 300-netmsg.patch

diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch
index e51a8bb..795ebb3 100644 (file)
--- a/package/busybox/patches/300-netmsg.patch
+++ b/package/busybox/patches/300-netmsg.patch
@@ -1,44 +1,57 @@
-diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1-new/include/applets.h
---- busybox-1.3.1-old/include/applets.h        2006-12-27 05:56:18.000000000 +0100
-+++ busybox-1.3.1-new/include/applets.h        2006-12-28 07:25:35.000000000 +0100
-@@ -211,6 +211,7 @@
- USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-+USE_NETMSG(APPLET_NOUSAGE(netmsg, netmsg, _BB_DIR_BIN, _BB_SUID_ALWAYS))
- USE_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-diff -ruN busybox-1.3.1-old/networking/Config.in busybox-1.3.1-new/networking/Config.in
---- busybox-1.3.1-old/networking/Config.in     2006-12-27 05:52:39.000000000 +0100
-+++ busybox-1.3.1-new/networking/Config.in     2006-12-28 07:25:35.000000000 +0100
-@@ -452,6 +452,12 @@
-       help
-         A simple Unix utility which reads and writes data across network
-         connections.
-+        
+--- a/include/applets.src.h
++++ b/include/applets.src.h
+@@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D
+ 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))
++IF_NETMSG(APPLET(netmsg, _BB_DIR_BIN, _BB_SUID_REQUIRE))
+ 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
+@@ -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" \
+--- a/networking/Config.src
++++ b/networking/Config.src
+@@ -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
+ 
 +config NETMSG
 +      bool "netmsg"
 +      default n
 +      help
 +        simple program for sending udp broadcast messages
- 
- config NC_SERVER
-       bool "Netcat server options (-lp)"
-diff -ruN busybox-1.3.1-old/networking/Kbuild busybox-1.3.1-new/networking/Kbuild
---- busybox-1.3.1-old/networking/Kbuild        2006-12-27 05:52:39.000000000 +0100
-+++ busybox-1.3.1-new/networking/Kbuild        2006-12-28 07:28:29.000000000 +0100
-@@ -25,6 +25,7 @@
- lib-$(CONFIG_IPTUNNEL)     += iptunnel.o
++
+ config NETSTAT
+       bool "netstat"
+       default y
+--- a/networking/Kbuild.src
++++ b/networking/Kbuild.src
+@@ -27,6 +27,7 @@ lib-$(CONFIG_IP)           += ip.o
+ lib-$(CONFIG_IPCALC)       += ipcalc.o
  lib-$(CONFIG_NAMEIF)       += nameif.o
  lib-$(CONFIG_NC)           += nc.o
 +lib-$(CONFIG_NETMSG)       += netmsg.o
  lib-$(CONFIG_NETSTAT)      += netstat.o
  lib-$(CONFIG_NSLOOKUP)     += nslookup.o
- lib-$(CONFIG_PING)         += ping.o
-diff -ruN busybox-1.3.1-old/networking/netmsg.c busybox-1.3.1-new/networking/netmsg.c
---- busybox-1.3.1-old/networking/netmsg.c      1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.3.1-new/networking/netmsg.c      2006-12-28 07:25:52.000000000 +0100
+ lib-$(CONFIG_NTPD)         += ntpd.o
+--- /dev/null
++++ b/networking/netmsg.c
 @@ -0,0 +1,63 @@
 +/*
 + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>