dropbear: never apply allow-nopw.patch for DISTRO=familiar

diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
index fc3d3f8..ec6433c 100644 (file)
--- a/packages/dropbear/dropbear.inc
+++ b/packages/dropbear/dropbear.inc
@@ -26,7 +26,8 @@ BINCOMMANDS = "dbclient ssh scp"
 EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
 
 do_configure_prepend() {
-       if [ "${DISTRO_TYPE}" == "debug" ]; then
+       if [ "x${DISTRO}" != "xfamiliar -a ""${DISTRO_TYPE}" == "debug" ]; then
+               oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
                patch -p1 < ${WORKDIR}/allow-nopw.patch
        fi
 }

diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb
index 8d94b37..68c6e87 100644 (file)
--- a/packages/dropbear/dropbear_0.45.bb
+++ b/packages/dropbear/dropbear_0.45.bb
@@ -1,5 +1,5 @@
 require dropbear.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://chansession-security-fix.patch;patch=1 "

diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index 6a4815f..d34787f 100644 (file)
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -1,5 +1,5 @@
 require dropbear.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://chansession-security-fix.patch;patch=1 "

diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb
index 1b09c7e..b8467e1 100644 (file)
--- a/packages/dropbear/dropbear_0.47.bb
+++ b/packages/dropbear/dropbear_0.47.bb
@@ -1,3 +1,3 @@
 require dropbear.inc
 
-PR = "r1"
+PR = "r2"