Fix IPv6 detection on Darwin. Patch supplied by itojun in private e-mail.

3 files changed, 85 insertions, 17 deletions

diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 1f4a7ca3a3f..a81a0dedd2b 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2002/08/28 04:55:18 jlam Exp $
+$NetBSD: distinfo,v 1.22 2002/09/09 20:16:22 jlam Exp $
 
 SHA1 (openssh-3.4p1.tar.gz) = 8841326bf79b2c8a88d7a6e371739ec21cee73bc
 Size (openssh-3.4p1.tar.gz) = 837668 bytes
-SHA1 (patch-aa) = 817aa0fc69ea933666c43a677695f3bf1f4dc3ec
-SHA1 (patch-ab) = 918ba2eed7dccd33c09b6caa1d379647ba97178f
+SHA1 (patch-aa) = 6ef5aad9f5db134be3b6c2fa34a3e5ab158b7a58
+SHA1 (patch-ab) = a8021e0af1bbc2ea2e74ca117f1210fbd2837699
 SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 34e7a59605a..15b80194482 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,8 +1,58 @@
-$NetBSD: patch-aa,v 1.25 2002/08/28 04:55:18 jlam Exp $
+$NetBSD: patch-aa,v 1.26 2002/09/09 20:16:25 jlam Exp $
 
 --- configure.orig	Wed Jun 26 07:08:18 2002
 +++ configure
-@@ -3920,6 +3920,7 @@ _ACEOF
+@@ -3683,10 +3683,49 @@ _ACEOF
+ 
+ 	;;
+ *-*-darwin*)
++	echo "$as_me:$LINENO: checking if we have working getaddrinfo" >&5
++echo $ECHO_N "checking if we have working getaddrinfo... $ECHO_C" >&6
++	if test "$cross_compiling" = yes; then
++  echo "$as_me:$LINENO: result: assume it is working" >&5
++echo "${ECHO_T}assume it is working" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++#include <mach-o/dyld.h>
++main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
++		exit(0);
++	else
++		exit(1);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  echo "$as_me:$LINENO: result: working" >&5
++echo "${ECHO_T}working" >&6
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++( exit $ac_status )
++echo "$as_me:$LINENO: result: buggy" >&5
++echo "${ECHO_T}buggy" >&6
+ 	cat >>confdefs.h <<\_ACEOF
+ #define BROKEN_GETADDRINFO 1
+ _ACEOF
+ 
++fi
++rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
+ 	;;
+ *-*-hpux10.26)
+ 	if test -z "$GCC"; then
+@@ -3920,6 +3959,7 @@ _ACEOF
  	SONY=1
  	;;
  *-*-netbsd*)
@@ -10,7 +60,7 @@ $NetBSD: patch-aa,v 1.25 2002/08/28 04:55:18 jlam Exp $
  	need_dash_r=1
  	;;
  *-*-freebsd*)
-@@ -3950,8 +3951,6 @@ _ACEOF
+@@ -3950,8 +3990,6 @@ _ACEOF
  	CFLAGS="$CFLAGS"
  	;;
  *-*-solaris*)
@@ -19,7 +69,7 @@ $NetBSD: patch-aa,v 1.25 2002/08/28 04:55:18 jlam Exp $
  	need_dash_r=1
  	cat >>confdefs.h <<\_ACEOF
  #define PAM_SUN_CODEBASE 1
-@@ -4406,6 +4405,9 @@ _ACEOF
+@@ -4406,6 +4444,9 @@ _ACEOF
  	;;
  esac
  
@@ -29,7 +79,7 @@ $NetBSD: patch-aa,v 1.25 2002/08/28 04:55:18 jlam Exp $
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -6319,6 +6321,10 @@ echo $ECHO_N "checking for libwrap... $E
+@@ -6319,6 +6360,10 @@ echo $ECHO_N "checking for libwrap... $E
  #line $LINENO "configure"
  #include "confdefs.h"
  
