tidied up the rc5/rc6 support. launched the svc stuff from the rc5 ebuild. added sshd_config to the docs. made the rc6 script more like the other rc6 ones. performed some much needed cleaning to the ebuilds.. they were getting quite messy :)

11 files changed, 111 insertions, 82 deletions

diff --git a/net-misc/openssh/files/digest-openssh-2.9_p1 b/net-misc/openssh/files/digest-openssh-2.9_p1
deleted file mode 100644
index 34725358ff1c..000000000000
--- a/net-misc/openssh/files/digest-openssh-2.9_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 591a5f59962c5604c8be81e37090759f openssh-2.9p1.tar.gz
diff --git a/net-misc/openssh/files/digest-openssh-2.9_p1-r1 b/net-misc/openssh/files/digest-openssh-2.9_p1-r1
deleted file mode 100644
index 34725358ff1c..000000000000
--- a/net-misc/openssh/files/digest-openssh-2.9_p1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 591a5f59962c5604c8be81e37090759f openssh-2.9p1.tar.gz
diff --git a/net-misc/openssh/files/digest-openssh-2.9_p2-r2 b/net-misc/openssh/files/digest-openssh-2.9_p2-r2
deleted file mode 100644
index 9c8a76bd9f29..000000000000
--- a/net-misc/openssh/files/digest-openssh-2.9_p2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fb5ea44cb5a894bed7b610c5a517542d openssh-2.9p2.tar.gz
diff --git a/net-misc/openssh/files/digest-openssh-2.9_p2-r1 b/net-misc/openssh/files/digest-openssh-2.9_p2-r6
index 9c8a76bd9f29..9c8a76bd9f29 100644
--- a/net-misc/openssh/files/digest-openssh-2.9_p2-r1
+++ b/net-misc/openssh/files/digest-openssh-2.9_p2-r6
diff --git a/net-misc/openssh/files/sshd b/net-misc/openssh/files/sshd
deleted file mode 100755
index 4c3e1d74fe8a..000000000000
--- a/net-misc/openssh/files/sshd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-SERVICE="sshd"
-PIDFILE=/var/run/sshd.pid
-EXE=/usr/sbin/sshd
-
-gen_keys() {
-	if [ ! -e /etc/ssh/ssh_host_key ] ; then
-		einfo "Generating Hostkey..."
-		/usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N ''
-	fi
-
-	if [ ! -e /etc/ssh/ssh_host_dsa_key ] ; then
-		einfo "Generating DSA-Hostkey..."
-		/usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N ''
-	fi
-
-	if [ ! -e /etc/ssh/ssh_host_rsa_key ] ; then
-		einfo "Generating RSA-Hostkey..."
-		/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-	fi
-}
-
-start() {
-	gen_keys
-	ebegin "Starting $SERVICE"
-	start-stop-daemon --start --quiet --exec $EXE
-	eend $? "Started $SERVICE." "Error starting $SERVICE."
-}
-
-stop() {
-	ebegin "Stopping $SERVICE"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXE
-	eend $? "Stopped $SERVICE." "Error stopping $SERVICE."
-}
diff --git a/net-misc/openssh/files/sshd.pam.old b/net-misc/openssh/files/sshd.pam.rc5
index 7d308cb13a2b..7d308cb13a2b 100644
--- a/net-misc/openssh/files/sshd.pam.old
+++ b/net-misc/openssh/files/sshd.pam.rc5
diff --git a/net-misc/openssh/files/sshd.pam b/net-misc/openssh/files/sshd.pam.rc6
index f5e4900ac27b..f5e4900ac27b 100644
--- a/net-misc/openssh/files/sshd.pam
+++ b/net-misc/openssh/files/sshd.pam.rc6
diff --git a/net-misc/openssh/files/sshd.old b/net-misc/openssh/files/sshd.rc5
index 9c01fcf05fd3..a4b7ae13c872 100644
--- a/net-misc/openssh/files/sshd.old
+++ b/net-misc/openssh/files/sshd.rc5
@@ -41,8 +41,3 @@ stop() {
 }
 
 doservice ${@}
