From 007c5605b0263e5105964bc646740019f5c32eea Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Sat, 11 Sep 2021 06:24:16 +0100 Subject: [PATCH] openssh: update misc_c.patch --- packages/openssh/misc_c.patch | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/packages/openssh/misc_c.patch b/packages/openssh/misc_c.patch index 8acd89313..feb138a97 100644 --- a/packages/openssh/misc_c.patch +++ b/packages/openssh/misc_c.patch @@ -1,21 +1,13 @@ -diff -u -r ../openssh-6.4p1/misc.c ./misc.c ---- ../openssh-6.4p1/misc.c 2013-08-08 04:50:06.000000000 +0200 -+++ ./misc.c 2014-02-03 03:58:35.000000000 +0100 -@@ -205,7 +205,7 @@ - struct passwd *copy = xcalloc(1, sizeof(*copy)); - - copy->pw_name = xstrdup(pw->pw_name); -- copy->pw_passwd = xstrdup(pw->pw_passwd); -+ copy->pw_passwd = xstrdup(pw->pw_passwd == NULL ? "*" : pw->pw_passwd); - #ifdef HAVE_STRUCT_PASSWD_PW_GECOS - copy->pw_gecos = xstrdup(pw->pw_gecos); - #endif -@@ -948,7 +948,7 @@ +diff --git a/misc.c b/misc.c +index b8d1040..1c4ce9c 100644 +--- a/misc.c ++++ b/misc.c +@@ -1757,7 +1757,7 @@ mktemp_proto(char *s, size_t len) if (r > 0 && (size_t)r < len) return; } - r = snprintf(s, len, "/tmp/ssh-XXXXXXXXXXXX"); + r = snprintf(s, len, "@TERMUX_PREFIX@/tmp/ssh-XXXXXXXXXXXX"); if (r < 0 || (size_t)r >= len) - fatal("%s: template string too short", __func__); + fatal_f("template string too short"); }