Make samba* work with autoconf-2.67 on 6.x

I'm not entirely sure why it compiles on 7.x/8.x, but nevertheless, the
autoconf-specific parts to these patches absolutely need to go upstream.

2 files changed, 49 insertions, 82 deletions

diff --git a/net/samba34/files/patch-lib__replace__libreplace.m4 b/net/samba34/files/patch-lib__replace__libreplace.m4
new file mode 100644
index 000000000000..c630cc61e02f
--- /dev/null
+++ b/net/samba34/files/patch-lib__replace__libreplace.m4
@@ -0,0 +1,12 @@
+--- ./lib/replace/libreplace.m4.orig	2010-05-10 07:58:53.000000000 -0500
++++ ./lib/replace/libreplace.m4	2010-09-24 17:13:45.000000000 -0500
+@@ -103,3 +103,8 @@
+ AC_CHECK_HEADERS(stdarg.h vararg.h)
+-AC_CHECK_HEADERS(sys/mount.h mntent.h)
++AC_CHECK_HEADERS([sys/param.h sys/mount.h], [], [],
++[[#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++]])
++AC_CHECK_HEADERS(mntent.h)
+ AC_CHECK_HEADERS(stropts.h)
diff --git a/net/samba34/files/patch-source3__configure.in b/net/samba34/files/patch-source3__configure.in
index c579e66296f4..768fb30c2762 100644
--- a/net/samba34/files/patch-source3__configure.in
+++ b/net/samba34/files/patch-source3__configure.in
@@ -1,8 +1,6 @@
---- ./source3/configure.in.orig	2010-05-10 14:58:53.000000000 +0200
-+++ ./source3/configure.in	2010-06-10 17:50:46.000000000 +0200
-@@ -210,16 +210,6 @@
-        fi
- fi
+--- ./source3/configure.in.orig	2010-05-10 07:58:53.000000000 -0500
++++ ./source3/configure.in	2010-09-24 16:43:52.000000000 -0500
+@@ -212,12 +212,2 @@
  
 -AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
 -
@@ -15,11 +13,17 @@
 -fi
 -
  #################################################
- # check for a shared memory profiling support
- AC_MSG_CHECKING(whether to use profiling)
-@@ -781,10 +771,10 @@
- 
-         if test "x$CUPS_CONFIG" != x; then
+@@ -699,3 +689,8 @@
+ AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h)
+-AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
++AC_CHECK_HEADERS(sys/mount.h, [], [],
++[[#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++]])
++AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
+ AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h)
+@@ -783,6 +778,6 @@
  
 -		ac_save_CFLAGS=$CFLAGS
 -		ac_save_LDFLAGS=$LDFLAGS
@@ -29,32 +33,20 @@
 -		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
 +		CPPFLAGS="$CPPFLAGS `$CUPS_CONFIG --cflags`"
  		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
- 		PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
- 		AC_CHECK_HEADERS(cups/cups.h cups/language.h)
-@@ -794,8 +784,8 @@
- 			samba_cv_HAVE_CUPS=yes
- 		else
+@@ -796,4 +791,4 @@
  			AC_MSG_WARN([cups-config around but cups-devel not installed])
 -			CFLAGS=$ac_save_CFLAGS
 -			LDFLAGS=$ac_save_LDFLAGS
 +			CPPFLAGS=$ac_save_PRINT_CPPFLAGS
 +			LDFLAGS=$ac_save_PRINT_LDFLAGS
  			PRINT_LIBS=$ac_save_PRINT_LIBS
- 		fi
- 
-@@ -1749,9 +1739,6 @@
- AC_MSG_CHECKING([PICFLAG])
- AC_MSG_RESULT([$PICFLAG])
+@@ -1751,5 +1746,2 @@
  
 -AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
 -AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
 -
  AC_CACHE_CHECK([whether building shared libraries actually works],
-                [ac_cv_shlib_works],[
-    # try building a trivial shared library
-@@ -3961,10 +3948,10 @@
- 
-   ################################################################
+@@ -3963,6 +3955,6 @@
    # first test for Active Directory support being enabled
 -  #if test x"$with_ads_support" = x"no"; then
 -  #		AC_MSG_ERROR(Active Directory support is required to enable DNS Update support)
@@ -65,11 +57,7 @@
 +  		with_dnsupdate_support=no
 +  fi
    ##################################################################
-   # then test for uuid.h (necessary to generate unique DNS keynames
-   # (uuid.h is required for this test)
-@@ -4181,15 +4168,51 @@
- 		x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
- 		if test x"${try_pam}" = x"yes";then
+@@ -4183,11 +4175,47 @@
  			AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])
 -       fi
 +		fi
@@ -121,38 +109,22 @@
 +			]
 +		)
  
- 		if test x"$create_pam_modules" = x"yes"; then
- 			AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
-@@ -4199,7 +4222,7 @@
- 			AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
- 			AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
+@@ -4201,3 +4229,3 @@
  		else
 -			AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])		
 +			AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])
  		fi
