From 602e9729c8276379a8779e503f3b3fa360c2d407 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Aug 2011 09:05:49 +0200 Subject: update to latest stable upstream version --- package/dropbear/Makefile | 6 +++--- package/dropbear/patches/patch-Makefile_in | 23 +++++++++++++++++++++++ package/dropbear/patches/patch-cli-runopts_c | 8 ++++---- package/dropbear/patches/patch-options_h | 22 +++++----------------- package/dropbear/patches/patch-svr-main_c | 15 --------------- 5 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 package/dropbear/patches/patch-Makefile_in delete mode 100644 package/dropbear/patches/patch-svr-main_c diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 5ee4e7d3d..07dc414b3 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dropbear -PKG_VERSION:= 0.52 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e +PKG_VERSION:= 0.53.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6b8d901859d9b8a18e2f6bfe0a892a03 PKG_DESCR:= SSH 2 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-Makefile_in b/package/dropbear/patches/patch-Makefile_in new file mode 100644 index 000000000..9f5447d74 --- /dev/null +++ b/package/dropbear/patches/patch-Makefile_in @@ -0,0 +1,23 @@ +--- dropbear-0.53.1.orig/Makefile.in 2011-03-02 14:23:34.000000000 +0100 ++++ dropbear-0.53.1/Makefile.in 2011-08-02 20:34:28.000000000 +0200 +@@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \ + queue.o \ + atomicio.o compat.o fake-rfc2553.o + +-SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \ ++SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \ + svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \ + svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\ + svr-tcpfwd.o svr-authpam.o +@@ -75,9 +75,8 @@ AR=@AR@ + RANLIB=@RANLIB@ + STRIP=@STRIP@ + INSTALL=@INSTALL@ +-CPPFLAGS=@CPPFLAGS@ +-CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ +-LIBS+=@LIBS@ ++CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) ++LIBS+=@LIBS@ @CRYPTLIB@ + LDFLAGS=@LDFLAGS@ + + EXEEXT=@EXEEXT@ diff --git a/package/dropbear/patches/patch-cli-runopts_c b/package/dropbear/patches/patch-cli-runopts_c index 46e03dfca..b2f98da81 100644 --- a/package/dropbear/patches/patch-cli-runopts_c +++ b/package/dropbear/patches/patch-cli-runopts_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/cli-runopts.c 2008-11-11 15:09:02.000000000 +0100 -+++ dropbear-0.52/cli-runopts.c 2009-03-19 19:20:16.000000000 +0100 -@@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv) +--- dropbear-0.53.1.orig/cli-runopts.c 2011-03-02 14:23:35.000000000 +0100 ++++ dropbear-0.53.1/cli-runopts.c 2011-08-02 20:03:12.000000000 +0200 +@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -12,7 +12,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ case 'F': case 'e': case 'c': -@@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv) +@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv) #ifndef ENABLE_CLI_LOCALTCPFWD case 'L': #endif diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index 00914dda2..c6fbe7871 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,20 +1,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/options.h 2008-11-11 15:13:50.000000000 +0100 -+++ dropbear-0.52/options.h 2010-03-14 23:30:26.277667006 +0100 -@@ -10,6 +10,11 @@ - * parts are to allow for commandline -DDROPBEAR_XXX options etc. - ******************************************************************/ - -+#if !defined(DROPBEAR_CLIENT) && !defined(DROPBEAR_SERVER) -+#define DROPBEAR_SERVER -+#define DROPBEAR_CLIENT -+#endif -+ - #ifndef DROPBEAR_DEFPORT - #define DROPBEAR_DEFPORT "22" +--- dropbear-0.53.1.orig/options.h 2011-03-02 14:23:36.000000000 +0100 ++++ dropbear-0.53.1/options.h 2011-08-02 20:03:13.000000000 +0200 +@@ -144,7 +144,7 @@ much traffic. */ #endif -@@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende - /* #define DSS_PROTOK */ /* Whether to do reverse DNS lookups. */ -#define DO_HOST_LOOKUP @@ -22,11 +10,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* Whether to print the message of the day (MOTD). This doesn't add much code * size */ -@@ -220,7 +225,7 @@ etc) slower (perhaps by 50%). Recommende +@@ -236,7 +236,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND --#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q" +-#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" +#define XAUTH_COMMAND "/usr/bin/xauth -q" #endif diff --git a/package/dropbear/patches/patch-svr-main_c b/package/dropbear/patches/patch-svr-main_c deleted file mode 100644 index eaf066158..000000000 --- a/package/dropbear/patches/patch-svr-main_c +++ /dev/null @@ -1,15 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - - * bzero is obsolete, use memset - ---- dropbear-0.52.orig/svr-main.c 2008-11-11 15:09:03.000000000 +0100 -+++ dropbear-0.52/svr-main.c 2009-05-23 16:13:30.569366604 +0200 -@@ -133,7 +133,7 @@ void main_noinetd() { - for (i = 0; i < MAX_UNAUTH_CLIENTS; i++) { - childpipes[i] = -1; - } -- bzero(preauth_addrs, sizeof(preauth_addrs)); -+ memset(preauth_addrs, 0, sizeof(preauth_addrs)); - - /* Set up the listening sockets */ - listensockcount = listensockets(listensocks, MAX_LISTEN_ADDR, &maxsock); -- cgit v1.2.3