Merge branch '3.4' into 3.5

 Conflicts:
	dovecot/.signature
	dovecot/Pkgfile
	dropbear/.signature
	dropbear/Pkgfile

3 files changed, 7 insertions, 60 deletions

diff --git a/dropbear/.signature b/dropbear/.signature
index d8280e9f7..269aba879 100644
--- a/dropbear/.signature
+++ b/dropbear/.signature
@@ -1,8 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SiZPq2mZq0J2yOuWeXOPx+APKUMH2OL/7Cb3PcHbsVMPwH1OAE6t7c1TBCABYpMTSTWBKGM2xmDorkGsOcmRgQ=
-SHA256 (Pkgfile) = 5631d02778f15631c1ebdffbc5c615631873e8133382471da75adebb2121731a
+RWSE3ohX2g5d/bLPX+9pApnc7y0YVx0M6DKf9UlXOBGJI+KZ10sd2WXKvtcImr/QyMGt+yUZQosiEkgk8Plg3ls3aBvw4XxHjQU=
+SHA256 (Pkgfile) = 4d5b4c7880f87ec46f638736ead293b02f5fcdd8a7edc91318975998644570f2
 SHA256 (.footprint) = 5d47799d69d21b860be70eb9e767298617679bcee2140d245cbc74f4a2a4502e
-SHA256 (dropbear-2019.77.tar.bz2) = d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d
+SHA256 (dropbear-2019.78.tar.bz2) = 525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4
 SHA256 (dropbear.rc) = def8d4ebda5759a3bc55055957235fa47f7e40216badf07830f487f05e7fbd42
-SHA256 (reset-tty-modes.patch) = 2fd8beca361dc5859fa996a28651c4748bd741c763587d828ede0ea634af0ed2
 SHA256 (dropbear.pam) = 0c0aff342e586e64f2d2a814ef127a2748b223e746c3efccfccc91a5aadbce4a
diff --git a/dropbear/Pkgfile b/dropbear/Pkgfile
index 6b10524b1..5504f2c43 100644
--- a/dropbear/Pkgfile
+++ b/dropbear/Pkgfile
@@ -4,17 +4,16 @@
 # Depends on:  zlib linux-pam
 
 name=dropbear
-version=2019.77
-release=2
+version=2019.78
+release=1
 source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \
-        dropbear.rc reset-tty-modes.patch dropbear.pam)
+        dropbear.rc dropbear.pam)
 
 build () {
     cd $name-$version
 
-    patch -p1 -i $SRC/reset-tty-modes.patch
-
     sed '/pam_start/s/sshd/dropbear/' -i svr-authpam.c
+    
     echo '#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server"' > localoptions.h
     echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> localoptions.h
     echo '#define DROPBEAR_SVR_PAM_AUTH 1' >> localoptions.h
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() {
-