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

6 files changed, 139 insertions, 96 deletions

diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 382c996662d..93d840d5dfd 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,84 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/10 10:02:34 seb Exp $
 #
 
-DISTNAME=	ssh-3.2.2
 PKGNAME=	${DISTNAME:C/ssh-/ssh2-/}
-CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/
+COMMENT=        Secure Shell client and server for V.2 SSH protocol
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.ssh.com
-COMMENT=	Secure Shell client and server for V.2 SSH protocol
+CONFLICTS=	ssh2-nox11-[0-9]*
 
-CONFLICTS=	openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
-
-USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
 USE_X11=		YES
-GNU_CONFIGURE=		YES
-
-BUILD_DEFS+=		USE_INET6
-
-CRYPTO=			YES
-PKG_SYSCONFSUBDIR=	ssh2
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS:M*BSD} == "") && (${OPSYS} != "Linux")
-LICENSE=		no-commercial-use
-.endif
-
-SSH_PID_DIR=		/var/run	# default directory for PID files
-SSH_PID_DIR.SunOS=      /etc		# Solaris doesn't have a /var/run
-
-.if defined(SSH_PID_DIR.${OPSYS})
-SSH_PID_DIR=		${SSH_PID_DIR.${OPSYS}}
-.endif
-
-CONFIGURE_ARGS+=	--without-daemonpam --without-clientpam
-CONFIGURE_ARGS+=	--without-ssh-agent1-compat
-CONFIGURE_ARGS+=	--without-ssh1-compat
-CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers}
-CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR}
-
-# Setting FOREIGN_ETCDIR to PKG_SYSCONFBASE may seem stupid
-# if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm...
-#
-CONFIGURE_ARGS+=	--with-foreign-etcdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
-
-MAKE_ENV+=		PKGBASE=${PKGBASE}
-
-RCD_SCRIPTS=		ssh2_secure_shell
-
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-EGFILES=		ext_authorization_example.sh \
-			kbdint_plugin_example.sh
-
-CONFS=			sshd2_config ssh2_config ssh_dummy_shell.out
-CONF_FILES=		# empty
-.for FILE in ${CONFS}
-CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
-.endfor
-FILES_SUBST=		SSH_PID_DIR=${SSH_PID_DIR}
-
-OWN_DIRS=		${PKG_SYSCONFDIR}/knownhosts
-OWN_DIRS+=		${PKG_SYSCONFDIR}/hostkeys
-
-DOCSDIR=		${PREFIX}/share/doc/${PKGBASE}
-DOCS=			CHANGES FAQ HOWTO.anonymous.sftp INSTALL LICENSE \
-			NEWS README REGEX-SYNTAX SSH2.QUICKSTART \
-			RFC.authorization_program_protocol \
-			RFC.kbdint_plugin_protocol
-
-post-install:
-	${INSTALL_DATA_DIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-.for FILE in ${EGFILES}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${EGDIR}
-.endfor
+CONFIGURE_ARGS+=	--with-x	# be explicit
 
-.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../security/ssh2/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common
new file mode 100644
index 00000000000..f792ecd7511
--- /dev/null
+++ b/security/ssh2/Makefile.common
@@ -0,0 +1,91 @@
+# $NetBSD: Makefile.common,v 1.1 2003/05/10 10:02:34 seb Exp $
+#
+
+DISTNAME=	ssh-3.2.2
+CATEGORIES=	security
+MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.ssh.com
+
+CONFLICTS+=	openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
+
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+GNU_CONFIGURE=		YES
+
+BUILD_DEFS+=		USE_INET6
+
+CRYPTO=			YES
+PKG_SYSCONFSUBDIR=	ssh2
+
+DISTINFO_FILE=		${.CURDIR}/../../security/ssh2/distinfo
+PATCHDIR=		${.CURDIR}/../../security/ssh2/patches
+FILESDIR=		${.CURDIR}/../../security/ssh2/files
+PLIST_SRC=		${.CURDIR}/../../security/ssh2/PLIST
+
+.if defined(USE_X11)
+PLIST_SUBST+=	X11_SUPPORT=
+.else
+PLIST_SUBST=	X11_SUPPORT='@comment '
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS:M*BSD} == "") && (${OPSYS} != "Linux")
+LICENSE=		no-commercial-use
+.endif
+
+SSH_PID_DIR=		/var/run	# default directory for PID files
+SSH_PID_DIR.SunOS=      /etc		# Solaris doesn't have a /var/run
+
+.if defined(SSH_PID_DIR.${OPSYS})
+SSH_PID_DIR=		${SSH_PID_DIR.${OPSYS}}
+.endif
+
+CONFIGURE_ARGS+=	--without-daemonpam --without-clientpam
+CONFIGURE_ARGS+=	--without-ssh-agent1-compat
+CONFIGURE_ARGS+=	--without-ssh1-compat
+CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers}
+CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR}
+
+# Setting FOREIGN_ETCDIR to PKG_SYSCONFBASE may seem stupid
+# if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm...
+#
+CONFIGURE_ARGS+=	--with-foreign-etcdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+
+MAKE_ENV+=		PKGBASE=${PKGBASE}
+
+RCD_SCRIPTS=		ssh2_secure_shell
+
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+EGFILES=		ext_authorization_example.sh \
+			kbdint_plugin_example.sh
+
+CONFS=			sshd2_config ssh2_config ssh_dummy_shell.out
+CONF_FILES=		# empty
+.for FILE in ${CONFS}
+CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+.endfor
+FILES_SUBST=		SSH_PID_DIR=${SSH_PID_DIR}
+
+OWN_DIRS=		${PKG_SYSCONFDIR}/knownhosts
+OWN_DIRS+=		${PKG_SYSCONFDIR}/hostkeys
+
+DOCSDIR=		${PREFIX}/share/doc/${PKGBASE}
+DOCS=			CHANGES FAQ HOWTO.anonymous.sftp INSTALL LICENSE \
+			NEWS README REGEX-SYNTAX SSH2.QUICKSTART \
+			RFC.authorization_program_protocol \
+			RFC.kbdint_plugin_protocol
+
+post-install:
+	${INSTALL_DATA_DIR} ${DOCSDIR}
+.for FILE in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.endfor
+.for FILE in ${EGFILES}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${EGDIR}
+.endfor
+
+.include "../../security/tcp_wrappers/buildlink2.mk"
diff --git a/security/ssh2/PLIST b/security/ssh2/PLIST
index 0dc24415b4c..16622fb2113 100644
--- a/security/ssh2/PLIST
+++ b/security/ssh2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/06 00:48:10 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/10 10:02:34 seb Exp $
 bin/scp
 bin/scp2
 bin/sftp
