summaryrefslogtreecommitdiff
path: root/contrib/suse
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/suse')
-rw-r--r--contrib/suse/openssh.spec18
-rw-r--r--contrib/suse/rc.sshd16
2 files changed, 8 insertions, 26 deletions
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 6afdcc4b4..3a4dfea37 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
13 13
14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation 14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
15Name: openssh 15Name: openssh
16Version: 5.8p1 16Version: 5.9p1
17URL: http://www.openssh.com/ 17URL: http://www.openssh.com/
18Release: 1 18Release: 1
19Source0: openssh-%{version}.tar.gz 19Source0: openssh-%{version}.tar.gz
@@ -28,11 +28,12 @@ Provides: ssh
28# (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.) 28# (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.)
29# building prerequisites -- stuff for 29# building prerequisites -- stuff for
30# OpenSSL (openssl-devel), 30# OpenSSL (openssl-devel),
31# TCP Wrappers (nkitb), 31# TCP Wrappers (tcpd-devel),
32# and Gnome (glibdev, gtkdev, and gnlibsd) 32# and Gnome (glibdev, gtkdev, and gnlibsd)
33# 33#
34BuildPrereq: openssl 34BuildPrereq: openssl
35BuildPrereq: nkitb 35BuildPrereq: tcpd-devel
36BuildPrereq: zlib-devel
36#BuildPrereq: glibdev 37#BuildPrereq: glibdev
37#BuildPrereq: gtkdev 38#BuildPrereq: gtkdev
38#BuildPrereq: gnlibsd 39#BuildPrereq: gnlibsd
@@ -177,15 +178,8 @@ rm -rf $RPM_BUILD_ROOT
177/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 || : 178/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 || :
178 179
179%post 180%post
180if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then 181/usr/bin/ssh-keygen -A
181 echo "Generating SSH RSA host key..." 182%{fillup_and_insserv -n -y ssh sshd}
182 /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' >&2
183fi
184if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then
185 echo "Generating SSH DSA host key..."
186 /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' >&2
187fi
188%{fillup_and_insserv -n -s -y ssh sshd START_SSHD}
189%run_permissions 183%run_permissions
190 184
191%verifyscript 185%verifyscript
diff --git a/contrib/suse/rc.sshd b/contrib/suse/rc.sshd
index 4d4880d7e..4a3bc41db 100644
--- a/contrib/suse/rc.sshd
+++ b/contrib/suse/rc.sshd
@@ -43,20 +43,8 @@ rc_reset
43 43
44case "$1" in 44case "$1" in
45 start) 45 start)
46 if ! test -f /etc/ssh/ssh_host_key ; then 46 # Generate any missing host keys
47 echo Generating /etc/ssh/ssh_host_key. 47 ssh-keygen -A
48 ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N ''
49 fi
50 if ! test -f /etc/ssh/ssh_host_dsa_key ; then
51 echo Generating /etc/ssh/ssh_host_dsa_key.
52
53 ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
54 fi
55 if ! test -f /etc/ssh/ssh_host_rsa_key ; then
56 echo Generating /etc/ssh/ssh_host_rsa_key.
57
58 ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
59 fi
60 echo -n "Starting SSH daemon" 48 echo -n "Starting SSH daemon"
61 ## Start daemon with startproc(8). If this fails 49 ## Start daemon with startproc(8). If this fails
62 ## the echo return value is set appropriate. 50 ## the echo return value is set appropriate.