Dropped patch series, because build with ENABLE_CLI_PUBKEY_AUTH unset was fixed in 2015.68.
2016.72 fixes CVE-2016-3116. Additional changes contain fixes for crashes, memory leaks, compile warnings, build for certain platforms or in certain invironments, and race conditions. Improved efficiency, manpage, memory consumption. Various cleanups for issues found by lint tools and static code analyzers. Signed-off-by: Alexander Dahl <[email protected]> --- ...sabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch | 45 ---------------------- patches/dropbear-2015.67/series | 4 -- rules/dropbear.make | 4 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch delete mode 100644 patches/dropbear-2015.67/series diff --git a/patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch b/patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch deleted file mode 100644 index 6fc655a..0000000 --- a/patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Juergen Borleis <[email protected]> -Date: Fri, 13 Mar 2015 10:53:46 +0100 -Subject: [PATCH] dropbear: disabling ENABLE_CLI_PUBKEY_AUTH let the build - fail - -Function multihop_passthrough_args() fails due to missing 'privkeys' member -in structure 'cli_runopts'. So lets also disable ENABLE_CLI_MULTIHOP for -this case. -And even cli_getopts() fails due to missing loadidentityfile() function -in this case. - -Signed-off-by: Juergen Borleis <[email protected]> ---- - options.h | 4 +++- - sysoptions.h | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/options.h b/options.h -index 6339b0a4738e..1360b5c6758f 100644 ---- a/options.h -+++ b/options.h -@@ -218,7 +218,9 @@ much traffic. */ - - /* A default argument for dbclient -i <privatekey>. - leading "~" is expanded */ --#define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear" -+#ifdef ENABLE_CLI_PUBKEY_AUTH -+# define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear" -+#endif - - /* This variable can be used to set a password for client - * authentication on the commandline. Beware of platforms -diff --git a/sysoptions.h b/sysoptions.h -index bec72461d8e4..eeb78cb129a5 100644 ---- a/sysoptions.h -+++ b/sysoptions.h -@@ -202,7 +202,7 @@ - #define USING_LISTENERS - #endif - --#if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD) -+#if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD) && defined(ENABLE_CLI_PUBKEY_AUTH) - #define ENABLE_CLI_MULTIHOP - #endif - diff --git a/patches/dropbear-2015.67/series b/patches/dropbear-2015.67/series deleted file mode 100644 index 501905e..0000000 --- a/patches/dropbear-2015.67/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch -# 847698d613b5ea08c9504df4ed3f0099 - git-ptx-patches magic diff --git a/rules/dropbear.make b/rules/dropbear.make index a659114..bc4b0e6 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear # # Paths and names # -DROPBEAR_VERSION := 2015.67 -DROPBEAR_MD5 := e967e320344cd4bfebe321e3ab8514d6 +DROPBEAR_VERSION := 2016.73 +DROPBEAR_MD5 := 8d6d78ce60ca52350ec04fcbd711ce9b DROPBEAR := dropbear-$(DROPBEAR_VERSION) DROPBEAR_SUFFIX := tar.bz2 DROPBEAR_URL := http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) -- 2.1.4 _______________________________________________ ptxdist mailing list [email protected]
