diff options
author | Mei Lei <lei.mei@intel.com> | 2011-09-30 09:25:30 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-04 13:46:20 +0100 |
commit | ff7f503620c340fded3d1bdbdc02d90d21d58770 (patch) | |
tree | 93327ec100313142f5212151737719f8cfc79bb9 /meta | |
parent | dcd82f7ed4ed37d8e25fbc6f588e38c538a95ce4 (diff) | |
download | poky-ff7f503620c340fded3d1bdbdc02d90d21d58770.tar.gz |
dropbear: Upgrade from 0.52 to 0.53.1
(From OE-Core rev: f1710d09e447b0f71a55b4ef24673c6388a045ad)
Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch (renamed from meta/recipes-core/dropbear/dropbear-0.52/configure.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/allow-nopw.patch | 14 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch | 29 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch | 11 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear_0.52.bb | 6 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear_0.53.1.bb | 6 |
7 files changed, 49 insertions, 18 deletions
diff --git a/meta/recipes-core/dropbear/dropbear-0.52/configure.patch b/meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch index aeb7c0a4ac..aeb7c0a4ac 100644 --- a/meta/recipes-core/dropbear/dropbear-0.52/configure.patch +++ b/meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch | |||
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 1582f2e703..189471511c 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -13,6 +13,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | |||
13 | 13 | ||
14 | SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ | 14 | SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ |
15 | file://urandom-xauth-changes-to-options.h.patch \ | 15 | file://urandom-xauth-changes-to-options.h.patch \ |
16 | file://dropbear-0.53.1-static_build_fix.patch \ | ||
16 | file://configure.patch \ | 17 | file://configure.patch \ |
17 | file://fix-2kb-keys.patch \ | 18 | file://fix-2kb-keys.patch \ |
18 | file://allow-nopw.patch;apply=no \ | 19 | file://allow-nopw.patch;apply=no \ |
diff --git a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch index add69cdfc8..3909ef26e7 100644 --- a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch +++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | 1 | Upstream-Status: Inappropriate [embedded specific] |
2 | 2 | ||
3 | diff --git a/svr-auth.c b/svr-auth.c | 3 | diff --git a/svr-auth.c b/svr-auth.c |
4 | index 5da0aa7..4de4964 100644 | 4 | index 87e3c5e..3e78c1a 100644 |
5 | --- a/svr-auth.c | 5 | --- a/svr-auth.c |
6 | +++ b/svr-auth.c | 6 | +++ b/svr-auth.c |
7 | @@ -249,6 +249,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { | 7 | @@ -250,6 +250,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { |
8 | } | 8 | } |
9 | 9 | ||
10 | /* check for an empty password */ | 10 | /* check for an empty password */ |
11 | +#ifdef DISALLOW_EMPTY_PW | 11 | +#ifdef DISALLOW_EMPTY_PW |
12 | if (ses.authstate.pw_passwd[0] == '\0') { | 12 | if (ses.authstate.pw_passwd[0] == '\0') { |
13 | TRACE(("leave checkusername: empty pword")) | 13 | TRACE(("leave checkusername: empty pword")) |
14 | dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", | 14 | dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", |
15 | @@ -256,6 +257,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { | 15 | @@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { |
16 | send_msg_userauth_failure(0, 1); | 16 | send_msg_userauth_failure(0, 1); |
17 | return DROPBEAR_FAILURE; | 17 | return DROPBEAR_FAILURE; |
18 | } | 18 | } |
@@ -21,7 +21,7 @@ index 5da0aa7..4de4964 100644 | |||
21 | TRACE(("shell is %s", ses.authstate.pw_shell)) | 21 | TRACE(("shell is %s", ses.authstate.pw_shell)) |
22 | 22 | ||
23 | diff --git a/svr-authpasswd.c b/svr-authpasswd.c | 23 | diff --git a/svr-authpasswd.c b/svr-authpasswd.c |
24 | index 53550a2..7b896bd 100644 | 24 | index a29fd63..6a3c7e9 100644 |
25 | --- a/svr-authpasswd.c | 25 | --- a/svr-authpasswd.c |
26 | +++ b/svr-authpasswd.c | 26 | +++ b/svr-authpasswd.c |
27 | @@ -64,9 +64,13 @@ void svr_auth_password() { | 27 | @@ -64,9 +64,13 @@ void svr_auth_password() { |
@@ -29,11 +29,11 @@ index 53550a2..7b896bd 100644 | |||
29 | * in auth.c */ | 29 | * in auth.c */ |
30 | if (passwdcrypt[0] == '\0') { | 30 | if (passwdcrypt[0] == '\0') { |
31 | +#ifdef DISALLOW_EMPTY_PASSWD | 31 | +#ifdef DISALLOW_EMPTY_PASSWD |
32 | dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", | 32 | dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", |
33 | ses.authstate.pw_name); | 33 | ses.authstate.pw_name); |
34 | send_msg_userauth_failure(0, 1); | 34 | send_msg_userauth_failure(0, 1); |
35 | +#else | 35 | +#else |
36 | + send_msg_userauth_success(); | 36 | + send_msg_userauth_success(); |
37 | +#endif | 37 | +#endif |
38 | return; | 38 | return; |
39 | } | 39 | } |
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 new file mode 100644 index 0000000000..14a87705d0 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Inappropriate [Pending] | ||
2 | Get this patch from buildroot maillist. | ||
3 | |||
4 | dropbear: fix static build | ||
5 | |||
6 | The latest release 0.53.1 change: lcrypt needs to be before object files for static linking | ||
7 | |||
8 | the -lcrypt is missing during the link | ||
9 | |||
10 | svr-authpasswd.o: In function `svr_auth_password': | ||
11 | svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt' | ||
12 | collect2: ld returned 1 exit status | ||
13 | |||
14 | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com> | ||
15 | Signed-off-by: Mei Lei <lei.mei@intel.com> | ||
16 | |||
17 | diff --git a/Makefile.in b/Makefile.in | ||
18 | index 8d81647..0b9b769 100644 | ||
19 | --- a/Makefile.in | ||
20 | +++ b/Makefile.in | ||
21 | @@ -77,7 +77,7 @@ STRIP=@STRIP@ | ||
22 | INSTALL=@INSTALL@ | ||
23 | CPPFLAGS=@CPPFLAGS@ | ||
24 | CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ | ||
25 | -LIBS+=@LIBS@ | ||
26 | +LIBS+=@CRYPTLIB@ @LIBS@ | ||
27 | LDFLAGS=@LDFLAGS@ | ||
28 | |||
29 | EXEEXT=@EXEEXT@ | ||
diff --git a/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch index 668824a5e1..4acc3974d6 100644 --- a/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch +++ b/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch | |||
@@ -1,13 +1,14 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | 1 | Upstream-Status: Inappropriate [configuration] |
2 | 2 | ||
3 | diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h | 3 | diff --git a/options.h b/options.h |
4 | --- dropbear-0.45/options.h 2005-03-06 20:27:02.000000000 -0800 | 4 | index d309ab4..7fbe97b 100644 |
5 | +++ dropbear-0.45.patched/options.h 2005-03-08 15:25:09.368742090 -0800 | 5 | --- a/options.h |
6 | @@ -167,7 +167,7 @@ | 6 | +++ b/options.h |
7 | @@ -236,7 +236,7 @@ much traffic. */ | ||
7 | /* The command to invoke for xauth when using X11 forwarding. | 8 | /* The command to invoke for xauth when using X11 forwarding. |
8 | * "-q" for quiet */ | 9 | * "-q" for quiet */ |
9 | #ifndef XAUTH_COMMAND | 10 | #ifndef XAUTH_COMMAND |
10 | -#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q" | 11 | -#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" |
11 | +#define XAUTH_COMMAND "xauth -q" | 12 | +#define XAUTH_COMMAND "xauth -q" |
12 | #endif | 13 | #endif |
13 | 14 | ||
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb deleted file mode 100644 index 4013c65074..0000000000 --- a/meta/recipes-core/dropbear/dropbear_0.52.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require dropbear.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e" | ||
4 | SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108" | ||
5 | |||
6 | PR = "r3" | ||
diff --git a/meta/recipes-core/dropbear/dropbear_0.53.1.bb b/meta/recipes-core/dropbear/dropbear_0.53.1.bb new file mode 100644 index 0000000000..54f86e80e0 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear_0.53.1.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require dropbear.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03" | ||
4 | SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6" | ||
5 | |||
6 | PR = "r0" | ||