switch to the IXP4xx microcode with crypto support

[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 ef6c0f4..b4afa05 100644 (file)
--- a/package/busybox/patches/300-netmsg.patch
+++ b/package/busybox/patches/300-netmsg.patch
@@ -1,45 +1,54 @@
-diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h
---- busybox-1.1.1/include/applets.h    2006-04-01 18:26:21.000000000 +0200
-+++ busybox-1.1.1-owrt/include/applets.h       2006-04-01 18:36:28.000000000 +0200
-@@ -197,6 +197,7 @@
- USE_MV(APPLET(mv, mv_main, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NAMEIF(APPLET(nameif, nameif_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
- USE_NC(APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-+USE_NETMSG(APPLET_NOUSAGE(netmsg, netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS))
- USE_NETSTAT(APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NICE(APPLET(nice, nice_main, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NOHUP(APPLET(nohup, nohup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-diff -Nur busybox-1.1.1/networking/Config.in busybox-1.1.1-owrt/networking/Config.in
---- busybox-1.1.1/networking/Config.in 2006-03-22 22:16:19.000000000 +0100
-+++ busybox-1.1.1-owrt/networking/Config.in    2006-04-01 18:35:32.000000000 +0200
-@@ -451,6 +451,12 @@
+Index: busybox-1.7.2/include/applets.h
+===================================================================
+--- busybox-1.7.2.orig/include/applets.h       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/include/applets.h    2007-10-30 15:35:03.000000000 -0500
+@@ -241,6 +241,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))
+Index: busybox-1.7.2/networking/Config.in
+===================================================================
+--- busybox-1.7.2.orig/networking/Config.in    2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/networking/Config.in 2007-10-30 15:35:03.000000000 -0500
+@@ -508,6 +508,12 @@

        help
          A simple Unix utility which reads and writes data across network
          connections.
 +        
        help
          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
  
 +      bool "netmsg"
 +      default n
 +      help
 +        simple program for sending udp broadcast messages
  

- config CONFIG_NC_GAPING_SECURITY_HOLE
-       bool "gaping security hole"
-diff -Nur busybox-1.1.1/networking/Makefile.in busybox-1.1.1-owrt/networking/Makefile.in
---- busybox-1.1.1/networking/Makefile.in       2006-03-22 22:16:19.000000000 +0100
-+++ busybox-1.1.1-owrt/networking/Makefile.in  2006-04-01 18:35:32.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 -Nur busybox-1.1.1/networking/netmsg.c busybox-1.1.1-owrt/networking/netmsg.c
---- busybox-1.1.1/networking/netmsg.c  1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.1.1-owrt/networking/netmsg.c     2006-04-01 18:35:32.000000000 +0200
-@@ -0,0 +1,58 @@
+ config NC_SERVER
+       bool "Netcat server options (-l)"
+Index: busybox-1.7.2/networking/Kbuild
+===================================================================
+--- busybox-1.7.2.orig/networking/Kbuild       2007-10-30 15:34:59.000000000 -0500
++++ busybox-1.7.2/networking/Kbuild    2007-10-30 15:35:03.000000000 -0500
+@@ -21,6 +21,7 @@
+ 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
+Index: busybox-1.7.2/networking/netmsg.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.7.2/networking/netmsg.c  2007-10-30 15:35:03.000000000 -0500
+@@ -0,0 +1,63 @@
++/*
++ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This is free software, licensed under the GNU General Public License v2.
++ */

 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netinet/in.h>


@@ -56,7 +65,7 @@ diff -Nur busybox-1.1.1/networking/netmsg.c busybox-1.1.1-owrt/networking/netmsg
 +int netmsg_main(int argc, char **argv)
 +#endif
 +{
 +int netmsg_main(int argc, char **argv)
 +#endif
 +{

-+      int s, i;
++      int s;

 +      struct sockaddr_in addr;
 +      int optval = 1;
 +      unsigned char buf[1001];
 +      struct sockaddr_in addr;
 +      int optval = 1;
 +      unsigned char buf[1001];