diff options
author | seb <seb@pkgsrc.org> | 2002-08-06 00:48:09 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2002-08-06 00:48:09 +0000 |
commit | 2291c3b2218c256a9036312072dc28a07488aa05 (patch) | |
tree | 34e3a477de4aab4902ee269f6eed200e48745134 /security/ssh2/patches/patch-aa | |
parent | 96a9db687e0ecc3fa91c07de7aa2d75c71df623e (diff) | |
download | pkgsrc-2291c3b2218c256a9036312072dc28a07488aa05.tar.gz |
Initial import of ssh version 2.3.0 into the NetBSD Packages Collection.
This package provides Secure Shell client and server for V.2 SSH protocol
from SSH Communications Security.
Based on PR 15358 from Greg A. Woods <woods@planix.com>.
Diffstat (limited to 'security/ssh2/patches/patch-aa')
-rw-r--r-- | security/ssh2/patches/patch-aa | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/security/ssh2/patches/patch-aa b/security/ssh2/patches/patch-aa new file mode 100644 index 00000000000..59a10bdfad5 --- /dev/null +++ b/security/ssh2/patches/patch-aa @@ -0,0 +1,114 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/08/06 00:48:12 seb Exp $ + +--- apps/ssh/Makefile.am.orig Thu May 16 10:32:14 2002 ++++ apps/ssh/Makefile.am +@@ -18,7 +18,8 @@ WINCONF_OPTIONS = maintainer=sjl@ssh.com + etcdir = @ETCDIR@ + known_hosts_dir = $(etcdir)/knownhosts + host_keys_dir = $(etcdir)/hostkeys +-subconfig_dir = $(etcdir)/subconfig ++egdir = $(prefix)/share/examples/${PKGBASE} ++subconfig_dir = $(egdir)/subconfig + STATIC_FLAG = @STATIC_FLAG@ + + # +@@ -576,13 +577,13 @@ COMPILE = $(CC) $(KERBEROS_INCS) $(INCLU + # + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) + # ++INSTALL_DATA_DIR= $(BSD_INSTALL_DATA_DIR) ++# + includes: + + make-install-dirs: +- -if test '!' -d $(DESTDIR)$(etcdir); then mkdir -p $(DESTDIR)$(etcdir); fi +- -if test '!' -d $(DESTDIR)$(known_hosts_dir); then mkdir -p $(DESTDIR)$(known_hosts_dir); fi +- -if test '!' -d $(DESTDIR)$(host_keys_dir); then mkdir -p $(DESTDIR)$(host_keys_dir); fi +- -if test '!' -d $(DESTDIR)$(subconfig_dir); then mkdir -p $(DESTDIR)$(subconfig_dir); fi ++ $(INSTALL_DATA_DIR) $(DESTDIR)$(egdir) ++ $(INSTALL_DATA_DIR) $(DESTDIR)$(subconfig_dir) + + generate-host-key: + -@if test -f $(DESTDIR)$(etcdir)/hostkey; \ +@@ -593,17 +594,6 @@ generate-host-key: + fi + + install-symlinks: +- -mv -f $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/ssh.old +- -mv -f $(DESTDIR)$(bindir)/ssh-agent $(DESTDIR)$(bindir)/ssh-agent.old +- -mv -f $(DESTDIR)$(bindir)/ssh-add $(DESTDIR)$(bindir)/ssh-add.old +- -mv -f $(DESTDIR)$(bindir)/ssh-askpass $(DESTDIR)$(bindir)/ssh-askpass.old +- -mv -f $(DESTDIR)$(bindir)/ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen.old +- -mv -f $(DESTDIR)$(bindir)/scp $(DESTDIR)$(bindir)/scp.old +- -mv -f $(DESTDIR)$(bindir)/sftp $(DESTDIR)$(bindir)/sftp.old +- -mv -f $(DESTDIR)$(bindir)/sftp-server $(DESTDIR)$(bindir)/sftp-server.old +- -mv -f $(DESTDIR)$(bindir)/ssh-signer $(DESTDIR)$(bindir)/ssh-signer.old +- -mv -f $(DESTDIR)$(bindir)/ssh-probe $(DESTDIR)$(bindir)/ssh-probe.old +- + (cd $(DESTDIR)$(bindir) && $(LN_S) ssh2 ssh) + (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-agent2 ssh-agent) + (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-add2 ssh-add) +@@ -614,15 +604,7 @@ install-symlinks: + (cd $(DESTDIR)$(bindir) && $(LN_S) sftp-server2 sftp-server) + (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-signer2 ssh-signer) + (cd $(DESTDIR)$(bindir) && $(LN_S) ssh-probe2 ssh-probe) +- -mv -f $(DESTDIR)$(sbindir)/sshd $(DESTDIR)$(sbindir)/sshd.old + (cd $(DESTDIR)$(sbindir) && $(LN_S) sshd2 sshd) +- -mv -f $(DESTDIR)$(mandir)/man1/ssh.1 $(DESTDIR)$(mandir)/man1/ssh.old.1 +- -mv -f $(DESTDIR)$(mandir)/man1/ssh-add.1 $(DESTDIR)$(mandir)/man1/ssh-add.old.1 +- -mv -f $(DESTDIR)$(mandir)/man1/ssh-agent.1 $(DESTDIR)$(mandir)/man1/ssh-agent.old.1 +- -mv -f $(DESTDIR)$(mandir)/man1/ssh-keygen.1 $(DESTDIR)$(mandir)/man1/ssh-keygen.old.1 +- -mv -f $(DESTDIR)$(mandir)/man1/scp.1 $(DESTDIR)$(mandir)/man1/scp.old.1 +- -mv -f $(DESTDIR)$(mandir)/man1/sftp.1 $(DESTDIR)$(mandir)/man1/sftp.old.1 +- -mv -f $(DESTDIR)$(mandir)/man1/ssh-probe.1 $(DESTDIR)$(mandir)/man1/ssh-probe.old.1 + (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh2.1 ssh.1) + (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-add2.1 ssh-add.1) + (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-agent2.1 ssh-agent.1) +@@ -630,7 +612,6 @@ install-symlinks: + (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) scp2.1 scp.1) + (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) sftp2.1 sftp.1) + (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) ssh-probe2.1 ssh-probe.1) +- -mv -f $(DESTDIR)$(mandir)/man8/sshd.8 $(DESTDIR)$(mandir)/man8/sshd.old.8 + (cd $(DESTDIR)$(mandir)/man8 && $(LN_S) sshd2.8 sshd.8) + + clean-up-old: +@@ -649,23 +630,13 @@ install-exec-hook: + -chown root $(DESTDIR)$(bindir)/ssh-signer2 + -chmod $(SSH_SIGNER_INSTALL_MODE) $(DESTDIR)$(bindir)/ssh-signer2 + +-install-data-hook: make-install-dirs generate-host-key install-symlinks +- -@if test '!' -f $(DESTDIR)$(etcdir)/sshd2_config ; then \ +- echo Installing $(DESTDIR)$(etcdir)/sshd2_config ; \ ++install-data-hook: make-install-dirs install-symlinks ++ echo Installing $(DESTDIR)$(egdir)/sshd2_config ; \ + $(INSTALL_DATA) $(srcdir)/sshd2_config \ +- $(DESTDIR)$(etcdir)/sshd2_config ; \ +- fi +- echo Updating $(DESTDIR)$(etcdir)/sshd2_config.example ; +- $(INSTALL_DATA) $(srcdir)/sshd2_config \ +- $(DESTDIR)$(etcdir)/sshd2_config.example ; +- -@if test '!' -f $(DESTDIR)$(etcdir)/ssh2_config ; then \ +- echo Installing $(DESTDIR)$(etcdir)/ssh2_config ; \ +- $(INSTALL_DATA) $(srcdir)/ssh2_config \ +- $(DESTDIR)$(etcdir)/ssh2_config ; \ +- fi +- echo Updating $(DESTDIR)$(etcdir)/ssh2_config.example ; ++ $(DESTDIR)$(egdir)/sshd2_config ; ++ echo Installing $(DESTDIR)$(egdir)/ssh2_config ; \ + $(INSTALL_DATA) $(srcdir)/ssh2_config \ +- $(DESTDIR)$(etcdir)/ssh2_config.example ; ++ $(DESTDIR)$(egdir)/ssh2_config ; + echo Updating $(DESTDIR)$(subconfig_dir)/host_ext.example ; + $(INSTALL_DATA) $(srcdir)/subconfig/host_ext.example \ + $(DESTDIR)$(subconfig_dir)/host_ext.example ; +@@ -678,8 +649,6 @@ install-data-hook: make-install-dirs gen + echo Updating $(DESTDIR)$(subconfig_dir)/user.example ; + $(INSTALL_DATA) $(srcdir)/subconfig/user.example \ + $(DESTDIR)$(subconfig_dir)/user.example ; +- -@if test '!' -f $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; then \ +- echo Installing $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \ ++ echo Installing $(DESTDIR)$(egdir)/ssh_dummy_shell.out ; \ + $(INSTALL_DATA) $(srcdir)/ssh_dummy_shell.out \ +- $(DESTDIR)$(etcdir)/ssh_dummy_shell.out ; \ +- fi ++ $(DESTDIR)$(egdir)/ssh_dummy_shell.out ; |