X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0d3fffa91dee49ba80032ce5c67f1cb47aee8f4d..03c1e266f1773bf19ec443a5c563ddfb0d13e49c:/package/busybox/patches/300-netmsg.patch?ds=inline diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch index 428e32139..01c290f59 100644 --- a/package/busybox/patches/300-netmsg.patch +++ b/package/busybox/patches/300-netmsg.patch @@ -1,49 +1,52 @@ -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.h ---- busybox-1.2.0-old/include/applets.h 2006-07-31 10:47:56.000000000 +0200 -+++ busybox-1.2.0-new/include/applets.h 2006-07-31 11:21:00.000000000 +0200 -@@ -200,6 +200,7 @@ +--- a/include/applets.h ++++ b/include/applets.h +@@ -257,6 +257,7 @@ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_ 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_NETMSG(APPLET(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_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -diff -ruN busybox-1.2.0-old/networking/Config.in busybox-1.2.0-new/networking/Config.in ---- busybox-1.2.0-old/networking/Config.in 2006-07-01 00:42:02.000000000 +0200 -+++ busybox-1.2.0-new/networking/Config.in 2006-07-31 11:18:01.000000000 +0200 -@@ -445,6 +445,12 @@ - help + USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) +--- a/include/usage.h ++++ b/include/usage.h +@@ -2815,6 +2815,9 @@ + + #endif + ++#define netmsg_trivial_usage NOUSAGE_STR ++#define netmsg_full_usage "" ++ + #define netstat_trivial_usage \ + "[-laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")"]" + #define netstat_full_usage "\n\n" \ +--- a/networking/Config.in ++++ b/networking/Config.in +@@ -602,6 +602,12 @@ config NC A simple Unix utility which reads and writes data across network connections. -+ -+config CONFIG_NETMSG + ++config NETMSG + bool "netmsg" + default n + help + simple program for sending udp broadcast messages - - config CONFIG_NC_GAPING_SECURITY_HOLE - bool "gaping security hole" -diff -ruN busybox-1.2.0-old/networking/Makefile.in busybox-1.2.0-new/networking/Makefile.in ---- busybox-1.2.0-old/networking/Makefile.in 2006-07-01 00:42:02.000000000 +0200 -+++ busybox-1.2.0-new/networking/Makefile.in 2006-07-31 11:18:01.000000000 +0200 -@@ -30,6 +30,7 @@ - NETWORKING-$(CONFIG_IPTUNNEL) += iptunnel.o - NETWORKING-$(CONFIG_NAMEIF) += nameif.o - NETWORKING-$(CONFIG_NC) += nc.o -+NETWORKING-$(CONFIG_NETMSG) += netmsg.o - NETWORKING-$(CONFIG_NETSTAT) += netstat.o - NETWORKING-$(CONFIG_NSLOOKUP) += nslookup.o - NETWORKING-$(CONFIG_PING) += ping.o -diff -ruN busybox-1.2.0-old/networking/netmsg.c busybox-1.2.0-new/networking/netmsg.c ---- busybox-1.2.0-old/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.2.0-new/networking/netmsg.c 2006-07-31 11:18:01.000000000 +0200 ++ + config NC_SERVER + bool "Netcat server options (-l)" + default n +--- a/networking/Kbuild ++++ b/networking/Kbuild +@@ -24,6 +24,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 +--- /dev/null ++++ b/networking/netmsg.c @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2006 Felix Fietkau @@ -66,7 +69,7 @@ diff -ruN busybox-1.2.0-old/networking/netmsg.c busybox-1.2.0-new/networking/net +int netmsg_main(int argc, char **argv) +#endif +{ -+ int s, i; ++ int s; + struct sockaddr_in addr; + int optval = 1; + unsigned char buf[1001];