ubus: update to the latest version

[openwrt.git] / package / dropbear / patches / 200-lcrypt_bsdfix.patch

diff --git a/package/dropbear/patches/200-lcrypt_bsdfix.patch b/package/dropbear/patches/200-lcrypt_bsdfix.patch
index bbd6644..57eb967 100644 (file)
--- a/package/dropbear/patches/200-lcrypt_bsdfix.patch
+++ b/package/dropbear/patches/200-lcrypt_bsdfix.patch
@@ -1,14 +1,14 @@
 --- a/Makefile.in
 +++ b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in

-@@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \
-               queue.o \
-               atomicio.o compat.o  fake-rfc2553.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

  
  

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

 @@ -77,7 +77,7 @@ STRIP=@STRIP@
  INSTALL=@INSTALL@
  CPPFLAGS=@CPPFLAGS@
 @@ -77,7 +77,7 @@ STRIP=@STRIP@
  INSTALL=@INSTALL@
  CPPFLAGS=@CPPFLAGS@


@@ -18,3 +18,12 @@
  LDFLAGS=@LDFLAGS@
  
  EXEEXT=@EXEEXT@
  LDFLAGS=@LDFLAGS@
  
  EXEEXT=@EXEEXT@

+@@ -169,7 +169,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
+