From edcccca8c759170711d51e70dec68d77855b5e64 Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 14 Jan 2006 17:22:39 +0000
Subject: upgrade busybox to 1.1.0 final

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2977 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/busybox/patches/110-telnetd.patch | 50 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 26 deletions(-)

(limited to 'package/busybox/patches/110-telnetd.patch')

diff --git a/package/busybox/patches/110-telnetd.patch b/package/busybox/patches/110-telnetd.patch
index e95757ee4..f14143aa6 100644
--- a/package/busybox/patches/110-telnetd.patch
+++ b/package/busybox/patches/110-telnetd.patch
@@ -1,17 +1,16 @@
-diff -urN busybox-1.00-pre8/networking/telnetd.c busybox-1.00-pre8-openwrt/networking/telnetd.c
---- busybox-1.00-pre8/networking/telnetd.c	2004-02-22 03:45:57.000000000 -0600
-+++ busybox-1.00-pre8-openwrt/networking/telnetd.c	2004-03-05 01:32:57.000000000 -0600
-@@ -44,6 +44,8 @@
+diff -ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt/networking/telnetd.c
+--- busybox-1.1.0/networking/telnetd.c	2006-01-11 06:43:51.000000000 +0100
++++ busybox-1.1.0-owrt/networking/telnetd.c	2006-01-14 17:41:20.000000000 +0100
+@@ -45,6 +45,7 @@
  #include <arpa/telnet.h>
  #include <ctype.h>
  #include <sys/syslog.h>
 +#include <net/if.h>
-+
  
  #include "busybox.h"
  
-@@ -384,11 +386,13 @@
- 	int portnbr = 23;
+@@ -394,11 +395,13 @@
+ 	struct in_addr bind_addr = { .s_addr = 0x0 };
  #endif /* CONFIG_FEATURE_TELNETD_INETD */
  	int c;
 +	char *interface_name = NULL;
@@ -19,34 +18,33 @@ diff -urN busybox-1.00-pre8/networking/telnetd.c busybox-1.00-pre8-openwrt/netwo
  	static const char options[] =
  #ifdef CONFIG_FEATURE_TELNETD_INETD
 -		"f:l:";
--#else /* CONFIG_EATURE_TELNETD_INETD */
--		"f:l:p:";
 +		"i:f:l:";
-+#else /* CONFIG_FEATURE_TELNETD_INETD */
-+		"i:f:l:p:";
+ #else /* CONFIG_EATURE_TELNETD_INETD */
+-		"f:l:p:b:";
++		"i:f:l:p:b:";
  #endif /* CONFIG_FEATURE_TELNETD_INETD */
  	int maxlen, w, r;
  
-@@ -403,6 +407,9 @@
+@@ -413,6 +416,9 @@
  			case 'f':
- 				issuefile = strdup (optarg);
+ 				issuefile = optarg;
  				break;
-+                        case 'i':
-+                                interface_name = strdup(optarg);
-+                                break;
++			case 'i':
++				interface_name = strdup(optarg);
++				break;
  			case 'l':
- 				loginpath = strdup (optarg);
+ 				loginpath = optarg;
  				break;
-@@ -442,6 +449,13 @@
- 	sa.sin_family = AF_INET;
- 	sa.sin_port = htons(portnbr);
+@@ -465,6 +471,13 @@
+ 	sa.sin_addr = bind_addr;
+ #endif
  
-+        /* Set it to listen on the specified interface */
-+        if (interface_name) {
-+                strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ);
-+                (void)setsockopt(master_fd, SOL_SOCKET,
-+                                SO_BINDTODEVICE, &interface, sizeof(interface));
-+        }
++	/* Set it to listen on the specified interface */
++	if (interface_name) {
++		strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ);
++		(void)setsockopt(master_fd, SOL_SOCKET,
++				SO_BINDTODEVICE, &interface, sizeof(interface));
++	}
 +
  	if (bind(master_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
  		bb_perror_msg_and_die("bind");
-- 
cgit v1.2.3