1. Update base ssh2 version from 2.0.9 to 2.0.11

   Ssh 2.0.9 has bugs abount updating utmp/wtmp file.

2. Now you can compile ssh2 to support TCP_Wrapper
   (security/tcp_wrapper) when you define USE_TCPWRAP=YES

3. Fix typo in MASTER_SITES
   (Thanks to Chris Piazza <norn@home.net>)

4. Use /usr/lib/libz.so.* instead of libz in ssh2 source file.

5. Delete some obsolute pathes.

PR:		ports/8916
Submitted by:	issei@jp.FreeBSD.ORG

7 files changed, 79 insertions, 33 deletions

diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 9cbda58f77fe..12e8a8dc84b8 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,29 +1,24 @@
 # New ports collection makefile for:	ssh2
-# Version required:     2.0.9
+# Version required:     2.0.11
 # Date created:		5 Oct 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.73 1998/11/23 05:15:16 kuriyama Exp $
+# $Id: Makefile,v 1.74 1998/12/01 09:33:58 obrien Exp $
 #
 # Maximal ssh2 package requires YES values for
 # USE_SSH1, USE_TCPWRAP
 
-DISTNAME=       ssh-2.0.9
+DISTNAME=       ssh-2.0.11
 CATEGORIES=	security net
 MASTER_SITES=   ftp://ftp.cs.hut.fi/pub/ssh/ \
 		ftp://sunsite.unc.edu/pub/packages/security/ssh/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME}-configure-patch
-
 MAINTAINER=	issei@jp.FreeBSD.org
 
 RESTRICTED=	"Crypto; export-controlled"
 
 GNU_CONFIGURE=	YES
-MAKE_ENV=	SSH_SERVER_DIR="${PREFIX}/etc/ssh2" \
-		SSH_CLIENT_GLOBAL_CONFIG_FILE="${PREFIX}/etc/ssh2/ssh2_config"
 
 CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc
 #Uncomment if all your users are in their own group and their homedir
@@ -46,7 +41,7 @@ CONFIGURE_ARGS+= --with-tis
 .endif
 # Include tcp_wrappers support
 .if defined(USE_TCPWRAP) && ${USE_TCPWRAP} == YES
-CONFIGURE_ARGS+= --with-libwrap
+CONFIGURE_ARGS+= --with-libwrap="-L ${PREFIX}/lib -lwrap"
 LIB_DEPENDS+=   wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo
index 6cf128dcbb2e..683c2807e76a 100644
--- a/security/ssh2/distinfo
+++ b/security/ssh2/distinfo
@@ -1,2 +1 @@
-MD5 (ssh-2.0.9.tar.gz) = 745a65d3a7516979b003fe15d78d93d4
-MD5 (ssh-2.0.9-configure-patch) = b8a422c201500ff816483825c1152788
+MD5 (ssh-2.0.11.tar.gz) = 2c93c5fa0cb530178bee8675e92be785
diff --git a/security/ssh2/files/patch-aa b/security/ssh2/files/patch-aa
index 31fcb2311bb8..87e4f78e3908 100644
--- a/security/ssh2/files/patch-aa
+++ b/security/ssh2/files/patch-aa
@@ -1,10 +1,31 @@
---- apps/ssh/Makefile.in.old	Mon Oct  5 22:18:17 1998
-+++ apps/ssh/Makefile.in	Mon Oct  5 22:25:16 1998
-@@ -167,6 +167,7 @@
- # defines
+--- lib/Makefile.in.old	Tue Nov 24 18:18:33 1998
++++ lib/Makefile.in	Tue Nov 24 18:20:13 1998
+@@ -97,14 +97,14 @@
  
- SSH_DEFS = -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\"
-+SSH_DEFS+= -DSSH_SERVER_DIR=\"$(SSH_SERVER_DIR)\" -DSSH_CLIENT_GLOBAL_CONFIG_FILE=\"$(SSH_CLIENT_GLOBAL_CONFIG_FILE)\"
+ AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies
  
