From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Sep 2009 09:42:16 +0000 (+0200)
Subject: Revert "dropbear: Enable allow empty password patch."
X-Git-Tag: Release-2010-05/1~2518
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eff28b3b4ec8309ac1d51d98b8bfc9f5d48ed43f;p=openembedded.git

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 3500670aca..c947cf0e74 100644
--- 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 2e3b7dd6b0..364799f12e 100644
--- 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 9d45ea0f3b..bf2f2add60 100644
--- 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 cdd312cb88..2566fbbd9b 100644
--- 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 6130e50380..6b2517b69a 100644
--- 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"