update to 2.1.1p3.

depend on openssl >= 0.9.5.  see PR 10593.

--- 2.1.1p2 -> 2.1.1p3
20000712
 - (djm) Remove -lresolve for Reliant Unix
 - (djm) OpenBSD CVS Updates:
   - deraadt@cvs.openbsd.org 2000/07/11 02:11:34
     [session.c sshd.c ]
     make MaxStartups code still work with -d; djm
   - deraadt@cvs.openbsd.org 2000/07/11 13:17:45
     [readconf.c ssh_config]
     disable FallBackToRsh by default
 - (djm) Replace in_addr_t with u_int32_t in bsd-inet_aton.c. Report from
   Ben Lindstrom <mouring@pconline.com>
 - (djm) Make building of X11-Askpass and GNOME-Askpass optional in RPM
   spec file.
 - (djm) Released 2.1.1p3

20000711
 - (djm) Fixup for AIX getuserattr() support from Tom Bertelson
   <tbert@abac.com>
 - (djm) ReliantUNIX support from Udo Schweigert <ust@cert.siemens.de>
 - (djm) NeXT: dirent structures to get scp working from Ben Lindstrom
   <mouring@pconline.com>
 - (djm) Fix broken inet_ntoa check and ut_user/ut_name confusion, report
   from Jim Watt <jimw@peisj.pebio.com>
 - (djm) Replaced bsd-snprintf.c with one from Mutt source tree, it is known
   to compile on more platforms (incl NeXT).
 - (djm) Added bsd-inet_aton and configure support for NeXT
 - (djm) Misc NeXT fixes from Ben Lindstrom <mouring@pconline.com>
 - (djm) OpenBSD CVS updates:
   - markus@cvs.openbsd.org  2000/06/26 03:22:29
     [authfd.c]
     cleanup, less cut&paste
   - markus@cvs.openbsd.org  2000/06/26 15:59:19
     [servconf.c servconf.h session.c sshd.8 sshd.c]
     MaxStartups: limit number of unauthenticated connections, work by
     theo and me
   - deraadt@cvs.openbsd.org 2000/07/05 14:18:07
     [session.c]
     use no_x11_forwarding_flag correctly; provos ok
   - provos@cvs.openbsd.org  2000/07/05 15:35:57
     [sshd.c]
     typo
   - aaron@cvs.openbsd.org   2000/07/05 22:06:58
     [scp.1 ssh-agent.1 ssh-keygen.1 sshd.8]
     Insert more missing .El directives. Our troff really should identify
     these and spit out a warning.
   - todd@cvs.openbsd.org    2000/07/06 21:55:04
     [auth-rsa.c auth2.c ssh-keygen.c]
     clean code is good code
   - deraadt@cvs.openbsd.org 2000/07/07 02:14:29
     [serverloop.c]
     sense of port forwarding flag test was backwards
   - provos@cvs.openbsd.org  2000/07/08 17:17:31
     [compat.c readconf.c]
     replace strtok with strsep; from David Young <dyoung@onthejob.net>
   - deraadt@cvs.openbsd.org 2000/07/08 19:21:15
     [auth.h]
     KNF
   - ho@cvs.openbsd.org      2000/07/08 19:27:33
     [compat.c readconf.c]
     Better conditions for strsep() ending.
   - ho@cvs.openbsd.org      2000/07/10 10:27:05
     [readconf.c]
     Get the correct message on errors. (niels@ ok)
   - ho@cvs.openbsd.org      2000/07/10 10:30:25
     [cipher.c kex.c servconf.c]
     strtok() --> strsep(). (niels@ ok)
 - (djm) Fix problem with debug mode and MaxStartups
 - (djm) Don't generate host keys when $(DESTDIR) is set (e.g. during RPM
   builds)
 - (djm) Add strsep function from OpenBSD libc for systems that lack it

