Rework detection of getifaddrs() code so that it precedes the AIX method as

AIX method was being chosen in preference (on NetBSD 5.0 at least). This
broke net and rpcclient, etc. as they failed to enumerate interfaces
correctly.

4 files changed, 54 insertions, 41 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 7903511ec7c..d589830f9c3 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.187 2009/02/03 09:46:41 uebayasi Exp $
+# $NetBSD: Makefile,v 1.188 2009/03/03 17:50:49 sborrill Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=		samba-${VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net
 MASTER_SITES=		${SAMBA_MIRRORS:=old-versions/}
 
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 1da8a87d306..93e66f185fb 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2008/11/28 03:17:58 taca Exp $
+$NetBSD: distinfo,v 1.66 2009/03/03 17:50:49 sborrill Exp $
 
 SHA1 (samba-3.0.32-CVE-2008-4314.patch) = 23354d8773e791fc9198da49048eff2a6966e6b9
 RMD160 (samba-3.0.32-CVE-2008-4314.patch) = 7507f46b58c96668a2e4e2c4aefa3244c18fad7d
@@ -12,8 +12,8 @@ SHA1 (patch-ae) = 28fc3d1ad158f8025f1f9ba8e170d93c31fa45ba
 SHA1 (patch-af) = 9f14842b7d0b5e66bf1d52bcacefe5e1aa392b7c
 SHA1 (patch-ag) = c73e717e053b6618b2a334602fefabe5a5f98a98
 SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
-SHA1 (patch-at) = 8664f61528e589beba02094e74e2485b3a865eb9
-SHA1 (patch-au) = f1b86b6f3a161b485bf5507fa1da69352b5a5e93
+SHA1 (patch-at) = 047657002d21420f737a1adb8026ce552f4e8b2a
+SHA1 (patch-au) = a3990e7da879e35bc184704547c08311bd8fa05e
 SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
 SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538
 SHA1 (patch-ax) = e528921710514bc2651bfca808c21d608f928a95
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index 80fa3892244..cf3cebbe900 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
+$NetBSD: patch-at,v 1.11 2009/03/03 17:50:49 sborrill Exp $
 
---- configure.orig	2008-05-28 15:15:44.000000000 +0100
-+++ configure	2008-06-28 14:02:26.000000000 +0100
+--- configure.orig	2008-08-25 22:16:26.000000000 +0100
++++ configure	2009-03-03 16:24:13.000000000 +0000
 @@ -667,6 +667,7 @@
  target_os
  configdir
@@ -81,10 +81,10 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -46876,6 +46902,75 @@
- fi
- 
- if test $iface = no; then
+@@ -46809,6 +46835,74 @@
+ ##################
+ # look for a method of finding the list of network interfaces
+ iface=no;
 +{ echo "$as_me:$LINENO: checking for iface ifaddrs" >&5
 +echo $ECHO_N "checking for iface ifaddrs... $ECHO_C" >&6; }
 +if test "${samba_cv_HAVE_IFACE_IFADDRS+set}" = set; then
@@ -151,13 +151,20 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
 +_ACEOF
 +
 +fi
-+fi
 +
 +if test $iface = no; then
+ { echo "$as_me:$LINENO: checking for iface AIX" >&5
+ echo $ECHO_N "checking for iface AIX... $ECHO_C" >&6; }
+ if test "${samba_cv_HAVE_IFACE_AIX+set}" = set; then
+@@ -46876,6 +46970,7 @@
+ _ACEOF
+ 
+ fi
++fi
+ 
+ if test $iface = no; then
  { echo "$as_me:$LINENO: checking for iface ifconf" >&5
- echo $ECHO_N "checking for iface ifconf... $ECHO_C" >&6; }
- if test "${samba_cv_HAVE_IFACE_IFCONF+set}" = set; then
-@@ -50251,9 +50346,9 @@
+@@ -50253,9 +50348,9 @@
  
  
  
@@ -170,7 +177,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -50269,11 +50364,11 @@
+@@ -50271,11 +50366,11 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -184,7 +191,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
    ;
    return 0;
  }
-@@ -50296,13 +50391,13 @@
+@@ -50298,13 +50393,13 @@
  	 test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -200,7 +207,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
  		  ac_cv_lib_ext_crypto=no
  fi
  
-@@ -50310,11 +50405,11 @@
+@@ -50312,11 +50407,11 @@
        conftest$ac_exeext conftest.$ac_ext
  
  fi
@@ -216,7 +223,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
  _ACEOF
  
  fi
-@@ -63338,31 +63433,39 @@
+@@ -63340,31 +63435,39 @@
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;
@@ -278,7 +285,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
  		;;
  	*irix*)
  		# IRIX has differently named shared libraries
