summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-03 11:53:57 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-03 11:54:07 +0100
commit7f1557456bcdab4984d588be7b5738f9160f8365 (patch)
treed271ab3619e3a717c0a8a35e598d5a8c66412fbd
parent30a1ca44eb6cc1833b876235e3b35c93bbac4065 (diff)
update to latest stable version, drop xauth patch, already applied upstream
-rw-r--r--package/dropbear/Makefile6
-rw-r--r--package/dropbear/patches/patch-cli-runopts_c22
-rw-r--r--package/dropbear/patches/patch-options_h12
3 files changed, 3 insertions, 37 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 443170a9d..c951df96f 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= dropbear
-PKG_VERSION:= 2014.63
-PKG_RELEASE:= 2
-PKG_HASH:= 595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae
+PKG_VERSION:= 2015.67
+PKG_RELEASE:= 1
+PKG_HASH:= 7e690594645dfde5787065c78a5d2e4d15e288babfa06e140197ce05f698c8e5
PKG_DESCR:= ssh server/client designed for embedded systems
PKG_SECTION:= net/security
PKG_URL:= http://matt.ucc.asn.au/dropbear/
diff --git a/package/dropbear/patches/patch-cli-runopts_c b/package/dropbear/patches/patch-cli-runopts_c
deleted file mode 100644
index 5a8297b87..000000000
--- a/package/dropbear/patches/patch-cli-runopts_c
+++ /dev/null
@@ -1,22 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dropbear-2013.58.orig/cli-runopts.c 2013-04-18 16:58:14.000000000 +0200
-+++ dropbear-2013.58/cli-runopts.c 2013-08-13 14:29:15.000000000 +0200
-@@ -309,6 +309,10 @@ void cli_getopts(int argc, char ** argv)
- debug_trace = 1;
- break;
- #endif
-+ case 'o':
-+ next = &dummy;
-+ case 'x':
-+ break;
- case 'F':
- case 'e':
- #ifndef ENABLE_USER_ALGO_LIST
-@@ -322,7 +326,6 @@ void cli_getopts(int argc, char ** argv)
- #ifndef ENABLE_CLI_LOCALTCPFWD
- case 'L':
- #endif
-- case 'o':
- case 'b':
- next = &dummy;
- default:
diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h
deleted file mode 100644
index 201444e68..000000000
--- a/package/dropbear/patches/patch-options_h
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h
---- dropbear-2014.63.orig/options.h 2014-02-19 15:05:24.000000000 +0100
-+++ dropbear-2014.63/options.h 2014-02-27 16:29:06.000000000 +0100
-@@ -264,7 +264,7 @@ much traffic. */
- /* The command to invoke for xauth when using X11 forwarding.
- * "-q" for quiet */
- #ifndef XAUTH_COMMAND
--#define XAUTH_COMMAND "/usr/bin/X11/xauth -q"
-+#define XAUTH_COMMAND "/usr/bin/xauth -q"
- #endif
-
- /* if you want to enable running an sftp server (such as the one included with