diff options
author | Eric Bénard <eric@eukrea.com> | 2013-04-25 00:56:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-29 14:45:07 +0100 |
commit | 213d204308afddae803007fbee17071beb773a30 (patch) | |
tree | ff41a15724070e05d999fe405b4245ec36c87e7b /meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch | |
parent | f94519c617b23df28d93e1313c3325eddf59d59d (diff) | |
download | poky-213d204308afddae803007fbee17071beb773a30.tar.gz |
dropbear: update to 2013.58
- patches updated
- nopw-option.patch dropped as the option is integrated since 2013.56
- compile tested for ARMv5 target
(From OE-Core rev: ce92c707f26aff8f02021c757056af4ecddb315d)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch b/meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch deleted file mode 100644 index d1256161c4..0000000000 --- a/meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | |||
3 | |||
4 | dropbear: fix static build | ||
5 | |||
6 | A more appropriate fix is to remove @CRYPTLIB@ from the objs | ||
7 | line, since it will cause problems with target checking, | ||
8 | this change also meets the goals of the orignal change which | ||
9 | was to not link libcrypt to all binaries. | ||
10 | |||
11 | svr-authpasswd.o: In function `svr_auth_password': | ||
12 | svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt' | ||
13 | collect2: ld returned 1 exit status | ||
14 | |||
15 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
16 | |||
17 | Index: dropbear-2011.54/Makefile.in | ||
18 | =================================================================== | ||
19 | --- dropbear-2011.54.orig/Makefile.in 2011-11-08 04:48:15.000000000 -0800 | ||
20 | +++ dropbear-2011.54/Makefile.in 2011-12-27 13:44:41.644354442 -0800 | ||
21 | @@ -56,7 +56,7 @@ | ||
22 | loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ | ||
23 | listener.h fake-rfc2553.h | ||
24 | |||
25 | -dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ | ||
26 | +dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) | ||
27 | dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) | ||
28 | dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) | ||
29 | dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) | ||
30 | @@ -158,7 +158,10 @@ | ||
31 | dropbearkey: $(dropbearkeyobjs) | ||
32 | dropbearconvert: $(dropbearconvertobjs) | ||
33 | |||
34 | -dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile | ||
35 | +dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile | ||
36 | + $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) @CRYPTLIB@ | ||
37 | + | ||
38 | +dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile | ||
39 | $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) | ||
40 | |||
41 | # scp doesn't use the libs so is special. | ||
42 | @@ -169,14 +172,14 @@ | ||
43 | # multi-binary compilation. | ||
44 | MULTIOBJS= | ||
45 | ifeq ($(MULTI),1) | ||
46 | - MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ | ||
47 | + MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) | ||
48 | CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI | ||
49 | endif | ||
50 | |||
51 | dropbearmulti: multilink | ||
52 | |||
53 | multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile | ||
54 | - $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) | ||
55 | + $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@ | ||
56 | |||
57 | multilink: multibinary $(addprefix link, $(PROGRAMS)) | ||
58 | |||