summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openembedded/packages/dropbear/dropbear.inc (renamed from openembedded/packages/dropbear/dropbear_0.46.bb)12
-rw-r--r--openembedded/packages/dropbear/dropbear/allow-nopw.patch (renamed from openembedded/packages/dropbear/dropbear-0.46/allow-nopw.patch)0
-rw-r--r--openembedded/packages/dropbear/dropbear/configure.patch (renamed from openembedded/packages/dropbear/dropbear-0.46/configure.patch)0
-rw-r--r--openembedded/packages/dropbear/dropbear/fix-2kb-keys.patch (renamed from openembedded/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch)0
-rw-r--r--openembedded/packages/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch (renamed from openembedded/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch)0
-rw-r--r--openembedded/packages/dropbear/dropbear_0.47.bb3
6 files changed, 9 insertions, 6 deletions
diff --git a/openembedded/packages/dropbear/dropbear_0.46.bb b/openembedded/packages/dropbear/dropbear.inc
index 5bce95a71d..301ac24cb2 100644
--- a/openembedded/packages/dropbear/dropbear_0.46.bb
+++ b/openembedded/packages/dropbear/dropbear.inc
@@ -4,14 +4,13 @@ SECTION = "console/network"
4LICENSE = "MIT" 4LICENSE = "MIT"
5DEPENDS = "zlib" 5DEPENDS = "zlib"
6PROVIDES = "ssh sshd" 6PROVIDES = "ssh sshd"
7PR = "r4" 7RPROVIDES = "ssh sshd"
8 8
9SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ 9SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
10 file://urandom-xauth-changes-to-options.h.patch;patch=1 \ 10 file://urandom-xauth-changes-to-options.h.patch;patch=1 \
11 file://configure.patch;patch=1 \ 11 file://configure.patch;patch=1 \
12 file://allow-nopw.patch \
13 file://fix-2kb-keys.patch;patch=1 \ 12 file://fix-2kb-keys.patch;patch=1 \
14 file://chansession-security-fix.patch;patch=1 \ 13 file://allow-nopw.patch \
15 file://init" 14 file://init"
16 15
17inherit autotools update-rc.d 16inherit autotools update-rc.d
@@ -19,7 +18,7 @@ inherit autotools update-rc.d
19INITSCRIPT_NAME = "dropbear" 18INITSCRIPT_NAME = "dropbear"
20INITSCRIPT_PARAMS = "defaults 10" 19INITSCRIPT_PARAMS = "defaults 10"
21 20
22CFLAGS_prepend = "-I. " 21CFLAGS_prepend = " -I. "
23LD = "${CC}" 22LD = "${CC}"
24 23
25SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" 24SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
@@ -27,7 +26,8 @@ BINCOMMANDS = "dbclient ssh scp"
27EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' 26EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
28 27
29do_configure_prepend() { 28do_configure_prepend() {
30 if [ "${DISTRO_TYPE}" == "debug" ]; then 29 if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then
30 oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
31 patch -p1 < ${WORKDIR}/allow-nopw.patch 31 patch -p1 < ${WORKDIR}/allow-nopw.patch
32 fi 32 fi
33} 33}
diff --git a/openembedded/packages/dropbear/dropbear-0.46/allow-nopw.patch b/openembedded/packages/dropbear/dropbear/allow-nopw.patch
index 1a709b8da0..1a709b8da0 100644
--- a/openembedded/packages/dropbear/dropbear-0.46/allow-nopw.patch
+++ b/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
index 9ae84b2604..9ae84b2604 100644
--- a/openembedded/packages/dropbear/dropbear-0.46/configure.patch
+++ b/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
index ba2b19d44a..ba2b19d44a 100644
--- a/openembedded/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch
+++ b/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
index e2b1dd5da5..e2b1dd5da5 100644
--- 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
diff --git a/openembedded/packages/dropbear/dropbear_0.47.bb b/openembedded/packages/dropbear/dropbear_0.47.bb
new file mode 100644
index 0000000000..5990260b87
--- /dev/null
+++ b/openembedded/packages/dropbear/dropbear_0.47.bb
@@ -0,0 +1,3 @@
1include dropbear.inc
2
3PR = "r2"