Attachment 2069 Details for Bug 1920 – Updated .spec file and init script for SLES

[patch] Updated .spec file and init script for SLES

openssh-contrib-suse.diff (text/plain), 2.43 KB, created by Iain Morgan on 2011-07-27 09:15:05 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Iain Morgan

Created: 2011-07-27 09:15:05 AEST

Size: 2.43 KB

patch

obsolete

>Index: contrib/suse/openssh.spec
>===================================================================
>RCS file: /cvs/openssh/contrib/suse/openssh.spec,v
>retrieving revision 1.95
>diff -u -r1.95 openssh.spec
>--- contrib/suse/openssh.spec	3 Jun 2011 00:35:26 -0000	1.95
>+++ contrib/suse/openssh.spec	25 Jul 2011 21:45:39 -0000
>@@ -28,11 +28,12 @@
> # (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 @@
> /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
>Index: contrib/suse/rc.sshd
>===================================================================
>RCS file: /cvs/openssh/contrib/suse/rc.sshd,v
>retrieving revision 1.3
>diff -u -r1.3 rc.sshd
>--- contrib/suse/rc.sshd	3 Nov 2008 09:16:02 -0000	1.3
>+++ contrib/suse/rc.sshd	25 Jul 2011 21:45:39 -0000
>@@ -43,20 +43,8 @@
> 
> case "$1" in
>     start)
>-        if ! test -f /etc/ssh/ssh_host_key ; then
>-	    echo Generating /etc/ssh/ssh_host_key.
>-	    ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N ''
>-        fi
>-        if ! test -f /etc/ssh/ssh_host_dsa_key ; then
>-	    echo Generating /etc/ssh/ssh_host_dsa_key.
>-	    
>-	    ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
>-        fi
>-        if ! test -f /etc/ssh/ssh_host_rsa_key ; then
>-	    echo Generating /etc/ssh/ssh_host_rsa_key.
>-	    
>-	    ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
>-        fi
>+	# Generate any missing host keys
>+	ssh-keygen -A
> 	echo -n "Starting SSH daemon"
> 	## Start daemon with startproc(8). If this fails
> 	## the echo return value is set appropriate.

Actions: View | Diff

Attachments on bug 1920: 2068 | 2069