Upgrade to ssh-2.3.0.

PR:	ports/20869
Submitted by:	Issei Suzuki <issei@issei.org> (Maintainer)

15 files changed, 109 insertions, 152 deletions

diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 5a7403803a5a..002bf70252e9 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	ssh2
-PORTVERSION=	2.1.0p2
+PORTVERSION=	2.3.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cs.hut.fi/pub/ssh/ \
+MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/ \
 		ftp://sunsite.unc.edu/pub/packages/security/ssh/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/
-DISTNAME=	ssh-secure-shell-2.1.0-noncommercial
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	ssh-2.1.0-patch1
-PATCH_DIST_STRIP=	-p1
+DISTNAME=	ssh-${PORTVERSION}
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
@@ -23,34 +19,16 @@ RESTRICTED=	"Crypto; export-controlled"
 
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --enable-debug
+CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --disable-compiler-optimizations
 #Uncomment if all your users are in their own group and their homedir
 #is writeable by that group.  Beware the security implications!
 #CONFIGURE_ARGS+= --enable-group-writeability
 
 .include <bsd.port.pre.mk>
 
-# Don't support for ssh1 client backward compatibility
-#WITHOUT_SSH1=	yes
 # Include tcp_wrappers support (automaticlly YES if /usr/include/tcpd.h exists)
 #WITH_TCPWRAP=	yes
-# Warning: untested!
-# Include support for the TIS authentication server
-#WITH_TIS=	yes
-# Include support for the SecureID card
-#WITH_SECUREID=	yes
-
-.if ${OSVERSION} < 400016 && !defined(WITHOUT_SSH1)
-BUILD_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
-RUN_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
-.endif
 
-.if defined(WITH_SECUREID)
-CONFIGURE_ARGS+= --with-secureid
-.endif
-.if defined(WITH_TIS)
-CONFIGURE_ARGS+= --with-tis
-.endif
 .if exists(/usr/include/tcpd.h) && !defined(WITHOUT_TCPWRAP)
 CONFIGURE_ARGS+= --with-libwrap
 .elif defined(WITH_TCPWRAP)
@@ -58,38 +36,18 @@ CONFIGURE_ARGS+= --with-libwrap="-L ${PREFIX}/lib -lwrap"
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
-MAN1=	ssh-add2.1 ssh-agent2.1 scp2.1 sftp2.1 sshregex.1 ssh-probe2.1 \
-	ssh-dummy-shell.1 ssh-pubkeymgr.1 ssh2.1 ssh-keygen2.1
-MAN8=	sshd2.8
-
-MLINKS=	scp2.1 scp.1 \
-	sftp2.1 sftp.1 \
-	ssh-add2.1 ssh-add.1 \
-	ssh-agent2.1 ssh-agent.1 \
-	ssh-keygen2.1 ssh-keygen.1 \
-	ssh-probe2.1 ssh-probe.1 \
-	ssh2.1 ssh.1  \
-	sshd2.8 sshd.8
+MAN1=	scp.1 sftp.1 scp2.1 sftp2.1 sshregex.1 ssh-probe2.1 ssh-dummy-shell.1 \
+	ssh-pubkeymgr.1 ssh2.1 ssh-chrootmgr.1 ssh-agent.1 ssh-keygen.1 \
+	ssh-add.1 ssh-add2.1 ssh-agent2.1 ssh-keygen2.1
+MAN5=	ssh2_config.5 sshd2_config.5
+MAN8=	sshd.8 sshd2.8
 
-PORTDOCS=	BUG.REPORT CHANGES FAQ INSTALL LICENSING README \
+PORTDOCS=	BUG.REPORT CHANGES FAQ INSTALL LICENSE README \
 		SSH2.QUICKSTART
-.if ${OSVERSION} >= 400016 || defined(WITHOUT_SSH1)
-PLIST=		${PKGDIR}/PLIST.ssh2_only
-.endif
-
-.if exists(/usr/sbin/sshd)
-post-patch:
-	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/use-base-openssh.diff
-.endif
 
 post-install:
-.if ${OSVERSION} < 400016 && !defined(WITHOUT_SSH1)
-.for i in ssh ssh-keygen ssh-add ssh-agent scp
-	${MV} -f ${PREFIX}/man/man1/${i}.1${MAN_SUFX} ${PREFIX}/man/man1/${i}.old.1${MAN_SUFX}
-.endfor
-	${MV} -f ${PREFIX}/man/man8/sshd.8${MAN_SUFX} ${PREFIX}/man/man8/sshd.old.8${MAN_SUFX}
-.endif
-#
+	${RM} ${PREFIX}/man/man1/ssh.1
+	${RM} ${PREFIX}/man/man1/ssh-probe.1
 .if !defined(NOPORTDOCS)
 	-${MKDIR} ${PREFIX}/share/doc/ssh2
 .for i in ${PORTDOCS}
diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo
index 308b81f21049..451ca931e7e2 100644
--- a/security/ssh2/distinfo
+++ b/security/ssh2/distinfo
@@ -1,2 +1 @@
-MD5 (ssh-secure-shell-2.1.0-noncommercial.tar.gz) = adb4e460471a40cb3952a34864300ffc
-MD5 (ssh-2.1.0-patch1) = 5173fde1245c6d1a02d2e63c2250d5e6
+MD5 (ssh-2.3.0.tar.gz) = 2296fa2ad3474f117759f65678ce0e7a
diff --git a/security/ssh2/files/patch-aa b/security/ssh2/files/patch-aa
index 0bb60792b62b..04952646a288 100644
--- a/security/ssh2/files/patch-aa
+++ b/security/ssh2/files/patch-aa
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	Thu Mar 30 21:41:49 2000
-+++ lib/Makefile.in	Wed May 17 18:03:14 2000
-@@ -105,7 +105,7 @@
+--- lib/Makefile.in.orig	Thu Aug 24 17:41:39 2000
++++ lib/Makefile.in	Sun Aug 27 01:13:32 2000
+@@ -110,7 +110,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies
  
@@ -9,7 +9,7 @@
  
  SUBDIRS_windelta = +win32
  
-@@ -114,7 +114,7 @@
+@@ -119,7 +119,7 @@
  # The `object_SUBLIBRARIES' variables are used on the Windows to
  # expand the original library `object' with the listed sublibraries at
  # the link step.
@@ -18,7 +18,7 @@
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../sshconf.h
-@@ -314,11 +314,6 @@
+@@ -319,11 +319,6 @@
  
  local-includes:
  	-if test '!' -d ../include; then mkdir ../include; fi
diff --git a/security/ssh2/files/patch-ab b/security/ssh2/files/patch-ab
index 5653ffc956ad..9eb972a7fb37 100644
--- a/security/ssh2/files/patch-ab
+++ b/security/ssh2/files/patch-ab
@@ -1,11 +1,11 @@
---- lib/sshapputil/Makefile.in.orig	Thu Mar 30 21:41:53 2000
-+++ lib/sshapputil/Makefile.in	Wed May 17 18:04:39 2000
-@@ -120,7 +120,7 @@
+--- lib/sshapputil/Makefile.in.orig	Sun Aug 27 01:23:04 2000
++++ lib/sshapputil/Makefile.in	Sun Aug 27 01:23:41 2000
+@@ -128,7 +128,7 @@
  include_HEADERS = sshuserfile.h 		  sshuserfilebuf.h
  
  
--ADD_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
-+ADD_INCLUDES = -I../.. -I. -I$(srcdir) 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshutil -I$(srcdir)/../sshutil -I../sshmath 	-I$(srcdir)/../sshmath
+-INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
++INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
  
- 
- INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
diff --git a/security/ssh2/files/patch-ac b/security/ssh2/files/patch-ac
index f0f554875ad8..c8d3f8ea9655 100644
--- a/security/ssh2/files/patch-ac
+++ b/security/ssh2/files/patch-ac
@@ -1,11 +1,11 @@
---- lib/sshcrypt/Makefile.in.orig	Thu Mar 30 21:41:53 2000
-+++ lib/sshcrypt/Makefile.in	Wed May 17 18:05:36 2000
-@@ -140,7 +140,7 @@
+--- lib/sshcrypt/Makefile.in.orig	Thu Aug 24 17:41:49 2000
++++ lib/sshcrypt/Makefile.in	Sun Aug 27 01:15:02 2000
+@@ -149,7 +149,7 @@
  LDADD = libsshcrypt.a 	../sshutil/libsshutil.a ../sshmath/libsshmath.a
  
  
