Update to 3.8.1p1:

Minor bugfixes.

3 files changed, 15 insertions, 37 deletions

diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index f77c73205e1..3a2ba88403f 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.33 2004/04/27 12:30:23 markd Exp $
+$NetBSD: patch-aa,v 1.34 2004/05/10 18:12:24 wiz Exp $
 
---- configure.orig	2004-02-24 19:22:59.000000000 +1300
+--- configure.orig	2004-04-18 14:51:57.000000000 +0200
 +++ configure
-@@ -4803,6 +4803,9 @@ EOF
+@@ -4816,6 +4816,9 @@ EOF
  	;;
  esac
  
@@ -12,18 +12,7 @@ $NetBSD: patch-aa,v 1.33 2004/04/27 12:30:23 markd Exp $
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -6809,6 +6812,10 @@ echo $ECHO_N "checking for libwrap... $E
- #line 6809 "configure"
- #include "confdefs.h"
- 
-+#ifdef HAVE_SYS_CDEFS_H
-+#include <sys/cdefs.h>
-+#endif
-+#include <stdio.h>
- #include <tcpd.h>
- 					int deny_severity = 0, allow_severity = 0;
- 
-@@ -17009,12 +17016,20 @@ fi
+@@ -17263,12 +17266,20 @@ fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -46,7 +35,7 @@ $NetBSD: patch-aa,v 1.33 2004/04/27 12:30:23 markd Exp $
  	cat >>confdefs.h <<EOF
  #define CONF_UTMPX_FILE "$conf_utmpx_location"
  EOF
-@@ -17069,12 +17084,20 @@ fi
+@@ -17323,12 +17334,20 @@ fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -69,7 +58,7 @@ $NetBSD: patch-aa,v 1.33 2004/04/27 12:30:23 markd Exp $
  	cat >>confdefs.h <<EOF
  #define CONF_WTMPX_FILE "$conf_wtmpx_location"
  EOF
-@@ -17983,7 +18006,7 @@ echo "OpenSSH has been configured with t
+@@ -18237,7 +18256,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 95df629b603..1469871ff21 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2004/04/27 12:30:23 markd Exp $
+$NetBSD: patch-ab,v 1.17 2004/05/10 18:12:24 wiz Exp $
 
---- configure.ac.orig	2004-02-24 18:47:04.000000000 +1300
+--- configure.ac.orig	2004-04-17 05:03:07.000000000 +0200
 +++ configure.ac
-@@ -438,6 +438,9 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -456,6 +456,9 @@ mips-sony-bsd|mips-sony-newsos4)
  	;;
  esac
  
@@ -12,18 +12,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/27 12:30:23 markd Exp $
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
  	[  --with-cflags           Specify additional flags to pass to compiler],
-@@ -767,6 +770,10 @@ AC_ARG_WITH(tcp-wrappers,
- 			AC_MSG_CHECKING(for libwrap)
- 			AC_TRY_LINK(
- 				[
-+#ifdef HAVE_SYS_CDEFS_H
-+#include <sys/cdefs.h>
-+#endif
-+#include <stdio.h>
- #include <tcpd.h>
- 					int deny_severity = 0, allow_severity = 0;
- 				],
-@@ -2725,9 +2732,17 @@ AC_TRY_COMPILE([
+@@ -2824,9 +2827,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -43,7 +32,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/27 12:30:23 markd Exp $
  	AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location")
  fi	
  
-@@ -2750,9 +2765,17 @@ AC_TRY_COMPILE([
+@@ -2849,9 +2860,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -63,7 +52,7 @@ $NetBSD: patch-ab,v 1.16 2004/04/27 12:30:23 markd Exp $
  	AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location")
  fi	
  
-@@ -2793,7 +2816,7 @@ echo "OpenSSH has been configured with t
+@@ -2892,7 +2911,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-ac b/security/openssh/patches/patch-ac
index 160d8095f14..d4508b29c06 100644
--- a/security/openssh/patches/patch-ac
+++ b/security/openssh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2004/04/27 12:30:23 markd Exp $
+$NetBSD: patch-ac,v 1.10 2004/05/10 18:12:24 wiz Exp $
 
---- defines.h.orig	2004-02-10 15:01:14.000000000 +1300
+--- defines.h.orig	2004-04-14 09:24:30.000000000 +0200
 +++ defines.h
-@@ -574,6 +574,24 @@ struct winsize {
+@@ -584,6 +584,24 @@ struct winsize {
  #    endif
  #  endif
  #endif