- COMPILE = $(CC) $(KERBEROS_INCS) $(INCLUDES) $(SSH_DEFS) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
+-SUBDIRS = zlib sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession
++SUBDIRS = sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession
+ 
+ # sshtest testsuite
+ 
+ lib_LIBRARIES = libssh.a
+ # libsshcrypt.kpure.a 
+ 
+-SUBLIBRARIES = sshmath/libsshmath.a zlib/libz.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a
++SUBLIBRARIES = sshmath/libsshmath.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../sshconf.h
+ CONFIG_CLEAN_FILES = 
+@@ -367,11 +367,6 @@
+ all-local: includes
+ includes:
+ 	-if test '!' -d ../include; then mkdir ../include; fi
+-	for i in zlib/zlib.h zlib/zconf.h; do   \
+-	  if test -f $(srcdir)/$$i; then		  \
+-	    $(COPY_INCLUDE) $(srcdir)/$$i ../include;	  \
+-	  fi;						  \
+-	done
+ 	-for dir in $(SUBDIRS); do \
+ 		if test "$$dir" != "zlib" && test "$$dir" != "gmp"; then \
+ 		  ( cd $$dir && $(MAKE) includes) ; \
diff --git a/security/ssh2/files/patch-ab b/security/ssh2/files/patch-ab
index f5d0d355ab77..b43c0324154b 100644
--- a/security/ssh2/files/patch-ab
+++ b/security/ssh2/files/patch-ab
@@ -1,15 +1,11 @@
-When you compile *.s with 'cc -pipe' on ELFed FreeBSD, it never ends.
-This patch is ugly hack to avoid the problem.
-
---- lib/sshmath/Makefile.in.old	Thu Oct  8 03:48:38 1998
-+++ lib/sshmath/Makefile.in	Thu Oct  8 03:49:32 1998
-@@ -383,8 +383,7 @@
- 
- .S.o:
- 	$(CPP) $(CPPFLAGS) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s
--	$(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s
--	mv tmp-$*.o $@
-+	$(AS) $(SFLAGS) -o $@ tmp-$*.s
- 	rm -f tmp-$*.s
- 
- includes:
+--- lib/sshapputil/Makefile.in.old	Tue Nov 24 18:24:57 1998
++++ lib/sshapputil/Makefile.in	Tue Nov 24 18:25:12 1998
+@@ -105,7 +105,7 @@
+ INCLUDES = -I../.. -I. -I$(srcdir) \
+ 	-I$(top_builddir) -I$(top_srcdir) \
+ 	-I../sshutil -I$(srcdir)/../sshutil -I../sshmath \
+-	-I$(srcdir)/../sshmath -I../zlib -I$(srcdir)/../zlib
++	-I$(srcdir)/../sshmath
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
+ CONFIG_CLEAN_FILES = 
diff --git a/security/ssh2/files/patch-ac b/security/ssh2/files/patch-ac
new file mode 100644
index 000000000000..371c450ac128
--- /dev/null
+++ b/security/ssh2/files/patch-ac
@@ -0,0 +1,11 @@
+--- lib/sshcrypt/Makefile.in.old	Tue Nov 24 18:24:57 1998
++++ lib/sshcrypt/Makefile.in	Tue Nov 24 18:25:21 1998
+@@ -173,7 +173,7 @@
+ INCLUDES = -I../.. -I. -I$(srcdir) \
+ 	-I$(top_builddir) -I$(top_srcdir) \
+ 	-I../sshutil -I$(srcdir)/../sshutil \
+-	-I../sshmath -I$(srcdir)/../sshmath -I../zlib -I$(srcdir)/../zlib \
++	-I../sshmath -I$(srcdir)/../sshmath \
+ 	-I../sshscard -I$(srcdir)/../sshscard \
+ 	-I../trq -I$(srcdir)/../trq
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/security/ssh2/files/patch-ad b/security/ssh2/files/patch-ad
new file mode 100644
index 000000000000..14996f2a3652
--- /dev/null
+++ b/security/ssh2/files/patch-ad
@@ -0,0 +1,10 @@
+--- lib/sshreadline/Makefile.in.old	Tue Nov 24 18:24:57 1998
++++ lib/sshreadline/Makefile.in	Tue Nov 24 18:25:27 1998
+@@ -106,7 +106,6 @@
+ INCLUDES = -I$(srcdir) -I. -I../.. \
+ 	-I$(top_builddir) -I$(top_srcdir) \
+ 	-I../sshmath -I$(srcdir)/../sshmath \
+-	-I../zlib -I$(srcdir)/../zlib \
+ 	-I../sshutil -I$(srcdir)/../sshutil
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
diff --git a/security/ssh2/files/patch-af b/security/ssh2/files/patch-af
new file mode 100644
index 000000000000..f522ea399d46
--- /dev/null
+++ b/security/ssh2/files/patch-af
@@ -0,0 +1,14 @@
+--- apps/ssh/Makefile.in.orig	Mon Nov 16 21:24:45 1998
++++ apps/ssh/Makefile.in	Tue Nov 24 19:06:58 1998
+@@ -133,9 +133,9 @@
+ 
+ INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) -I../../include \
+ 	   -I$(top_builddir) -I$(top_srcdir) \
+-	   -I$(srcdir)/../../include 
++	   -I$(srcdir)/../../include -I${PREFIX}/include
+ 
+-LDADD = -L. -L../../lib -lssh2 -lssh
++LDADD = -L. -L../../lib -lssh2 -lssh -lz
+ DEPENDENCIES = ./libssh2.a ../../lib/libssh.a
+ 
+ libssh2_a_SOURCES = agentclient.c sshchagent.c sshserver.c \