upgrade to 2.1.1p1 from portable openssh distribution.

--- changelog from 2.1.0p3:

20000609
 - (djm) Patch from Kenji Miyake <kenji@miyake.org> to disable utmp usage
   (in favour of utmpx) on Solaris 8

20000606
 - (djm) Cleanup of entropy.c. Reorganised code, removed second pass through
   list of commands (by default). Removed verbose debugging (by default).
 - (djm) Increased command entropy estimates and default entropy collection
   timeout
 - (djm) Remove duplicate headers from loginrec.c
 - (djm) Don't add /usr/local/lib to library search path on Irix
 - (djm) Fix rsh path in RPMs. Report from Jason L Tibbitts III
   <tibbs@math.uh.edu>
 - (djm) Warn user if grabs fail in GNOME askpass. Patch from Zack Weinberg
   <zack@wolery.cumb.org>
 - (djm) OpenBSD CVS updates:
  - todd@cvs.openbsd.org
    [sshconnect2.c]
    teach protocol v2 to count login failures properly and also enable an
    explanation of why the password prompt comes up again like v1; this is NOT
    crypto
  - markus@cvs.openbsd.org
    [readconf.c readconf.h servconf.c servconf.h session.c ssh.1 ssh.c sshd.8]
    xauth_location support; pr 1234
    [readconf.c sshconnect2.c]
    typo, unused
    [session.c]
    allow use_login only for login sessions, otherwise remote commands are
    execed with uid==0
    [sshd.8]
    document UseLogin better
    [version.h]
    OpenSSH 2.1.1
    [auth-rsa.c]
    fix match_hostname() logic for auth-rsa: deny access if we have a
    negative match or no match at all
    [channels.c hostfile.c match.c]
    don't panic if mkdtemp fails for authfwd; jkb@yahoo-inc.com via
    kris@FreeBSD.org

20000606
 - (djm) Added --with-cflags, --with-ldflags and --with-libs options to
   configure.

20000604
 - Configure tweaking for new login code on Irix 5.3
 - (andre) login code changes based on djm feedback

20000603
 - (andre) New login code
    - Remove bsd-login.[ch] and all the OpenBSD-derived code in login.c
    - Add loginrec.[ch], logintest.c and autoconf code

20000531
 - Cleanup of auth.c, login.c and fake-*
 - Cleanup of auth-pam.c, save and print "account expired" error messages
 - Fix EGD read bug by IWAMURO Motonori <iwa@mmp.fujitsu.co.jp>
 - Rewrote bsd-login to use proper utmp API if available. Major cleanup
   of fallback DIY code.

5 files changed, 12 insertions, 58 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 77234834f1e..d6cd02ca5a8 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2000/05/31 15:32:44 itojun Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/15 04:56:50 itojun Exp $
 #
 
-DISTNAME=		openssh-2.1.0p3
+DISTNAME=		openssh-2.1.1p1
 CATEGORIES=		security
 MASTER_SITES=		http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \
 			http://www.firedrake.org/openssh/files/ \
diff --git a/security/openssh/files/md5 b/security/openssh/files/md5
index 01d4240af6d..11d5db8fe82 100644
--- a/security/openssh/files/md5
+++ b/security/openssh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/05/31 15:32:44 itojun Exp $
+$NetBSD: md5,v 1.5 2000/06/15 04:56:50 itojun Exp $
 
-MD5 (openssh-2.1.0p3.tar.gz) = cf4bbd40eb0ea722627760abc8ec1b13
+MD5 (openssh-2.1.1p1.tar.gz) = e043cabc802d7d0790f5aaaea31185b2
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index e57cfc02a22..d95aec6470b 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,12 +1,11 @@
-$NetBSD: patch-sum,v 1.9 2000/05/31 15:32:44 itojun Exp $
+$NetBSD: patch-sum,v 1.10 2000/06/15 04:56:50 itojun Exp $
 
 MD5 (patch-aa) = 45b54d94970c6b58478641edaea06ee8
 MD5 (patch-ac) = 5bdf4a142210aea600f3bf6f3ac14010
-MD5 (patch-ad) = 9307af423624aca41ea0a160c6efe011
 MD5 (patch-ae) = 0076ca9d2343f21a304a3eee1a82c3cc
 MD5 (patch-af) = 601161a5721c12fa31ae5dcfc1f88a91
 MD5 (patch-ag) = 037888228d97283b54d1232daf3945a2
 MD5 (patch-ah) = 2699d4a4c560b1896d756d3799e1614b
 MD5 (patch-ai) = c2621996e146a82e7deea0363a0e68c9
-MD5 (patch-aj) = 54e9f5ecd7c1ca1f32401144c7980908
+MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329
 MD5 (patch-ak) = 1bd755c11128b2b8d7ecc894e70b82c7
diff --git a/security/openssh/patches/patch-ad b/security/openssh/patches/patch-ad
deleted file mode 100644
index 9573514ce52..00000000000
--- a/security/openssh/patches/patch-ad
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/05/31 15:32:44 itojun Exp $
-
---- fake-getnameinfo.c-	Wed May 31 18:50:37 2000
-+++ fake-getnameinfo.c	Wed May 31 18:51:02 2000
-@@ -37,25 +37,27 @@
-     else
-       strcpy(serv, tmpserv);
-   }
--  if (host)
--    if (flags & NI_NUMERICHOST)
-+  if (host) {
-+    if (flags & NI_NUMERICHOST) {
-       if (strlen(inet_ntoa(sin->sin_addr)) > hostlen)
- 	return EAI_MEMORY;
-       else {
- 	strcpy(host, inet_ntoa(sin->sin_addr));
- 	return 0;
-       }
--    else
-+    } else {
-       if (NULL != (hp = gethostbyaddr((char *)&sin->sin_addr, 
--			sizeof(struct in_addr), AF_INET)))
-+			sizeof(struct in_addr), AF_INET))) {
- 	if (strlen(hp->h_name) > hostlen)
- 	  return EAI_MEMORY;
- 	else {
- 	  strcpy(host, hp->h_name);
- 	  return 0;
- 	}
--      else
-+      } else
- 	return EAI_NODATA;
-+    }
-+  }
-   return 0;
- }
- #endif /* !HAVE_GETNAMEINFO */
diff --git a/security/openssh/patches/patch-aj b/security/openssh/patches/patch-aj
index 96e86ed235a..1111a969841 100644
--- a/security/openssh/patches/patch-aj
+++ b/security/openssh/patches/patch-aj
@@ -1,20 +1,12 @@
-$NetBSD: patch-aj,v 1.1 2000/03/27 00:59:13 fredb Exp $
+$NetBSD: patch-aj,v 1.2 2000/06/15 04:56:51 itojun Exp $
 
---- ssh.1.orig	Fri Mar 17 06:40:17 2000
-+++ ssh.1	Sun Mar 26 18:50:05 2000
-@@ -829,6 +829,7 @@
- .Dq yes
- or
- .Dq no .
+--- ssh.1.orig	Wed Jun  7 18:55:44 2000
++++ ssh.1	Thu Jun 15 13:46:26 2000
+@@ -948,2 +948,3 @@
+ .Pa /usr/X11R6/bin/xauth .
 +.El
  .Sh ENVIRONMENT
- .Nm
- will normally set the following environment variables:
-@@ -1056,6 +1057,7 @@
- .It Pa libcrypto.so.X.1
- A version of this library which includes support for the RSA algorithm
+@@ -1191,2 +1192,3 @@
  is required for proper operation.
 +.El
  .Sh AUTHOR
- OpenSSH
- is a derivative of the original (free) ssh 1.2.12 release by Tatu Ylonen,