Recipe upgrades
cover Recipe upgrades
This commit includes some recipes upgrade: curl,diffutils,dropbear. And update the distro_tracking_fields.inc
Thanks,
Lei
The following changes since commit 96241de59fdf548ae0f80cc9e4668f9ba11924ef:
Matthew McClintock (1):
Fix flac build on e500mc cores
are available in the git repository at:
git://git.pokylinux.org/poky-contrib lmei3/upgrade-0928
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/upgrade-0928
Mei Lei (4):
curl: Upgrade from 7.21.7 to 7.22.0
diffutils: Upgrade from 3.0 to 3.2.
dropbear: Upgrade from 0.52 to 0.53.1 distro_tracking_fields.inc: Update upgrade information
.../conf/distro/include/distro_tracking_fields.inc | 25 +++++++++--------
.../configure.patch | 0
meta/recipes-core/dropbear/dropbear.inc | 1 +
.../dropbear/dropbear/allow-nopw.patch | 14 +++++-----
.../dropbear-0.53.1-static_build_fix.patch | 29 ++++++++++++++++++++
.../urandom-xauth-changes-to-options.h.patch | 11 ++++---
meta/recipes-core/dropbear/dropbear_0.52.bb | 6 ----
meta/recipes-core/dropbear/dropbear_0.53.1.bb | 6 ++++
.../{diffutils_3.0.bb => diffutils_3.2.bb} | 4 +-
.../curl/{curl_7.21.7.bb => curl_7.22.0.bb} | 4 +-
10 files changed, 66 insertions(+), 34 deletions(-)
rename meta/recipes-core/dropbear/{dropbear-0.52 => dropbear-0.53.1}/configure.patch (100%)
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch
delete mode 100644 meta/recipes-core/dropbear/dropbear_0.52.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
rename meta/recipes-extended/diffutils/{diffutils_3.0.bb => diffutils_3.2.bb} (84%)
rename meta/recipes-support/curl/{curl_7.21.7.bb => curl_7.22.0.bb} (92%)PATCH 1/4 curl: Upgrade from 7.21.7 to 7.22.0
---
.../curl/{curl_7.21.7.bb => curl_7.22.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/curl/{curl_7.21.7.bb => curl_7.22.0.bb} (92%)meta/recipes-support/curl/curl_7.22.0.bb renamed from meta/recipes-support/curl/curl_7.21.7.bb +2 -2
@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \ file://pkgconfig_fix.patch" -SRC_URI[md5sum] = "5f6d50c4d4ee38c57fe37e3cff75adbd" -SRC_URI[sha256sum] = "1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a" +SRC_URI[md5sum] = "bde820eac53fa3a8d8696667418557ad" +SRC_URI[sha256sum] = "bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112" inherit autotools pkgconfig binconfig
Signature · 1 line
1.7.0.4
Re: [PATCH 1/4] curl: Upgrade from 7.21.7 to 7.22.0
Quoted 17 lines · Mei Lei
Signed-off-by Mei Lei <[email protected]>---
.../curl/{curl_7.21.7.bb => curl_7.22.0.bb} | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)rename meta/recipes-support/curl/{curl_7.21.7.bb => curl_7.22.0.bb} (92%)
meta/recipes-support/curl/curl_7.22.0.bb renamed from meta/recipes-support/curl/curl_7.21.7.bb +0
-0@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \file://pkgconfig_fix.patch"
meta/recipes-support/curl/curl_7.22.0.bb SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ · line 18
Quoted 4 lines
meta/recipes-support/curl/curl_7.22.0.bb renamed from meta/recipes-support/curl/curl_7.21.7.bb +2
-2-SRC_URI[md5sum] = "5f6d50c4d4ee38c57fe37e3cff75adbd" -SRC_URI[sha256sum] = "1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a" +SRC_URI[md5sum] = "bde820eac53fa3a8d8696667418557ad" +SRC_URI[sha256sum] = "bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112"
md5sum looks wrong (I have the same sha256sum)
OE @ ~ $ md5sum curl-7.22.0.tar.bz2 bdb5c226d37c4a6082c70e7ef6f63060 curl-7.22.0.tar.bz2 OE @ ~ $ sha256sum curl-7.22.0.tar.bz2 bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112 curl-7.22.0.tar.bz2
Regards,
Re: [PATCH 1/4] curl: Upgrade from 7.21.7 to 7.22.0
Quoted 25 lines · Martin Jansa
Quoted 14 lines · Mei Lei
Signed-off-by Mei Lei <[email protected]>--- .../curl/{curl_7.21.7.bb => curl_7.22.0.bb} | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/curl/{curl_7.21.7.bb => curl_7.22.0.bb} (92%)meta/recipes-support/curl/curl_7.22.0.bb renamed from meta/recipes-support/curl/curl_7.21.7.bb +0
-0meta/recipes-support/curl/curl_7.22.0.bb SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ · line 18
Quoted 7 lines
meta/recipes-support/curl/curl_7.22.0.bb renamed from meta/recipes-support/curl/curl_7.21.7.bb +2
-2@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \ file://pkgconfig_fix.patch" -SRC_URI[md5sum] = "5f6d50c4d4ee38c57fe37e3cff75adbd" -SRC_URI[sha256sum] = "1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a" +SRC_URI[md5sum] = "bde820eac53fa3a8d8696667418557ad" +SRC_URI[sha256sum] = "bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112"md5sum looks wrong (I have the same sha256sum)
Quoted 5 lines
OE @ ~ $ md5sum curl-7.22.0.tar.bz2
bdb5c226d37c4a6082c70e7ef6f63060curl-7.22.0.tar.bz2 OE @ ~ $ sha256sum curl-7.22.0.tar.bz2bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112curl-7.22.0.tar.bz2
My test agrees with you, I've updated master-next with a fix.
Cheers,
Richard
PATCH 2/4 diffutils: Upgrade from 3.0 to 3.2.
In reply to Mei Lei---
.../{diffutils_3.0.bb => diffutils_3.2.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/diffutils/{diffutils_3.0.bb => diffutils_3.2.bb} (84%)meta/recipes-extended/diffutils/diffutils_3.2.bb renamed from meta/recipes-extended/diffutils/diffutils_3.0.bb +2 -2
@@ -21,5 +21,5 @@ EXTRA_OECONF_libc-uclibc = "--without-included-regex" ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp" ALTERNATIVE_PRIORITY = "100" -SRC_URI[md5sum] = "684aaba1baab743a2a90e52162ff07da" -SRC_URI[sha256sum] = "2fb91f65bbae3c6043b85ba23967f27235b12928da8e406dc91b48b0a589e809" +SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc" +SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3"
Signature · 1 line
1.7.0.4
PATCH 3/4 dropbear: Upgrade from 0.52 to 0.53.1
In reply to Mei Lei---
.../configure.patch | 0
meta/recipes-core/dropbear/dropbear.inc | 1 +
.../dropbear/dropbear/allow-nopw.patch | 14 +++++-----
.../dropbear-0.53.1-static_build_fix.patch | 29 ++++++++++++++++++++
.../urandom-xauth-changes-to-options.h.patch | 11 ++++---
meta/recipes-core/dropbear/dropbear_0.52.bb | 6 ----
meta/recipes-core/dropbear/dropbear_0.53.1.bb | 6 ++++
7 files changed, 49 insertions(+), 18 deletions(-)
rename meta/recipes-core/dropbear/{dropbear-0.52 => dropbear-0.53.1}/configure.patch (100%)
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch
delete mode 100644 meta/recipes-core/dropbear/dropbear_0.52.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bbmeta/recipes-core/dropbear/dropbear-0.53.1/configure.patch renamed from meta/recipes-core/dropbear/dropbear-0.52/configure.patch +0 -0
meta/recipes-core/dropbear/dropbear.inc +1 -0
@@ -13,6 +13,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ file://urandom-xauth-changes-to-options.h.patch \ + file://dropbear-0.53.1-static_build_fix.patch \ file://configure.patch \ file://fix-2kb-keys.patch \ file://allow-nopw.patch;apply=no \
meta/recipes-core/dropbear/dropbear/allow-nopw.patch +7 -7
@@ -1,18 +1,18 @@ Upstream-Status: Inappropriate [embedded specific] diff --git a/svr-auth.c b/svr-auth.c -index 5da0aa7..4de4964 100644 +index 87e3c5e..3e78c1a 100644 --- a/svr-auth.c +++ b/svr-auth.c -@@ -249,6 +249,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { +@@ -250,6 +250,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { } /* check for an empty password */ +#ifdef DISALLOW_EMPTY_PW if (ses.authstate.pw_passwd[0] == '\0') { TRACE(("leave checkusername: empty pword")) - dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", -@@ -256,6 +257,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { + dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", +@@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { send_msg_userauth_failure(0, 1); return DROPBEAR_FAILURE; }
@@ -21,7 +21,7 @@ index 5da0aa7..4de4964 100644 TRACE(("shell is %s", ses.authstate.pw_shell)) diff --git a/svr-authpasswd.c b/svr-authpasswd.c -index 53550a2..7b896bd 100644 +index a29fd63..6a3c7e9 100644 --- a/svr-authpasswd.c +++ b/svr-authpasswd.c @@ -64,9 +64,13 @@ void svr_auth_password() {
@@ -29,11 +29,11 @@ index 53550a2..7b896bd 100644 * in auth.c */ if (passwdcrypt[0] == '\0') { +#ifdef DISALLOW_EMPTY_PASSWD - dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", + dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", ses.authstate.pw_name); send_msg_userauth_failure(0, 1); +#else -+ send_msg_userauth_success(); ++ send_msg_userauth_success(); +#endif return; }
meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch new file +29 -0
@@ -0,0 +1,29 @@ +Upstream-Status: Inappropriate [Pending] +Get this patch from buildroot maillist. + +dropbear: fix static build + +The latest release 0.53.1 change: lcrypt needs to be before object files for static linking + +the -lcrypt is missing during the link + +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: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com> +Signed-off-by: Mei Lei <[email protected]> + +diff --git a/Makefile.in b/Makefile.in +index 8d81647..0b9b769 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,7 +77,7 @@ STRIP=@STRIP@ + INSTALL=@INSTALL@ + CPPFLAGS=@CPPFLAGS@ + CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ +-LIBS+=@LIBS@ ++LIBS+=@CRYPTLIB@ @LIBS@ + LDFLAGS=@LDFLAGS@ + + EXEEXT=@EXEEXT@
meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch +6 -5
@@ -1,13 +1,14 @@ Upstream-Status: Inappropriate [configuration] -diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h ---- dropbear-0.45/options.h 2005-03-06 20:27:02.000000000 -0800 -+++ dropbear-0.45.patched/options.h 2005-03-08 15:25:09.368742090 -0800 -@@ -167,7 +167,7 @@ +diff --git a/options.h b/options.h +index d309ab4..7fbe97b 100644 +--- a/options.h ++++ b/options.h +@@ -236,7 +236,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND --#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q" +-#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" +#define XAUTH_COMMAND "xauth -q" #endif
meta/recipes-core/dropbear/dropbear_0.52.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e" -SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108" - -PR = "r3"
meta/recipes-core/dropbear/dropbear_0.53.1.bb new file +6 -0
@@ -0,0 +1,6 @@ +require dropbear.inc + +SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03" +SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6" + +PR = "r0"
Signature · 1 line
1.7.0.4
PATCH 4/4 distro_tracking_fields.inc: Update upgrade information
In reply to Mei LeiUpdate dropbear,diffutils,curl upgrade tracking information.
--- .../conf/distro/include/distro_tracking_fields.inc | 25 ++++++++++--------- 1 files changed, 13 insertions(+), 12 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +13 -12
@@ -1,8 +1,7 @@ RECIPE_STATUS_pn-diffutils = "green" -RECIPE_LATEST_VERSION_pn-diffutils = "3.0" -RECIPE_LAST_UPDATE_pn-diffutils = "Dec 10, 2010" -RECIPE_NO_UPDATE_REASON_pn-diffutils = "3.0 is the latest version" -RECIPE_MANUAL_CHECK_DATE_pn-diffutils = "Jul 4, 2011" +RECIPE_LATEST_VERSION_pn-diffutils = "3.2" +RECIPE_LAST_UPDATE_pn-diffutils = "Sep 30, 2011" +RECIPE_NO_UPDATE_REASON_pn-diffutils = "3.2 is the latest version" RECIPE_MAINTAINER_pn-diffutils = "Mei Lei <[email protected]>" RECIPE_STATUS_pn-epdfview = "red"
@@ -1463,15 +1462,15 @@ RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Sep 27, 2011" RECIPE_COMMENTS_pn-sysfsutils = "" RECIPE_STATUS_pn-curl = "green" -RECIPE_LAST_UPDATE_pn-curl = "Jul 2, 2011" +RECIPE_LAST_UPDATE_pn-curl = "Sep 30, 2011" RECIPE_MAINTAINER_pn-curl = "Mei Lei <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-curl = "not done" -RECIPE_LATEST_VERSION_pn-curl = "7.21.1" +RECIPE_LATEST_VERSION_pn-curl = "7.22.0" RECIPE_PATCH_pn-curl+noldlibpath = "no bother set LD_LIBRARY_PATH since we are cross compiling" RECIPE_PATCH_pn-curl+pkgconfig-fix = "fix libcurl.pc" RECIPE_INTEL_SECTION_pn-curl = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-curl = "2 months" -RECIPE_LATEST_RELEASE_DATE_pn-curl = "06/2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-curl = "3 months" +RECIPE_LATEST_RELEASE_DATE_pn-curl = "09/2011" RECIPE_COMMENTS_pn-curl = "" RECIPE_STATUS_pn-gconf-dbus = "green"
@@ -1579,19 +1578,21 @@ RECIPE_COMMENTS_pn-nfs-utils = "" RECIPE_STATUS_pn-dropbear = "green" DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" -RECIPE_LAST_UPDATE_pn-dropbear = "Jul 5, 2010" +RECIPE_LAST_UPDATE_pn-dropbear = "Sep 30, 2011" RECIPE_MAINTAINER_pn-dropbear = "Mei Lei <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-dropbear = "not done" -RECIPE_LATEST_VERSION_pn-dropbear = "0.52" +RECIPE_LATEST_VERSION_pn-dropbear = "0.53.1" RECIPE_PATCH_pn-dropbear+urandom-xauth-changes-to-options.h = "xauth path change" RECIPE_PATCH_pn-dropbear+configure = "use configure cache value for cross compiling" RECIPE_PATCH_pn-dropbear+fix-skb-keys = "enlarge key buffer size" RECIPE_PATCH_pn-dropbear+allow-nopw = "allow login with no password, applied on in occasions" RECIPE_PATCH_pn-dropbear+init = "init script" +RECIPE_PATCH_pn-dropbear+dropbear-0.53.1-static_build_fix = "fix link error in 0.53.1 release" RECIPE_INTEL_SECTION_pn-dropbear = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dropbear = "8 months" -RECIPE_LATEST_RELEASE_DATE_pn-dropbear = "11/2008" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dropbear = "1 month" +RECIPE_LATEST_RELEASE_DATE_pn-dropbear = "03/2011" RECIPE_COMMENTS_pn-dropbear = "" +RECIPE_NO_UPDATE_REASON_pn-dropbear="0.53.1 is the latest version,not 0.255" RECIPE_STATUS_pn-hal = "green" RECIPE_LAST_UPDATE_pn-hal = "Jul 20, 2010"
Signature · 1 line
1.7.0.4
Saul Wold
AppliedQuoted 40 lines · Mei Lei
This commit includes some recipes upgrade: curl,diffutils,dropbear. And update the distro_tracking_fields.inc
Thanks,
LeiThe following changes since commit
96241de59fdf548ae0f80cc9e4668f9ba11924ef:
Matthew McClintock (1):
Fix flac build on e500mc coresare available in the git repository at:
git://git.pokylinux.org/poky-contrib lmei3/upgrade-0928 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/upgrade-0928Mei Lei (4):
curl: Upgrade from 7.21.7 to 7.22.0
diffutils: Upgrade from 3.0 to 3.2.
dropbear: Upgrade from 0.52 to 0.53.1 distro_tracking_fields.inc: Update upgrade information.../conf/distro/include/distro_tracking_fields.inc | 25 +++++++++-------- .../configure.patch | 0 meta/recipes-core/dropbear/dropbear.inc | 1 + .../dropbear/dropbear/allow-nopw.patch | 14 +++++----- .../dropbear-0.53.1-static_build_fix.patch | 29 ++++++++++++++++++++ .../urandom-xauth-changes-to-options.h.patch | 11 ++++--- meta/recipes-core/dropbear/dropbear_0.52.bb | 6 ---- meta/recipes-core/dropbear/dropbear_0.53.1.bb | 6 ++++ .../{diffutils_3.0.bb => diffutils_3.2.bb} | 4 +- .../curl/{curl_7.21.7.bb => curl_7.22.0.bb} | 4 +- 10 files changed, 66 insertions(+), 34 deletions(-)rename meta/recipes-core/dropbear/{dropbear-0.52 =>
dropbear-0.53.1}/configure.patch(100%) create mode 100644meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patchdelete mode 100644 meta/recipes-core/dropbear/dropbear_0.52.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
rename meta/recipes-extended/diffutils/{diffutils_3.0.bb => diffutils_3.2.bb} (84%) rename meta/recipes-support/curl/{curl_7.21.7.bb => curl_7.22.0.bb} (92%)
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Merged into master with the md5sum fix by Richard
Thanks
Sau!