Update to version 2.1.0pl2.

PR:		18620
Submitted by:	maintainer

12 files changed, 119 insertions, 100 deletions

diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index e2d4d04..bf40269 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -4,19 +4,17 @@
 #
 # $FreeBSD$
 #
-# Maximal ssh2 package requires YES values for
-# WITH_SSH1, WITH_TCPWRAP
 
 PORTNAME=	ssh2
-PORTVERSION=	2.0.13
+PORTVERSION=	2.1.0p2
 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/
-DISTNAME=	ssh-2.0.13
+DISTNAME=	ssh-secure-shell-2.1.0-noncommercial
 
-PATCHFILES=	patch-${DISTNAME}-bsd.tty.chown
-PATCH_SITES=	http://www.ssh.org/patches/
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	ssh-2.1.0-patch1
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	issei@jp.FreeBSD.org
@@ -60,20 +58,22 @@ CONFIGURE_ARGS+= --with-libwrap="-L ${PREFIX}/lib -lwrap"
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
-MAN1=	ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 \
-	scp2.1 sftp2.1
+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=	ssh2.1 ssh.1 \
-	ssh-keygen2.1 ssh-keygen.1 \
+MLINKS=	scp2.1 scp.1 \
+	sftp2.1 sftp.1 \
 	ssh-add2.1 ssh-add.1 \
 	ssh-agent2.1 ssh-agent.1 \
-	scp2.1 scp.1 \
-	sftp2.1 sftp.1 \
+	ssh-keygen2.1 ssh-keygen.1 \
+	ssh-probe2.1 ssh-probe.1 \
+	ssh2.1 ssh.1  \
 	sshd2.8 sshd.8
 
-PORTDOCS=	CHANGES LICENSING README
-.if defined(WITHOUT_SSH1)
+PORTDOCS=	BUG.REPORT CHANGES FAQ INSTALL LICENSING README \
+		SSH2.QUICKSTART
+.if ${OSVERSION} >= 400016 || defined(WITHOUT_SSH1)
 PLIST=		${PKGDIR}/PLIST.ssh2_only
 .endif
 
@@ -83,7 +83,7 @@ post-patch:
 .endif
 
 post-install:
-.if !defined(WITHOUT_SSH1)
+.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
diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo
index d7dc52e..308b81f 100644
--- a/security/ssh2/distinfo
+++ b/security/ssh2/distinfo
@@ -1,2 +1,2 @@
-MD5 (ssh-2.0.13.tar.gz) = 1853aba4c7c9c501545c9e56a71fa9c3
-MD5 (patch-ssh-2.0.13-bsd.tty.chown) = 544cff13eff9d3fc54a5c65754726ee9
+MD5 (ssh-secure-shell-2.1.0-noncommercial.tar.gz) = adb4e460471a40cb3952a34864300ffc
+MD5 (ssh-2.1.0-patch1) = 5173fde1245c6d1a02d2e63c2250d5e6
diff --git a/security/ssh2/files/patch-aa b/security/ssh2/files/patch-aa
index 5c8beb2..0bb6079 100644
--- a/security/ssh2/files/patch-aa
+++ b/security/ssh2/files/patch-aa
@@ -1,31 +1,32 @@
---- lib/Makefile.in.orig	Tue May 11 17:35:00 1999
-+++ lib/Makefile.in	Fri Jun 18 16:01:12 1999
-@@ -99,14 +99,14 @@
+--- 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 @@
  
  AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies
  
--SUBDIRS = zlib sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession sshpgp
-+SUBDIRS = sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession sshpgp
+-SUBDIRS = sshutil zlib sshmath sshreadline sshapputil sshcrypt sshproto sshsession sshpgp sshfilexfer
++SUBDIRS = sshutil sshmath sshreadline sshapputil sshcrypt sshproto sshsession sshpgp sshfilexfer
  
- # sshtest testsuite
+ SUBDIRS_windelta = +win32
  
