summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-03-27 16:37:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-27 16:37:49 +0000
commitfd76ecd58f985cd8552b7cdb46942311307f68be (patch)
treeda2531efee7647403d7eb9acfcf7690a8f2aee09
parentc061cac00b68cb66701fba06f2eb3380dd24f4cc (diff)
parent68e40b62e47cd5f08c4665e60b95393757019c85 (diff)
merge of 1506d12fe8ff1d8436934663e78fc3c298406bd2
and 3910a6fc3b183fcafe7dfaa73ec6d03f9da5cb69
-rw-r--r--packages/openssh/openssh_4.0p1.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb
index e41b8f655c..bcfe2f370f 100644
--- a/packages/openssh/openssh_4.0p1.bb
+++ b/packages/openssh/openssh_4.0p1.bb
@@ -1,4 +1,10 @@
DEPENDS = "zlib openssl"
+
+RREPLACES_openssh = "dropbear"
+RCONFLICTS_openssh = "dropbear"
+RREPLACES_openssh-sshd = "dropbear"
+RCONFLICTS_openssh-sshd = "dropbear"
+
SECTION = "console/network"
DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
Ssh (Secure Shell) is a program for logging into a remote machine \
@@ -11,7 +17,7 @@ used to provide applications with a secure communication channel."
HOMEPAGE = "http://www.openssh.org/"
LICENSE = "BSD"
MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
-PR = "r6"
+PR = "r7"
SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
file://configure.patch;patch=1 \