-
-
-
-
-
diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
new file mode 100644
index 000000000000..5442b08e9f5f
--- /dev/null
+++ b/net-misc/openssh/files/sshd.rc6
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+
+checkconfig() {
+    if [ ! -e /etc/ssh/sshd_config ] ; then
+	eerror "You need an /etc/ssh/sshd_config file to run sshd"
+	eerror "There is a sample file in /usr/share/docs/openssh"
+	return 1
+    fi
+}
+
+gen_keys() {
+    if [ ! -e /etc/ssh/ssh_host_key ] ; then
+	einfo "Generating Hostkey..."
+	/usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N ''
+    fi
+    if [ ! -e /etc/ssh/ssh_host_dsa_key ] ; then
+	einfo "Generating DSA-Hostkey..."
+	/usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N ''
+    fi
+    if [ ! -e /etc/ssh/ssh_host_rsa_key ] ; then
+	einfo "Generating RSA-Hostkey..."
+	/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+    fi
+}
+
+start() {
+    checkconfig || return 1
+    gen_keys
+    ebegin "Starting sshd"
+    start-stop-daemon --start --quiet --exec /usr/sbin/sshd
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping sshd"
+    start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid
+    eend $?
+}
diff --git a/net-misc/openssh/openssh-2.9_p2-r6.ebuild b/net-misc/openssh/openssh-2.9_p2-r6.ebuild
new file mode 100644
index 000000000000..60df7aad28fb
--- /dev/null
+++ b/net-misc/openssh/openssh-2.9_p2-r6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: System Team <system@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-2.9_p2-r6.ebuild,v 1.1 2001/09/07 09:07:37 woodchip Exp $
+
+P=openssh-2.9p2
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="Port of OpenBSD's free SSH release"
+SRC_URI="ftp://ftp.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/${A}"
+HOMEPAGE="http://www.openssh.com/"
+
+DEPEND="virtual/glibc sys-devel/perl sys-apps/groff
+        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+        pam? ( >=sys-libs/pam-0.73 )
+        >=dev-libs/openssl-0.9.6
+        sys-libs/zlib"
+
+RDEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.73 )
+	>=dev-libs/openssl-0.9.6
+	sys-libs/zlib"
+
+src_compile() {
+
+    local myconf
+    use tcpd && myconf="${myconf} --with-tcp-wrappers"
+    use tcpd || myconf="${myconf} --without-tcp-wrappers"
+    use pam  && myconf="${myconf} --with-pam"
+    use pam  || myconf="${myconf} --without-pam"
+
+    ./configure --prefix=/usr --sysconfdir=/etc/ssh --host=${CHOST} \
+	--libexecdir=/usr/lib/misc --mandir=/usr/share/man \
+	--with-ipv4-default --disable-suid-ssh ${myconf}
+    assert
+    make || die
+}
+
+src_install() {                               
+
+    make install-files DESTDIR=${D} || die
+    dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+    insinto /etc/pam.d
+    newins ${FILESDIR}/sshd.pam.rc6 sshd
+    exeinto /etc/init.d
+    newexe ${FILESDIR}/sshd.rc6 sshd
+}
diff --git a/net-misc/openssh/openssh-2.9_p2.ebuild b/net-misc/openssh/openssh-2.9_p2.ebuild
index 96d001eba816..16d5fddd9ba6 100644
--- a/net-misc/openssh/openssh-2.9_p2.ebuild
+++ b/net-misc/openssh/openssh-2.9_p2.ebuild
@@ -1,63 +1,48 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-2.9_p2.ebuild,v 1.2 2001/09/03 21:47:39 drobbins Exp $
+# Maintainer: System Team <system@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-2.9_p2.ebuild,v 1.3 2001/09/07 09:07:37 woodchip Exp $
 
 P=openssh-2.9p2
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Port of OpenBSD's free SSH release"
-SRC_URI="ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/"${A}
+SRC_URI="ftp://ftp.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/${A}"
 HOMEPAGE="http://www.openssh.com/"
 
 DEPEND="virtual/glibc sys-devel/perl sys-apps/groff
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	pam? ( >=sys-libs/pam-0.73 )
-	>=dev-libs/openssl-0.9.6"
+        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+        pam? ( >=sys-libs/pam-0.73 )
+        >=dev-libs/openssl-0.9.6
+        sys-libs/zlib"
 
 RDEPEND="virtual/glibc
 	pam? ( >=sys-libs/pam-0.73 )
-	>=dev-libs/openssl-0.9.6"
+	>=dev-libs/openssl-0.9.6
+	sys-libs/zlib"
 
 src_compile() {
+
     local myconf
-    if [ "`use tcpd`" ]
-    then
-		myconf="--with-tcp-wrappers"
-    else
-		myconf="--without-tcp-wrappers"
-	fi
-    if [ "`use pam`" ]
-    then
-	myconf="${myconf} --with-pam"
-    else
-	myconf="${myconf} --without-pam"
-    fi
-
-    try ./configure --prefix=/usr --sysconfdir=/etc/ssh \
+    use tcpd && myconf="${myconf} --with-tcp-wrappers"
+    use tcpd || myconf="${myconf} --without-tcp-wrappers"
+    use pam  && myconf="${myconf} --with-pam"
+    use pam  || myconf="${myconf} --without-pam"
+
+    ./configure --prefix=/usr --sysconfdir=/etc/ssh --host=${CHOST} \
 	--libexecdir=/usr/lib/misc --mandir=/usr/share/man \
-	--with-ipv4-default --disable-suid-ssh --host=${CHOST} ${myconf}                         
-    try make
+	--with-ipv4-default --disable-suid-ssh ${myconf}
+    assert
+    make || die
 }
 
 src_install() {                               
 
-    try make install-files DESTDIR=${D} 
-    dodoc ChangeLog CREDITS OVERVIEW README* TODO
+    make install-files DESTDIR=${D} || die
+    dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
     insinto /etc/pam.d
-    newins ${FILESDIR}/sshd.pam.old sshd
+    newins ${FILESDIR}/sshd.pam.rc5 sshd
     exeinto /etc/rc.d/init.d
-    newexe ${FILESDIR}/sshd.old sshd
-    newexe ${FILESDIR}/svc-openssh svc-sshd
-    exeinto /var/lib/supervise/services/sshd
-    newexe ${FILESDIR}/sshd-run run
+    newexe ${FILESDIR}/sshd.rc5 sshd
 }
-
-
-pkg_postinst() {
-	# Make ssh start at boot
-	. /etc/rc.d/config/functions
-	einfo ">>> Generating symlinks"
-	${ROOT}/usr/sbin/rc-update add svc-sshd
-}
-