New 3.2.8 version of Samba 3.2 series. Major changes are:

    o Correctly detect if the current DC is the closest one.
    o Add saf_join_store() function to memorize the DC used at join time.
      This avoids problems caused by replication delays shortly after domain
      joins.

More bugs introduced^Wfixed!

7 files changed, 52 insertions, 52 deletions

diff --git a/net/samba32/Makefile b/net/samba32/Makefile
index 2940961cf426..143a9b3b80fe 100644
--- a/net/samba32/Makefile
+++ b/net/samba32/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.2.7
+PORTVERSION?=		3.2.8
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
@@ -15,7 +15,7 @@ DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
-CONFLICTS?=		*samba-2.* *samba-3.0* sharity-light-1.* tdb-1.*
+CONFLICTS?=		*samba-2.* *samba-3.[03].* sharity-light-1.* tdb-1.*
 
 USE_GMAKE=		yes
 USE_ICONV=		yes
@@ -295,13 +295,13 @@ MAN1=		findsmb.1 ldbadd.1 ldbdel.1 ldbedit.1 ldbmodify.1 ldbsearch.1 \
 MAN3=		ldb.3
 MAN5=		lmhosts.5 smb.conf.5 smbgetrc.5 smbpasswd.5
 MAN7=		samba.7
-
 MAN8=		eventlogadm.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbpasswd.8 \
 		smbspool.8 tdbbackup.8 tdbdump.8 tdbtool.8 \
 		idmap_nss.8 idmap_tdb.8 \
 		vfs_audit.8 vfs_cap.8 vfs_default_quota.8 vfs_extd_audit.8 \
 		vfs_fake_perms.8 vfs_full_audit.8 vfs_netatalk.8 \
-		vfs_readonly.8 vfs_recycle.8 vfs_readahead.8 vfs_shadow_copy.8 \
+		vfs_readahead.8 vfs_readonly.8 vfs_recycle.8 vfs_shadow_copy.8 \
+		vfs_shadow_copy2.8 vfs_smb_traffic_analyzer.8 \
 		vfs_streams_xattr.8 vfs_xattr_tdb.8
 
 .if !defined(WITHOUT_WINBIND)
@@ -383,11 +383,13 @@ pre-fetch:
 .endif
 
 pre-configure:
+	@${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} u+w,a+rx
+	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
+
+post-configure:
 # It's in another port
 	@${RM} -f ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html
 	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
-	@${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} u+w,a+rx
-	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
 
 pre-install:
 	-@${FIND} "${SAMBA_MODULEDIR}" -type f -o -type l 2>/dev/null | ${SORT} | ${SED} -E 's|^${PREFIX}/?||;' > ${WRKDIR}/.PLIST.exclude
@@ -416,9 +418,9 @@ post-install:
 .if !defined(WITHOUT_WINBIND)
 	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
 	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
