Update this to a CVS_DATE of a few minutes ago.

4 files changed, 21 insertions, 39 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index fe1bb2fee623..0bd76f07c338 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -24,7 +24,7 @@ IGNOREFILES!=	${SED} 's:^\(.*\)$$:${PKGNAME}/\1:g' ${FILESDIR}/ignorefiles
 DISTFILES+=	${IGNOREFILES}
 
 CVS_CMD?=	cvs -z3
-CVS_DATE=	Tue Feb  1 02:19:07 EST 2000
+CVS_DATE=	Fri Mar  3 00:37:20 EST 2000
 SED?=		/usr/bin/sed
 CVS_DATE_!=	${ECHO} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g'
 CVS_SITES?=	anoncvs@anoncvs1.ca.openbsd.org:/cvs \
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 4b6e066d08d4..ca28bc2ffd08 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -4,12 +4,12 @@ MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/Makefile.inc) = 8f096d4d5a830efe7dde5674b482c
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/OVERVIEW) = 5def77be758d9e4aa2390c3825ed7cb2
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/README) = e54fb9189053db5ad25892054c8d0989
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/RFC.nroff) = 1615f30810a3d47716883b2eaddd712c
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/atomicio.c) = 765037b689925ccd476de647d4aaf9ed
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/atomicio.c) = 9a5c994c7ecdb7ebf875037b7cc70f37
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/auth-krb4.c) = e9f588343a4954004ecbf7ba805edde2
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/auth-passwd.c) = 176629d0f658f24120a5710c9b5a84d8
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/auth-rh-rsa.c) = a1c4177fb07f7dcc4dbe6c468bab608e
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/auth-rhosts.c) = 2df099d85d31d7346cba663a45592c91
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/auth-rsa.c) = 7637ed092b3af52e77826bfe1e80dc9e
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/auth-rsa.c) = c63d62200ea033bbc0f97264e57fb512
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/auth-skey.c) = 1c003cb98aea4e771a9ec3e67dd99096
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/authfd.c) = 08ebd5cb6fd9521ead44475a59880ea9
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/authfd.h) = 84826e6490812a490bb07b97dfeef085
@@ -21,7 +21,7 @@ MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/buffer.h) = c284a258593ae4d8905d94ddae45f4b1
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/canohost.c) = 4ebd799aac04aa6c0e23d0c1e27e9ea6
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/channels.c) = a1d2901a30b86a02a12fea83b3112e21
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/channels.h) = e597ecd2255e0f92fb5a92c40c99d8b4
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/cipher.c) = 2bf8f287540f2448b4af0b894aeacf8b
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/cipher.c) = cbceaaa4261bbd5d1109510cd9a8eab5
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/cipher.h) = e1b48bd7a4e37c1b106f968d8377b843
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/clientloop.c) = 35f80aaf2f0796a25a54140f65731f07
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/compat.c) = 08c12cb64c7bc91f90ff6480e53097b9
@@ -35,11 +35,11 @@ MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/deattack.h) = db63f71b6c19484dd8ce5041cc6b646
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/fingerprint.c) = 782318f23ec96a679f140a475ee38638
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/fingerprint.h) = 17d73906c4f0c1cddb3c1c7e98d02785
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/getput.h) = bf729289671363abc3882e1e0c34d270
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/hostfile.c) = a165685e4989eb99d31a84eba3acb55c
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/hostfile.c) = 9103a4ee3c59637516599ca8fa02393f
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/includes.h) = 1dc9df93b0be59b6351755ea7817be09
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/lib/Makefile) = 66b181f50f06eb76ecc6c59acf0f3068
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/log-client.c) = a05d3671346fd5a958cc74d1e2416b63
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/log-server.c) = d1c4f02578b1a83c972b7acd04ea2fa2
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/log-client.c) = e312007400dea60e00ca36678dcceb81
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/log-server.c) = 04e8a5f18b5f23c9c0ca1c361bde61dd
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/log.c) = 40cc9c89526c10ef6cb2c46c0258727e
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/login.c) = ab361f9b7f5bccae2ca67c55445353a0
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/match.c) = facc507e6b48d09f9df77c2a77b365c3
@@ -48,20 +48,20 @@ MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/mpaux.h) = 3dd5ddaa6baccf7f38964e69cd2f9e1c
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/nchan.c) = 0e73a88c8609432113d26f46ef6f5a8b
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/nchan.h) = 884bb0c2b62f274ccbf9c0eafc9d37c2
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/nchan.ms) = 854123795358a9aa6005cd1e69309cfb
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/packet.c) = 6fdc7b9bac04ebdd19e1c0af6bd6b91b
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/packet.c) = 118b0601641c75e8df0168e778901143
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/packet.h) = a2889cb1db9ae9e8833a8746e7e3cc18
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/pty.c) = 42defbf1571c948865056a06d976235f
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/pty.h) = f2fb71af9954aebec8b3b69320dd6d12
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/pty.c) = 07863e9203fd2be22f79a24b04fc5029
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/pty.h) = 8118b38a8ac83aca08697f0af0375ce7
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/radix.c) = 599f6349035451d48e36334b21696963
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/readconf.c) = d851d54ba4c4606268eb4089e1a7164c
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/readconf.c) = 7f4addf8a7e1db663b2f4f5b82d8dca8
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/readconf.h) = 9f40c6fa01b174149efbaad4bf21c334
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/readpass.c) = c34101348efcacbdbadaa63a98736e55
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/rsa.c) = 3b47f0c260e26c118d971fafed604d3f
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/rsa.c) = 3c7310a68b6ad41d18097aaa57158bd7
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/rsa.h) = ee65e38f1fcc22328c5d5f07b57d6e5f
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/scp.1) = 939fd8b3eb1965e081e557fcd069b89e
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/scp.c) = 45a32c046e4c796237b090bee70834a2
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/scp/Makefile) = 5cb4c5fcabde5ccc4f9ca475ac3452f4
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/servconf.c) = 2a4ae4323190d562b1bf5406822c7f43
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/servconf.c) = d83776a1cc4470b1183c961df27b1902
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/servconf.h) = 70595ee9c1fb106695343787e1696bce
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/serverloop.c) = b2282cf4f899b132134d783f691a2fca
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-add.1) = 27dc45bd1de670387eb40eeb8376a3db
@@ -71,17 +71,17 @@ MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-agent.1) = 77cfce4f00bf81ad0a94826ec282df
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-agent.c) = 5bdf7f32d33ceb9dab8f3b0516e3b012
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-agent/Makefile) = c7ec7c4e61b4da3369980f197fdcb501
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-keygen.1) = 82cd3ead37718cf5d5b7091f0c18fe2c
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-keygen.c) = 439aac7630c0dc54b750ecbe314bc09b
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-keygen.c) = 6c9eea3bcb9fc9100e7d510133bd62d0
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh-keygen/Makefile) = 2d597b6e6458d0c0246ba2563dd2498b
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh.1) = 53897c340fcf7290adb73ae22990a4d2
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh.c) = 13de482b362f050b3893b95514a6f56d
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh.h) = daa7778da5032e411ca567a79782a316
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh.1) = a16d0cfbcd673288933dd6e18bd29e7e
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh.c) = 845acac60210c29706d48c0a0bb1725d
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh.h) = d686342b58a0b9266f811a40cd472a5c
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh/Makefile) = 41b006d3c04b599619990b47da60f81e
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ssh_config) = 9658715526aeaf0bc43528d3159b475f
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshconnect.c) = f925f698d591f5a3cfb1c3d962a6bd30
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshd.8) = f8af245893a650fbfcabf93e585e6d1a
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshd.c) = 7d8441a8a5bf04c3f86f4d29186aa4cc
-MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshd/Makefile) = d1d83d1ece775d3a5cbf8cfaaf2330f3
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshconnect.c) = fe87f5f195aec789a5461e00e1339882
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshd.8) = 2903c2b7d21d12c9d7314367dceffd3d
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshd.c) = c246cc5f1a368db3e704eab431c12378
+MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshd/Makefile) = cf75ee12082a0b63fa9510dcbaa32126
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/sshd_config) = f48bdabb5094cb6aaa1f398987cbf9b4
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/tildexpand.c) = 65ba9200404da3a094823605f57bca12
 MD5 (OpenSSH-1.2.2/src/usr.bin/ssh/ttymodes.c) = 570810b08bdb8bc962630c2fbb425a00
