diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /contrib/suse/openssh.spec | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'contrib/suse/openssh.spec')
-rw-r--r-- | contrib/suse/openssh.spec | 18 |
1 files changed, 6 insertions, 12 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 | ||
14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
15 | Name: openssh | 15 | Name: openssh |
16 | Version: 5.8p1 | 16 | Version: 5.9p1 |
17 | URL: http://www.openssh.com/ | 17 | URL: http://www.openssh.com/ |
18 | Release: 1 | 18 | Release: 1 |
19 | Source0: openssh-%{version}.tar.gz | 19 | Source0: 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 | # |
34 | BuildPrereq: openssl | 34 | BuildPrereq: openssl |
35 | BuildPrereq: nkitb | 35 | BuildPrereq: tcpd-devel |
36 | BuildPrereq: 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 |
180 | if [ ! -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 | ||
183 | fi | ||
184 | if [ ! -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 | ||
187 | fi | ||
188 | %{fillup_and_insserv -n -s -y ssh sshd START_SSHD} | ||
189 | %run_permissions | 183 | %run_permissions |
190 | 184 | ||
191 | %verifyscript | 185 | %verifyscript |