-@@ -67891,6 +67994,7 @@
+@@ -67893,6 +67998,7 @@
  target_os!$target_os$ac_delim
  configdir!$configdir$ac_delim
  lockdir!$lockdir$ac_delim
@@ -286,7 +293,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
  piddir!$piddir$ac_delim
  logfilebase!$logfilebase$ac_delim
  privatedir!$privatedir$ac_delim
-@@ -67934,7 +68038,6 @@
+@@ -67936,7 +68042,6 @@
  KRB5_LIBS!$KRB5_LIBS$ac_delim
  UUID_LIBS!$UUID_LIBS$ac_delim
  LDAP_LIBS!$LDAP_LIBS$ac_delim
@@ -294,7 +301,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67976,6 +68079,7 @@
+@@ -67978,6 +68083,7 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -302,7 +309,7 @@ $NetBSD: patch-at,v 1.10 2008/06/28 22:51:21 tron Exp $
  INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
  UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
  NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -68060,7 +68164,7 @@
+@@ -68062,7 +68168,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au
index a5c9d7d2449..ec08fab714f 100644
--- a/net/samba/patches/patch-au
+++ b/net/samba/patches/patch-au
@@ -1,8 +1,7 @@
-$NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
-
---- configure.in.orig	2008-03-08 10:56:26.000000000 -0500
-+++ configure.in
-@@ -38,6 +38,7 @@ AC_PREFIX_DEFAULT(/usr/local/samba)
+$NetBSD: patch-au,v 1.10 2009/03/03 17:50:49 sborrill Exp $
+--- configure.in.orig	2008-08-25 22:09:21.000000000 +0100
++++ configure.in	2009-03-03 17:11:54.000000000 +0000
+@@ -38,6 +38,7 @@
  
  rootsbindir="\${SBINDIR}"
  lockdir="\${VARDIR}/locks"
@@ -10,7 +9,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
  piddir="\${VARDIR}/locks"
  test "${mandir}" || mandir="\${prefix}/man"
  logfilebase="\${VARDIR}"
-@@ -51,7 +52,8 @@ AC_ARG_WITH(fhs,
+@@ -51,7 +52,8 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
    yes)
@@ -20,7 +19,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
      piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
-@@ -111,6 +113,22 @@ AC_ARG_WITH(lockdir,
+@@ -111,6 +113,22 @@
    esac])
  
  #################################################
@@ -43,7 +42,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
  # set pid directory location
  AC_ARG_WITH(piddir,
  [  --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)],
-@@ -257,6 +275,7 @@ fi
+@@ -257,6 +275,7 @@
  
  AC_SUBST(configdir)
  AC_SUBST(lockdir)
@@ -51,7 +50,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
  AC_SUBST(piddir)
  AC_SUBST(logfilebase)
  AC_SUBST(privatedir)
-@@ -1242,7 +1261,7 @@ AC_CHECK_FUNCS(lstat64 fopen64 atexit gr
+@@ -1242,7 +1261,7 @@
  AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf)
  AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
  AC_CHECK_FUNCS(getpwent_r)
@@ -60,10 +59,10 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
  AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink)
  AC_CHECK_FUNCS(syslog vsyslog timegm)
  AC_CHECK_FUNCS(setlocale nl_langinfo)
-@@ -2834,6 +2853,21 @@ if test x"$samba_cv_HAVE_IFACE_AIX" = x"
- fi
- 
- if test $iface = no; then
+@@ -2821,6 +2840,20 @@
+ ##################
+ # look for a method of finding the list of network interfaces
+ iface=no;
 +AC_CACHE_CHECK([for iface ifaddrs],samba_cv_HAVE_IFACE_IFADDRS,[
 +SAVE_CPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
@@ -76,13 +75,20 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
 +if test x"$samba_cv_HAVE_IFACE_IFADDRS" = x"yes"; then
 +	iface=yes;AC_DEFINE(HAVE_IFACE_IFADDRS,1,[Whether iface ifaddrs is available])
 +fi
-+fi
 +
 +if test $iface = no; then
- AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[
+ AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[
  SAVE_CPPFLAGS="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
-@@ -3524,7 +3558,7 @@ if test x"$with_ads_support" != x"no"; t
+@@ -2834,6 +2867,7 @@
+ if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then
+     iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available])
+ fi
++fi
+ 
+ if test $iface = no; then
+ AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[
+@@ -3526,7 +3560,7 @@
    AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
  
    # Heimdal checks.
@@ -91,7 +97,7 @@ $NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
    AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
    AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
  
-@@ -5769,31 +5803,39 @@ case "$host_os" in
+@@ -5771,31 +5805,39 @@
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;