summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-02-28 16:37:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-02 17:25:28 (GMT)
commit0c6ee422bdb516f9ccb06f3ea570ced96e13f40b (patch)
tree89260c379da3a7a7d0eb9b07226e7b5f9d902168 /meta/recipes-core/dropbear
parent5f4e1a984d5b3adf220cb31c1292dbc78ca3f5ce (diff)
downloadpoky-0c6ee422bdb516f9ccb06f3ea570ced96e13f40b.tar.gz
dropbear: upgrade to 2014.63
Drop 0002-static_build_fix.patch since an equivalent fix has been merged upstream. (From OE-Core rev: d5ff33a328a90abb6aae7c02bf119b53afdae5b7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc1
-rw-r--r--meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch64
-rw-r--r--meta/recipes-core/dropbear/dropbear_2013.62.bb4
-rw-r--r--meta/recipes-core/dropbear/dropbear_2014.63.bb4
4 files changed, 4 insertions, 69 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index d5fceec..40ed9d2 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -14,7 +14,6 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14 14
15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ 15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
16 file://0001-urandom-xauth-changes-to-options.h.patch \ 16 file://0001-urandom-xauth-changes-to-options.h.patch \
17 file://0002-static_build_fix.patch \
18 file://0003-configure.patch \ 17 file://0003-configure.patch \
19 file://0004-fix-2kb-keys.patch \ 18 file://0004-fix-2kb-keys.patch \
20 file://0007-dropbear-fix-for-x32-abi.patch \ 19 file://0007-dropbear-fix-for-x32-abi.patch \
diff --git a/meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch b/meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch
deleted file mode 100644
index 552bee8..0000000
--- a/meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1Subject: [PATCH 2/6] static_build_fix
2Upstream-Status: Submitted
3
4dropbear: fix static build
5
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.
10
11svr-authpasswd.o: In function `svr_auth_password':
12svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
13collect2: ld returned 1 exit status
14
15Signed-off-by: Saul Wold <sgw@linux.intel.com>
16---
17 Makefile.in | 11 +++++++----
18 1 file changed, 7 insertions(+), 4 deletions(-)
19
20diff --git a/Makefile.in b/Makefile.in
21index 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--
631.7.11.7
64
diff --git a/meta/recipes-core/dropbear/dropbear_2013.62.bb b/meta/recipes-core/dropbear/dropbear_2013.62.bb
deleted file mode 100644
index 3cae940..0000000
--- a/meta/recipes-core/dropbear/dropbear_2013.62.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require dropbear.inc
2
3SRC_URI[md5sum] = "ca2c7932a1399cf361f795aaa3843998"
4SRC_URI[sha256sum] = "c6656302bbcc54b0a9c361f505822f6994039117ec32d2897ead3364da079ffa"
diff --git a/meta/recipes-core/dropbear/dropbear_2014.63.bb b/meta/recipes-core/dropbear/dropbear_2014.63.bb
new file mode 100644
index 0000000..bb7e617
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2014.63.bb
@@ -0,0 +1,4 @@
1require dropbear.inc
2
3SRC_URI[md5sum] = "7066bb9a2da708f3ed06314fdc9c47fd"
4SRC_URI[sha256sum] = "595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae"