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 @@
    - markus@cvs.openbsd.org 2005/03/14 11:46:56
      [buffer.c buffer.h channels.c]
      limit input buffer size for channels; bugzilla #896; with and ok dtucker@
+ - (tim) [contrib/caldera/openssh.spec] links in rc?.d were getting trashed
+   with a rpm -F
 
 20050313
  - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the
@@ -2362,4 +2364,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3719 2005/03/14 12:24:43 dtucker Exp $
+$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 @@
   %define cvs           %{nil}
   %define release       1
 %else
-  %define version       3.9p1
-  %define cvs           cvs20011009
+  %define version       4.0p1
+  %define cvs           cvs20050315
   %define release       0r1
 %endif
 %define xsa             x11-ssh-askpass         
@@ -297,12 +297,7 @@ fi
 
 %PreUn server
 [ "$1" = 0 ] || exit 0
-
 ! %{SVIdir}/sshd status || %{SVIdir}/sshd stop
-: # to protect the rpm database
-
-
-%PostUn server
 if [ -x %{LSBinit}-remove ]; then
   %{LSBinit}-remove sshd
 else
@@ -310,7 +305,6 @@ else
 fi
 : # to protect the rpm database
 
-
 %Files 
 %defattr(-,root,root)
 %dir %{_sysconfdir}
@@ -363,4 +357,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.52 2005/03/09 00:02:42 djm Exp $
+$Id: openssh.spec,v 1.53 2005/03/15 01:24:51 tim Exp $