view images/static-tools/patches/dropbear-fixstatic.patch @ 3:4c679e447ffc

Ahem, use a variant of the upstream dropbear patch with -p1 paths.
author Rob Landley <rob@landley.net>
date Wed, 06 Jul 2011 07:49:49 -0500
parents bcd2e358d57f
children
line wrap: on
line source

#
# 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