From f061d2b32c659a0bb2f594964163f46a01b966a7 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 28 Oct 2019 15:14:35 +0200 Subject: [PATCH] putty: update to 0.73 --- x11-packages/putty/build.sh | 5 ++--- .../putty/putty-0.70_unix_uxmisc.c.patch | 19 ---------------- .../putty/putty-0.70_unix_uxproxy.c.patch | 22 +++++++++---------- 3 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 x11-packages/putty/putty-0.70_unix_uxmisc.c.patch diff --git a/x11-packages/putty/build.sh b/x11-packages/putty/build.sh index d157b5d65..dc30b73a7 100644 --- a/x11-packages/putty/build.sh +++ b/x11-packages/putty/build.sh @@ -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 " -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() { diff --git a/x11-packages/putty/putty-0.70_unix_uxmisc.c.patch b/x11-packages/putty/putty-0.70_unix_uxmisc.c.patch deleted file mode 100644 index f02b403f9..000000000 --- a/x11-packages/putty/putty-0.70_unix_uxmisc.c.patch +++ /dev/null @@ -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); - } diff --git a/x11-packages/putty/putty-0.70_unix_uxproxy.c.patch b/x11-packages/putty/putty-0.70_unix_uxproxy.c.patch index fe5b077b5..c3cf896cd 100644 --- a/x11-packages/putty/putty-0.70_unix_uxproxy.c.patch +++ b/x11-packages/putty/putty-0.70_unix_uxproxy.c.patch @@ -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); + }