Revert "dropbear: Enable allow empty password patch."

dropbear.inc needs the patch non-applied, see the thread in http://thread.gmane.org/gmane.comp.handhelds.openembedded/26302

This reverts commit c26fc5db90702b035bd545cff3ee7575a0f9b70f.

diff --git a/recipes/dropbear/dropbear-early_1.0.bb b/recipes/dropbear/dropbear-early_1.0.bb
index 3500670aca9216dfc8f042076ce130d49bcbd91b..c947cf0e747c9c5b4237f3712718ba70e6bccd72 100644 (file)
--- a/recipes/dropbear/dropbear-early_1.0.bb
+++ b/recipes/dropbear/dropbear-early_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
 SECTION = "devel"
 RDEPENDS = "dropbear"
-PR = "${INC_PR}.0"
+PR = "r3"
 
 SRC_URI = "file://dropbear-early"
 

diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc
index 2e3b7dd6b075084f64381c76c6be28c3b4082c9d..364799f12e11d551d97916804d7b2d750aac68d6 100644 (file)
--- a/recipes/dropbear/dropbear.inc
+++ b/recipes/dropbear/dropbear.inc
@@ -6,14 +6,12 @@ DEPENDS = "zlib"
 PROVIDES = "ssh sshd"
 RPROVIDES = "ssh sshd"
 
-INC_PR = "r3"
-
 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;patch=1 \
+  file://allow-nopw.patch \
   file://init \
 "
 SRC_URI_append_openmoko = "\

diff --git a/recipes/dropbear/dropbear_0.49.bb b/recipes/dropbear/dropbear_0.49.bb
index 9d45ea0f3bf135693dbd100011968425b06fa4ce..bf2f2add601dfdbdb175cb7905d40378fd527be3 100644 (file)
--- a/recipes/dropbear/dropbear_0.49.bb
+++ b/recipes/dropbear/dropbear_0.49.bb
@@ -1,5 +1,5 @@
 require dropbear.inc
 
-PR = "${INC_PR}.0"
+PR = "r2"
 
 SRC_URI += "file://scp-argument-fix.patch;patch=1"

diff --git a/recipes/dropbear/dropbear_0.51.bb b/recipes/dropbear/dropbear_0.51.bb
index cdd312cb88784b2a075b31aa50230ae47942e512..2566fbbd9bcc13eb4f2d27ddf21c7ef27d19e70e 100644 (file)
--- a/recipes/dropbear/dropbear_0.51.bb
+++ b/recipes/dropbear/dropbear_0.51.bb
@@ -1,3 +1,4 @@
 require dropbear.inc
-PR = "${INC_PR}.0"
+PR = "r1.01"
+
 SRC_URI += "file://no-host-lookup.patch;patch=1"

diff --git a/recipes/dropbear/dropbear_0.52.bb b/recipes/dropbear/dropbear_0.52.bb
index 6130e50380bb868f28dc1039ffeff651aaba4a83..6b2517b69a9df0fbda4644918f488761dbff88ba 100644 (file)
--- a/recipes/dropbear/dropbear_0.52.bb
+++ b/recipes/dropbear/dropbear_0.52.bb
@@ -1,5 +1,6 @@
 require dropbear.inc
-PR = "${INC_PR}.0"
+PR = "r0"
+
 SRC_URI += "file://no-host-lookup.patch;patch=1"
 
 DEFAULT_PREFERENCE = "-1"