--ADD_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../sshscard -I$(srcdir)/../sshscard 	-I../sshexternalkey -I$(srcdir)/../sshexternalkey 	-I../trq -I$(srcdir)/../trq
-+ADD_INCLUDES = -I../.. -I. -I$(srcdir) 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshutil -I$(srcdir)/../sshutil 	-I../sshmath -I$(srcdir)/../sshmath 	-I../sshscard -I$(srcdir)/../sshscard 	-I../sshexternalkey -I$(srcdir)/../sshexternalkey 	-I../trq -I$(srcdir)/../trq
+-INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
++INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
  
- 
- INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
diff --git a/security/ssh2/files/patch-ad b/security/ssh2/files/patch-ad
index f577701a086e..43aca36d71b4 100644
--- a/security/ssh2/files/patch-ad
+++ b/security/ssh2/files/patch-ad
@@ -1,11 +1,11 @@
---- lib/sshreadline/Makefile.in.orig	Thu Mar 30 21:41:55 2000
-+++ lib/sshreadline/Makefile.in	Wed May 17 18:06:26 2000
-@@ -120,7 +120,7 @@
- include_HEADERS = sshreadline.h
- # noinst_HEADERS =
+--- lib/sshreadline/Makefile.in.orig	Thu Aug 24 17:41:51 2000
++++ lib/sshreadline/Makefile.in	Sun Aug 27 01:15:31 2000
+@@ -127,7 +127,7 @@
  
--ADD_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
-+ADD_INCLUDES = -I$(srcdir) -I. -I../.. 	-I$(top_builddir) -I$(top_srcdir) 	-I../sshmath -I$(srcdir)/../sshmath 	-I../sshutil -I$(srcdir)/../sshutil
+ include_HEADERS = sshreadline.h
  
+-INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
++INCLUDES = $(ADD_INCLUDES)  -I$(srcdir) -I.  -I$(top_builddir) -I$(top_srcdir)  -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer 
  
- INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../sshconf.h
diff --git a/security/ssh2/files/patch-af b/security/ssh2/files/patch-af
index f052a835c93c..981cd3e1550d 100644
--- a/security/ssh2/files/patch-af
+++ b/security/ssh2/files/patch-af
@@ -1,6 +1,6 @@
---- apps/ssh/Makefile.in.orig	Thu Mar 30 21:41:56 2000
-+++ apps/ssh/Makefile.in	Wed May 17 18:09:57 2000
-@@ -134,7 +134,7 @@
+--- apps/ssh/Makefile.in.orig	Thu Aug 24 17:41:55 2000
++++ apps/ssh/Makefile.in	Sun Aug 27 01:16:01 2000
+@@ -143,7 +143,7 @@
  INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) 	   -I$(top_builddir) -I$(top_srcdir) 	   -I../../include -I$(srcdir)/../../include
  
  
@@ -8,4 +8,4 @@
 +LDADD = @ssh2_ldadd_options@ -lz
  DEPENDENCIES = ./libssh2.a ../../lib/libssh.a
  