- 	fi
- 	AC_MSG_CHECKING(whether to use PAM support)
-@@ -5254,7 +5277,8 @@
-         esac
- fi # with_acl_support
+@@ -5256,3 +5284,4 @@
  
 -
 +# check for NFSv4 acl
 +AC_CHECK_LIB(sunacl, acl, [ACL_LIBS="$ACL_LIBS -lsunacl"])
  
- #################################################
- # check for AIO support
-@@ -5796,6 +5820,7 @@
- 		NSSSONAMEVERSIONSUFFIX=".1"
- 		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
+@@ -5798,2 +5827,3 @@
  		    ../nsswitch/winbind_nss_linux.o"
 +		WINBIND_WINS_NSS_EXTRA_OBJS="../nsswitch/wins_freebsd.o"
  		WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
- 		WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
- 		;;
-@@ -5888,17 +5913,10 @@
- 	AC_DEFINE(WITH_WINBIND,1,[Whether to link to wbclient])
- 	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
+@@ -5890,8 +5920,2 @@
  else
 -	if test x"$enable_developer" = x"yes" -a x"$LINK_LIBWBCLIENT" = x"STATIC" ; then
 -		BUILD_LIBWBCLIENT_SHARED=no
@@ -161,29 +133,22 @@
 -	fi
 -
  	LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
- 	LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
- 	LIBWBCLIENT_SOVER=0
+@@ -5900,3 +5924,2 @@
  	if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
 -		NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
  		## Only worry about libwbclient if we have shared
- 		# library support
- 		LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
-@@ -5920,26 +5938,34 @@
- 
- 	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
+@@ -5922,3 +5945,5 @@
  	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
 -        if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
 +        if test $BLDSHARED = true; then
 +	    NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
 +	    if test x"$create_pam_modules" = x"yes"; then
  		PAM_MODULES="$PAM_MODULES pam_winbind"
- 		INSTALL_PAM_MODULES="installpammodules"
+@@ -5926,2 +5951,3 @@
  		UNINSTALL_PAM_MODULES="uninstallpammodules"
 +	    fi
  	fi
- else
-         AC_MSG_RESULT(no$winbind_no_reason)
- fi
+@@ -5931,3 +5957,6 @@
  
 -AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-lpthread"
 +AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
@@ -191,12 +156,11 @@
 +
 +AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="${PTHREAD_LIBS}"
  			AC_DEFINE(HAVE_PTHREAD, 1, [whether pthread exists])])
- 
- AC_SUBST(WINBIND_NSS_PTHREAD)
+@@ -5936,3 +5965,2 @@
  AC_SUBST(WINBIND_NSS)
 -AC_SUBST(WINBIND_WINS_NSS)
  AC_SUBST(WINBIND_NSS_LDSHFLAGS)
- AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
+@@ -5940,4 +5968,7 @@
  AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
 -AC_SUBST(NSSSONAMEVERSIONSUFFIX)
  AC_SUBST(PAM_WINBIND_EXTRA_LIBS)
@@ -205,18 +169,15 @@
 +AC_SUBST(WINBIND_WINS_NSS_EXTRA_LIBS)
 +AC_SUBST(NSSSONAMEVERSIONSUFFIX)
  
- AC_SUBST(WINBIND_KRB5_LOCATOR)
- 
-@@ -6131,13 +6157,21 @@
- # Start
- AC_CHECK_FUNC(getmntent)
- 
--AC_CHECK_HEADERS(sys/statfs.h)
-+AC_CHECK_HEADERS(sys/statfs.h sys/mount.h)
+@@ -6134,2 +6165,7 @@
+ AC_CHECK_HEADERS(sys/statfs.h)
++AC_CHECK_HEADERS(sys/mount.h, [], [],
++[[#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++]])
  
- AC_MSG_CHECKING([vfs_fileid: checking for statfs() and struct statfs.f_fsid)])
- AC_CACHE_VAL(vfsfileid_cv_statfs,[
- 	     AC_TRY_RUN([
+@@ -6139,3 +6175,11 @@
  		#include <sys/types.h>
 +		#ifdef HAVE_SYS_PARAM_H
 +		#include <sys/param.h>
@@ -228,11 +189,7 @@
  		#include <sys/statfs.h>
 +		#endif
  		int main(void)
- 		{
- 			struct statfs fsd;
-@@ -6449,6 +6483,26 @@
- 	CFLAGS="-I../lib/zlib $CFLAGS"
- ])
+@@ -6451,2 +6495,22 @@
  
 +AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
 +
@@ -255,5 +212,3 @@
 +fi
 +
  dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
- LIB_REMOVE_USR_LIB(LDFLAGS)
- LIB_REMOVE_USR_LIB(LIBS)