changeset 1407:662c5e9ca17c

Use dropbear fix static linking patch from dropbear maintainer.
author Rob Landley <rob@landley.net>
date Sat, 02 Jul 2011 20:31:49 -0500
parents aca2150c9531
children 096ac2dfb9bd
files sources/control-images/static-tools-patches/dropbear-fixstatic.patch
diffstat 1 files changed, 28 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/sources/control-images/static-tools-patches/dropbear-fixstatic.patch	Wed Jun 29 07:47:05 2011 -0500
+++ b/sources/control-images/static-tools-patches/dropbear-fixstatic.patch	Sat Jul 02 20:31:49 2011 -0500
@@ -1,7 +1,14 @@
-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 @@
+#
+# old_revision [c7f6c45c46a2f8e2394756c68ae825d6e4dc7489]
+#
+# patch "Makefile.in"
+#  from [ea21753734b01f01ea1062923f4cb5eac65eadec]
+#    to [3dcc9b69742a8a4f59ea9f22b6d80bad2c761117]
+#
+============================================================
+--- Makefile.in	ea21753734b01f01ea1062923f4cb5eac65eadec
++++ Makefile.in	3dcc9b69742a8a4f59ea9f22b6d80bad2c761117
+@@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \
  		queue.o \
  		atomicio.o compat.o  fake-rfc2553.o 
  
@@ -10,12 +17,21 @@
  		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@
+@@ -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
  
- EXEEXT=@EXEEXT@
+-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
+