X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/977ad1af3b9689bb7845bea2052720a7b0e00dc0..0149a69d6c72702ebadf4b2a89636db438987a76:/packages/busybox/telnetd.patch

diff --git a/packages/busybox/telnetd.patch b/packages/busybox/telnetd.patch
index dea853b2..b973d3a3 100644
--- a/packages/busybox/telnetd.patch
+++ b/packages/busybox/telnetd.patch
@@ -1,21 +1,10 @@
-diff -u -r ../busybox-1.23.2/networking/telnetd.c ./networking/telnetd.c
---- ../busybox-1.23.2/networking/telnetd.c	2015-03-22 23:07:19.000000000 -0400
-+++ ./networking/telnetd.c	2015-08-09 07:23:22.408532696 -0400
-@@ -31,8 +31,8 @@
- //usage:     "\n	-K		Close connection as soon as login exits"
- //usage:     "\n			(normally wait until all programs close slave pty)"
- //usage:	IF_FEATURE_TELNETD_STANDALONE(
--//usage:     "\n	-p PORT		Port to listen on"
--//usage:     "\n	-b ADDR[:PORT]	Address to bind to"
-+//usage:     "\n	-p PORT		Port to listen on (default 8023)"
-+//usage:     "\n	-b ADDR[:PORT]	Address to bind to (default *:8023)"
- //usage:     "\n	-F		Run in foreground"
- //usage:     "\n	-i		Inetd mode"
- //usage:	IF_FEATURE_TELNETD_INETD_WAIT(
-@@ -84,8 +84,9 @@
- } FIX_ALIASING;
- #define G (*(struct globals*)&bb_common_bufsiz1)
+diff -u -r ../busybox-1.25.1/networking/telnetd.c ./networking/telnetd.c
+--- ../busybox-1.25.1/networking/telnetd.c	2016-10-07 10:47:47.000000000 -0400
++++ ./networking/telnetd.c	2016-10-08 17:49:55.717890508 -0400
+@@ -86,8 +86,9 @@
+ #define G (*(struct globals*)bb_common_bufsiz1)
  #define INIT_G() do { \
+ 	setup_common_bufsiz(); \
 -	G.loginpath = "/bin/login"; \
 -	G.issuefile = "/etc/issue.net"; \
 +	struct passwd* pwd = getpwuid(getuid()); \
@@ -24,7 +13,7 @@ diff -u -r ../busybox-1.23.2/networking/telnetd.c ./networking/telnetd.c
  } while (0)
  
  
-@@ -535,7 +536,7 @@
+@@ -529,7 +530,7 @@
  	} else {
  		master_fd = 0;
  		if (!(opt & OPT_WAIT)) {