Mercurial > hg > control-images
changeset 21:823e6222e924
Upgrade dropbear.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 13 Nov 2011 21:00:58 -0600 |
parents | e2d5699cee3a |
children | 84b321099814 |
files | images/static-tools/build.sh images/static-tools/patches/dropbear-fixnopasswd.patch images/static-tools/patches/dropbear-fixstatic.patch |
diffstat | 3 files changed, 2 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/images/static-tools/build.sh Sun Nov 06 21:08:49 2011 -0600 +++ b/images/static-tools/build.sh Sun Nov 13 21:00:58 2011 -0600 @@ -19,8 +19,8 @@ SHA1=543fa9abff0442edca308772d6cef85557677e02 \ maybe_fork "download || dienow" -URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2 \ -SHA1=01d9c6673b2b20659b8557cfe6de8386a94f4801 \ +URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-2011.54.tar.bz2 +SHA1=ebae34ae1f64324cae83f3440b3b05a93835d5fb \ maybe_fork download || dienow #URL=http://kernel.org/pub/software/utils/pciutils/pciutils-3.1.7.tar.bz2 \
--- a/images/static-tools/patches/dropbear-fixnopasswd.patch Sun Nov 06 21:08:49 2011 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -No password is no reason to prevent key-based logins. - -diff -ru dropbear.new/svr-auth.c dropbear/svr-auth.c ---- dropbear.new/svr-auth.c 2011-10-11 09:50:22.047129393 -0500 -+++ dropbear/svr-auth.c 2011-03-02 07:23:36.000000000 -0600 -@@ -249,7 +249,7 @@ - return DROPBEAR_FAILURE; - } - -- /* check for an empty password */ -+ /* check for an empty password - if (ses.authstate.pw_passwd[0] == '\0') { - TRACE(("leave checkusername: empty pword")) - dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", -@@ -257,6 +257,7 @@ - send_msg_userauth_failure(0, 1); - return DROPBEAR_FAILURE; - } -+*/ - - TRACE(("shell is %s", ses.authstate.pw_shell)) -
--- a/images/static-tools/patches/dropbear-fixstatic.patch Sun Nov 06 21:08:49 2011 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# -# old_revision [c7f6c45c46a2f8e2394756c68ae825d6e4dc7489] -# -# patch "Makefile.in" -# from [ea21753734b01f01ea1062923f4cb5eac65eadec] -# to [3dcc9b69742a8a4f59ea9f22b6d80bad2c761117] -# -============================================================ ---- dropbear/Makefile.in ea21753734b01f01ea1062923f4cb5eac65eadec -+++ dropbear/Makefile.in 3dcc9b69742a8a4f59ea9f22b6d80bad2c761117 -@@ -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 -@@ -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 - --dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) -+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ - dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) - dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) - dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) -@@ -167,7 +167,7 @@ ifeq ($(MULTI),1) - # multi-binary compilation. - MULTIOBJS= - ifeq ($(MULTI),1) -- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) -+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ - CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI - endif -