- lib_LIBRARIES = libssh.a
- # libsshcrypt.kpure.a
+@@ -114,7 +114,7 @@
+ # The `object_SUBLIBRARIES' variables are used on the Windows to
+ # expand the original library `object' with the listed sublibraries at
+ # the link step.
+-libssh_a_SUBLIBRARIES =  	sshcert/libsshcert.a				sshcrypt/libsshcrypt.a				sshexternalkey/libsshexternalkey.a		sshhs/libsshhs.a				sshhttp/libsshhttp.a				sshipsecappapi/libsshipsecappapi.a		sshisakmp/libsshisakmp.a			sshldap/libsshldap.a				sshmath/libsshmath.a				sshpgp/libsshpgp.a				sshproto/libsshproto.a				sshscard/libsshscard.a				sshtls/libsshtls.a				sshsmtp/libsshsmtp.a				sshemul/libsshemul.a				sshutil/libsshutil.a				sshfilexfer/libsshfilexfer.a			sshsession/libsshsession.a			trq/libtrq.a					zlib/libz.a
++libssh_a_SUBLIBRARIES =  	sshcert/libsshcert.a				sshcrypt/libsshcrypt.a				sshexternalkey/libsshexternalkey.a		sshhs/libsshhs.a				sshhttp/libsshhttp.a				sshipsecappapi/libsshipsecappapi.a		sshisakmp/libsshisakmp.a			sshldap/libsshldap.a				sshmath/libsshmath.a				sshpgp/libsshpgp.a				sshproto/libsshproto.a				sshscard/libsshscard.a				sshtls/libsshtls.a				sshsmtp/libsshsmtp.a				sshemul/libsshemul.a				sshutil/libsshutil.a				sshfilexfer/libsshfilexfer.a			sshsession/libsshsession.a			trq/libtrq.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 sshpgp/libsshpgp.a
-+SUBLIBRARIES = sshmath/libsshmath.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a sshpgp/libsshpgp.a
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../sshconf.h
- CONFIG_CLEAN_FILES = 
-@@ -369,11 +369,6 @@
- all-local: includes
- includes:
+@@ -314,11 +314,6 @@
+ 
+ local-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) ; \
+ 
+ includes: local-includes
+ 	for d in $(SUBDIRS); do (cd $$d && $(MAKE) includes); done
diff --git a/security/ssh2/files/patch-ab b/security/ssh2/files/patch-ab
index ef11a09..5653ffc 100644
--- a/security/ssh2/files/patch-ab
+++ b/security/ssh2/files/patch-ab
@@ -1,11 +1,11 @@
---- lib/sshapputil/Makefile.in.orig	Tue May 11 17:35:02 1999
-+++ lib/sshapputil/Makefile.in	Fri Jun 18 16:02:20 1999
-@@ -108,7 +108,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 = 
+--- 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 @@
+ 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_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
diff --git a/security/ssh2/files/patch-ac b/security/ssh2/files/patch-ac
index f16064c..f0f5548 100644
--- a/security/ssh2/files/patch-ac
+++ b/security/ssh2/files/patch-ac
@@ -1,10 +1,11 @@
---- lib/sshcrypt/Makefile.in.orig	Tue May 11 17:35:02 1999
-+++ lib/sshcrypt/Makefile.in	Fri Jun 18 16:02:38 1999
-@@ -179,7 +179,6 @@
- 	-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../trq -I$(srcdir)/../trq
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- 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 @@
+ 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_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
diff --git a/security/ssh2/files/patch-ad b/security/ssh2/files/patch-ad
index 529e845..f577701 100644
--- a/security/ssh2/files/patch-ad
+++ b/security/ssh2/files/patch-ad
@@ -1,10 +1,11 @@
---- lib/sshreadline/Makefile.in.orig	Tue May 11 17:35:03 1999
-+++ lib/sshreadline/Makefile.in	Fri Jun 18 16:02:51 1999
-@@ -108,7 +108,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
+--- 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 =
+ 
+-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
+ 
+ 
+ INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/lib/sshutil
diff --git a/security/ssh2/files/patch-af b/security/ssh2/files/patch-af
index 34dcb28..f052a83 100644
--- a/security/ssh2/files/patch-af
+++ b/security/ssh2/files/patch-af
@@ -1,15 +1,11 @@
---- apps/ssh/Makefile.in.orig	Tue May 11 17:35:06 1999
-+++ apps/ssh/Makefile.in	Fri Jun 18 16:04:37 1999
-@@ -140,9 +140,10 @@
+--- 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 @@
+ INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) 	   -I$(top_builddir) -I$(top_srcdir) 	   -I../../include -I$(srcdir)/../../include
  
- INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) \
- 	   -I$(top_builddir) -I$(top_srcdir) \
--	   -I../../include -I$(srcdir)/../../include
-+ 	   -I$(srcdir)/../../include -I${PREFIX}/include \
-+	   -I${PREFIX}/include
  
--LDADD = -L. -L../../lib -lssh2 -lssh
-+LDADD = -L. -L../../lib -lssh2 -lssh -lz
+-LDADD = @ssh2_ldadd_options@
++LDADD = @ssh2_ldadd_options@ -lz
  DEPENDENCIES = ./libssh2.a ../../lib/libssh.a
  
- libssh2_a_SOURCES = agentclient.c sshchagent.c sshserver.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 	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 2dc355e..5a02a56 100644
--- a/security/ssh2/files/patch-ag
+++ b/security/ssh2/files/patch-ag
@@ -1,6 +1,6 @@
---- configure.orig	Tue May 11 12:34:58 1999
-+++ configure	Fri Jun 18 23:36:10 1999
-@@ -5003,7 +5003,7 @@
+--- configure.orig	Wed May 17 18:01:34 2000
++++ configure	Wed May 17 18:10:35 2000
+@@ -5373,7 +5373,7 @@
  char tgetent();
  
  int main() {
@@ -8,8 +8,8 @@
 +XXXtgetent()
  ; return 0; }
  EOF