@@ -40,7 +90,7 @@ $NetBSD: patch-aa,v 1.25 2002/08/28 04:55:18 jlam Exp $
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  
-@@ -8090,6 +8096,76 @@ fi
+@@ -8090,6 +8135,76 @@ fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -117,7 +167,7 @@ $NetBSD: patch-aa,v 1.25 2002/08/28 04:55:18 jlam Exp $
  # Search for OpenSSL
  saved_CPPFLAGS="$CPPFLAGS"
  saved_LDFLAGS="$LDFLAGS"
-@@ -17497,7 +17573,7 @@ echo "OpenSSH has been configured with t
+@@ -17497,7 +17612,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 c2bdd0cb0c0..af0c28a8918 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,8 +1,26 @@
-$NetBSD: patch-ab,v 1.12 2002/08/28 04:55:18 jlam Exp $
+$NetBSD: patch-ab,v 1.13 2002/09/09 20:16:26 jlam Exp $
 
 --- configure.ac.orig	Tue Jun 25 15:35:16 2002
 +++ configure.ac
-@@ -167,6 +167,7 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -93,7 +93,16 @@ case "$host" in
+ 	AC_DEFINE(IP_TOS_IS_BROKEN)
+ 	;;
+ *-*-darwin*)
+-	AC_DEFINE(BROKEN_GETADDRINFO)
++	AC_MSG_CHECKING(if we have working getaddrinfo)
++	AC_TRY_RUN([#include <mach-o/dyld.h>
++main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
++		exit(0);
++	else
++		exit(1);
++}], [AC_MSG_RESULT(working)],
++	[AC_MSG_RESULT(buggy)
++	AC_DEFINE(BROKEN_GETADDRINFO)],
++	[AC_MSG_RESULT(assume it is working)])
+ 	;;
+ *-*-hpux10.26)
+ 	if test -z "$GCC"; then
+@@ -167,6 +176,7 @@ mips-sony-bsd|mips-sony-newsos4)
  	SONY=1
  	;;
  *-*-netbsd*)
@@ -10,7 +28,7 @@ $NetBSD: patch-ab,v 1.12 2002/08/28 04:55:18 jlam Exp $
  	need_dash_r=1
  	;;
  *-*-freebsd*)
-@@ -185,8 +186,6 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -185,8 +195,6 @@ mips-sony-bsd|mips-sony-newsos4)
  	CFLAGS="$CFLAGS"
  	;;
  *-*-solaris*)
@@ -19,7 +37,7 @@ $NetBSD: patch-ab,v 1.12 2002/08/28 04:55:18 jlam Exp $
  	need_dash_r=1
  	AC_DEFINE(PAM_SUN_CODEBASE)
  	AC_DEFINE(LOGIN_NEEDS_UTMPX)
-@@ -312,6 +311,9 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -312,6 +320,9 @@ mips-sony-bsd|mips-sony-newsos4)
  	;;
  esac
  
@@ -29,7 +47,7 @@ $NetBSD: patch-ab,v 1.12 2002/08/28 04:55:18 jlam Exp $
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
  	[  --with-cflags           Specify additional flags to pass to compiler],
-@@ -545,6 +547,10 @@ AC_ARG_WITH(tcp-wrappers,
+@@ -545,6 +556,10 @@ AC_ARG_WITH(tcp-wrappers,
  			AC_MSG_CHECKING(for libwrap)
  			AC_TRY_LINK(
  				[
@@ -40,7 +58,7 @@ $NetBSD: patch-ab,v 1.12 2002/08/28 04:55:18 jlam Exp $
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  				],
-@@ -723,6 +729,12 @@ if test "x$PAM_MSG" = "xyes" ; then
+@@ -723,6 +738,12 @@ if test "x$PAM_MSG" = "xyes" ; then
  	)
  fi
  
@@ -53,7 +71,7 @@ $NetBSD: patch-ab,v 1.12 2002/08/28 04:55:18 jlam Exp $
  # Search for OpenSSL
  saved_CPPFLAGS="$CPPFLAGS"
  saved_LDFLAGS="$LDFLAGS"
-@@ -2385,7 +2397,7 @@ echo "OpenSSH has been configured with t
+@@ -2385,7 +2406,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"