Patchwork [6/6] dropbear: upgrade to 2014.63

login
register
mail settings
Submitter Paul Eggleton
Date Feb. 28, 2014, 4:37 p.m.
Message ID <b05cf2dbbc02b9b21cc076fcba58892f08471bfb.1393605405.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/67739/
State Accepted
Commit 0c6ee422bdb516f9ccb06f3ea570ced96e13f40b
Headers show

Comments

Paul Eggleton - Feb. 28, 2014, 4:37 p.m.
Drop 0002-static_build_fix.patch since an equivalent fix has been merged
upstream.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-core/dropbear/dropbear.inc            |  1 -
 .../dropbear/dropbear/0002-static_build_fix.patch  | 64 ----------------------
 meta/recipes-core/dropbear/dropbear_2013.62.bb     |  4 --
 meta/recipes-core/dropbear/dropbear_2014.63.bb     |  4 ++
 4 files changed, 4 insertions(+), 69 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/0002-static_build_fix.patch
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2013.62.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2014.63.bb

Patch

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)}"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
            file://0001-urandom-xauth-changes-to-options.h.patch \
-           file://0002-static_build_fix.patch \
            file://0003-configure.patch \
            file://0004-fix-2kb-keys.patch \
            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 @@ 
-Subject: [PATCH 2/6] static_build_fix
-Upstream-Status: Submitted
-
-dropbear: fix static build
-
-A more appropriate fix is to remove @CRYPTLIB@ from the objs
-line, since it will cause problems with target checking,
-this change also meets the goals of the orignal change which
-was to not link libcrypt to all binaries.
-
-svr-authpasswd.o: In function `svr_auth_password':
-svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
-collect2: ld returned 1 exit status
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
----
- Makefile.in | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 4bdd845..e82e561 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \
- 		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
- 		listener.h fake-rfc2553.h
- 
--dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 
-+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
- dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
- dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
- dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
-@@ -158,7 +158,10 @@ dbclient: $(dbclientobjs)
- dropbearkey: $(dropbearkeyobjs)
- dropbearconvert: $(dropbearconvertobjs)
- 
--dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
-+dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile
-+	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) @CRYPTLIB@
-+
-+dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
- 	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS)
- 
- # scp doesn't use the libs so is special.
-@@ -169,14 +172,14 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
- # multi-binary compilation.
- MULTIOBJS=
- ifeq ($(MULTI),1)
--	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ 
-+	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
- 	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
- endif
- 
- dropbearmulti: multilink 
- 
- multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
--	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@
- 
- multilink: multibinary $(addprefix link, $(PROGRAMS))
- 
--- 
-1.7.11.7
-
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 @@ 
-require dropbear.inc
-
-SRC_URI[md5sum] = "ca2c7932a1399cf361f795aaa3843998"
-SRC_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 @@ 
+require dropbear.inc
+
+SRC_URI[md5sum] = "7066bb9a2da708f3ed06314fdc9c47fd"
+SRC_URI[sha256sum] = "595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae"