summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--contrib/caldera/openssh.spec12
2 files changed, 6 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d004007b..4095d6071 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
28 - markus@cvs.openbsd.org 2005/03/14 11:46:56 28 - markus@cvs.openbsd.org 2005/03/14 11:46:56
29 [buffer.c buffer.h channels.c] 29 [buffer.c buffer.h channels.c]
30 limit input buffer size for channels; bugzilla #896; with and ok dtucker@ 30 limit input buffer size for channels; bugzilla #896; with and ok dtucker@
31 - (tim) [contrib/caldera/openssh.spec] links in rc?.d were getting trashed
32 with a rpm -F
31 33
3220050313 3420050313
33 - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the 35 - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the
@@ -2362,4 +2364,4 @@
2362 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2364 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2363 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2365 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2364 2366
2365$Id: ChangeLog,v 1.3719 2005/03/14 12:24:43 dtucker Exp $ 2367$Id: ChangeLog,v 1.3720 2005/03/15 01:24:51 tim Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 67d8e6ff4..b04562dc8 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -21,8 +21,8 @@
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.0p1
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
306if [ -x %{LSBinit}-remove ]; then 301if [ -x %{LSBinit}-remove ]; then
307 %{LSBinit}-remove sshd 302 %{LSBinit}-remove sshd
308else 303else
@@ -310,7 +305,6 @@ else
310fi 305fi
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 ...
364Template Version: 1.31 358Template 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.53 2005/03/15 01:24:51 tim Exp $