Update openssh to 2.1.1p4.

Package changes:
    * Factor out common post-install code from PLIST and package Makefile
      into files/INSTALL.
    * Enhance files/sshd.sh to handle start/stop/restart/status.
    * Check for usable installed version of OpenSSL.  This bit possibly
      closes the following PRs: 10404, 10501, 10593

Changes from 2.1.1p3:
    * allow multiple whitespace but only one '=' between tokens
    * close can fail on AFS
    * allow leading whitespace in configuration files
    * Always create ~/.ssh with mode 700

3 files changed, 32 insertions, 26 deletions

diff --git a/security/openssh/patches/patch-ae b/security/openssh/patches/patch-ae
index 850725f9be0..b548b8809ec 100644
--- a/security/openssh/patches/patch-ae
+++ b/security/openssh/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2000/03/27 00:59:13 fredb Exp $
+$NetBSD: patch-ae,v 1.4 2000/07/22 08:22:02 jlam Exp $
 
---- ssh-add.1.orig	Sat Jan 22 02:57:40 2000
-+++ ssh-add.1	Sun Mar 26 18:39:34 2000
+--- ssh-add.1.orig	Sat May  6 22:03:18 2000
++++ ssh-add.1	Fri Jul 21 01:24:49 2000
 @@ -64,6 +64,7 @@
  .Nm
  when no other files have been specified.
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.3 2000/03/27 00:59:13 fredb Exp $
  .Sh ENVIRONMENT
  .Bl -tag -width Ds
  .It Ev "DISPLAY" and "SSH_ASKPASS"
-@@ -87,6 +88,7 @@
+@@ -89,6 +90,7 @@
  may be necessary to redirect the input from
  .Pa /dev/null
  to make this work.)
diff --git a/security/openssh/patches/patch-ag b/security/openssh/patches/patch-ag
deleted file mode 100644
index 13d45051b68..00000000000
--- a/security/openssh/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2000/01/27 17:12:05 hubertf Exp $
-
---- uidswap.c.orig	Thu Jan 20 14:18:16 2000
-+++ uidswap.c	Thu Jan 27 17:04:38 2000
-@@ -26,8 +26,10 @@
-    is not part of the posix specification. */
- #define SAVED_IDS_WORK_WITH_SETEUID
- 
-+#ifdef SAVED_IDS_WORK_WITH_SETEUID
- /* Saved effective uid. */
- static uid_t saved_euid = 0;
-+#endif
- 
- #endif /* _POSIX_SAVED_IDS */
- 
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index f23fe12d35b..d939b58de0d 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,12 +1,27 @@
-$NetBSD: patch-ah,v 1.6 2000/07/02 22:07:56 itojun Exp $
+$NetBSD: patch-ah,v 1.7 2000/07/22 08:22:03 jlam Exp $
 
---- Makefile.in.orig	Tue Jun 27 15:24:49 2000
-+++ Makefile.in	Sun Jul  2 14:30:43 2000
-@@ -8,2 +8,3 @@
+--- Makefile.in.orig	Tue Jul 11 07:34:34 2000
++++ Makefile.in	Fri Jul 21 01:30:17 2000
+@@ -6,6 +6,7 @@
+ mandir=@mandir@
+ mansubdir=@mansubdir@
  sysconfdir=@sysconfdir@
 +examplesdir=@prefix@/share/examples/ssh
  piddir=@piddir@
-@@ -141,6 +142,6 @@
+ srcdir=@srcdir@
+ top_srcdir=@top_srcdir@
+@@ -115,7 +116,7 @@
+ distprep: catman-do
+ 	autoreconf
+ 
+-install: manpages $(TARGETS) install-files host-key
++install: manpages $(TARGETS) install-files
+ 
+ install-files:
+ 	./mkinstalldirs $(DESTDIR)$(bindir)
+@@ -139,14 +140,14 @@
+ 	ln -s ssh $(DESTDIR)$(bindir)/slogin
+ 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
  	ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 -	if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
 -		./mkinstalldirs $(DESTDIR)$(sysconfdir); \
@@ -17,12 +32,16 @@ $NetBSD: patch-ah,v 1.6 2000/07/02 22:07:56 itojun Exp $
 +		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(examplesdir)/ssh_config; \
 +		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(examplesdir)/sshd_config; \
  	fi
-@@ -148,3 +149,3 @@
+ 	if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
  		$(PERL) fixprogs ssh_prng_cmds $(ENT); \
 -		$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
 +		$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \
  	fi
-@@ -168,6 +169,6 @@
+ 
+ host-key: ssh-keygen
+@@ -168,10 +169,10 @@
+ 	./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
+ 
  uninstallall:	uninstall
 -	-rm -f $(DESTDIR)$(sysconfdir)/ssh_config
 -	-rm -f $(DESTDIR)$(sysconfdir)/sshd_config
@@ -33,3 +52,5 @@ $NetBSD: patch-ah,v 1.6 2000/07/02 22:07:56 itojun Exp $
 +	-rm -f $(DESTDIR)$(examplesdir)/ssh_prng_cmds
 +	-rmdir $(DESTDIR)$(examplesdir)
  	-rmdir $(DESTDIR)$(bindir)
+ 	-rmdir $(DESTDIR)$(sbindir)
+ 	-rmdir $(DESTDIR)$(mandir)/$(mansubdir)1