diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-17 12:04:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-14 11:33:52 +0000 |
commit | 6c93994dee481d8cd6e92adc11e50a113736b98e (patch) | |
tree | 9625c39eb89539eab7d20652371616af2e5977a1 /meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch | |
parent | ad6f3ea1b4e2d05a9308e957bc7431fa8f96a342 (diff) | |
download | poky-6c93994dee481d8cd6e92adc11e50a113736b98e.tar.gz |
dropbear: upgrade to 2013.62
LIC_FILES_CHKSUM has changed with the introduction of a BSD-3-Clause
algorithm (curve25519-donna); this has prompted a re-evaluation of the
LICENSE value which should now reflect the licenses declared in the
upstream documentation. Thanks to Beth Flanagan for helping with this.
(From OE-Core rev: 232e8b96988ffa6e5107917fbf41222d26e4e90b)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.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/0002-static_build_fix.patch')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch b/meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch new file mode 100644 index 0000000000..552bee8996 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | Subject: [PATCH 2/6] static_build_fix | ||
2 | Upstream-Status: Submitted | ||
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 | Makefile.in | 11 +++++++---- | ||
18 | 1 file changed, 7 insertions(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/Makefile.in b/Makefile.in | ||
21 | index 4bdd845..e82e561 100644 | ||
22 | --- a/Makefile.in | ||
23 | +++ b/Makefile.in | ||
24 | @@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \ | ||
25 | loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ | ||
26 | listener.h fake-rfc2553.h | ||
27 | |||
28 | -dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ | ||
29 | +dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) | ||
30 | dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) | ||
31 | dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) | ||
32 | dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) | ||
33 | @@ -158,7 +158,10 @@ dbclient: $(dbclientobjs) | ||
34 | dropbearkey: $(dropbearkeyobjs) | ||
35 | dropbearconvert: $(dropbearconvertobjs) | ||
36 | |||
37 | -dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile | ||
38 | +dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile | ||
39 | + $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) @CRYPTLIB@ | ||
40 | + | ||
41 | +dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile | ||
42 | $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) | ||
43 | |||
44 | # scp doesn't use the libs so is special. | ||
45 | @@ -169,14 +172,14 @@ scp: $(SCPOBJS) $(HEADERS) Makefile | ||
46 | # multi-binary compilation. | ||
47 | MULTIOBJS= | ||
48 | ifeq ($(MULTI),1) | ||
49 | - MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ | ||
50 | + MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) | ||
51 | CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI | ||
52 | endif | ||
53 | |||
54 | dropbearmulti: multilink | ||
55 | |||
56 | multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile | ||
57 | - $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) | ||
58 | + $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@ | ||
59 | |||
60 | multilink: multibinary $(addprefix link, $(PROGRAMS)) | ||
61 | |||
62 | -- | ||
63 | 1.7.11.7 | ||
64 | |||