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-2013.58 | |
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-2013.58')
6 files changed, 208 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear-2013.58/0001-urandom-xauth-changes-to-options.h.patch new file mode 100644 index 0000000000..71a4666b5c --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear-2013.58/0001-urandom-xauth-changes-to-options.h.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | --- | ||
5 | options.h | 2 +- | ||
6 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
7 | |||
8 | diff --git a/options.h b/options.h | ||
9 | index 7d06322..71a21c2 100644 | ||
10 | --- a/options.h | ||
11 | +++ b/options.h | ||
12 | @@ -247,7 +247,7 @@ much traffic. */ | ||
13 | /* The command to invoke for xauth when using X11 forwarding. | ||
14 | * "-q" for quiet */ | ||
15 | #ifndef XAUTH_COMMAND | ||
16 | -#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" | ||
17 | +#define XAUTH_COMMAND "xauth -q" | ||
18 | #endif | ||
19 | |||
20 | /* if you want to enable running an sftp server (such as the one included with | ||
21 | -- | ||
22 | 1.7.11.7 | ||
23 | |||
diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0002-static_build_fix.patch b/meta/recipes-core/dropbear/dropbear-2013.58/0002-static_build_fix.patch new file mode 100644 index 0000000000..552bee8996 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear-2013.58/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 | |||
diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0003-configure.patch b/meta/recipes-core/dropbear/dropbear-2013.58/0003-configure.patch new file mode 100644 index 0000000000..2baf665ae4 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear-2013.58/0003-configure.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Thu, 25 Apr 2013 00:27:25 +0200 | ||
4 | Subject: [PATCH 3/6] configure | ||
5 | |||
6 | --- | ||
7 | configure.ac | 11 ++++++++--- | ||
8 | 1 file changed, 8 insertions(+), 3 deletions(-) | ||
9 | |||
10 | diff --git a/configure.ac b/configure.ac | ||
11 | index 05461f3..9c16d90 100644 | ||
12 | --- a/configure.ac | ||
13 | +++ b/configure.ac | ||
14 | @@ -166,15 +166,20 @@ AC_ARG_ENABLE(openpty, | ||
15 | AC_MSG_NOTICE(Not using openpty) | ||
16 | else | ||
17 | AC_MSG_NOTICE(Using openpty if available) | ||
18 | - AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)]) | ||
19 | + AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) | ||
20 | fi | ||
21 | ], | ||
22 | [ | ||
23 | AC_MSG_NOTICE(Using openpty if available) | ||
24 | - AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)]) | ||
25 | + AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) | ||
26 | ] | ||
27 | ) | ||
28 | - | ||
29 | + | ||
30 | +if test "x$dropbear_cv_func_have_openpty" = "xyes"; then | ||
31 | + AC_DEFINE(HAVE_OPENPTY,,Have openpty() function) | ||
32 | + no_ptc_check=yes | ||
33 | + no_ptmx_check=yes | ||
34 | +fi | ||
35 | |||
36 | AC_ARG_ENABLE(syslog, | ||
37 | [ --disable-syslog Don't include syslog support], | ||
38 | -- | ||
39 | 1.7.11.7 | ||
40 | |||
diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0004-fix-2kb-keys.patch b/meta/recipes-core/dropbear/dropbear-2013.58/0004-fix-2kb-keys.patch new file mode 100644 index 0000000000..7539d2034f --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear-2013.58/0004-fix-2kb-keys.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Subject: [PATCH 4/6] fix 2kb keys | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | --- | ||
5 | kex.h | 2 +- | ||
6 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
7 | |||
8 | diff --git a/kex.h b/kex.h | ||
9 | index 72430e9..375c677 100644 | ||
10 | --- a/kex.h | ||
11 | +++ b/kex.h | ||
12 | @@ -67,6 +67,6 @@ struct KEXState { | ||
13 | }; | ||
14 | |||
15 | |||
16 | -#define MAX_KEXHASHBUF 2000 | ||
17 | +#define MAX_KEXHASHBUF 3000 | ||
18 | |||
19 | #endif /* _KEX_H_ */ | ||
20 | -- | ||
21 | 1.7.11.7 | ||
22 | |||
diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0005-dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear-2013.58/0005-dropbear-enable-pam.patch new file mode 100644 index 0000000000..e9307339ce --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear-2013.58/0005-dropbear-enable-pam.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Subject: [PATCH 5/6] dropbear enable pam | ||
2 | |||
3 | dropbear: We need modify file option.h besides enabling pam in \ | ||
4 | configure if we want dropbear to support pam. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
9 | --- | ||
10 | options.h | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/options.h b/options.h | ||
14 | index 71a21c2..305f789 100644 | ||
15 | --- a/options.h | ||
16 | +++ b/options.h | ||
17 | @@ -174,9 +174,9 @@ much traffic. */ | ||
18 | * PAM challenge/response. | ||
19 | * You can't enable both PASSWORD and PAM. */ | ||
20 | |||
21 | -#define ENABLE_SVR_PASSWORD_AUTH | ||
22 | +//#define ENABLE_SVR_PASSWORD_AUTH | ||
23 | /* PAM requires ./configure --enable-pam */ | ||
24 | -//#define ENABLE_SVR_PAM_AUTH | ||
25 | +#define ENABLE_SVR_PAM_AUTH | ||
26 | #define ENABLE_SVR_PUBKEY_AUTH | ||
27 | |||
28 | /* Whether to take public key options in | ||
29 | -- | ||
30 | 1.7.11.7 | ||
31 | |||
diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0006-dropbear-configuration-file.patch b/meta/recipes-core/dropbear/dropbear-2013.58/0006-dropbear-configuration-file.patch new file mode 100644 index 0000000000..7e38663981 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear-2013.58/0006-dropbear-configuration-file.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Subject: [PATCH 6/6] dropbear configuration file | ||
2 | |||
3 | dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \ | ||
4 | to "/etc/pam.d/dropbear for dropbear when enabling pam supporting" | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
9 | --- | ||
10 | svr-authpam.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/svr-authpam.c b/svr-authpam.c | ||
14 | index e84f076..e28be7d 100644 | ||
15 | --- a/svr-authpam.c | ||
16 | +++ b/svr-authpam.c | ||
17 | @@ -195,7 +195,7 @@ void svr_auth_pam() { | ||
18 | userData.passwd = password; | ||
19 | |||
20 | /* Init pam */ | ||
21 | - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { | ||
22 | + if ((rc = pam_start("dropbear", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { | ||
23 | dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s\n", | ||
24 | rc, pam_strerror(pamHandlep, rc)); | ||
25 | goto cleanup; | ||
26 | -- | ||
27 | 1.7.11.7 | ||
28 | |||