diff --git a/security/openssh/files/patch-ak b/security/openssh/files/patch-ak
index a0b31bf4ad20..ab72c61830cf 100644
--- a/security/openssh/files/patch-ak
+++ b/security/openssh/files/patch-ak
@@ -10,12 +10,3 @@
  	args[i++] = _PATH_RSH;
  	/* host may have to come after user on some systems */
  	args[i++] = host;
-@@ -489,7 +492,7 @@
- 		struct addrinfo *ai = NULL;
- 		int errgai;
- 		memset(&hints, 0, sizeof(hints));
--		hints.ai_family = AF_UNSPEC;
-+		hints.ai_family = IPv4or6;
- 		hints.ai_flags = AI_CANONNAME;
- 		hints.ai_socktype = SOCK_STREAM;
- 		errgai = getaddrinfo(host, NULL, &hints, &ai);
diff --git a/security/openssh/files/patch-at b/security/openssh/files/patch-at
index 64a3b5cd80ed..66049dac99c2 100644
--- a/security/openssh/files/patch-at
+++ b/security/openssh/files/patch-at
@@ -1,14 +1,5 @@
 --- sshconnect.c-	Tue Feb 15 22:00:22 2000
 +++ sshconnect.c	Tue Feb 15 22:00:27 2000
-@@ -150,7 +150,7 @@
- 		int p = IPPORT_RESERVED - 1;
- 		sock = rresvport_af(&p, family);
- 		if (sock < 0)
--			fatal("rresvport: af=%d %.100s", family, strerror(errno));
-+			error("rresvport: af=%d %.100s", family, strerror(errno));
- 		debug("Allocated local port %d.", p);
- 	} else {
- 		/*
 @@ -1080,9 +1080,11 @@
  	case AF_INET:
  		local = (ntohl(((struct sockaddr_in *)hostaddr)->sin_addr.s_addr) >> 24) == IN_LOOPBACKNET;