- libssh2_a_SOURCES =  	agentclient.c 	sshchagent.c 	sshserver.c 	agentpath.c 	sshchsession.c 	sshstdiofilter.c 	authc-passwd.c 	sshchssh1agent.c 	sshunixconfig.c 	authc-pubkey.c 	sshchtcpfwd.c 	sshunixuserfiles.c 	auths-passwd.c 	sshchx11.c 	sshuserfiles.c 	auths-pubkey.c 	sshclient.c 	sshcommon.c 	readpass.c 	sshconfig.c 	sshauthmethodc.c 	sshauthmethods.c 	sshglob.c 	auths-common.c 	sshttyflags.c 	auths-hostbased.c 	authc-hostbased.c 	auths-hostbased-rhosts.c 	ssh2pgppub.c 	ssh2pgpsec.c 	ssh2pgputil.c 	sshappcommon.c 	sshfilecopy.c 	sshgetcwd.c 	sshfc_conn.c 	sshfc_glob.c 	sshfc_transfer.c 	sshfc_recurse.c 	sshserverprobe.c 	ssh1encode.c 	ssh1keydecode.c
+ libssh2_a_SOURCES =  	agentclient.c 	sshchagent.c 	sshserver.c 	agentpath.c 	sshchsession.c 	sshstdiofilter.c 	authc-passwd.c 	sshchssh1agent.c 	sshunixconfig.c 	authc-pubkey.c 	sshchtcpfwd.c 	sshunixuserfiles.c 	auths-passwd.c 	sshchx11.c 	sshuserfiles.c 	auths-pubkey.c 	auths-kerberos.c 	authc-kerberos.c 	auths-kerberos-tgt.c 	authc-kerberos-tgt.c 	sshclient.c 	sshcommon.c 	readpass.c 	sshconfig.c 	sshauthmethodc.c 	sshauthmethods.c 	sshglob.c 	auths-common.c 	sshttyflags.c 	auths-hostbased.c 	authc-hostbased.c 	auths-hostbased-rhosts.c 	ssh2pgppub.c 	ssh2pgpsec.c 	ssh2pgputil.c 	sshappcommon.c 	sshfilecopy.c 	sshgetcwd.c 	sshfc_conn.c 	sshfc_glob.c 	sshfc_transfer.c 	sshfc_recurse.c 	sshserverprobe.c 	ssh1encode.c 	ssh1keydecode.c
diff --git a/security/ssh2/files/patch-ag b/security/ssh2/files/patch-ag
index 5a02a56effb1..144f9fb96f4c 100644
--- a/security/ssh2/files/patch-ag
+++ b/security/ssh2/files/patch-ag
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 17 18:01:34 2000
-+++ configure	Wed May 17 18:10:35 2000
-@@ -5373,7 +5373,7 @@
+--- configure.orig	Thu Aug 24 17:41:37 2000
++++ configure	Sun Aug 27 01:16:15 2000
+@@ -6021,7 +6021,7 @@
  char tgetent();
  
  int main() {
@@ -8,8 +8,8 @@
 +XXXtgetent()
  ; return 0; }
  EOF