@@ -10,8 +10,8 @@ bin/ssh-add
 bin/ssh-add2
 bin/ssh-agent
 bin/ssh-agent2
-bin/ssh-askpass
-bin/ssh-askpass2
+${X11_SUPPORT}bin/ssh-askpass
+${X11_SUPPORT}bin/ssh-askpass2
 bin/ssh-chrootmgr
 bin/ssh-dummy-shell
 bin/ssh-keygen
diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo
index 40082254fac..1d6c8cf6b07 100644
--- a/security/ssh2/distinfo
+++ b/security/ssh2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2003/01/12 15:15:51 seb Exp $
+$NetBSD: distinfo,v 1.4 2003/05/10 10:02:34 seb Exp $
 
 SHA1 (ssh-3.2.2.tar.gz) = 19e8c9857d0fc14771c31223249eb56adb5ddf6b
 Size (ssh-3.2.2.tar.gz) = 2256690 bytes
-SHA1 (patch-aa) = eeec9d05b2360fe971a397cf53795caf3fd47bfb
-SHA1 (patch-ab) = 5e4d66e3f8f3f13c9f3926d181e2a1a568c20b4b
+SHA1 (patch-aa) = 7781e4c7a567f6465829cdf9026920e45241bca5
+SHA1 (patch-ab) = 450267a0f18684f0b8f8ff611e290a8f478068ad
 SHA1 (patch-ac) = b87e967252b1eaafc6e6b7ee95d8e09550957bff
 SHA1 (patch-ad) = b6944222c0b84d5f906ad019b5260fb19ee299d9
 SHA1 (patch-ae) = 79288d501031c56fd155f966c905de2e4f5ffc35
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 ;