[oe-commits] org.oe.dev dropbear 0.50 update testing version (DEFAULT_PREFERENCE=-1) to 0.51. Consider commenting on bug #2506

[mickeyl commit]

dropbear 0.50 update testing version (DEFAULT_PREFERENCE=-1) to 0.51. Consider commenting on bug #2506

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0f34f029ae013c8424b0693e3c1017d67649c235
ViewMTN: http://monotone.openembedded.org/revision/info/0f34f029ae013c8424b0693e3c1017d67649c235
Files:
1
packages/dropbear/dropbear-0.50
packages/dropbear/dropbear-0.51
packages/dropbear/dropbear_0.50.bb
packages/dropbear/dropbear_0.51.bb
packages/dropbear/dropbear-0.51/allow-nopw.patch
packages/dropbear/dropbear.inc
Diffs:

#
# mt diff -rd17dcf16c103e9f006f5a74e4a3ede60a6a92178 -r0f34f029ae013c8424b0693e3c1017d67649c235
#
#
#
# rename "packages/dropbear/dropbear-0.50"
#     to "packages/dropbear/dropbear-0.51"
# 
# rename "packages/dropbear/dropbear_0.50.bb"
#     to "packages/dropbear/dropbear_0.51.bb"
# 
# add_file "packages/dropbear/dropbear-0.51/allow-nopw.patch"
#  content [c5ccbb00c5a8e24ff7177af9bffdda9110038b88]
# 
# patch "packages/dropbear/dropbear.inc"
#  from [6d50c1193e4d2fa9a7c6f85db6149b36aee06851]
#    to [8974ff1e11e258705f1ba627535481893748e0b1]
# 
# patch "packages/dropbear/dropbear_0.51.bb"
#  from [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
#    to [b4549d3c7ecf3920758e70e164410850ae6bebe8]
#
============================================================
--- packages/dropbear/dropbear-0.51/allow-nopw.patch	c5ccbb00c5a8e24ff7177af9bffdda9110038b88
+++ packages/dropbear/dropbear-0.51/allow-nopw.patch	c5ccbb00c5a8e24ff7177af9bffdda9110038b88
@@ -0,0 +1,40 @@
+Index: dropbear-0.51/svr-auth.c
+===================================================================
+--- dropbear-0.51.orig/svr-auth.c
++++ dropbear-0.51/svr-auth.c
+@@ -270,7 +270,7 @@ static int checkusername(unsigned char *
+ 		send_msg_userauth_failure(0, 1);
+ 		return DROPBEAR_FAILURE;
+ 	}
+-
++#ifdef DISALLOW_EMPTY_PW
+ 	/* check for an empty password */
+ 	if (ses.authstate.pw_passwd[0] == '\0') {
+ 		TRACE(("leave checkusername: empty pword"))
+@@ -279,7 +279,7 @@ static int checkusername(unsigned char *
+ 		send_msg_userauth_failure(0, 1);
+ 		return DROPBEAR_FAILURE;
+ 	}
+-
++#endif
+ 	TRACE(("shell is %s", ses.authstate.pw_shell))
+ 
+ 	/* check that the shell is set */
+Index: dropbear-0.51/svr-authpasswd.c
+===================================================================
+--- dropbear-0.51.orig/svr-authpasswd.c
++++ dropbear-0.51/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_PW
+ 		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;
+ 	}
+ 
============================================================
--- packages/dropbear/dropbear.inc	6d50c1193e4d2fa9a7c6f85db6149b36aee06851
+++ packages/dropbear/dropbear.inc	8974ff1e11e258705f1ba627535481893748e0b1
@@ -6,19 +6,21 @@ RPROVIDES = "ssh sshd"
 PROVIDES = "ssh sshd"
 RPROVIDES = "ssh sshd"
 
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
-	   file://urandom-xauth-changes-to-options.h.patch;patch=1 \
-	   file://configure.patch;patch=1 \
-	   file://fix-2kb-keys.patch;patch=1 \
-	   file://allow-nopw.patch \
-	   file://init"
+SRC_URI = "\
+  http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \
+  file://urandom-xauth-changes-to-options.h.patch;patch=1 \
+  file://configure.patch;patch=1 \
+  file://fix-2kb-keys.patch;patch=1 \
+  file://allow-nopw.patch \
+  file://init \
+"
 
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "dropbear"
 INITSCRIPT_PARAMS = "defaults 10"
 
-CFLAGS_prepend = " -I. "
+CFLAGS =+ "-I."
 LD = "${CC}"
 
 SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
@@ -33,13 +35,13 @@ do_install() {
 }
 
 do_install() {
-	install -d ${D}${sysconfdir} \
-		   ${D}${sysconfdir}/init.d \
-		   ${D}${sysconfdir}/default \
-		   ${D}${sysconfdir}/dropbear \
-                   ${D}${bindir} \
-		   ${D}${sbindir} \
-		   ${D}${localstatedir}
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/default
+	install -d ${D}${sysconfdir}/dropbear
+	install -d ${D}${bindir}
+	install -d ${D}${sbindir}
+	install -d ${D}${localstatedir}
 
 	install -m 0755 dropbearmulti ${D}${sbindir}/
 	ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
@@ -62,12 +64,12 @@ pkg_postrm_append () {
 }
 
 pkg_postrm_append () {
-  if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
-  fi
-  if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_dss_host_key
-  fi
-  update-alternatives --remove ssh ${bindir}/dropbearmulti
-  update-alternatives --remove scp ${bindir}/dropbearmulti
+	if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+		rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+	fi
+	if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+		rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+	fi
+	update-alternatives --remove ssh ${bindir}/dropbearmulti
+	update-alternatives --remove scp ${bindir}/dropbearmulti
 }
============================================================
--- packages/dropbear/dropbear_0.50.bb	61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200
+++ packages/dropbear/dropbear_0.51.bb	b4549d3c7ecf3920758e70e164410850ae6bebe8
@@ -1,6 +1,5 @@ require dropbear.inc
 require dropbear.inc
+PR = "r0"
 
-PR = "r1"
-
 # testing
 DEFAULT_PREFERENCE = "-1"