Recipes upgrade for dropbear,iproute2
cover Recipes upgrade for dropbear,iproute2
Hi Saul,
These patches upgraded dropbear and iproute2, and update the distro tracking information for dropbear, iproute2 and net-tools. Please help to review and pull.
Thanks,
Lei
The following changes since commit 177df2c51927f44e3536856f4604364b38695bc2:
Richard Purdie (1):
qt-mobility: Add missing patch
are available in the git repository at:
git://git.pokylinux.org/poky-contrib lmei3/upgrade1129
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/upgrade1129
Mei Lei (3):
iproute2: Upgrade from 3.0.0 to 3.1.0
dropbear: Upgrade from 0.53.1 to 2011.54 distro_tracking_fields.inc: Update dropbear,iproute2,net-tools
tracking information.
.../conf/distro/include/distro_tracking_fields.inc | 20 +++++-----
.../configure-cross.patch | 0
.../{iproute2_3.0.0.bb => iproute2_3.1.0.bb} | 4 +-
.../configure.patch | 0
meta/recipes-core/dropbear/dropbear.inc | 8 ----
.../dropbear/dropbear/allow-nopw.patch | 40 --------------------
meta/recipes-core/dropbear/dropbear_0.53.1.bb | 6 ---
meta/recipes-core/dropbear/dropbear_2011.54.bb | 6 +++
8 files changed, 18 insertions(+), 66 deletions(-)
rename meta/recipes-connectivity/iproute2/{iproute2-3.0.0 => iproute2-3.1.0}/configure-cross.patch (100%)
rename meta/recipes-connectivity/iproute2/{iproute2_3.0.0.bb => iproute2_3.1.0.bb} (72%)
rename meta/recipes-core/dropbear/{dropbear-0.53.1 => dropbear-2011.54}/configure.patch (100%)
delete mode 100644 meta/recipes-core/dropbear/dropbear/allow-nopw.patch
delete mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bbPATCH 1/3 iproute2: Upgrade from 3.0.0 to 3.1.0
---
.../configure-cross.patch | 0
.../{iproute2_3.0.0.bb => iproute2_3.1.0.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/iproute2/{iproute2-3.0.0 => iproute2-3.1.0}/configure-cross.patch (100%)
rename meta/recipes-connectivity/iproute2/{iproute2_3.0.0.bb => iproute2_3.1.0.bb} (72%)meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch renamed from meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch +0 -0
meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb +2 -2
@@ -1,7 +1,7 @@ require iproute2.inc -#v3.0.0 tag -SRCREV = "ce691fb5ce78b2c75243c60a757a3990ae09681c" +#v3.1.0 tag +SRCREV = "9cbe6bc337a35b91882f92599eefeb161f3e776e" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \ file://configure-cross.patch" S = "${WORKDIR}/git"
Signature · 1 line
1.7.0.4
Richard Purdie
AppliedRe: [PATCH 1/3] iproute2: Upgrade from 3.0.0 to 3.1.0
Quoted 7 lines · Mei Lei
Signed-off-by Mei Lei <[email protected]>--- .../configure-cross.patch | 0 .../{iproute2_3.0.0.bb => iproute2_3.1.0.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/iproute2/{iproute2-3.0.0 => iproute2-3.1.0}/configure-cross.patch (100%) rename meta/recipes-connectivity/iproute2/{iproute2_3.0.0.bb => iproute2_3.1.0.bb} (72%)
I merged this to master, thanks. Koen has feedback on the dropbear changes which aren't acceptable.
Cheers,
Richard
PATCH 2/3 dropbear: Upgrade from 0.53.1 to 2011.54
In reply to Mei Lei---
.../configure.patch | 0
meta/recipes-core/dropbear/dropbear.inc | 8 ----
.../dropbear/dropbear/allow-nopw.patch | 40 --------------------
meta/recipes-core/dropbear/dropbear_0.53.1.bb | 6 ---
meta/recipes-core/dropbear/dropbear_2011.54.bb | 6 +++
5 files changed, 6 insertions(+), 54 deletions(-)
rename meta/recipes-core/dropbear/{dropbear-0.53.1 => dropbear-2011.54}/configure.patch (100%)
delete mode 100644 meta/recipes-core/dropbear/dropbear/allow-nopw.patch
delete mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
create mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bbmeta/recipes-core/dropbear/dropbear-2011.54/configure.patch renamed from meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch +0 -0
meta/recipes-core/dropbear/dropbear.inc +0 -8
@@ -16,7 +16,6 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ file://dropbear-0.53.1-static_build_fix.patch \ file://configure.patch \ file://fix-2kb-keys.patch \ - file://allow-nopw.patch;apply=no \ file://init \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
@@ -40,13 +39,6 @@ EXTRA_OECONF += "\ DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" -do_debug_patch() { - if [ "${DISTRO_TYPE}" = "debug" ]; then - bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!" - patch -p1 < ${WORKDIR}/allow-nopw.patch - fi -} - addtask do_debug_patch after do_patch before do_configure do_install() {
meta/recipes-core/dropbear/dropbear/allow-nopw.patch deleted +0 -40
@@ -1,40 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -diff --git a/svr-auth.c b/svr-auth.c -index 87e3c5e..3e78c1a 100644 ---- a/svr-auth.c -+++ b/svr-auth.c -@@ -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", -@@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { - send_msg_userauth_failure(0, 1); - return DROPBEAR_FAILURE; - } -+#endif - - TRACE(("shell is %s", ses.authstate.pw_shell)) - -diff --git a/svr-authpasswd.c b/svr-authpasswd.c -index a29fd63..6a3c7e9 100644 ---- a/svr-authpasswd.c -+++ b/svr-authpasswd.c -@@ -64,9 +64,13 @@ void svr_auth_password() { - * since the shadow password may differ to that tested - * in auth.c */ - if (passwdcrypt[0] == '\0') { -+#ifdef DISALLOW_EMPTY_PASSWD - 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(); -+#endif - return; - } -
meta/recipes-core/dropbear/dropbear_0.53.1.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03" -SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6" - -PR = "r0"
meta/recipes-core/dropbear/dropbear_2011.54.bb new file +6 -0
@@ -0,0 +1,6 @@ +require dropbear.inc + +SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5" +SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47" + +PR = "r0"
Signature · 1 line
1.7.0.4
Re: [PATCH 2/3] dropbear: Upgrade from 0.53.1 to 2011.54
Op 30 nov. 2011, om 06:57 heeft Mei Lei het volgende geschreven:
Quoted 1 line
Signed-off-by Mei Lei <[email protected]>
So the commit summary says 'upgrade', but look here:
meta/recipes-core/dropbear/dropbear.inc SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ · line 19
Quoted 7 lines
meta/recipes-core/dropbear/dropbear.inc +0
-1@@ -16,7 +16,6 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ file://dropbear-0.53.1-static_build_fix.patch \ file://configure.patch \ file://fix-2kb-keys.patch \ - file://allow-nopw.patch;apply=no \
Why did you remove that?
Quoted 7 lines
meta/recipes-core/dropbear/dropbear.inc +0
-0file://init \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "@@ -40,13 +39,6 @@ EXTRA_OECONF += "\
DISTRO_TYPE?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
meta/recipes-core/dropbear/dropbear.inc EXTRA_OECONF += "\ · line 49
Quoted 7 lines
meta/recipes-core/dropbear/dropbear.inc +0
-7-do_debug_patch() { - if [ "${DISTRO_TYPE}" = "debug" ]; then - bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!" - patch -p1 < ${WORKDIR}/allow-nopw.patch - fi -} -
And why did you remove that as well?
Quoted 1 line
addtask
do_debug_patchafterdo_patchbeforedo_configure
After removing the previous 2, why did you leave this one in?
Why are you breaking passwwdless logins without mentioning it in the commit summary!?!?!?
PATCH 3/3 distro_tracking_fields.inc: Update dropbear, iproute2, net-tools tracking information.
In reply to Mei Lei--- .../conf/distro/include/distro_tracking_fields.inc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +10 -10
@@ -846,14 +846,15 @@ DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool" RECIPE_STATUS_pn-iproute2 = "green" RECIPE_DEPENDENCY_CHECK_pn-iproute2 = "not done" -RECIPE_LATEST_VERSION_pn-iproute2 = "2.6.34" +RECIPE_LATEST_VERSION_pn-iproute2 = "3.1.0" RECIPE_PATCH_pn-iproute2+configure-cross = "to be pushed upstream" RECIPE_INTEL_SECTION_pn-iproute2 = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-iproute2 = "3 months" -RECIPE_LATEST_RELEASE_DATE_pn-iproute2 = "May 01, 2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-iproute2 = "1 months" +RECIPE_LATEST_RELEASE_DATE_pn-iproute2 = "Nov 17, 2011" +RECIPE_NO_UPDATE_REASON_pn-iproute2="3.1.0 is the latest version, not 760" RECIPE_COMMENTS_pn-iproute2 = "" DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" -RECIPE_LAST_UPDATE_pn-iproute2 = "Nov 10, 2010" +RECIPE_LAST_UPDATE_pn-iproute2 = "Nov 29, 2011" RECIPE_MAINTAINER_pn-iproute2 = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-netbase = "green"
@@ -1060,6 +1061,7 @@ RECIPE_MAINTAINER_pn-ethtool = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-net-tools = "green" RECIPE_LAST_UPDATE_pn-net-tools = "Aug 16, 2010" RECIPE_LATEST_VERSION_pn-net-tools = "1.60-23" +RECIPE_NO_UPDATE_REASON_pn-net-tools="1.60 is the latest version, 1.60-23 just its patch version" RECIPE_MAINTAINER_pn-net-tools = "Dongxiao Xu <[email protected]>" RECIPE_LATEST_VERSION_pn-net-tools = "1.60-23"
@@ -1603,21 +1605,19 @@ RECIPE_COMMENTS_pn-nfs-utils = "" RECIPE_STATUS_pn-dropbear = "green" DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" -RECIPE_LAST_UPDATE_pn-dropbear = "Sep 30, 2011" +RECIPE_LAST_UPDATE_pn-dropbear = "Nov 29, 2011" RECIPE_MAINTAINER_pn-dropbear = "Mei Lei <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-dropbear = "not done" -RECIPE_LATEST_VERSION_pn-dropbear = "0.53.1" +RECIPE_LATEST_VERSION_pn-dropbear = "2011.54" 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 = "1 month" -RECIPE_LATEST_RELEASE_DATE_pn-dropbear = "Mar 01, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dropbear = "8 month" +RECIPE_LATEST_RELEASE_DATE_pn-dropbear = "Nov 08, 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