diff options
Diffstat (limited to 'security/openssh/patches/patch-ah')
| -rw-r--r-- | security/openssh/patches/patch-ah | 71 |
1 files changed, 29 insertions, 42 deletions
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah index c098575dec5..9e5a0d9afa8 100644 --- a/security/openssh/patches/patch-ah +++ b/security/openssh/patches/patch-ah @@ -1,60 +1,49 @@ -$NetBSD: patch-ah,v 1.9 2000/11/09 09:18:24 itojun Exp $ +$NetBSD: patch-ah,v 1.10 2001/02/20 16:33:14 itojun Exp $ -ssh-askpass: assumes NetBSD 1.5 path, could be wrong - ---- Makefile.in.orig Mon Nov 6 06:13:45 2000 -+++ Makefile.in Thu Nov 9 18:11:16 2000 -@@ -6,6 +6,7 @@ - mandir=@mandir@ - mansubdir=@mansubdir@ +--- Makefile.in.orig Mon Feb 19 04:13:33 2001 ++++ Makefile.in Wed Feb 21 01:28:06 2001 +@@ -10,2 +10,3 @@ sysconfdir=@sysconfdir@ -+examplesdir=@prefix@/share/examples/ssh ++examplesdir=@prefix@/share/examples/openssh piddir=@piddir@ - srcdir=@srcdir@ - top_srcdir=@top_srcdir@ -@@ -15,7 +16,7 @@ - VPATH=@srcdir@ - +@@ -17,3 +18,3 @@ SSH_PROGRAM=@bindir@/ssh -ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass +ASKPASS_PROGRAM=/usr/X11R6/bin/ssh-askpass - - CC=@CC@ - LD=@LD@ -@@ -119,7 +120,7 @@ - distprep: catman-do - autoreconf + SFTP_SERVER=$(libexecdir)/sftp-server +@@ -152,3 +153,3 @@ -install: manpages $(TARGETS) install-files host-key +install: manpages $(TARGETS) install-files - install-files: - $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -@@ -147,15 +148,15 @@ - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin -- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ -- $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ +@@ -161,2 +162,3 @@ + $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(examplesdir) + $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh +@@ -187,19 +189,7 @@ + fi +- if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ +- fi +- if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ -+ if [ ! -f $(DESTDIR)$(examplesdir)/ssh_config -a ! -f $(DESTDIR)$(examplesdir)/sshd_config ]; then \ -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(examplesdir); \ -+ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \ -+ $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \ - fi +- else \ +- echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ +- fi ++ $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \ ++ $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \ if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ -+ if [ ! -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds ] ; then \ -+ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \ - fi ; \ +- else \ +- echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ +- fi ; \ ++ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \ fi - -@@ -178,10 +179,10 @@ - $(srcdir)/ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" - +@@ -236,6 +226,6 @@ uninstallall: uninstall - -rm -f $(DESTDIR)$(sysconfdir)/ssh_config - -rm -f $(DESTDIR)$(sysconfdir)/sshd_config @@ -65,5 +54,3 @@ ssh-askpass: assumes NetBSD 1.5 path, could be wrong + -rm -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds + -rmdir $(DESTDIR)$(examplesdir) -rmdir $(DESTDIR)$(bindir) - -rmdir $(DESTDIR)$(sbindir) - -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1 |