diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-03-11 18:51:17 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-11 18:51:17 +0000 |
| commit | e2c415e2d5816bee9ac4c15e2443023877aec027 (patch) | |
| tree | 10f9a160f94f238621985caae152f37bf195499b /packages/dropbear | |
| parent | 913e783b3be3463462e767e810121750b67b880e (diff) | |
| parent | 4d7864b69c443fa8810bc6407d160e994b75ac67 (diff) | |
merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
and 97dd2ea8547ce10b119dbe5649f9504851b72a0a
Diffstat (limited to 'packages/dropbear')
| -rw-r--r-- | packages/dropbear/dropbear.inc | 3 | ||||
| -rw-r--r-- | packages/dropbear/dropbear_0.45.bb | 2 | ||||
| -rw-r--r-- | packages/dropbear/dropbear_0.46.bb | 2 | ||||
| -rw-r--r-- | packages/dropbear/dropbear_0.47.bb | 2 | ||||
| -rw-r--r-- | packages/dropbear/dropbear_0.48.bb | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc index fc3d3f8c9c..ec6433cfaf 100644 --- 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 8d94b370c1..68c6e87e75 100644 --- 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 6a4815f07f..d34787fa64 100644 --- 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 1b09c7ef92..b8467e1e7c 100644 --- 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" diff --git a/packages/dropbear/dropbear_0.48.bb b/packages/dropbear/dropbear_0.48.bb new file mode 100644 index 0000000000..f98c0ac8f6 --- /dev/null +++ b/packages/dropbear/dropbear_0.48.bb @@ -0,0 +1 @@ +require dropbear.inc |