+	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
 	@${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
 	@${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
-	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
 	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
 .endif
 .if defined(WITH_PAM_SMBPASS)
diff --git a/net/samba32/distinfo b/net/samba32/distinfo
index b476d0c42e56..d4486b38b60e 100644
--- a/net/samba32/distinfo
+++ b/net/samba32/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.2.7.tar.gz) = 528677f261f3ed4a58f9483ca25ba6b2
-SHA256 (samba-3.2.7.tar.gz) = 4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3
-SIZE (samba-3.2.7.tar.gz) = 25177621
+MD5 (samba-3.2.8.tar.gz) = 06efd6e6cc4aac628a1a0b082e4be0f2
+SHA256 (samba-3.2.8.tar.gz) = 7e7fb53d6ff05993dcb8b871e3c3016bd4d161d72ded8f8760a4439e9d76aa3b
+SIZE (samba-3.2.8.tar.gz) = 24292385
diff --git a/net/samba32/files/patch-Makefile.in b/net/samba32/files/patch-Makefile.in
index 616839fad711..2b72908b1269 100644
--- a/net/samba32/files/patch-Makefile.in
+++ b/net/samba32/files/patch-Makefile.in
@@ -1,20 +1,26 @@
---- ./Makefile.in.orig	2008-09-18 08:49:02.000000000 +0200
-+++ ./Makefile.in	2008-09-23 01:38:57.000000000 +0200
-@@ -122,7 +122,7 @@
+--- Makefile.in.orig	2008-12-15 08:11:28.000000000 +0000
++++ Makefile.in	2009-01-26 01:58:03.000000000 +0000
+@@ -124,9 +124,8 @@
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
  LOGFILEBASE = @logfilebase@
 -CONFIGFILE = $(CONFIGDIR)/smb.conf
 +CONFIGFILE = $(CONFIGDIR)/%%SAMBA_CONFIG%%
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- CTDBDIR = @ctdbdir@
+-CTDBDIR = @ctdbdir@
  
-@@ -961,7 +961,7 @@
+ # This is where smbpasswd et al go
+ PRIVATEDIR = @privatedir@
+@@ -153,10 +152,10 @@
+ # the directory where pid files go
+ PIDDIR = @piddir@
  
- WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
- 	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
--	$(LIBNDR_GEN_OBJ0)
-+	$(LIBNDR_GEN_OBJ0) @WINBIND_WINS_NSS_EXTRA_OBJS@
+-FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
++FLAGS1 = @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) $(CFLAGS)
+ FLAGS2 =
+ FLAGS3 =
+-FLAGS4 = -I$(CTDBDIR)/include
++FLAGS4 =
+ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
+ FLAGS  = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
  
- PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
- 		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
diff --git a/net/samba32/files/patch-aa b/net/samba32/files/patch-aa
deleted file mode 100644
index 05e210258292..000000000000
--- a/net/samba32/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./rpc_server/srv_samr_nt.c.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./rpc_server/srv_samr_nt.c	2009-01-06 17:10:53.000000000 +0000
-@@ -2709,7 +2709,7 @@
- 		return NT_STATUS_INVALID_HANDLE;
- 
- 	status = access_check_samr_function(info->acc_granted,
--					    SA_RIGHT_DOMAIN_OPEN_ACCOUNT,
-+					    SAMR_USER_ACCESS_GET_ATTRIBUTES,
- 					    "_samr_QueryUserInfo");
- 	if (!NT_STATUS_IS_OK(status)) {
- 		return status;
diff --git a/net/samba32/files/patch-configure.in b/net/samba32/files/patch-configure.in
index 86c40f06af11..b04851d13ebd 100644
--- a/net/samba32/files/patch-configure.in
+++ b/net/samba32/files/patch-configure.in
@@ -1,5 +1,5 @@
---- ./configure.in.orig	2008-12-19 13:57:33.000000000 +0000
-+++ ./configure.in	2009-01-06 17:10:53.000000000 +0000
+--- configure.in.orig	2009-02-03 16:10:07.000000000 +0000
++++ configure.in	2009-02-08 16:14:09.000000000 +0000
 @@ -184,16 +184,6 @@
         fi
  fi
@@ -39,7 +39,7 @@
  AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
      AC_TRY_COMPILE([
  #include <sys/types.h>
-@@ -1858,9 +1863,6 @@
+@@ -1976,9 +1981,6 @@
  AC_MSG_CHECKING([PICFLAG])
  AC_MSG_RESULT([$PICFLAG])
  
@@ -49,7 +49,7 @@
  AC_CACHE_CHECK([whether building shared libraries actually works],
                 [ac_cv_shlib_works],[
     # try building a trivial shared library
-@@ -2299,31 +2301,15 @@
+@@ -2417,31 +2419,15 @@
  
      #  This is here to handle -withval stuff for --with-libiconv
      #  Perhaps we should always add a -L
@@ -87,7 +87,7 @@
  	iconv_current_CPPFLAGS="-I$i/include"
  
          if test x"$jm_cv_lib_iconv" != x; then
-@@ -2332,7 +2318,6 @@
+@@ -2450,7 +2436,6 @@
  	    # We found iconv in libc.
  	    iconv_current_LIBS=""
          fi
@@ -95,7 +95,7 @@
      fi
  
      if test x"$ICONV_FOUND" = "xyes" ; then
-@@ -4030,10 +4015,10 @@
+@@ -4148,10 +4133,10 @@
  
    ################################################################
    # first test for Active Directory support being enabled
@@ -110,7 +110,7 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
-@@ -5673,6 +5658,7 @@
+@@ -5791,6 +5776,7 @@
  		NSSSONAMEVERSIONSUFFIX=".1"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
  		    nsswitch/winbind_nss_linux.o"
@@ -118,7 +118,7 @@
  		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
  		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
  		;;
-@@ -5751,23 +5737,15 @@
+@@ -5869,23 +5855,15 @@
  fi
  
  # Display test results
@@ -142,7 +142,7 @@
  	## Only worry about libwbclient if we have shared library support
  	## and winbindd
          LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
-@@ -5785,26 +5763,34 @@
+@@ -5903,26 +5881,34 @@
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
  	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
@@ -181,16 +181,7 @@
  
  AC_SUBST(WINBIND_KRB5_LOCATOR)
  
-@@ -5899,7 +5885,7 @@
-     AC_CHECK_FUNCS(DNSServiceRegister)
-     AC_CHECK_LIB_EXT(dns_sd, DNSSD_LIBS, DNSServiceRegister)
-     if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
--            x"$ac_cv_lib_ext_DNSServiceRegister" != x"yes"; then
-+	    x"$ac_cv_lib_ext_dns_sd_DNSServiceRegister" != x"yes"; then
- 	have_dnssd_support=no
-     fi
- 
-@@ -5955,13 +5941,21 @@
+@@ -6073,13 +6059,21 @@
  # Start
  AC_CHECK_FUNC(getmntent)
  
@@ -213,7 +204,7 @@
  		int main(void)
  		{
  			struct statfs fsd;
-@@ -6207,6 +6201,16 @@
+@@ -6325,6 +6319,16 @@
  
  fi
  
diff --git a/net/samba32/files/patch-lib__replace__libnetwork.m4 b/net/samba32/files/patch-lib__replace__libnetwork.m4
new file mode 100644
index 000000000000..a87b87beb3c2
--- /dev/null
+++ b/net/samba32/files/patch-lib__replace__libnetwork.m4
@@ -0,0 +1,10 @@
+--- lib/replace/libreplace_network.m4.orig	2009-02-20 17:12:18.000000000 +0000
++++ lib/replace/libreplace_network.m4	2009-02-20 17:14:31.000000000 +0000
+@@ -353,6 +353,7 @@
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <netdb.h>
++#include <netinet/in.h>
+ 		],
+ 		[
+ struct sockaddr_storage sa_store;
diff --git a/net/samba32/pkg-plist.swat b/net/samba32/pkg-plist.swat
index b1e13fae2c59..9d55c00a8e21 100644
--- a/net/samba32/pkg-plist.swat
+++ b/net/samba32/pkg-plist.swat
@@ -259,6 +259,7 @@ share/swat/help/manpages/vfs_commit.8.html
 share/swat/help/manpages/vfs_default_quota.8.html
 share/swat/help/manpages/vfs_extd_audit.8.html
 share/swat/help/manpages/vfs_fake_perms.8.html
+share/swat/help/manpages/vfs_fileid.8.html
 share/swat/help/manpages/vfs_full_audit.8.html
 share/swat/help/manpages/vfs_gpfs.8.html
 share/swat/help/manpages/vfs_netatalk.8.html
@@ -268,6 +269,7 @@ share/swat/help/manpages/vfs_readahead.8.html
 share/swat/help/manpages/vfs_readonly.8.html
 share/swat/help/manpages/vfs_recycle.8.html
 share/swat/help/manpages/vfs_shadow_copy.8.html
+share/swat/help/manpages/vfs_shadow_copy2.8.html
 share/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
 share/swat/help/manpages/vfs_streams_depot.8.html
 share/swat/help/manpages/vfs_streams_xattr.8.html