OpenSSH 2.4.0 patch call..

[Mo DeJong]

On Wed, 27 Dec 2000 mouring at etoh.eviladmin.org wrote:

> : Is there any undisputed patches still out not applied to the current
> : portable CVS tree?

I am still wondering about my patch to remove the fixpaths
perl script and replace it with a sed script (it fixes the build
under Cygwin). I am not sure if it is "undisputed" since I
don't remember hearing anything back. I have appended it
to this email in case it got lost in the shuffle.

Mo DeJong
Red Hat Inc

Index: Makefile.in
===================================================================
RCS file: /cvs/openssh_cvs/Makefile.in,v
retrieving revision 1.127
diff -u -r1.127 Makefile.in
--- Makefile.in	2000/12/27 05:44:51	1.127
+++ Makefile.in	2000/12/28 05:30:27
@@ -25,6 +25,7 @@
 RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 PERL=@PERL@
+SED=@SED@
 ENT=@ENT@
 XAUTH_PATH=@XAUTH_PATH@
 LDFLAGS=-L. @LDFLAGS@
@@ -50,20 +51,20 @@
 CONFIGFILES=sshd_config ssh_config primes
 
 PATHSUBS	= \
-	-D/etc/ssh_config=$(sysconfdir)/ssh_config \
-	-D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \
-	-D/etc/sshd_config=$(sysconfdir)/sshd_config \
-	-D/usr/libexec=$(libexecdir) \
-	-D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \
-	-D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key \
-	-D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \
-	-D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \
-	-D/var/run/sshd.pid=$(piddir)/sshd.pid \
-	-D/etc/primes=$(sysconfdir)/primes \
-	-D/etc/sshrc=$(sysconfdir)/sshrc \
-	-D/usr/X11R6/bin/xauth=$(XAUTH_PATH)
+	-e 's|/etc/ssh_config|$(sysconfdir)/ssh_config|g' \
+	-e 's|/etc/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
+	-e 's|/etc/sshd_config|$(sysconfdir)/sshd_config|g' \
+	-e 's|/usr/libexec|$(libexecdir)|g' \
+	-e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
+	-e 's|/etc/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
+	-e 's|/etc/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
+	-e 's|/etc/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
+	-e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
+	-e 's|/etc/primes|$(sysconfdir)/primes|g' \
+	-e 's|/etc/sshrc|$(sysconfdir)/sshrc|g' \
+	-e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g'
 
-FIXPATHSCMD	= $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
+FIXPATHSCMD	= $(SED) $(PATHSUBS)
 
 all: $(TARGETS) $(CONFIGFILES)
 
@@ -111,7 +112,7 @@
 	$(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh log-client.o $(LIBS)
 
 $(MANPAGES) $(CONFIGFILES)::
-	$(FIXPATHSCMD) $(srcdir)/$@
+	$(FIXPATHSCMD) $(srcdir)/$@ > $@.out
 
 clean:
 	rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
Index: configure.in
===================================================================
RCS file: /cvs/openssh_cvs/configure.in,v
retrieving revision 1.209
diff -u -r1.209 configure.in
--- configure.in	2000/12/28 00:07:07	1.209
+++ configure.in	2000/12/28 05:30:27
@@ -10,6 +10,7 @@
 AC_PROG_INSTALL
 AC_CHECK_PROG(AR, ar, ar)
 AC_PATH_PROG(PERL, perl)
+AC_PATH_PROG(SED, sed)
 AC_SUBST(PERL)
 AC_PATH_PROG(ENT, ent)
 AC_SUBST(ENT)