commit 869427b0888906454936d7cb42f33c301e76000f Author: Juergen Daubert <jue@jue.li> Date: Wed Mar 27 18:54:19 2019 +0100 dropbear: update to 2019.78 diff --git a/dropbear/.signature b/dropbear/.signature index 74630d0a4..f3d9fc376 100644 --- a/dropbear/.signature +++ b/dropbear/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eP8G/FELsWyMIunkv/sWCi+4YXZ1qk+d1JHRy9P786fn+XiXH3AZTp3zFoeW48uBKgVQtTC09r7EKbdAVjSLwA= -SHA256 (Pkgfile) = 55e5e63211fa11393a7388c75313f31a28a0e48745392a4af26330937b9633f5 +RWSE3ohX2g5d/UFSAAYfRZdO637GqjIFH3gPCKE+Xxf+9e8TJNn1SvBvT16UHUTt4ac7zEXKxdLWeNabfCsSrSJrFLbjXwD/VQU= +SHA256 (Pkgfile) = 0804d40e772ba331ac449cece649241af377936b986ac0126321ef1acbd2a405 SHA256 (.footprint) = 62bfe7191a20fcd5f6ec3511c951dee47aefdae734f7d616302e6bfc3a0c1923 -SHA256 (dropbear-2019.77.tar.bz2) = d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d +SHA256 (dropbear-2019.78.tar.bz2) = 525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 SHA256 (dropbear) = def8d4ebda5759a3bc55055957235fa47f7e40216badf07830f487f05e7fbd42 -SHA256 (reset-tty-modes.patch) = 2fd8beca361dc5859fa996a28651c4748bd741c763587d828ede0ea634af0ed2 diff --git a/dropbear/Pkgfile b/dropbear/Pkgfile index 5ba3b22e6..5d9a18e24 100644 --- a/dropbear/Pkgfile +++ b/dropbear/Pkgfile @@ -4,16 +4,14 @@ # Depends on: zlib name=dropbear -version=2019.77 -release=2 +version=2019.78 +release=1 source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \ - $name reset-tty-modes.patch) + $name) build () { cd $name-$version - patch -p1 -i $SRC/reset-tty-modes.patch - echo '#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"' > localoptions.h ./configure --prefix=/usr diff --git a/dropbear/reset-tty-modes.patch b/dropbear/reset-tty-modes.patch deleted file mode 100644 index cd2f086a5..000000000 --- a/dropbear/reset-tty-modes.patch +++ /dev/null @@ -1,51 +0,0 @@ - -# HG changeset patch -# User Matt Johnston <matt@ucc.asn.au> -# Date 1553431262 -28800 -# Node ID 4b01f4826a29a2837e971197d4f72b7cb376745a -# Parent 48c6e54f7281aaf89fbc8b2b99ca4a9cd62969af -Fix regression where TTY modes weren't reset for client - -diff -r 48c6e54f7281 -r 4b01f4826a29 cli-chansession.c ---- a/cli-chansession.c Sat Mar 23 21:54:23 2019 +0800 -+++ b/cli-chansession.c Sun Mar 24 20:41:02 2019 +0800 -@@ -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 @@ - 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 @@ - - - /* 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 @@ - cli_init_netcat, /* inithandler */ - NULL, - NULL, -+ cli_closechansess, - NULL, -- cli_cleanupchansess - }; - - void cli_send_netcat_request() { -