Pave the way for bits sharing with the upcoming ssh2-nox11 package.

2 files changed, 37 insertions, 14 deletions

diff --git a/security/ssh2/patches/patch-aa b/security/ssh2/patches/patch-aa
index 59a10bdfad5..33457f3d124 100644
--- a/security/ssh2/patches/patch-aa
+++ b/security/ssh2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/06 00:48:12 seb Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/10 10:02:35 seb Exp $
 
---- apps/ssh/Makefile.am.orig	Thu May 16 10:32:14 2002
+--- apps/ssh/Makefile.am.orig	2002-10-29 09:27:42.000000000 +0000
 +++ apps/ssh/Makefile.am
 @@ -18,7 +18,8 @@ WINCONF_OPTIONS = maintainer=sjl@ssh.com
  etcdir = @ETCDIR@
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/06 00:48:12 seb Exp $
  
  generate-host-key:
  	-@if test -f $(DESTDIR)$(etcdir)/hostkey; \
-@@ -593,17 +594,6 @@ generate-host-key:
+@@ -593,36 +594,20 @@ generate-host-key:
  	  fi
  
  install-symlinks:
@@ -48,7 +48,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/06 00:48:12 seb Exp $
  	(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) ssh-askpass2 ssh-askpass)
++	case x"@CONFPROGRAMS@" in 					\
++	x*askpass*)							\
++	(cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass) ;;	\
++	esac
+ 	(cd $(DESTDIR)$(bindir) && $(LN_S) ssh-keygen2 ssh-keygen)
+ 	(cd $(DESTDIR)$(bindir) && $(LN_S) scp2 scp)
+ 	(cd $(DESTDIR)$(bindir) && $(LN_S) sftp2 sftp)
  	(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)
@@ -64,7 +71,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/06 00:48:12 seb Exp $
  	(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:
+@@ -630,7 +615,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)
@@ -72,7 +79,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/06 00:48:12 seb Exp $
  	(cd $(DESTDIR)$(mandir)/man8 && $(LN_S) sshd2.8 sshd.8)
  
  clean-up-old:
-@@ -649,23 +630,13 @@ install-exec-hook:
+@@ -649,23 +633,13 @@ install-exec-hook:
  	-chown root $(DESTDIR)$(bindir)/ssh-signer2
  	-chmod $(SSH_SIGNER_INSTALL_MODE) $(DESTDIR)$(bindir)/ssh-signer2
  
@@ -101,7 +108,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/06 00:48:12 seb Exp $
  	 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
+@@ -678,8 +652,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 ;
diff --git a/security/ssh2/patches/patch-ab b/security/ssh2/patches/patch-ab
index af40be11ca3..4353a7df856 100644
--- a/security/ssh2/patches/patch-ab
+++ b/security/ssh2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
+$NetBSD: patch-ab,v 1.2 2003/05/10 10:02:35 seb Exp $
 
---- apps/ssh/Makefile.in.orig	Thu May 16 10:32:43 2002
+--- apps/ssh/Makefile.in.orig	2002-10-29 09:27:59.000000000 +0000
 +++ apps/ssh/Makefile.in
 @@ -124,7 +124,8 @@ WINCONF_OPTIONS = maintainer=sjl@ssh.com
  etcdir = @ETCDIR@
@@ -21,6 +21,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../sshconf.h
  CONFIG_CLEAN_FILES = 
+@@ -892,7 +895,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+ 	  awk '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
++	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+ 
+ mostlyclean-tags:
+ 
 @@ -1026,10 +1029,8 @@ maintainer-clean-generic clean mostlycle
  includes:
  
@@ -34,7 +43,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
  
  generate-host-key:
  	-@if test -f $(DESTDIR)$(etcdir)/hostkey; \
-@@ -1040,17 +1041,6 @@ generate-host-key:
+@@ -1040,36 +1041,20 @@ generate-host-key:
  	  fi
  
  install-symlinks:
@@ -52,7 +61,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
  	(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)
-@@ -1061,15 +1051,7 @@ install-symlinks:
+-	(cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass)
++	case x"@CONFPROGRAMS@" in 					\
++	x*askpass*)							\
++	(cd $(DESTDIR)$(bindir) && $(LN_S) ssh-askpass2 ssh-askpass) ;;	\
++	esac
+ 	(cd $(DESTDIR)$(bindir) && $(LN_S) ssh-keygen2 ssh-keygen)
+ 	(cd $(DESTDIR)$(bindir) && $(LN_S) scp2 scp)
+ 	(cd $(DESTDIR)$(bindir) && $(LN_S) sftp2 sftp)
  	(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)
@@ -68,7 +84,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
  	(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)
-@@ -1077,7 +1059,6 @@ install-symlinks:
+@@ -1077,7 +1062,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)
@@ -76,7 +92,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
  	(cd $(DESTDIR)$(mandir)/man8 && $(LN_S) sshd2.8 sshd.8)
  
  clean-up-old:
-@@ -1096,23 +1077,13 @@ install-exec-hook:
+@@ -1096,23 +1080,13 @@ install-exec-hook:
  	-chown root $(DESTDIR)$(bindir)/ssh-signer2
  	-chmod $(SSH_SIGNER_INSTALL_MODE) $(DESTDIR)$(bindir)/ssh-signer2
  
@@ -105,7 +121,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
  	 echo Updating $(DESTDIR)$(subconfig_dir)/host_ext.example ;
  	 $(INSTALL_DATA) $(srcdir)/subconfig/host_ext.example \
                           $(DESTDIR)$(subconfig_dir)/host_ext.example ;
-@@ -1125,11 +1096,9 @@ install-data-hook: make-install-dirs gen
+@@ -1125,11 +1099,9 @@ 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 ;