From 2db9977c061ff027bafa488c8e9afad505be773e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 12 Aug 2011 11:02:35 +1000
Subject:  - (djm) [contrib/redhat/openssh.spec contrib/redhat/sshd.init]   
 [contrib/suse/openssh.spec contrib/suse/rc.sshd] Updated RHEL and SLES   
 init scrips from imorgan AT nas.nasa.gov

---
 contrib/suse/openssh.spec | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'contrib/suse/openssh.spec')

diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index db0c127bd..4621f548c 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -28,11 +28,12 @@ Provides:	ssh
 # (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.)
 # building prerequisites -- stuff for
 #   OpenSSL (openssl-devel),
-#   TCP Wrappers (nkitb),
+#   TCP Wrappers (tcpd-devel),
 #   and Gnome (glibdev, gtkdev, and gnlibsd)
 #
 BuildPrereq:	openssl
-BuildPrereq:	nkitb
+BuildPrereq:	tcpd-devel
+BuildPrereq:	zlib-devel
 #BuildPrereq:	glibdev
 #BuildPrereq:	gtkdev
 #BuildPrereq:	gnlibsd
@@ -177,15 +178,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/useradd -r -o -g sshd -u %{sshd_uid} -s /bin/false -c "SSH Privilege Separation User" -d /var/lib/sshd sshd 2> /dev/null || :
 
 %post
-if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then
-	echo "Generating SSH RSA host key..."
-	/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' >&2
-fi
-if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then
-	echo "Generating SSH DSA host key..."
-	/usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' >&2
-fi
-%{fillup_and_insserv -n -s -y ssh sshd START_SSHD}
+/usr/bin/ssh-keygen -A
+%{fillup_and_insserv -n -y ssh sshd}
 %run_permissions
 
 %verifyscript
-- 
cgit v1.2.3