diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2019-04-07 20:22:19 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-04-07 20:32:55 +0200 |
| commit | 80568e58545fc2c3622022bbbc77ea36987fefa5 (patch) | |
| tree | 080bb314cfa3732f9e8271e373e29342c136cafe | |
| parent | 310e2764a8141a31d12df9d96655da7b083416a5 (diff) | |
| download | upstream-80568e58545fc2c3622022bbbc77ea36987fefa5.tar.gz upstream-80568e58545fc2c3622022bbbc77ea36987fefa5.tar.bz2 upstream-80568e58545fc2c3622022bbbc77ea36987fefa5.zip | |
dropbear: bump to 2019.78
Fix dbclient regression in 2019.77. After exiting the terminal would be left
in a bad state. Reported by Ryan Woodsmall
drop patch applied upstream:
010-tty-modes-werent-reset-for-client.patch
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | package/network/services/dropbear/Makefile | 4 | ||||
| -rw-r--r-- | package/network/services/dropbear/patches/010-tty-modes-werent-reset-for-client.patch | 46 |
2 files changed, 2 insertions, 48 deletions
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 1ad1f516a7..22b769f152 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2019.77 +PKG_VERSION:=2019.78 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://matt.ucc.asn.au/dropbear/releases/ \ https://dropbear.nl/mirror/releases/ -PKG_HASH:=d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d +PKG_HASH:=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE diff --git a/package/network/services/dropbear/patches/010-tty-modes-werent-reset-for-client.patch b/package/network/services/dropbear/patches/010-tty-modes-werent-reset-for-client.patch deleted file mode 100644 index 585465004a..0000000000 --- a/package/network/services/dropbear/patches/010-tty-modes-werent-reset-for-client.patch +++ /dev/null @@ -1,46 +0,0 @@ -Hash: 7bc6280613f5ab4ee86c14c779739070e5784dfe -From: Matt Johnston <matt@ucc.asn.au> -Date: Sun, 24 Mar 2019 20:41:02 +0800 -Subject: Fix regression where TTY modes weren't reset for client - ---- 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 @@ out: - - - /* 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_ne - cli_init_netcat, /* inithandler */ - NULL, - NULL, -+ cli_closechansess, - NULL, -- cli_cleanupchansess - }; - - void cli_send_netcat_request() { |