diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-03-23 21:14:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-03-23 21:14:40 +0000 |
| commit | f7f54600f1ce3763705c6c6337bea052f77c5e33 (patch) | |
| tree | b2376f113fc5e8cf5302d5eecc1bc03ddae4b6f5 /openembedded | |
| parent | f72d3a88ef9f90c337222c22138d4af268ad4680 (diff) | |
| download | openembedded-core-f7f54600f1ce3763705c6c6337bea052f77c5e33.tar.gz openembedded-core-f7f54600f1ce3763705c6c6337bea052f77c5e33.tar.bz2 openembedded-core-f7f54600f1ce3763705c6c6337bea052f77c5e33.tar.xz openembedded-core-f7f54600f1ce3763705c6c6337bea052f77c5e33.zip | |
Dropbear 0.46 -> 0.47
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@326 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
| -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.bb | 3 |
6 files changed, 9 insertions, 6 deletions
diff --git a/openembedded/packages/dropbear/dropbear_0.46.bb b/openembedded/packages/dropbear/dropbear.inc index 5bce95a71..301ac24cb 100644 --- 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 index 1a709b8da..1a709b8da 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 9ae84b260..9ae84b260 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 ba2b19d44..ba2b19d44 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 e2b1dd5da..e2b1dd5da 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 000000000..5990260b8 --- /dev/null +++ b/openembedded/packages/dropbear/dropbear_0.47.bb @@ -0,0 +1,3 @@ +include dropbear.inc + +PR = "r2" |