[PATCH 0/2]dropbear:Upgrade from 0.53.1 to 2011.54

[PATCH 0/2]dropbear:Upgrade from 0.53.1 to 2011.54

[Mei Lei]

Hi all,
	This patch upgrade dropbear from 0.53.1 to 2011.54. The new release added ALLOW_BLANK_PASSWORD option, we can enable empty passwd login funciton in options.h.
	So change the allow-nopw.patch content to enable this function.
	Please review it.
Thanks,
Lei
The following changes since commit 493746f1d7f1410284880203c1ac462d61ab5299:
  Martin Jansa (1):
        matchbox-session-sato: respect VIRTUAL-RUNTIME_initscripts settings

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib lmei3/dropbear
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/dropbear

Mei Lei (2):
  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 |   19 ++++---
 .../configure.patch                                |    0
 .../dropbear/dropbear/allow-nopw.patch             |   55 ++++++--------------
 meta/recipes-core/dropbear/dropbear_0.53.1.bb      |    6 --
 meta/recipes-core/dropbear/dropbear_2011.54.bb     |    6 ++
 5 files changed, 33 insertions(+), 53 deletions(-)
 rename meta/recipes-core/dropbear/{dropbear-0.53.1 => dropbear-2011.54}/configure.patch (100%)
 delete mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bb

[PATCH 1/2] dropbear: Upgrade from 0.53.1 to 2011.54

[Mei Lei]

This new version added ALLOW_BLANK_PASSWORD option. So change the allow-nopw.patch content to enable this function.

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../configure.patch                                |    0
 .../dropbear/dropbear/allow-nopw.patch             |   55 ++++++--------------
 meta/recipes-core/dropbear/dropbear_0.53.1.bb      |    6 --
 meta/recipes-core/dropbear/dropbear_2011.54.bb     |    6 ++
 4 files changed, 23 insertions(+), 44 deletions(-)
 rename meta/recipes-core/dropbear/{dropbear-0.53.1 => dropbear-2011.54}/configure.patch (100%)
 delete mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bb

diff --git a/meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch b/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
similarity index 100%
rename from meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch
rename to meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
diff --git a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
index 3909ef2..a175ee1 100644
--- a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
+++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
@@ -1,40 +1,19 @@
-Upstream-Status: Inappropriate [embedded specific]
+Enable blank password login function for new release dropbear.
 
-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;
- 	}
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Mei Lei <lei.mei@intel.com>
+
+diff --git a/options.h b/options.h
+index 73689ad..041ddaa 100644
+--- a/options.h
++++ b/options.h
+@@ -180,7 +180,7 @@ much traffic. */
+  * Public key logins are allowed for blank-password accounts regardless of this
+  * setting.  PAM is not affected by this setting, it uses the normal pam.d
+  * settings ('nullok' option) */
+-/* #define ALLOW_BLANK_PASSWORD */
++#define ALLOW_BLANK_PASSWORD
  
+ #define ENABLE_CLI_PASSWORD_AUTH
+ #define ENABLE_CLI_PUBKEY_AUTH
diff --git a/meta/recipes-core/dropbear/dropbear_0.53.1.bb b/meta/recipes-core/dropbear/dropbear_0.53.1.bb
deleted file mode 100644
index 54f86e8..0000000
--- a/meta/recipes-core/dropbear/dropbear_0.53.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03"
-SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6"
-
-PR = "r0"
diff --git a/meta/recipes-core/dropbear/dropbear_2011.54.bb b/meta/recipes-core/dropbear/dropbear_2011.54.bb
new file mode 100644
index 0000000..b7b4b83
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2011.54.bb
@@ -0,0 +1,6 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
+SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
+
+PR = "r0"
-- 
1.7.0.4

[PATCH 2/2] distro_tracking_fields.inc: Update dropbear, iproute2, net-tools tracking information.

[Mei Lei]

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index f53fffa..890340b 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -848,14 +848,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 050607"
 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 <dongxiao.xu@intel.com>"
 
 RECIPE_STATUS_pn-netbase = "green"
@@ -1062,6 +1063,7 @@ RECIPE_MAINTAINER_pn-ethtool = "Zhai Edwin <edwin.zhai@intel.com>"
 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 <dongxiao.xu@intel.com>"
 RECIPE_LATEST_VERSION_pn-net-tools = "1.60-23"
 
@@ -1608,10 +1610,10 @@ 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 <lei.mei@intel.com>"
 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"
@@ -1619,10 +1621,9 @@ RECIPE_PATCH_pn-dropbear+allow-nopw = "allow login with no password, applied on
 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"
-- 
1.7.0.4

Re: [PATCH 0/2]dropbear:Upgrade from 0.53.1 to 2011.54

[Saul Wold]

On 12/07/2011 07:49 AM, Mei Lei wrote:
> Hi all,
> 	This patch upgrade dropbear from 0.53.1 to 2011.54. The new release added ALLOW_BLANK_PASSWORD option, we can enable empty passwd login funciton in options.h.
> 	So change the allow-nopw.patch content to enable this function.
> 	Please review it.
> Thanks,
> Lei
> The following changes since commit 493746f1d7f1410284880203c1ac462d61ab5299:
>    Martin Jansa (1):
>          matchbox-session-sato: respect VIRTUAL-RUNTIME_initscripts settings
>
> are available in the git repository at:
>
>    git://git.pokylinux.org/poky-contrib lmei3/dropbear
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/dropbear
>
> Mei Lei (2):
>    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 |   19 ++++---
>   .../configure.patch                                |    0
>   .../dropbear/dropbear/allow-nopw.patch             |   55 ++++++--------------
>   meta/recipes-core/dropbear/dropbear_0.53.1.bb      |    6 --
>   meta/recipes-core/dropbear/dropbear_2011.54.bb     |    6 ++
>   5 files changed, 33 insertions(+), 53 deletions(-)
>   rename meta/recipes-core/dropbear/{dropbear-0.53.1 =>  dropbear-2011.54}/configure.patch (100%)
>   delete mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
>   create mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bb
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core

Thanks
	Sau!