From 2f09289e741582871ff068f8697b924a257fb703 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Mon, 29 Apr 2002 20:53:12 -0700
Subject: [PATCH] [contrib/caldera/openssh.spec] update fixUP to reflect
 changes in sshd_config. [contrib/cygwin/README] remove reference to regex.
 patch from Corinna Vinschen <vinschen@redhat.com>

---
 ChangeLog                    | 8 +++++++-
 contrib/caldera/openssh.spec | 6 +++---
 contrib/cygwin/README        | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da3c1e8da..96b4c63bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20020429
+ - (tim) [contrib/caldera/openssh.spec] update fixUP to reflect changes in
+   sshd_config.
+ - (tim) [contrib/cygwin/README] remove reference to regex.
+   patch from Corinna Vinschen <vinschen@redhat.com>
+
 20020426
  - (djm) Bug #137, #209: fix make problems for scard/Ssh.bin, do uudecode
    during distprep only
@@ -515,4 +521,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2088 2002/04/26 06:54:34 djm Exp $
+$Id: ChangeLog,v 1.2089 2002/04/30 03:53:12 tim Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index b34ff14f1..53c7397ab 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -93,7 +93,7 @@ mkdir -p $DESTDIR/{etc/pam.d,%{SVIcdir},%{SVIdir}}
 # enabling X11 forwarding on the server is convenient and okay,
 # on the client side we consider it a potential security risk!
 %{fixUP} -vT  $DESTDIR/etc/ssh/sshd_config -e '
-   s/X11Forwarding no/X11Forwarding yes/i'
+   s/#X11Forwarding no/X11Forwarding yes/i'
 
 install -m644 contrib/caldera/sshd.pam $DESTDIR/etc/pam.d/sshd
 # FIXME: disabled, find out why this doesn't work with NIS
@@ -171,7 +171,7 @@ EOF
 if [ -x %{LSBinit}-install ]; then
   %{LSBinit}-install sshd
 else
-  lisa --SysV-init install sshd S55 3:4:5 K45 0:1:2:6
+  lisa --SysV-init install sshd S55 2:3:4:5 K45 0:1:6
 fi
 
 ! %{SVIdir}/sshd status || %{SVIdir}/sshd restart
@@ -224,4 +224,4 @@ by Jim Knoble <jmknoble@pobox.com>.
 %ChangeLog
 * Mon Jan 01 1998 ...
 
-$Id: openssh.spec,v 1.28 2002/04/23 11:15:32 djm Exp $
+$Id: openssh.spec,v 1.29 2002/04/30 03:53:13 tim Exp $
diff --git a/contrib/cygwin/README b/contrib/cygwin/README
index 60d391691..9021ba2b0 100644
--- a/contrib/cygwin/README
+++ b/contrib/cygwin/README
@@ -172,8 +172,8 @@ configure are used for the Cygwin binary distribution:
 	--sysconfdir=/etc \
 	--libexecdir='${exec_prefix}/sbin'
 
-You must have installed the zlib, openssl and regex packages to
-be able to build OpenSSH!
+You must have installed the zlib and openssl packages to be able to
+build OpenSSH!
 
 Please send requests, error reports etc. to cygwin@cygwin.com.