libgcrypt: Revert from 1.7.4 to 1.7.3

[termux-packages] / packages / busybox / telnetd.patch

diff --git a/packages/busybox/telnetd.patch b/packages/busybox/telnetd.patch
index fb618c0..b973d3a 100644 (file)
--- a/packages/busybox/telnetd.patch
+++ b/packages/busybox/telnetd.patch
@@ -1,18 +1,19 @@
-diff -u -r ../busybox-1.22.1/networking/telnetd.c ./networking/telnetd.c
---- ../busybox-1.22.1/networking/telnetd.c     2014-01-09 19:15:44.000000000 +0100
-+++ ./networking/telnetd.c     2014-01-20 08:47:37.000000000 +0100
-@@ -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(
-@@ -535,7 +535,7 @@
+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()); \
++      G.loginpath = pwd->pw_shell; \
++      G.issuefile = "@TERMUX_PREFIX@/etc/issue.net"; \
+ } while (0)
+ 
+ 
+@@ -529,7 +530,7 @@
        } else {
                master_fd = 0;
                if (!(opt & OPT_WAIT)) {