Clean this up, sync with the ssh package, and update to

1.2.2 (fixing PR 9304 by David Rankin <drankin@bohemians.lexington.ky.us>.

Changes:

20000125
 - Fix NULL pointer dereference in login.c. Fix from Andre Lucas
   <andre.lucas@dial.pipex.com>
 - Reorder PAM initialisation so it does not mess up lastlog. Reported
   by Andre Lucas <andre.lucas@dial.pipex.com>
 - Use preformatted manpages on SCO, report from Gary E. Miller
   <gem@rellim.com>
 - New URL for x11-ssh-askpass.
 - Fixpaths was missing /etc/ssh_known_hosts. Report from Jim Knoble
   <jmknoble@pobox.com>
 - Added 'DESTDIR' option to Makefile to ease package building. Patch from
   Jim Knoble <jmknoble@pobox.com>
 - Updated RPM spec files to use DESTDIR

20000124
 - Pick up version 1.2.2 from OpenBSD CVS (no changes, just version number
   increment)

20000123
 - OpenBSD CVS:
   - [packet.c]
     getsockname() requires initialized tolen; andy@guildsoftware.com
 - AIX patch from Matt Richards <v2matt@btv.ibm.com> and David Rankin
   <drankin@bohemians.lexington.ky.us>
 - Fix lastlog support, patch from Andre Lucas <andre.lucas@dial.pipex.com>

20000122
 - Fix compilation of bsd-snprintf.c on Solaris, fix from Ben Taylor
   <bent@clark.net>
 - Merge preformatted manpage patch from Andre Lucas
   <andre.lucas@dial.pipex.com>
 - Make IPv4 use the default in RPM packages
 - Irix uses preformatted manpages
 - Missing htons() in bsd-bindresvport.c, fix from Holger Trapp
   <Holger.Trapp@Informatik.TU-Chemnitz.DE>
 - OpenBSD CVS updates:
   - [packet.c]
     use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
     from Holger.Trapp@Informatik.TU-Chemnitz.DE
   - [sshd.c]
     log with level log() not fatal() if peer behaves badly.
   - [readpass.c]
     instead of blocking SIGINT, catch it ourselves, so that we can clean
     the tty modes up and kill ourselves -- instead of our process group
     leader (scp, cvs, ...) going away and leaving us in noecho mode.
     people with cbreak shells never even noticed..
   - [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
     ie. -> i.e.,

20000120
 - Don't use getaddrinfo on AIX
 - Update to latest OpenBSD CVS:
   - [auth-rsa.c]
     - fix user/1056, sshd keeps restrictions; dbt@meat.net
   - [sshconnect.c]
     - disable agent fwding for proto 1.3, remove abuse of auth-rsa flags.
     - destroy keys earlier
     - split key exchange (kex) and user authentication (user-auth),
       ok: provos@
   - [sshd.c]
     - no need for poll.h; from bright@wintelcom.net
     - disable agent fwding for proto 1.3, remove abuse of auth-rsa flags.
     - split key exchange (kex) and user authentication (user-auth),
       ok: provos@
   - [sshd.c]
     - no need for poll.h; from bright@wintelcom.net
     - disable agent fwding for proto 1.3, remove abuse of auth-rsa flags.
     - split key exchange (kex) and user authentication (user-auth),
       ok: provos@
 - Big manpage and config file cleanup from Andre Lucas
   <andre.lucas@dial.pipex.com>
   - Re-added latest (unmodified) OpenBSD manpages
 - Doc updates
 - NetBSD patch from David Rankin <drankin@bohemians.lexington.ky.us> and
   Christos Zoulas <christos@netbsd.org>

20000119
 - SCO compile fixes from Gary E. Miller <gem@rellim.com>
 - Compile fix from Darren_Hall@progressive.com
 - Linux/glibc-2.1.2 takes a *long* time to look up names for AF_UNSPEC
   addresses using getaddrinfo(). Added a configure switch to make the
   default lookup mode AF_INET

20000118
 - Fixed --with-pid-dir option
 - Makefile fix from Gary E. Miller <gem@rellim.com>
 - Compile fix for HPUX and Solaris from Andre Lucas
   <andre.lucas@dial.pipex.com>

2 files changed, 7 insertions, 8 deletions

diff --git a/security/openssh/files/md5 b/security/openssh/files/md5
index b6faaffddde..c5bffc8d597 100644
--- a/security/openssh/files/md5
+++ b/security/openssh/files/md5
@@ -1 +1,3 @@
-MD5 (openssh-1.2.1pre26.tar.gz) = 75501f28adcca30aeb965596a5dc0326
+$NetBSD: md5,v 1.2 2000/01/27 17:12:03 hubertf Exp $
+
+MD5 (openssh-1.2.2.tar.gz) = 4eccb907bf7bd6368300dc23b20dc8c2
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index 38c05d1aaf7..c213f76cc29 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,10 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/01/17 07:24:39 christos Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/27 17:12:03 hubertf Exp $
 
-MD5 (patch-aa) = e6f1eb1a5fca7347b2f93ce7a5b2420a
+MD5 (patch-aa) = 0895daea0973a07833d5eadbfc902afd
 MD5 (patch-ab) = b1be98743ffb76d3e0401dda3a420f25
-MD5 (patch-ac) = 33cece26534692f25fca101e2a5f9340
 MD5 (patch-ad) = affe7f6d4df103015cb788cac15d2670
-MD5 (patch-ae) = 60bdd814e2305bd2f70d5728344ad85f
-MD5 (patch-af) = 5944fcd4ff8e95f38af74bca6cf6c97d
-MD5 (patch-ag) = 4f4487055339564aca2c495456645919
-MD5 (patch-ah) = 9923ffcb1636a92de6b94069bd5fb4bf
+MD5 (patch-ag) = 037888228d97283b54d1232daf3945a2
+MD5 (patch-ah) = b31a5dfc27312a091e76108f25e1bf6d