changeset 1393:4770338067dc

Upgrade to dropbear 0.53.1 and fix its' broken static linking.
author Rob Landley <rob@landley.net>
date Wed, 22 Jun 2011 12:51:19 -0500
parents d16057658651
children 23f4333fec0c
files sources/control-images/static-tools-patches/dropbear-fixstatic.patch sources/control-images/static-tools.sh
diffstat 2 files changed, 28 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/control-images/static-tools-patches/dropbear-fixstatic.patch	Wed Jun 22 12:51:19 2011 -0500
@@ -0,0 +1,21 @@
+diff -ru dropbear-0.53.1/Makefile.in dropbear.new/Makefile.in
+--- dropbear-0.53.1/Makefile.in	2011-03-02 07:23:34.000000000 -0600
++++ dropbear.new/Makefile.in	2011-06-21 12:48:11.044303706 -0500
+@@ -28,7 +28,7 @@
+ 		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
+@@ -77,7 +77,7 @@
+ INSTALL=@INSTALL@
+ CPPFLAGS=@CPPFLAGS@
+ CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
+-LIBS+=@LIBS@
++LIBS+=@LIBS@ @CRYPTLIB@
+ LDFLAGS=@LDFLAGS@
+ 
+ EXEEXT=@EXEEXT@
--- a/sources/control-images/static-tools.sh	Sun Jun 19 21:51:42 2011 -0500
+++ b/sources/control-images/static-tools.sh	Wed Jun 22 12:51:19 2011 -0500
@@ -8,7 +8,7 @@
 source sources/include.sh || exit 1
 
 PATCHDIR="$SOURCES/control-images/static-tools-patches"
-SRCDIR="$SRCDIR/native" && mkdir -p "$SRCDIR" || dienow
+SRCDIR="$SRCDIR/static-tools" && mkdir -p "$SRCDIR" || dienow
 WORK="$BUILD/control-images/static-tools" && blank_tempdir "$WORK"
 SRCTREE="$WORK"
 
@@ -26,8 +26,12 @@
 SHA1=543fa9abff0442edca308772d6cef85557677e02 \
 maybe_fork "download || dienow"
 
-URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2 \
-SHA1=8c1745a9b64ffae79f28e25c6fe9a8b96cac86d8 \
+URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2 \
+SHA1= \
+maybe_fork download || dienow
+
+URL=http://kernel.org/pub/software/utils/pciutils/pciutils-3.1.7.tar.bz2 \
+SHA1= \
 maybe_fork download || dienow
 
 echo === Got all source.