split up openssh package and add individual postinsts. patch courtesy Bruno Randolf

BKrev: 4118c97eQEe7igMAC_GNuHtKi1xIsA

1 files changed, 40 insertions, 5 deletions

diff --git a/openssh/openssh_3.8p1.oe b/openssh/openssh_3.8p1.oe
index e590a02bd6..b33a60b48f 100644
--- a/openssh/openssh_3.8p1.oe
+++ b/openssh/openssh_3.8p1.oe
@@ -12,11 +12,11 @@ used to provide applications with a secure communication channel."
 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://sshd_config \
+           file://init"
 
 inherit autotools
 
-sysconfdir_append = "/ssh"
 export ASKPASS_PROGRAM = "${bindir}/ssh-askpass"
 export LD = "${CC}"
 CFLAGS_prepend = "-I${S} "
@@ -24,7 +24,10 @@ 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"
+	        --without-zlib-version-check \
+		--with-privsep-path=/var/run/sshd \
+		--sysconfdir=${sysconfdir}/ssh"
+		
 EXTRA_OEMAKE = "'STRIP_OPT='"
 
 do_configure_prepend () {
@@ -37,7 +40,39 @@ do_compile_append () {
 	install -m 0644 ${WORKDIR}/sshd_config ${S}/
 }
 
-PACKAGES =+ " openssh-scp "
+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"
-RDEPENDS_openssh += " openssh-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 -s 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
+}