Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/dropbear/files: dropbear-0.53.1-link.patch
Date: Fri, 01 Jul 2011 01:52:59
Message-Id: 20110701015250.7E3AE20057@flycatcher.gentoo.org
1 vapier 11/07/01 01:52:50
2
3 Added: dropbear-0.53.1-link.patch
4 Log:
5 Add patch from upstream for crypt linking #357249 by J.Taimr.
6
7 (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-misc/dropbear/files/dropbear-0.53.1-link.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/files/dropbear-0.53.1-link.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dropbear/files/dropbear-0.53.1-link.patch?rev=1.1&content-type=text/plain
14
15 Index: dropbear-0.53.1-link.patch
16 ===================================================================
17 http://bugs.gentoo.org/357249
18
19 fix from upstream
20
21 #
22 # old_revision [c7f6c45c46a2f8e2394756c68ae825d6e4dc7489]
23 #
24 # patch "Makefile.in"
25 # from [ea21753734b01f01ea1062923f4cb5eac65eadec]
26 # to [3dcc9b69742a8a4f59ea9f22b6d80bad2c761117]
27 #
28 ============================================================
29 --- Makefile.in ea21753734b01f01ea1062923f4cb5eac65eadec
30 +++ Makefile.in 3dcc9b69742a8a4f59ea9f22b6d80bad2c761117
31 @@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \
32 queue.o \
33 atomicio.o compat.o fake-rfc2553.o
34
35 -SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \
36 +SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \
37 svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
38 svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
39 svr-tcpfwd.o svr-authpam.o
40 @@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac
41 loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
42 listener.h fake-rfc2553.h
43
44 -dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
45 +dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@
46 dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
47 dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
48 dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
49 @@ -167,7 +167,7 @@ ifeq ($(MULTI),1)
50 # multi-binary compilation.
51 MULTIOBJS=
52 ifeq ($(MULTI),1)
53 - MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
54 + MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@
55 CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
56 endif