diff options
| -rw-r--r-- | package/dropbear/Makefile | 6 | ||||
| -rw-r--r-- | package/dropbear/patches/patch-Makefile_in | 29 | ||||
| -rw-r--r-- | package/dropbear/patches/patch-options_h | 6 |
3 files changed, 25 insertions, 16 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 1fdab9501..3728ef8da 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dropbear -PKG_VERSION:= 0.53.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 6b8d901859d9b8a18e2f6bfe0a892a03 +PKG_VERSION:= 2012.55 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 44836e5a0419ba12557f9ea46880077e 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 index 9f5447d74..0995ed95a 100644 --- a/package/dropbear/patches/patch-Makefile_in +++ b/package/dropbear/patches/patch-Makefile_in @@ -1,14 +1,14 @@ ---- 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 +--- dropbear-2012.55.orig/Makefile.in 2012-02-23 14:47:05.000000000 +0100 ++++ dropbear-2012.55/Makefile.in 2012-06-02 21:00:17.000000000 +0200 +@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac + loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ + listener.h fake-rfc2553.h --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 +-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ ++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) + dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) + dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) + dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) @@ -75,9 +75,8 @@ AR=@AR@ RANLIB=@RANLIB@ STRIP=@STRIP@ @@ -21,3 +21,12 @@ LDFLAGS=@LDFLAGS@ EXEEXT=@EXEEXT@ +@@ -169,7 +168,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile + # multi-binary compilation. + MULTIOBJS= + ifeq ($(MULTI),1) +- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ ++ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) + CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI + endif + diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index c6fbe7871..0a7dd432b 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- 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 +--- dropbear-2012.55.orig/options.h 2012-02-23 14:47:06.000000000 +0100 ++++ dropbear-2012.55/options.h 2012-06-02 20:53:47.000000000 +0200 @@ -144,7 +144,7 @@ much traffic. */ #endif @@ -10,7 +10,7 @@ $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 */ -@@ -236,7 +236,7 @@ much traffic. */ +@@ -243,7 +243,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND |