Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/19 01:11:20+00:00 nexus.co.uk!pb
apply openssh postrm patch from Erik Hovland

2005/01/19 01:09:15+00:00 nexus.co.uk!pb
apply dropbear-0.44 patches from Erik Hovland


BKrev: 41edba78_Lnf4inFl-JNKT6cEUGhDA

5 files changed, 89 insertions, 1 deletions

diff --git a/packages/dropbear/dropbear-0.44/fix-2kb-keys.patch b/packages/dropbear/dropbear-0.44/fix-2kb-keys.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dropbear/dropbear-0.44/fix-2kb-keys.patch
diff --git a/packages/dropbear/dropbear-0.44/fix-ctrl-C-in-scp.patch b/packages/dropbear/dropbear-0.44/fix-ctrl-C-in-scp.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dropbear/dropbear-0.44/fix-ctrl-C-in-scp.patch
diff --git a/packages/dropbear/dropbear-0.44/fix-empty-termode-problem.patch b/packages/dropbear/dropbear-0.44/fix-empty-termode-problem.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dropbear/dropbear-0.44/fix-empty-termode-problem.patch
diff --git a/packages/dropbear/dropbear_0.44.bb b/packages/dropbear/dropbear_0.44.bb
index 64ee5aa40e..f9b706d6f9 100644
--- a/packages/dropbear/dropbear_0.44.bb
+++ b/packages/dropbear/dropbear_0.44.bb
@@ -2,13 +2,16 @@ DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
 SECTION = "console/network"
 LICENSE = "MIT"
 DEPENDS = "zlib"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
 	   file://use-urandom.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://allow-nopw.patch;patch=1 \
 	   file://xauth-path.patch;patch=1 \
+	   file://fix-2kb-keys.patch;patch=1 \
+	   file://fix-ctrl-C-in-scp.patch;patch=1 \
+	   file://fix-empty-termode-problem.patch;patch=1 \
 	   file://init"
 
 inherit autotools update-rc.d
diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb
index e69de29bb2..7f6a3c45bc 100644
--- a/packages/openssh/openssh_3.8p1.bb
+++ b/packages/openssh/openssh_3.8p1.bb
@@ -0,0 +1,85 @@
+DEPENDS = "zlib openssl"
+SECTION = "console/network"
+DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
+Ssh (Secure Shell) is a program for logging into a remote machine \
+and for executing commands on a remote machine. \
+It provides secure encrypted communications between two untrusted \
+hosts over an insecure network.  X11 connections and arbitrary TCP/IP \
+ports can also be forwarded over the secure channel. \
+It is intended as a replacement for rlogin, rsh and rcp, and can be \
+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 = "r1"
+
+SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+           file://scp-nossl.patch;patch=1 \
+           file://sshd_config \
+           file://init"
+
+inherit autotools
+
+export ASKPASS_PROGRAM = "${bindir}/ssh-askpass"
+export LD = "${CC}"
+CFLAGS_prepend = "-I${S} "
+CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
+LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat "
+EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
+	        --with-rand-helper=no --without-pam \
+	        --without-zlib-version-check \
+		--with-privsep-path=/var/run/sshd \
+		--sysconfdir=${sysconfdir}/ssh"
+		
+EXTRA_OEMAKE = "'STRIP_OPT='"
+
+do_configure_prepend () {
+	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
+		cp aclocal.m4 acinclude.m4
+	fi
+}
+
+do_compile_append () {
+	install -m 0644 ${WORKDIR}/sshd_config ${S}/
+}
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}/etc/init.d/sshd
+}
+
+PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc"
+FILES_openssh-scp = "/usr/bin/scp"
+FILES_openssh-ssh = "/usr/bin/ssh /usr/bin/slogin /${sysconfdir}/ssh/ssh_config"
+FILES_openssh-sshd = "/usr/sbin/sshd /${sysconfdir}/init.d/sshd /usr/bin/ssh-keygen"
+FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd"
+FILES_openssh-sftp = "/usr/bin/sftp /usr/libexec/sftp-server"
+FILES_openssh-misc = "/usr/bin /usr/libexec/"
+RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd"
+DEPENDS_openssh-sshd += " update-rc.d"
+RDEPENDS_openssh-sshd += " update-rc.d"
+
+pkg_postinst_openssh-sshd() {
+if test "x$D" != "x"; then
+	exit 1
+else
+	addgroup sshd
+	adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd
+	update-rc.d sshd defaults
+fi
+}
+
+pkg_postrm_openssh-sshd() {
+if test "x$D" != "x"; then
+	exit 1
+else
+	${sysconfdir}/init.d/sshd stop
+	deluser sshd
+	delgroup sshd
+	update-rc.d -f sshd remove
+fi
+}
+
+CONFFILES_openssh-sshd_nylon = "${sysconfdir}/ssh/sshd_config"
+CONFFILES_openssh-ssh_nylon = "${sysconfdir}/ssh/ssh_config"