Update openssh package to 4.5.1 (openssh-4.5p1).

Changes:

Security bugs resolved in this release:

 * Fix a bug in the sshd privilege separation monitor that weakened its
   verification of successful authentication. This bug is not known to
   be exploitable in the absence of additional vulnerabilities.

This release includes the following non-security fixes:

 * Several compilation fixes for portable OpenSSH

 * Fixes to Solaris SMF/process contract support (bugzilla #1255)

2 files changed, 49 insertions, 49 deletions

diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 0dd61a862d3..20e523159f8 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $
+$NetBSD: patch-aa,v 1.43 2006/11/08 01:49:22 taca Exp $
 
---- configure.orig	2006-09-26 20:03:41.000000000 +0900
+--- configure.orig	2006-11-07 22:07:18.000000000 +0900
 +++ configure
-@@ -7326,6 +7326,36 @@ _ACEOF
+@@ -5835,6 +5835,9 @@ if test "${with_rpath+set}" = set; then
+ fi
+ 
+ 
++# pkgsrc handles any rpath settings this package needs
++need_dash_r=
++
+ # Allow user to specify flags
+ 
+ # Check whether --with-cflags was given.
+@@ -5976,6 +5979,7 @@ for ac_header in \
+ 	maillock.h \
+ 	ndir.h \
+ 	net/if_tun.h \
++	net/tun/if_tun.h \
+ 	netdb.h \
+ 	netgroup.h \
+ 	pam/pam_appl.h \
+@@ -7919,6 +7923,36 @@ _ACEOF
  		;;
  	esac
  	;;
@@ -39,7 +57,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $
  *-*-irix5*)
  	PATH="$PATH:/usr/etc"
  
-@@ -7931,7 +7961,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -8524,7 +8558,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
  	;;
@@ -48,25 +66,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $
  	check_for_libcrypt_later=1
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9144,6 +9174,9 @@ _ACEOF
-         ;;
- esac
- 
-+# pkgsrc handles any rpath settings this package needs
-+need_dash_r=
-+
- # Allow user to specify flags
- 
- # Check whether --with-cflags was given.
-@@ -9344,6 +9377,7 @@ for ac_header in \
- 	maillock.h \
- 	ndir.h \
- 	net/if_tun.h \
-+	net/tun/if_tun.h \
- 	netdb.h \
- 	netgroup.h \
- 	pam/pam_appl.h \
-@@ -32055,14 +32089,21 @@ fi
+@@ -32058,14 +32092,21 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -92,7 +92,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $
  #define CONF_UTMPX_FILE "$conf_utmpx_location"
  _ACEOF
  
-@@ -32143,14 +32184,20 @@ fi
+@@ -32146,14 +32187,20 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -118,7 +118,7 @@ $NetBSD: patch-aa,v 1.42 2006/10/31 03:31:19 taca Exp $
  #define CONF_WTMPX_FILE "$conf_wtmpx_location"
  _ACEOF
  
-@@ -33383,7 +33430,7 @@ echo "OpenSSH has been configured with t
+@@ -33386,7 +33433,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab
index 6e8f34f8387..102af7061a3 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,8 +1,26 @@
-$NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $
+$NetBSD: patch-ab,v 1.25 2006/11/08 01:49:22 taca Exp $
 
---- configure.ac.orig	2006-09-25 04:08:59.000000000 +0900
+--- configure.ac.orig	2006-10-07 08:07:21.000000000 +0900
 +++ configure.ac
-@@ -324,6 +324,15 @@ main() { if (NSVersionOfRunTimeLibrary("
+@@ -127,6 +127,9 @@ AC_ARG_WITH(rpath,
+ 	]
+ )
+ 
++# pkgsrc handles any rpath settings this package needs
++need_dash_r=
++
+ # Allow user to specify flags
+ AC_ARG_WITH(cflags,
+ 	[  --with-cflags           Specify additional flags to pass to compiler],
+@@ -194,6 +197,7 @@ AC_CHECK_HEADERS( \
+ 	maillock.h \
+ 	ndir.h \
+ 	net/if_tun.h \
++	net/tun/if_tun.h \
+ 	netdb.h \
+ 	netgroup.h \
+ 	pam/pam_appl.h \
+@@ -454,6 +458,15 @@ main() { if (NSVersionOfRunTimeLibrary("
  		;;
  	esac
  	;;
@@ -18,25 +36,7 @@ $NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $
  *-*-irix5*)
  	PATH="$PATH:/usr/etc"
  	AC_DEFINE(BROKEN_INET_NTOA, 1,
-@@ -663,6 +672,9 @@ mips-sony-bsd|mips-sony-newsos4)
-         ;;
- esac
- 
-+# pkgsrc handles any rpath settings this package needs
-+need_dash_r=
-+
- # Allow user to specify flags
- AC_ARG_WITH(cflags,
- 	[  --with-cflags           Specify additional flags to pass to compiler],
-@@ -745,6 +757,7 @@ AC_CHECK_HEADERS( \
- 	maillock.h \
- 	ndir.h \
- 	net/if_tun.h \
-+	net/tun/if_tun.h \
- 	netdb.h \
- 	netgroup.h \
- 	pam/pam_appl.h \
-@@ -3873,9 +3886,17 @@ AC_TRY_COMPILE([
+@@ -3876,9 +3889,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $
  	AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location",
  		[Define if you want to specify the path to your utmpx file])
  fi
-@@ -3899,9 +3920,17 @@ AC_TRY_COMPILE([
+@@ -3902,9 +3923,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -76,7 +76,7 @@ $NetBSD: patch-ab,v 1.24 2006/10/31 03:31:20 taca Exp $
  	AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location",
  		[Define if you want to specify the path to your wtmpx file])
  fi
-@@ -3941,7 +3970,7 @@ echo "OpenSSH has been configured with t
+@@ -3944,7 +3973,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"