Add a boolean to allow NAT from LAN or not, default to nat LAN (#2535)

[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..b4afa05 100644 (file)
--- a/package/busybox/patches/300-netmsg.patch
+++ b/package/busybox/patches/300-netmsg.patch
@@ -1,7 +1,8 @@
-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 @@
+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))
@@ -9,10 +10,11 @@ diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1-new/include/applets.
  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 @@
+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.
@@ -24,21 +26,23 @@ diff -ruN busybox-1.3.1-old/networking/Config.in busybox-1.3.1-new/networking/Co
 +        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
+       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
-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
+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>