summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-27 13:54:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:30 +0000
commitaff9305b36e3e474d8f4a818c93ae3d7cef6997e (patch)
tree335fe74830e6f3c65c173f41c763d0e61ffd1c79
parentabd108a45fdee66024294549356676590bcf2c92 (diff)
downloadpoky-aff9305b36e3e474d8f4a818c93ae3d7cef6997e.tar.gz
dropbear: fix CRYPTLIB patch
(From OE-Core rev: 6ec513e7e6e6959a5eb19f0b06b9e7207fb15ada) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch67
-rw-r--r--meta/recipes-core/dropbear/dropbear_2011.54.bb2
2 files changed, 49 insertions, 20 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
index 14a87705d0..d1256161c4 100644
--- 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
@@ -1,29 +1,58 @@
1Upstream-Status: Inappropriate [Pending] 1Upstream-Status: Submitted
2Get this patch from buildroot maillist.
3 2
4dropbear: fix static build
5 3
6The latest release 0.53.1 change: lcrypt needs to be before object files for static linking 4dropbear: fix static build
7 5
8the -lcrypt is missing during the link 6A more appropriate fix is to remove @CRYPTLIB@ from the objs
7line, since it will cause problems with target checking,
8this change also meets the goals of the orignal change which
9was to not link libcrypt to all binaries.
9 10
10svr-authpasswd.o: In function `svr_auth_password': 11svr-authpasswd.o: In function `svr_auth_password':
11svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt' 12svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
12collect2: ld returned 1 exit status 13collect2: ld returned 1 exit status
13 14
14Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com> 15Signed-off-by: Saul Wold <sgw@linux.intel.com>
15Signed-off-by: Mei Lei <lei.mei@intel.com>
16 16
17diff --git a/Makefile.in b/Makefile.in 17Index: dropbear-2011.54/Makefile.in
18index 8d81647..0b9b769 100644 18===================================================================
19--- a/Makefile.in 19--- dropbear-2011.54.orig/Makefile.in 2011-11-08 04:48:15.000000000 -0800
20+++ b/Makefile.in 20+++ dropbear-2011.54/Makefile.in 2011-12-27 13:44:41.644354442 -0800
21@@ -77,7 +77,7 @@ STRIP=@STRIP@ 21@@ -56,7 +56,7 @@
22 INSTALL=@INSTALL@ 22 loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
23 CPPFLAGS=@CPPFLAGS@ 23 listener.h fake-rfc2553.h
24 CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ 24
25-LIBS+=@LIBS@ 25-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@
26+LIBS+=@CRYPTLIB@ @LIBS@ 26+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
27 LDFLAGS=@LDFLAGS@ 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))
28 58
29 EXEEXT=@EXEEXT@
diff --git a/meta/recipes-core/dropbear/dropbear_2011.54.bb b/meta/recipes-core/dropbear/dropbear_2011.54.bb
index b7b4b83e89..1bd8bda358 100644
--- a/meta/recipes-core/dropbear/dropbear_2011.54.bb
+++ b/meta/recipes-core/dropbear/dropbear_2011.54.bb
@@ -3,4 +3,4 @@ require dropbear.inc
3SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5" 3SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
4SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47" 4SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
5 5
6PR = "r0" 6PR = "r1"