diff options
Diffstat (limited to 'package/dropbear/patches/patch-Makefile_in')
-rw-r--r-- | package/dropbear/patches/patch-Makefile_in | 29 |
1 files changed, 19 insertions, 10 deletions
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 + |