diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /contrib/caldera/openssh.spec | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'contrib/caldera/openssh.spec')
-rw-r--r-- | contrib/caldera/openssh.spec | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 67d8e6ff4..bfde0fefc 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -17,12 +17,12 @@ | |||
17 | #old cvs stuff. please update before use. may be deprecated. | 17 | #old cvs stuff. please update before use. may be deprecated. |
18 | %define use_stable 1 | 18 | %define use_stable 1 |
19 | %if %{use_stable} | 19 | %if %{use_stable} |
20 | %define version 4.0p1 | 20 | %define version 4.2p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
23 | %else | 23 | %else |
24 | %define version 3.9p1 | 24 | %define version 4.1p1 |
25 | %define cvs cvs20011009 | 25 | %define cvs cvs20050315 |
26 | %define release 0r1 | 26 | %define release 0r1 |
27 | %endif | 27 | %endif |
28 | %define xsa x11-ssh-askpass | 28 | %define xsa x11-ssh-askpass |
@@ -297,12 +297,7 @@ fi | |||
297 | 297 | ||
298 | %PreUn server | 298 | %PreUn server |
299 | [ "$1" = 0 ] || exit 0 | 299 | [ "$1" = 0 ] || exit 0 |
300 | |||
301 | ! %{SVIdir}/sshd status || %{SVIdir}/sshd stop | 300 | ! %{SVIdir}/sshd status || %{SVIdir}/sshd stop |
302 | : # to protect the rpm database | ||
303 | |||
304 | |||
305 | %PostUn server | ||
306 | if [ -x %{LSBinit}-remove ]; then | 301 | if [ -x %{LSBinit}-remove ]; then |
307 | %{LSBinit}-remove sshd | 302 | %{LSBinit}-remove sshd |
308 | else | 303 | else |
@@ -310,7 +305,6 @@ else | |||
310 | fi | 305 | fi |
311 | : # to protect the rpm database | 306 | : # to protect the rpm database |
312 | 307 | ||
313 | |||
314 | %Files | 308 | %Files |
315 | %defattr(-,root,root) | 309 | %defattr(-,root,root) |
316 | %dir %{_sysconfdir} | 310 | %dir %{_sysconfdir} |
@@ -363,4 +357,4 @@ fi | |||
363 | * Mon Jan 01 1998 ... | 357 | * Mon Jan 01 1998 ... |
364 | Template Version: 1.31 | 358 | Template Version: 1.31 |
365 | 359 | ||
366 | $Id: openssh.spec,v 1.52 2005/03/09 00:02:42 djm Exp $ | 360 | $Id: openssh.spec,v 1.55 2005/09/01 09:10:49 djm Exp $ |