20000709
 - (djm) Only enable PAM_TTY kludge for Linux. Problem report from
   Kevin Steves <stevesk@sweden.hp.com>
 - (djm) Match prototype and function declaration for rresvport_af.
   Problem report from Niklas Edmundsson <nikke@ing.umu.se>
 - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM
   builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu>
 - (djm) Replace ut_name with ut_user. Patch from Jim Watt
   <jimw@peisj.pebio.com>
 - (djm) Fix pam sprintf fix
 - (djm) Cleanup entropy collection code a little more. Split initialisation
   from seeding, perform intialisation immediatly at start, be careful with
   uids. Based on problem report from Jim Watt <jimw@peisj.pebio.com>
 - (djm) More NeXT compatibility from Ben Lindstrom <mouring@pconline.com>
   Including sigaction() et al. replacements
 - (djm) AIX getuserattr() session initialisation from Tom Bertelson
   <tbert@abac.com>

20000708
 - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from
   Aaron Hopkins <aaron@die.net>
 - (djm) Fix incorrect configure handling of --with-rsh-path option. Fix from
   Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>
 - (djm) Fixed undefined variables for OSF SIA. Report from
   Baars, Henk <Hendrik.Baars@nl.origin-it.com>
 - (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c
   Fix from Marquess, Steve Mr JMLFDC <Steve.Marquess@DET.AMEDD.ARMY.MIL>
 - (djm) Don't use inet_addr.

20000702
 - (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>
 - (djm) Stop shadow expiry checking from preventing logins with NIS. Based
   on fix from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
 - (djm) Use standard OpenSSL functions in auth-skey.c. Patch from
   Chris, the Young One <cky@pobox.com>
 - (djm) Fix scp progress meter on really wide terminals. Based on patch
   from James H. Cloos Jr. <cloos@jhcloos.com>

20000701
 - (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>
 - (djm) Login fixes from Tom Bertelson <tbert@abac.com>
 - (djm) Replace "/bin/sh" with _PATH_BSHELL. Report from Corinna Vinschen
   <vinschen@cygnus.com>
 - (djm) Replace "/usr/bin/login" with LOGIN_PROGRAM
 - (djm) Added check for broken snprintf() functions which do not correctly
   terminate output string and attempt to use replacement.
 - (djm) Released 2.1.1p2

11 files changed, 9 insertions, 141 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index f6f6896b5b6..d424b144270 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2000/07/09 13:19:36 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2000/07/15 03:53:46 itojun Exp $
 #
 
-DISTNAME=		openssh-2.1.1p2
+DISTNAME=		openssh-2.1.1p3
 CATEGORIES=		security
 MASTER_SITES=		http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \
 			http://www.firedrake.org/openssh/files/ \
@@ -16,9 +16,10 @@ HOMEPAGE=		http://www.openssh.com/
 BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
 BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
-.if !exists(/usr/include/openssl/rsa.h)
-DEPENDS+=		openssl-[0-9]*:../../security/openssl
-.endif
+# src/crypto is still 0.9.4 at this moment.  see NetBSD PR 10593.
+#.if !exists(/usr/include/openssl/rsa.h)
+DEPENDS+=		openssl>=0.9.5:../../security/openssl
+#.endif
 
 CONFLICTS=		ssh-[0-9]* ssh6-[0-9]*
 
diff --git a/security/openssh/files/md5 b/security/openssh/files/md5
index 2912b9210ec..69d6c96f421 100644
--- a/security/openssh/files/md5
+++ b/security/openssh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/07/02 22:07:56 itojun Exp $
+$NetBSD: md5,v 1.7 2000/07/15 03:53:46 itojun Exp $
 
-MD5 (openssh-2.1.1p2.tar.gz) = 261de4f02ea8f50f1f0566b40821034a
+MD5 (openssh-2.1.1p3.tar.gz) = a5febdb5d74fdc678bd3c4864f4cf825
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index e7c78fe824e..976e4519e9a 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,15 +1,7 @@
-$NetBSD: patch-sum,v 1.13 2000/07/07 08:11:03 elric Exp $
+$NetBSD: patch-sum,v 1.14 2000/07/15 03:53:46 itojun Exp $
 
-MD5 (patch-aa) = 9de9202a42d721e8027f9f829a3af96c
-MD5 (patch-ac) = 5bdf4a142210aea600f3bf6f3ac14010
 MD5 (patch-ae) = 0076ca9d2343f21a304a3eee1a82c3cc
-MD5 (patch-af) = 601161a5721c12fa31ae5dcfc1f88a91
 MD5 (patch-ag) = 037888228d97283b54d1232daf3945a2
 MD5 (patch-ah) = 0c144a44edc914f64ebf5bb5fb0ff401
-MD5 (patch-ai) = c2621996e146a82e7deea0363a0e68c9
 MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329
-MD5 (patch-ak) = 1bd755c11128b2b8d7ecc894e70b82c7
-MD5 (patch-al) = dde98ebfbbe801c5042a803e0e0df0d3
-MD5 (patch-am) = 6b53bafd568db64bf16d9aa5582733e3
 MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609
-MD5 (patch-ao) = dd215025d01544077265a6573daf4db7
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
deleted file mode 100644
index 4d7e5ff7beb..00000000000
--- a/security/openssh/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2000/07/02 22:07:56 itojun Exp $
-
---- configure.in.orig	Sat Jul  1 15:52:55 2000
-+++ configure.in	Mon Jul  3 06:49:00 2000
-@@ -647,2 +647,6 @@
- 
-+OSSH_CHECK_HEADER_FOR_FIELD(ut_name, utmp.h, HAVE_NAME_IN_UTMP)
-+OSSH_CHECK_HEADER_FOR_FIELD(ut_name, utmpx.h, HAVE_NAME_IN_UTMPX)
-+OSSH_CHECK_HEADER_FOR_FIELD(ut_user, utmp.h, HAVE_USER_IN_UTMP)
-+OSSH_CHECK_HEADER_FOR_FIELD(ut_user, utmpx.h, HAVE_USER_IN_UTMPX)
- OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP)
diff --git a/security/openssh/patches/patch-ac b/security/openssh/patches/patch-ac
deleted file mode 100644
index ca63cb92fd4..00000000000
--- a/security/openssh/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/03/27 00:59:13 fredb Exp $
-
---- scp.1.orig	Thu Jan 20 06:13:36 2000
-+++ scp.1	Sun Mar 26 18:32:09 2000
-@@ -101,6 +101,7 @@
- Forces
- .Nm
- to use IPv6 addresses only.
-+.El
- .Sh AUTHORS
- Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi>
- .Sh HISTORY
diff --git a/security/openssh/patches/patch-af b/security/openssh/patches/patch-af
deleted file mode 100644
index 73eac1d33a0..00000000000
--- a/security/openssh/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.4 2000/05/31 15:32:44 itojun Exp $
-
---- ssh-agent.1-	Wed May 31 18:52:51 2000
-+++ ssh-agent.1	Wed May 31 18:52:33 2000
-@@ -133,6 +133,7 @@
- authentication agent.
- These sockets should only be readable by the owner.
- The sockets should get automatically removed when the agent exits.
-+.El
- .Sh AUTHOR
- Tatu Ylonen <ylo@cs.hut.fi>
- .Pp
diff --git a/security/openssh/patches/patch-ai b/security/openssh/patches/patch-ai
deleted file mode 100644
index ce21a10b93d..00000000000
--- a/security/openssh/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2000/05/31 15:32:44 itojun Exp $
-
---- ssh-keygen.1-	Wed May 31 18:55:33 2000
-+++ ssh-keygen.1	Wed May 31 18:55:48 2000
-@@ -188,6 +188,7 @@
- on all machines
- where you wish to log in using DSA authentication.
- There is no need to keep the contents of this file secret.
-+.El
- .Sh AUTHOR
- Tatu Ylonen <ylo@cs.hut.fi>
- .Pp
diff --git a/security/openssh/patches/patch-ak b/security/openssh/patches/patch-ak
deleted file mode 100644
index 3e6acd0829b..00000000000
--- a/security/openssh/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2000/05/31 15:32:44 itojun Exp $
-
---- sshd.8-	Wed May 31 18:56:16 2000
-+++ sshd.8	Wed May 31 18:56:26 2000
-@@ -940,6 +940,7 @@
- This can be used to specify
- machine-specific login-time initializations globally.
- This file should be writable only by root, and should be world-readable.
-+.El
- .Sh AUTHOR
- OpenSSH
- is a derivative of the original (free) ssh 1.2.12 release by Tatu Ylonen,
diff --git a/security/openssh/patches/patch-al b/security/openssh/patches/patch-al
deleted file mode 100644
index 97badb24e03..00000000000
--- a/security/openssh/patches/patch-al
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-al,v 1.1 2000/07/02 22:07:56 itojun Exp $
-
---- loginrec.c-	Mon Jul  3 06:49:20 2000
-+++ loginrec.c	Mon Jul  3 06:51:59 2000
-@@ -618,3 +618,9 @@
- 	/* Use strncpy because we don't necessarily want null termination */
-+# ifdef HAVE_USER_IN_UTMP
- 	strncpy(ut->ut_user, li->username, MIN_SIZEOF(ut->ut_user, li->username));
-+# elif defined(HAVE_NAME_IN_UTMP)
-+	strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username));
-+# else
-+#  error no ut_user nor ut_name
-+# endif
- # ifdef HAVE_HOST_IN_UTMP
-@@ -1008,4 +1014,12 @@
- {
-+# ifdef HAVE_USER_IN_UTMP
- 	if (strncmp(li->username, ut->ut_user, 
--		MIN_SIZEOF(li->username, ut->ut_user)) == 0) {
-+		MIN_SIZEOF(li->username, ut->ut_user)) == 0)
-+# elif defined(HAVE_NAME_IN_UTMP)
-+	if (strncmp(li->username, ut->ut_name, 
-+		MIN_SIZEOF(li->username, ut->ut_name)) == 0)
-+# else
-+#  error no ut_user nor ut_name
-+# endif
-+		{
- # ifdef HAVE_TYPE_IN_UTMP
-@@ -1163,4 +1177,12 @@
- {
-+# ifdef HAVE_USER_IN_UTMP
- 	if ( strncmp(li->username, utx->ut_user,
--		MIN_SIZEOF(li->username, utx->ut_user)) == 0 ) {
-+		MIN_SIZEOF(li->username, utx->ut_user)) == 0 )
-+# elif defined(HAVE_NAME_IN_UTMP)
-+	if ( strncmp(li->username, utx->ut_name,
-+		MIN_SIZEOF(li->username, utx->ut_name)) == 0 )
-+# else
-+#  error no ut_user nor ut_name
-+# endif
-+		{
- # ifdef HAVE_TYPE_IN_UTMPX
diff --git a/security/openssh/patches/patch-am b/security/openssh/patches/patch-am
deleted file mode 100644
index aff55275033..00000000000
--- a/security/openssh/patches/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-am,v 1.1 2000/07/02 22:07:56 itojun Exp $
-
---- acconfig.h-	Mon Jul  3 06:58:28 2000
-+++ acconfig.h	Mon Jul  3 06:58:09 2000
-@@ -49,2 +49,6 @@
- /* struct utmp and struct utmpx fields */
-+#undef HAVE_NAME_IN_UTMP
-+#undef HAVE_NAME_IN_UTMPX
-+#undef HAVE_USER_IN_UTMP
-+#undef HAVE_USER_IN_UTMPX
- #undef HAVE_HOST_IN_UTMP
diff --git a/security/openssh/patches/patch-ao b/security/openssh/patches/patch-ao
deleted file mode 100644
index ac1dc823319..00000000000
--- a/security/openssh/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2000/07/07 08:11:04 elric Exp $
-
---- fake-getaddrinfo.c.orig	Fri Jul  7 00:46:59 2000
-+++ fake-getaddrinfo.c	Thu Jul  6 21:07:02 2000
-@@ -86,7 +86,7 @@
- 			return EAI_MEMORY;
- 	}
- 	
--	if (inet_addr(hostname) != -1) {
-+	if (inet_addr(hostname) != INADDR_NONE) {
- 		if (NULL != (*res = malloc_ai(port, inet_addr(hostname))))
- 			return 0;
- 		else