diff options
Diffstat (limited to 'security/openssh/patches/patch-ah')
| -rw-r--r-- | security/openssh/patches/patch-ah | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah index 0649063bd76..c15b1b265ae 100644 --- a/security/openssh/patches/patch-ah +++ b/security/openssh/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.4 2000/03/27 00:59:13 fredb Exp $ +$NetBSD: patch-ah,v 1.5 2000/05/31 15:32:44 itojun Exp $ ---- Makefile.in.orig Thu Mar 16 08:48:26 2000 -+++ Makefile.in Sun Mar 26 23:19:20 2000 +--- Makefile.in.orig Sat May 20 14:33:44 2000 ++++ Makefile.in Wed May 31 18:55:11 2000 @@ -6,6 +6,7 @@ mandir=@mandir@ mansubdir=@mansubdir@ @@ -10,29 +10,37 @@ $NetBSD: patch-ah,v 1.4 2000/03/27 00:59:13 fredb Exp $ piddir=@piddir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ -@@ -118,19 +119,19 @@ +@@ -131,14 +132,14 @@ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ -- $(INSTALL) -d $(DESTDIR)$(sysconfdir); \ +- ./mkinstalldirs $(DESTDIR)$(sysconfdir); \ - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ + if [ ! -f $(DESTDIR)$(examplesdir)/ssh_config -a ! -f $(DESTDIR)$(examplesdir)/sshd_config ]; then \ -+ $(INSTALL) -d $(DESTDIR)$(examplesdir); \ ++ ./mkinstalldirs $(DESTDIR)$(examplesdir); \ + $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \ + $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \ fi + if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ + $(PERL) fixprogs ssh_prng_cmds $(ENT); \ +- $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ ++ $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \ + fi host-key: ssh-keygen - ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N '' +@@ -146,10 +147,10 @@ + ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N "" uninstallall: uninstall - -rm -f $(DESTDIR)$(sysconfdir)/ssh_config - -rm -f $(DESTDIR)$(sysconfdir)/sshd_config +- -rm -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds - -rmdir $(DESTDIR)$(sysconfdir) + -rm -f $(DESTDIR)$(examplesdir)/ssh_config + -rm -f $(DESTDIR)$(examplesdir)/sshd_config ++ -rm -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds + -rmdir $(DESTDIR)$(examplesdir) -rmdir $(DESTDIR)$(bindir) -rmdir $(DESTDIR)$(sbindir) |