Update openssh pacakge to 4.6.1.

Changes since OpenSSH 4.5:
============================

 * sshd now allows the enabling and disabling of authentication
   methods on a per user, group, host and network basis via the
   Match directive in sshd_config.

 * The following bugs have been fixed in this release:

   - Clear SIGALRM when restarting due to SIGHUP. Prevents stray
     signal from taking down sshd if a connection was pending at
     the time SIGHUP was received
   - sftp returned a zero exit status when upload failed due to write
     errors (bugzilla #1252)
   - fixed an inconsistent check for a terminal when displaying scp
     progress meter (bugzilla #1265)
   - Parsing of time values in Match blocks was incorrectly applied
     to the global configuration (bugzilla #1275)
   - Allow multiple forwarding options to work when specified in a
     PermitOpen directive (bugzilla #1267)
   - Interoperate with ssh.com versions that do not support binding
     remote port forwarding sessions to a hostname (bugzilla #1019)

 * Portable OpenSSH bugs fixed:

   - "hang on exit" when background processes are running at the time
     of exit on a ttyful/login session (bugzilla #52)
   - Fix typos in the ssh-rand-helper(8) man page (bugzilla #1259)
   - Check that some SIG records have been returned in getrrsetbyname
     (bugzilla #1281)
   - Fix contrib/findssl for platforms that lack "which" (bugzilla
     #1237)
   - Work around bug in OpenSSL 0.9.8e that broke aes256-ctr,
     aes192-ctr, arcfour256 (bugzilla #1291)

5 files changed, 19 insertions, 33 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 2f061e271e9..77ec2bd4d51 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.178 2007/03/16 05:46:06 cjs Exp $
+# $NetBSD: Makefile,v 1.179 2007/03/18 12:38:44 taca Exp $
 
-DISTNAME=		openssh-4.5p1
-PKGNAME=		openssh-4.5.1
-PKGREVISION=		2
+DISTNAME=		openssh-4.6p1
+PKGNAME=		openssh-4.6.1
 SVR4_PKGNAME=		ossh
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index f284abbfac4..931a0631aa8 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.61 2007/03/16 05:46:06 cjs Exp $
+$NetBSD: distinfo,v 1.62 2007/03/18 12:38:45 taca Exp $
 
-SHA1 (openssh-4.5p1-hpn12v14.diff.gz) = 8bea17b13e7e91135785f4222252c28d08c9c887
-RMD160 (openssh-4.5p1-hpn12v14.diff.gz) = 1f937174d5418d578da5d9dfab16b5cc8960efc5
-Size (openssh-4.5p1-hpn12v14.diff.gz) = 15791 bytes
-SHA1 (openssh-4.5p1.tar.gz) = 2eefcbbeb9e4fa16fa4500dec107d1a09d3d02d7
-RMD160 (openssh-4.5p1.tar.gz) = 3f70b6f4228e84c7b9b8b3bee7fd3875f3e3bad3
-Size (openssh-4.5p1.tar.gz) = 965925 bytes
+SHA1 (openssh-4.6p1-hpn12v16.diff.gz) = a10ed53ad92e2e3106da7050c3b0076a2cd1c0ca
+RMD160 (openssh-4.6p1-hpn12v16.diff.gz) = 421e2c189c2e9b378f6ee3944183355f9f18d5e8
+Size (openssh-4.6p1-hpn12v16.diff.gz) = 15944 bytes
+SHA1 (openssh-4.6p1.tar.gz) = b2aefeb1861b4688b1777436035239ec32a47da8
+RMD160 (openssh-4.6p1.tar.gz) = 2959ac56c9175275bf82847ec64b2b169aedcb82
+Size (openssh-4.6p1.tar.gz) = 967395 bytes
 SHA1 (patch-aa) = 8b7a16e9a63cfff3b73d70b9cebb6627b96396e0
 SHA1 (patch-ab) = a105c238c8dc774ed6992791b131da56824869e9
 SHA1 (patch-ac) = dfb054ef02fbb5d206f6adaf82944f16da20eaf9
@@ -19,13 +19,12 @@ SHA1 (patch-aj) = 4f477f40d1d891dcda9083cec5521e80410ebd54
 SHA1 (patch-ak) = 3720afb4e95356d5310762cda881820d524dcffc
 SHA1 (patch-al) = d312a068047a375e52180026554bab745efdcdb7
 SHA1 (patch-am) = 4e2278b20e87e530e1819efde976d4414e160e38
-SHA1 (patch-an) = 283b17f27224dad853091d5145f2dab342132f8f
+SHA1 (patch-an) = 2f955b8891bedd79986490d282eb09acd4910250
 SHA1 (patch-ao) = a70da4f5942553a42fa935b82172e601b29951df
 SHA1 (patch-ap) = 2c0c092637661328046b71292a7412d09e92bb2a
 SHA1 (patch-aq) = a619b57361b04d5ab3d41375c18f7b99d71c8b34
 SHA1 (patch-ar) = fce4dc1011a124f02b8e14980cda1d633b36aa7d
 SHA1 (patch-as) = 19660f5983931ea3b053e6f4289cf6fae2ce50f3
-SHA1 (patch-at) = 1053afa04babc82374d7356aa0cc5fa55cf184e2
 SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f
 SHA1 (patch-av) = 00f54c3fae7318b278b16bd0b01881a90bd31365
 SHA1 (patch-aw) = 2a88b7563c6f52163c6c5f716e437ecaea613a30
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
index 2c6d283edf6..24fffa0b576 100644
--- a/security/openssh/options.mk
+++ b/security/openssh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2007/02/22 19:27:08 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2007/03/18 12:38:45 taca Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--with-kerberos5=${KRB5BASE:Q}
 .endif
 
 .if !empty(PKG_OPTIONS:Mhpn-patch)
-PATCHFILES=		openssh-4.5p1-hpn12v14.diff.gz
+PATCHFILES=		openssh-4.6p1-hpn12v16.diff.gz
 PATCH_SITES=		http://www.psc.edu/networking/projects/hpn-ssh/
 PATCH_DIST_STRIP=	-p1
 .endif
diff --git a/security/openssh/patches/patch-an b/security/openssh/patches/patch-an
index 929a983dc72..dac9e7edfe6 100644
--- a/security/openssh/patches/patch-an
+++ b/security/openssh/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.8 2006/10/31 03:31:20 taca Exp $
+$NetBSD: patch-an,v 1.9 2007/03/18 12:38:45 taca Exp $
 
---- scp.c.orig	2006-10-29 12:02:30.000000000 +0900
+--- scp.c.orig	2007-03-18 16:27:26.000000000 +0900
 +++ scp.c
-@@ -375,7 +375,11 @@ main(int argc, char **argv)
+@@ -377,7 +377,11 @@ main(int argc, char **argv)
  	argc -= optind;
  	argv += optind;
  
@@ -13,8 +13,8 @@ $NetBSD: patch-an,v 1.8 2006/10/31 03:31:20 taca Exp $
 +#endif
  		fatal("unknown user %u", (u_int) userid);
  
- 	if (!isatty(STDERR_FILENO))
-@@ -722,8 +726,10 @@ rsource(char *name, struct stat *statp)
+ 	if (!isatty(STDOUT_FILENO))
+@@ -724,8 +728,10 @@ rsource(char *name, struct stat *statp)
  		return;
  	}
  	while ((dp = readdir(dirp)) != NULL) {
@@ -25,7 +25,7 @@ $NetBSD: patch-an,v 1.8 2006/10/31 03:31:20 taca Exp $
  		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
  			continue;
  		if (strlen(name) + 1 + strlen(dp->d_name) >= sizeof(path) - 1) {
-@@ -1173,7 +1179,9 @@ okname(char *cp0)
+@@ -1175,7 +1181,9 @@ okname(char *cp0)
  			case '\'':
  			case '"':
  			case '`':
diff --git a/security/openssh/patches/patch-at b/security/openssh/patches/patch-at
deleted file mode 100644
index 77aa3cf9259..00000000000
--- a/security/openssh/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.5 2007/01/27 22:57:35 schwarz Exp $
-
---- packet.c.orig	2007-01-27 20:39:52.000000000 +0100
-+++ packet.c	2007-01-27 20:39:38.000000000 +0100
-@@ -47,7 +47,6 @@
- # include <sys/time.h>
- #endif
- 
--#include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <arpa/inet.h>