SETGROUPS_NOOP disappeared, so we're relying only on HAVE_INTERIX in those

specific cases.

3 files changed, 40 insertions, 39 deletions

diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index edc8b949961..5544997c5fe 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.45 2005/11/04 14:47:32 tv Exp $
+$NetBSD: distinfo,v 1.46 2005/11/04 15:27:34 tv Exp $
 
 SHA1 (openssh-4.2p1.tar.gz) = 5e7231cfa8ec673ea856ce291b78fac8b380eb78
 RMD160 (openssh-4.2p1.tar.gz) = e1f45333e66d0afceb9934ab73401b4ca06f03a6
 Size (openssh-4.2p1.tar.gz) = 914165 bytes
-SHA1 (patch-aa) = c9483cd952fdb539bf9d46fe87a8ad6b16fb0fff
-SHA1 (patch-ab) = 9a42cc9bd5e5425cc8251fed081edfcc910ec037
+SHA1 (patch-aa) = cbe1d379a9ee8c9d907c132dcc4f090c3056b307
+SHA1 (patch-ab) = 9fa222f3ec2be4dc7d2090d5ea9e1812544659f3
 SHA1 (patch-ac) = 3f693738d3e02aa6abd0687fbd22465db65abfc0
 SHA1 (patch-ad) = 23f73b7ce008c6ccd431d3d80692e59fcf33aa14
 SHA1 (patch-ae) = 21b58d72f4dbf9affed65857518c26ab9277a0f8
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 5f790f41d62..ae36aa2db9f 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,21 +1,11 @@
-$NetBSD: patch-aa,v 1.39 2005/09/23 15:45:14 taca Exp $
+$NetBSD: patch-aa,v 1.40 2005/11/04 15:27:34 tv Exp $
 
---- configure.orig	2005-09-01 02:15:24.000000000 -0700
-+++ configure	2005-09-21 09:49:24.000000000 -0700
-@@ -5706,7 +5706,7 @@
- 		need_dash_r=1
- 	fi
- 	;;
--*-*-freebsd*)
-+*-*-freebsd*|*-*-dragonfly*)
- 	check_for_libcrypt_later=1
+--- configure.orig	2005-09-01 05:15:24.000000000 -0400
++++ configure
+@@ -5481,6 +5481,36 @@ _ACEOF
+ 		;;
+ 	esac
  	;;
- *-*-bsdi*)
-@@ -6552,8 +6552,46 @@
- _ACEOF
- 
-         ;;
-+ 
 +*-*-interix3)
 +        cat >>confdefs.h <<\_ACEOF
 +#define HAVE_INTERIX 1
@@ -42,14 +32,24 @@ $NetBSD: patch-aa,v 1.39 2005/09/23 15:45:14 taca Exp $
 +_ACEOF
 +
 +        cat >>confdefs.h <<\_ACEOF
-+#define SETGROUPS_NOOP 1
-+_ACEOF
-+
-+        cat >>confdefs.h <<\_ACEOF
 +#define USE_PIPES 1
 +_ACEOF
 +
 +       ;;
+ *-*-irix5*)
+ 	PATH="$PATH:/usr/etc"
+ 	cat >>confdefs.h <<\_ACEOF
+@@ -5706,7 +5736,7 @@ _ACEOF
+ 		need_dash_r=1
+ 	fi
+ 	;;
+-*-*-freebsd*)
++*-*-freebsd*|*-*-dragonfly*)
+ 	check_for_libcrypt_later=1
+ 	;;
+ *-*-bsdi*)
+@@ -6554,6 +6584,9 @@ _ACEOF
+         ;;
  esac
  
 +# pkgsrc handles any rpath settings this package needs
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.39 2005/09/23 15:45:14 taca Exp $
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -25360,12 +25398,19 @@
+@@ -25360,12 +25393,19 @@ fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -81,7 +81,7 @@ $NetBSD: patch-aa,v 1.39 2005/09/23 15:45:14 taca Exp $
  	cat >>confdefs.h <<_ACEOF
  #define CONF_UTMPX_FILE "$conf_utmpx_location"
  _ACEOF
-@@ -25434,12 +25479,20 @@
+@@ -25434,12 +25474,20 @@ fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.39 2005/09/23 15:45:14 taca Exp $
  	cat >>confdefs.h <<_ACEOF
  #define CONF_WTMPX_FILE "$conf_wtmpx_location"
  _ACEOF
-@@ -26665,7 +26718,7 @@
+@@ -26665,7 +26713,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 9e734228534..7ccf35c635b 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,13 +1,11 @@
-$NetBSD: patch-ab,v 1.21 2005/09/21 18:07:09 reed Exp $
+$NetBSD: patch-ab,v 1.22 2005/11/04 15:27:34 tv Exp $
 
---- configure.ac.orig	2005-08-31 11:59:49.000000000 -0500
+--- configure.ac.orig	2005-08-31 12:59:49.000000000 -0400
 +++ configure.ac
-@@ -570,8 +570,24 @@
-         AC_DEFINE(MISSING_HOWMANY)
-         AC_DEFINE(BROKEN_SETVBUF, 1, [LynxOS has broken setvbuf() implementation])
-         ;;
-+
-+
+@@ -305,6 +305,15 @@ main() { if (NSVersionOfRunTimeLibrary("
+ 		;;
+ 	esac
+ 	;;
 +*-*-interix3*)
 +        AC_DEFINE(HAVE_INTERIX)
 +        AC_DEFINE(DISABLE_FD_PASSING)
@@ -15,10 +13,13 @@ $NetBSD: patch-ab,v 1.21 2005/09/21 18:07:09 reed Exp $
 +        AC_DEFINE(IP_TOS_IS_BROKEN)
 +        AC_DEFINE(MISSING_HOWMANY)
 +        AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
-+        AC_DEFINE(SETGROUPS_NOOP)
 +        AC_DEFINE(USE_PIPES)
 +        ;;
-+
+ *-*-irix5*)
+ 	PATH="$PATH:/usr/etc"
+ 	AC_DEFINE(BROKEN_INET_NTOA)
+@@ -572,6 +581,9 @@ mips-sony-bsd|mips-sony-newsos4)
+         ;;
  esac
  
 +# pkgsrc handles any rpath settings this package needs
@@ -27,7 +28,7 @@ $NetBSD: patch-ab,v 1.21 2005/09/21 18:07:09 reed Exp $
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
  	[  --with-cflags           Specify additional flags to pass to compiler],
-@@ -3358,9 +3374,17 @@
+@@ -3358,9 +3370,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_utmpx_location"; then
  	if test x"$system_utmpx_path" = x"no" ; then
@@ -47,7 +48,7 @@ $NetBSD: patch-ab,v 1.21 2005/09/21 18:07:09 reed Exp $
  	AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location")
  fi
  
-@@ -3383,9 +3407,17 @@
+@@ -3383,9 +3403,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_wtmpx_location"; then
  	if test x"$system_wtmpx_path" = x"no" ; then
@@ -67,7 +68,7 @@ $NetBSD: patch-ab,v 1.21 2005/09/21 18:07:09 reed Exp $
  	AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location")
  fi
  
-@@ -3431,7 +3463,7 @@
+@@ -3431,7 +3459,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"