- if { (eval echo configure:5380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -5497,7 +5497,7 @@
+ if { (eval echo configure:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -6145,7 +6145,7 @@
    echo "$ac_t""no" 1>&6
  fi
  
diff --git a/security/ssh2/files/patch-ah b/security/ssh2/files/patch-ah
index e968267ef800..5400ef05dd3f 100644
--- a/security/ssh2/files/patch-ah
+++ b/security/ssh2/files/patch-ah
@@ -1,6 +1,6 @@
---- apps/ssh/sshchsession.c.orig	Wed May 17 18:01:34 2000
-+++ apps/ssh/sshchsession.c	Wed May 17 18:11:14 2000
-@@ -77,6 +77,11 @@
+--- apps/ssh/sshchsession.c.orig	Thu Aug 24 17:40:41 2000
++++ apps/ssh/sshchsession.c	Sun Aug 27 01:16:55 2000
+@@ -83,6 +83,11 @@
  #include <ulimit.h>
  #endif /* ULIMIT_H */
  
@@ -12,7 +12,7 @@
  #define SSH_DEBUG_MODULE "Ssh2ChannelSession"
  
  #define SSH_SESSION_INTERACTIVE_WINDOW                 10000
-@@ -483,6 +488,67 @@
+@@ -489,6 +494,67 @@
    if (getenv("TZ"))
      ssh_child_set_env(envp, envsizep, "TZ", getenv("TZ"));
  
@@ -80,9 +80,9 @@
    /* Set SSH_CLIENT. */
    snprintf(buf, sizeof(buf), "%s %s %s %s",
             session->common->remote_ip, session->common->remote_port,
-@@ -710,12 +776,20 @@
+@@ -729,12 +795,20 @@
    char buff[100], *time_string;
-   
+ 
    /* Check /etc/nologin. */
 +#ifdef __FreeBSD__
 +  f = fopen("/var/run/nologin", "r");
@@ -101,7 +101,7 @@
        while (fgets(buf, sizeof(buf), f))
          fputs(buf, stderr);
        fclose(f);
-@@ -878,7 +952,11 @@
+@@ -918,7 +992,11 @@
                    {
                      struct stat mailbuf;
                      if (stat(mailbox, &mailbuf) == -1 || mailbuf.st_size == 0)
diff --git a/security/ssh2/files/patch-ai b/security/ssh2/files/patch-ai
index 022941dcb42f..4fdb60571ff5 100644
--- a/security/ssh2/files/patch-ai
+++ b/security/ssh2/files/patch-ai
@@ -1,6 +1,6 @@
---- lib/sshsession/sshunixuser.c.orig	Thu Mar 30 21:41:05 2000
-+++ lib/sshsession/sshunixuser.c	Wed May 17 18:15:10 2000
-@@ -55,6 +55,10 @@
+--- lib/sshsession/sshunixuser.c.orig	Thu Aug 24 17:40:39 2000
++++ lib/sshsession/sshunixuser.c	Sun Aug 27 01:21:57 2000
+@@ -86,6 +86,10 @@
  
  #define SSH_DEBUG_MODULE "SshUnixUser"
  
@@ -11,7 +11,7 @@
  extern char *crypt(const char *key, const char *salt);
  
  /* Data type to hold machine-specific user data. */
-@@ -736,6 +740,24 @@
+@@ -1224,6 +1228,24 @@
    /* Set uid, gid, and groups. */
    if (getuid() == UID_ROOT || geteuid() == UID_ROOT)
      { 
@@ -36,11 +36,11 @@
        if (setgid(ssh_user_gid(uc)) < 0)
          {
            SSH_DEBUG(2, ("ssh_user_become: setgid: %s", strerror(errno)));
-@@ -773,6 +795,7 @@
-                         (int)ssh_user_uid(uc)));
-           return FALSE;
+@@ -1280,6 +1302,7 @@
          }
+ #endif /* HAVE_SIA */
+ #endif /* SSHDIST_SESSION_SIA */
 +#endif /* HAVE_LOGIN_CAP_H */
      }
    
-   /* We are now running with the user's privileges. */
+ #ifdef KERBEROS
diff --git a/security/ssh2/files/patch-aj b/security/ssh2/files/patch-aj
index 29e5e4712619..444c68f3aff3 100644
--- a/security/ssh2/files/patch-aj
+++ b/security/ssh2/files/patch-aj
@@ -1,6 +1,6 @@
---- lib/sshutil/sshincludes.h.old	Wed May 17 18:39:44 2000
-+++ lib/sshutil/sshincludes.h	Wed May 17 18:40:19 2000
-@@ -166,7 +166,7 @@
+--- lib/sshutil/sshincludes.h.orig	Thu Aug 24 17:43:30 2000
++++ lib/sshutil/sshincludes.h	Sun Aug 27 01:22:27 2000
+@@ -213,7 +213,7 @@
  #define SSH_UID_ROOT 0
  #endif /* SSH_UID_ROOT */
  
@@ -9,7 +9,7 @@
  /* Define zlib to have ssh prefix, so we will not care if there is another zlib
     in the kernel */
  #define deflateInit_            ssh_z_deflateInit_
-@@ -202,6 +202,6 @@
+@@ -249,6 +249,6 @@
  #define uLongf                  ssh_z_uLongf
  #define voidpf                  ssh_z_voidpf
  #define voidp                   ssh_z_voidp
diff --git a/security/ssh2/files/patch-ak b/security/ssh2/files/patch-ak
new file mode 100644
index 000000000000..7d22a903f909
--- /dev/null
+++ b/security/ssh2/files/patch-ak
@@ -0,0 +1,13 @@
+--- apps/ssh/sshd2_config.orig	Sun Aug 27 02:30:53 2000
++++ apps/ssh/sshd2_config	Sun Aug 27 02:31:08 2000
+@@ -90,8 +90,8 @@
+ 
+ ## SSH1 compatibility
+ 
+-#	Ssh1Compatibility		<set by	configure by default>
+-#	Sshd1Path			<set by	configure by default>
++	Ssh1Compatibility		yes
++	Sshd1Path			/usr/sbin/sshd
+ 
+ 
+ ## Chrooted environment settings
diff --git a/security/ssh2/files/patch-al b/security/ssh2/files/patch-al
new file mode 100644
index 000000000000..31e6440ee067
--- /dev/null
+++ b/security/ssh2/files/patch-al
@@ -0,0 +1,10 @@
+--- apps/ssh/ssh2_config.orig	Sun Aug 27 02:30:11 2000
++++ apps/ssh/ssh2_config	Sun Aug 27 02:30:48 2000
+@@ -43,6 +43,7 @@
+ ## SSH1 Compatibility
+ 
+         Ssh1Compatibility               yes
++	Ssh1Path			/usr/bin/ssh
+ 	Ssh1AgentCompatibility		none
+ #	Ssh1AgentCompatibility		traditional
+ #	Ssh1AgentCompatibility		ssh2
diff --git a/security/ssh2/pkg-descr b/security/ssh2/pkg-descr
index c0b7a0dce270..339fa422e0b2 100644
--- a/security/ssh2/pkg-descr
+++ b/security/ssh2/pkg-descr
@@ -20,4 +20,4 @@ o Encryption and compression of data for security and speed.
 o Secure file transfer.
 o Tunneling and encryption of arbitrary connections.
 
-WWW: http://www.ssh.fi/
+WWW: http://www.ssh.com/
diff --git a/security/ssh2/pkg-plist b/security/ssh2/pkg-plist
index 23ba35b18863..9eddc45d1a10 100644
--- a/security/ssh2/pkg-plist
+++ b/security/ssh2/pkg-plist
@@ -1,60 +1,37 @@
 bin/ssh2
-@exec mv %D/bin/ssh %D/bin/ssh.old
-bin/ssh
-@unexec mv -f %B/%f.old %B/%f
 bin/scp2
-@exec mv %D/bin/scp %D/bin/scp.old
-bin/scp
-@unexec mv -f %B/%f.old %B/%f
 bin/sftp2
-bin/sftp
-bin/sftp-server2
-bin/sftp-server
 bin/ssh-agent2
-@exec mv %D/bin/ssh-agent %D/bin/ssh-agent.old
-bin/ssh-agent
-@unexec mv -f %B/%f.old %B/%f
 bin/ssh-keygen2
-@exec mv %D/bin/ssh-keygen %D/bin/ssh-keygen.old
-bin/ssh-keygen
-@unexec mv -f %B/%f.old %B/%f
 bin/ssh-add2
-@exec mv %D/bin/ssh-add %D/bin/ssh-add.old
-bin/ssh-add
-@unexec mv -f %B/%f.old %B/%f
+bin/ssh-signer2
+bin/ssh-probe2
 bin/ssh-askpass2
-@exec mv %D/bin/ssh-askpass %D/bin/ssh-askpass.old
-bin/ssh-askpass
-@unexec mv -f %B/%f.old %B/%f
+bin/sftp-server2
 bin/ssh-dummy-shell
-bin/ssh-probe2
-bin/ssh-probe
-bin/ssh-signer2
+bin/ssh-pubkeymgr
+bin/ssh-chrootmgr
+bin/ssh
+bin/ssh-agent
+bin/ssh-add
+bin/ssh-askpass
+bin/ssh-keygen
+bin/scp
+bin/sftp
+bin/sftp-server
 bin/ssh-signer
+bin/ssh-probe
+etc/rc.d/sshd.sh
+etc/ssh2/sshd2_config
 etc/ssh2/ssh2_config
 etc/ssh2/ssh_dummy_shell.out
-etc/ssh2/sshd2_config
-@exec mv %D/man/man1/ssh.1.gz %D/man/man1/ssh.old.1.gz
-@unexec mv -f %B/ssh.old.1.gz %B/%f
-@exec mv %D/man/man1/ssh-add.1.gz %D/man/man1/ssh-add.old.1.gz
-@unexec mv -f %B/ssh-add.old.1.gz %B/%f
-@exec mv %D/man/man1/ssh-agent.1.gz %D/man/man1/ssh-agent.old.1.gz
-@unexec mv -f %B/ssh-agent.old.1.gz %B/%f
-@exec mv %D/man/man1/ssh-keygen.1.gz %D/man/man1/ssh-keygen.old.1.gz
-@unexec mv -f %B/ssh-keygen.old.1.gz %B/%f
-@exec mv %D/man/man1/scp.1.gz %D/man/man1/scp.old.1.gz
-@unexec mv -f %B/scp.old.1.gz %B/%f
-@exec mv %D/man/man8/sshd.8.gz %D/man/man8/sshd.old.8.gz
-@unexec mv -f %B/sshd.old.8.gz %B/%f
 sbin/sshd2
-@exec mv %D/sbin/sshd %D/sbin/sshd.old
 sbin/sshd
-@unexec mv -f %B/%f.old %B/%f
 share/doc/ssh2/BUG.REPORT
 share/doc/ssh2/CHANGES
 share/doc/ssh2/FAQ
 share/doc/ssh2/INSTALL
-share/doc/ssh2/LICENSING
+share/doc/ssh2/LICENSE
 share/doc/ssh2/README
 share/doc/ssh2/SSH2.QUICKSTART
 @dirrm share/doc/ssh2