putty: update to 0.73

This commit is contained in:
Leonid Pliushch 2019-10-28 15:14:35 +02:00 committed by Yaksh Bariya
parent 8ddc434ee2
commit f061d2b32c
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
3 changed files with 13 additions and 33 deletions

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
TERMUX_PKG_DESCRIPTION="A terminal integrated SSH/Telnet client"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=0.70
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=0.73
TERMUX_PKG_SRCURL=https://the.earth.li/~sgtatham/putty/${TERMUX_PKG_VERSION}/putty-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be
TERMUX_PKG_SHA256=3db0b5403fb41aecd3aa506611366650d927650b6eb3d839ad4dcc782519df1c
TERMUX_PKG_DEPENDS="atk, gdk-pixbuf, glib, gtk3, libandroid-glob, libandroid-shmem, libcairo-x, libx11, pango-x"
termux_step_pre_configure() {

View File

@ -1,19 +0,0 @@
diff -uNr putty-0.70/unix/uxmisc.c putty-0.70.mod/unix/uxmisc.c
--- putty-0.70/unix/uxmisc.c 2017-07-04 22:30:56.000000000 +0300
+++ putty-0.70.mod/unix/uxmisc.c 2018-10-05 20:12:00.693981290 +0300
@@ -131,7 +131,6 @@
* coping correctly with people who have su'ed.
*/
user = getlogin();
- setpwent();
if (user)
p = getpwnam(user);
else
@@ -153,7 +152,6 @@
return NULL;
ret = p->pw_name;
}
- endpwent();
return dupstr(ret);
}

View File

@ -1,12 +1,12 @@
diff -uNr putty-0.70/unix/uxproxy.c putty-0.70.mod/unix/uxproxy.c
--- putty-0.70/unix/uxproxy.c 2017-07-04 22:30:56.000000000 +0300
+++ putty-0.70.mod/unix/uxproxy.c 2018-10-05 20:17:20.194819370 +0300
@@ -355,7 +355,7 @@
}
noncloexec(0);
noncloexec(1);
- execl("/bin/sh", "sh", "-c", cmd, (void *)NULL);
+ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, (void *)NULL);
_exit(255);
}
diff -uNr putty-0.73/unix/uxproxy.c putty-0.73.mod/unix/uxproxy.c
--- putty-0.73/unix/uxproxy.c 2019-09-22 12:14:52.000000000 +0300
+++ putty-0.73.mod/unix/uxproxy.c 2019-10-28 15:01:54.259328879 +0200
@@ -62,7 +62,7 @@
dup2(cmd_err_pipe[1], 2);
noncloexec(0);
noncloexec(1);
- execl("/bin/sh", "sh", "-c", cmd, (void *)NULL);
+ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, (void *)NULL);
_exit(255);
}