From d7b7a3cdee67779f5c3b24ac3a07f0e877a7d82d Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 30 Mar 2019 00:37:45 +0100 Subject: [PATCH] dropbear: Update from 2019.77 to 2019.78 --- ...280613f5ab4ee86c14c779739070e5784dfe.patch | 52 ------------------- packages/dropbear/build.sh | 4 +- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 packages/dropbear/7bc6280613f5ab4ee86c14c779739070e5784dfe.patch diff --git a/packages/dropbear/7bc6280613f5ab4ee86c14c779739070e5784dfe.patch b/packages/dropbear/7bc6280613f5ab4ee86c14c779739070e5784dfe.patch deleted file mode 100644 index 5ba1efb020..0000000000 --- a/packages/dropbear/7bc6280613f5ab4ee86c14c779739070e5784dfe.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7bc6280613f5ab4ee86c14c779739070e5784dfe Mon Sep 17 00:00:00 2001 -From: Matt Johnston -Date: Sun, 24 Mar 2019 20:41:02 +0800 -Subject: [PATCH] Fix regression where TTY modes weren't reset for client - ---- - cli-chansession.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/cli-chansession.c b/cli-chansession.c -index 8b72e279..cfd3401b 100644 ---- a/cli-chansession.c -+++ b/cli-chansession.c -@@ -35,7 +35,7 @@ - #include "chansession.h" - #include "agentfwd.h" - --static void cli_cleanupchansess(const struct Channel *channel); -+static void cli_closechansess(const struct Channel *channel); - static int cli_initchansess(struct Channel *channel); - static void cli_chansessreq(struct Channel *channel); - static void send_chansess_pty_req(const struct Channel *channel); -@@ -51,8 +51,8 @@ const struct ChanType clichansess = { - cli_initchansess, /* inithandler */ - NULL, /* checkclosehandler */ - cli_chansessreq, /* reqhandler */ -- NULL, /* closehandler */ -- cli_cleanupchansess, /* cleanup */ -+ cli_closechansess, /* closehandler */ -+ NULL, /* cleanup */ - }; - - static void cli_chansessreq(struct Channel *channel) { -@@ -84,7 +84,7 @@ static void cli_chansessreq(struct Channel *channel) { - - - /* If the main session goes, we close it up */ --static void cli_cleanupchansess(const struct Channel *UNUSED(channel)) { -+static void cli_closechansess(const struct Channel *UNUSED(channel)) { - cli_tty_cleanup(); /* Restore tty modes etc */ - - /* This channel hasn't gone yet, so we have > 1 */ -@@ -388,8 +388,8 @@ static const struct ChanType cli_chan_netcat = { - cli_init_netcat, /* inithandler */ - NULL, - NULL, -+ cli_closechansess, - NULL, -- cli_cleanupchansess - }; - - void cli_send_netcat_request() { diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index 300e8b2b92..6dce08ea73 100644 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html TERMUX_PKG_DESCRIPTION="Small SSH server and client" TERMUX_PKG_LICENSE="BSD" -TERMUX_PKG_VERSION=2019.77 +TERMUX_PKG_VERSION=2019.78 TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d +TERMUX_PKG_SHA256=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="termux-auth" TERMUX_PKG_CONFLICTS="openssh"