@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
-PKG_VERSION:=2015.68
-PKG_RELEASE:=3
+PKG_VERSION:=2015.71
+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_MD5SUM:=7664ac10f7cc2301c530eb80c756fc5d
+PKG_MD5SUM:=2ccc0a2f3e37ca221db12c5af6a88137
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
@@ -70,7 +70,7 @@
/* The MOTD file path */
#ifndef MOTD_FILENAME
-@@ -231,7 +231,7 @@ Homedir is prepended unless path begins
+@@ -237,7 +237,7 @@ Homedir is prepended unless path begins
* note that it will be provided for all "hidden" client-interactive
* style prompts - if you want something more sophisticated, use
* SSH_ASKPASS instead. Comment out this var to remove this functionality.*/
@@ -1,6 +1,6 @@
--- a/cli-runopts.c
+++ b/cli-runopts.c
-@@ -315,6 +315,10 @@ void cli_getopts(int argc, char ** argv)
+@@ -284,6 +284,10 @@ void cli_getopts(int argc, char ** argv)
debug_trace = 1;
break;
#endif
@@ -11,7 +11,7 @@
case 'F':
case 'e':
#ifndef ENABLE_USER_ALGO_LIST
-@@ -332,7 +336,6 @@ void cli_getopts(int argc, char ** argv)
+@@ -301,7 +305,6 @@ void cli_getopts(int argc, char ** argv)
print_version();
exit(EXIT_SUCCESS);
break;
@@ -1,6 +1,6 @@
--- a/options.h
+++ b/options.h
-@@ -341,7 +341,7 @@ be overridden at runtime with -I. 0 disa
+@@ -347,7 +347,7 @@ be overridden at runtime with -I. 0 disa
#define DEFAULT_IDLE_TIMEOUT 0
/* The default path. This will often get replaced by the shell */
@@ -1,6 +1,6 @@
--- a/svr-runopts.c
+++ b/svr-runopts.c
-@@ -475,6 +475,7 @@ void load_all_hostkeys() {
+@@ -488,6 +488,7 @@ void load_all_hostkeys() {
m_free(hostkey_file);
}
@@ -8,7 +8,7 @@
#ifdef DROPBEAR_RSA
loadhostkey(RSA_PRIV_FILENAME, 0);
#endif
-@@ -486,6 +487,7 @@ void load_all_hostkeys() {
+@@ -499,6 +500,7 @@ void load_all_hostkeys() {
#ifdef DROPBEAR_ECDSA
loadhostkey(ECDSA_PRIV_FILENAME, 0);
#endif
Update dropbear to version 2015.71, released on 3 Dec 2015. Refresh patches. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> --- Compiled and run-tested with ar71xx/WNDR3700. Release notes: https://matt.ucc.asn.au/dropbear/CHANGES 2015.71 - 3 December 2015 - Fix "bad buf_incrpos" when data is transferred, broke in 2015.69 - Fix crash on exit when -p address:port is used, broke in 2015.68 - Fix building with only ENABLE_CLI_REMOTETCPFWD given, patch from Konstantin Tokarev - Fix bad configure script test which didn't work with dash shell, patch from Juergen Daubert, broke in 2015.70 - Fix server race condition that could cause sessions to hang on exit, https://github.com/robotframework/SSHLibrary/issues/128 2015.70 - 26 November 2015 - Fix server password authentication on Linux, broke in 2015.69 2015.69 - 25 November 2015 - Fix crash when forwarded TCP connections fail to connect (bug introduced in 2015.68) - Avoid hang on session close when multiple sessions are started, affects Qt Creator Patch from Andrzej Szombierski - Reduce per-channel memory consumption in common case, increase default channel limit from 100 to 1000 which should improve SOCKS forwarding for modern webpages - Handle multiple command line arguments in a single flag, thanks to Guilhem Moulin - Manpage improvements from Guilhem Moulin - Build fixes for Android from Mike Frysinger - Don't display the MOTD when an explicit command is run from Guilhem Moulin - Check curve25519 shared secret isn't zero package/network/services/dropbear/Makefile | 8 ++++---- .../network/services/dropbear/patches/120-openwrt_options.patch | 2 +- .../services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch | 4 ++-- .../network/services/dropbear/patches/500-set-default-path.patch | 2 +- .../dropbear/patches/610-skip-default-keys-in-custom-runs.patch | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)