Dropbear 0.46 -> 0.47

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@326 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/openembedded/packages/dropbear/dropbear_0.46.bb b/openembedded/packages/dropbear/dropbear.inc
similarity index 90%
rename from openembedded/packages/dropbear/dropbear_0.46.bb
rename to openembedded/packages/dropbear/dropbear.inc
index 5bce95a71d3091d63e546d29885d89678eee18e7..301ac24cb2a1e73c0e376074e076cced393d03e6 100644 (file)
--- a/openembedded/packages/dropbear/dropbear_0.46.bb
+++ b/openembedded/packages/dropbear/dropbear.inc
@@ -4,14 +4,13 @@ SECTION = "console/network"
 LICENSE = "MIT"
 DEPENDS = "zlib"
 PROVIDES = "ssh sshd"
-PR = "r4"
+RPROVIDES = "ssh sshd"
 
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
+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://allow-nopw.patch \
           file://fix-2kb-keys.patch;patch=1 \
-          file://chansession-security-fix.patch;patch=1 \
+          file://allow-nopw.patch \
           file://init"
 
 inherit autotools update-rc.d
@@ -19,7 +18,7 @@ inherit autotools update-rc.d
 INITSCRIPT_NAME = "dropbear"
 INITSCRIPT_PARAMS = "defaults 10"
 
-CFLAGS_prepend = "-I. "
+CFLAGS_prepend = " -I. "
 LD = "${CC}"
 
 SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
@@ -27,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/openembedded/packages/dropbear/dropbear-0.46/allow-nopw.patch b/openembedded/packages/dropbear/dropbear/allow-nopw.patch
similarity index 100%
rename from openembedded/packages/dropbear/dropbear-0.46/allow-nopw.patch
rename to openembedded/packages/dropbear/dropbear/allow-nopw.patch

diff --git a/openembedded/packages/dropbear/dropbear-0.46/configure.patch b/openembedded/packages/dropbear/dropbear/configure.patch
similarity index 100%
rename from openembedded/packages/dropbear/dropbear-0.46/configure.patch
rename to openembedded/packages/dropbear/dropbear/configure.patch

diff --git a/openembedded/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch b/openembedded/packages/dropbear/dropbear/fix-2kb-keys.patch
similarity index 100%
rename from openembedded/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch
rename to openembedded/packages/dropbear/dropbear/fix-2kb-keys.patch

diff --git a/openembedded/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch b/openembedded/packages/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
similarity index 100%
rename from openembedded/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch
rename to openembedded/packages/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch

diff --git a/openembedded/packages/dropbear/dropbear_0.47.bb b/openembedded/packages/dropbear/dropbear_0.47.bb
new file mode 100644 (file)
index 0000000..5990260
--- /dev/null
+++ b/openembedded/packages/dropbear/dropbear_0.47.bb
@@ -0,0 +1,3 @@
+include dropbear.inc
+
+PR = "r2"