- if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-@@ -5033,7 +5033,7 @@
+ if { (eval echo configure:5380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -5497,7 +5497,7 @@
    echo "$ac_t""no" 1>&6
  fi
  
diff --git a/security/ssh2/files/patch-ah b/security/ssh2/files/patch-ah
index 4ed5807..e968267 100644
--- a/security/ssh2/files/patch-ah
+++ b/security/ssh2/files/patch-ah
@@ -1,6 +1,6 @@
---- apps/ssh/sshchsession.c.orig	Fri May  7 20:02:03 1999
-+++ apps/ssh/sshchsession.c	Sat Jun 19 03:51:31 1999
-@@ -81,6 +81,11 @@
+--- 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 @@
  #include <ulimit.h>
  #endif /* ULIMIT_H */
  
@@ -12,7 +12,7 @@
  #define SSH_DEBUG_MODULE "Ssh2ChannelSession"
  
  #define SSH_SESSION_INTERACTIVE_WINDOW                 10000
-@@ -406,6 +411,67 @@
+@@ -483,6 +488,67 @@
    if (getenv("TZ"))
      ssh_child_set_env(envp, envsizep, "TZ", getenv("TZ"));
  
@@ -80,7 +80,7 @@
    /* Set SSH_CLIENT. */
    snprintf(buf, sizeof(buf), "%s %s %s %s",
             session->common->remote_ip, session->common->remote_port,
-@@ -633,12 +699,20 @@
+@@ -710,12 +776,20 @@
    char buff[100], *time_string;
    
    /* Check /etc/nologin. */
@@ -101,7 +101,7 @@
        while (fgets(buf, sizeof(buf), f))
          fputs(buf, stderr);
        fclose(f);
-@@ -789,7 +863,11 @@
+@@ -878,7 +952,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 8488afb..022941d 100644
--- a/security/ssh2/files/patch-ai
+++ b/security/ssh2/files/patch-ai
@@ -1,6 +1,6 @@
---- lib/sshsession/sshunixuser.c.orig	Tue May  4 20:09:15 1999
-+++ lib/sshsession/sshunixuser.c	Fri Jun 18 16:18:08 1999
-@@ -56,6 +56,10 @@
+--- 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 @@
  
  #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. */
-@@ -776,6 +780,24 @@
+@@ -736,6 +740,24 @@
    /* Set uid, gid, and groups. */
    if (getuid() == UID_ROOT || geteuid() == UID_ROOT)
      { 
@@ -36,10 +36,10 @@
        if (setgid(ssh_user_gid(uc)) < 0)
          {
            SSH_DEBUG(2, ("ssh_user_become: setgid: %s", strerror(errno)));
-@@ -830,6 +852,7 @@
+@@ -773,6 +795,7 @@
+                         (int)ssh_user_uid(uc)));
            return FALSE;
          }
- #endif /* HAVE_SIA */
 +#endif /* HAVE_LOGIN_CAP_H */
      }
    
diff --git a/security/ssh2/files/patch-aj b/security/ssh2/files/patch-aj
new file mode 100644
index 0000000..29e5e47
--- /dev/null
+++ b/security/ssh2/files/patch-aj
@@ -0,0 +1,19 @@
+--- 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 @@
+ #define SSH_UID_ROOT 0
+ #endif /* SSH_UID_ROOT */
+ 
+-#ifdef SSHDIST_ZLIB
++#if defined(SSHDIST_ZLIB) && !defined(__FreeBSD__)
+ /* 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 @@
+ #define uLongf                  ssh_z_uLongf
+ #define voidpf                  ssh_z_voidpf
+ #define voidp                   ssh_z_voidp
+-#endif /* SSHDIST_ZLIB */
++#endif /* SSHDIST_ZLIB && !__FreeBSD__ */
+ 
+ #endif /* SSHINCLUDES_H */
diff --git a/security/ssh2/pkg-plist b/security/ssh2/pkg-plist
index 7de54e6..23ba35b 100644
--- a/security/ssh2/pkg-plist
+++ b/security/ssh2/pkg-plist
@@ -26,35 +26,36 @@ 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/ssh-dummy-shell
+bin/ssh-probe2
+bin/ssh-probe
 bin/ssh-signer2
 bin/ssh-signer
 etc/ssh2/ssh2_config
+etc/ssh2/ssh_dummy_shell.out
 etc/ssh2/sshd2_config
-man/man1/sftp.1.gz
 @exec mv %D/man/man1/ssh.1.gz %D/man/man1/ssh.old.1.gz
-man/man1/ssh.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
-man/man1/ssh-add.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
-man/man1/ssh-agent.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
-man/man1/ssh-keygen.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
-man/man1/scp.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
-man/man8/sshd.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/README
+share/doc/ssh2/SSH2.QUICKSTART
 @dirrm share/doc/ssh2
 @exec if [ ! -f %D/etc/ssh2/hostkey ]; then umask 022; echo "Generating 1024 bit host key."; %D/bin/ssh-keygen2 -P -b 1024 -t dsa -c "1024-bit dsa hostkey" -o %D/etc/ssh2/hostkey;  fi