dropbear: add patch to fix regression where TTY modes weren't reset

This commit is contained in:
Juergen Daubert 2019-03-25 13:17:34 +01:00
parent 8dd198debe
commit 9da27ccc27
3 changed files with 57 additions and 3 deletions

View File

@ -1,6 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bmUi4dEvvHreEEmnrNqHfVnQz/fylF4X1PWxRg+PcNmfkvY+Ec8RrBbXFy9lXnF97Rjl1cJ/ALhYPh2h8kReQc=
SHA256 (Pkgfile) = 97d2294889f187b318f337da97af42e0efbd970269ceaedd429946e1d0cb988f
RWSE3ohX2g5d/eP8G/FELsWyMIunkv/sWCi+4YXZ1qk+d1JHRy9P786fn+XiXH3AZTp3zFoeW48uBKgVQtTC09r7EKbdAVjSLwA=
SHA256 (Pkgfile) = 55e5e63211fa11393a7388c75313f31a28a0e48745392a4af26330937b9633f5
SHA256 (.footprint) = 62bfe7191a20fcd5f6ec3511c951dee47aefdae734f7d616302e6bfc3a0c1923
SHA256 (dropbear-2019.77.tar.bz2) = d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d
SHA256 (dropbear) = def8d4ebda5759a3bc55055957235fa47f7e40216badf07830f487f05e7fbd42
SHA256 (reset-tty-modes.patch) = 2fd8beca361dc5859fa996a28651c4748bd741c763587d828ede0ea634af0ed2

View File

@ -7,11 +7,13 @@ name=dropbear
version=2019.77
release=2
source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \
$name)
$name reset-tty-modes.patch)
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

View File

@ -0,0 +1,51 @@
# 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() {