Update net/samba33 to the version 3.3.3. Major changes are:

    o Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb
      correctly (bug #6195).
    o Fix serving of files with colons to CIFS/VFS client (bug #6196).
    o Fix "map readonly" (bug #6186).

15 files changed, 44 insertions, 68 deletions

diff --git a/net/samba33/Makefile b/net/samba33/Makefile
index df64d298320f..7cf5b6d6c46c 100644
--- a/net/samba33/Makefile
+++ b/net/samba33/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.3.2
+PORTVERSION?=		3.3.3
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
@@ -499,9 +499,7 @@ post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.if defined(WITH_MAX_DEBUG)
 test:
-	cd ${WRKSRC} && ${MAKE} test
-.endif
+	cd ${WRKSRC} && ${MAKE} test_nss_modules test_pam_modules && ${MAKE} test
 
 .include <bsd.port.post.mk>
diff --git a/net/samba33/distinfo b/net/samba33/distinfo
index e898a998e84e..0055fb1d0325 100644
--- a/net/samba33/distinfo
+++ b/net/samba33/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.3.2.tar.gz) = 5c5178ea2c5d9bd5f6569285f2e0e6d7
-SHA256 (samba-3.3.2.tar.gz) = 1b4fa9fbe7ccced6cca449c4b0b9fba65ffd2ad63b1f0bf2507e943281461477
-SIZE (samba-3.3.2.tar.gz) = 26058163
+MD5 (samba-3.3.3.tar.gz) = 4d5835817416d1ffa30783af45c5a9ed
+SHA256 (samba-3.3.3.tar.gz) = 16179b74296b9567613ef966b56da58d971285195db6b34b5281154dcfb3a323
+SIZE (samba-3.3.3.tar.gz) = 26070757
diff --git a/net/samba33/files/patch-Makefile.in b/net/samba33/files/patch-Makefile.in
index a68b4a08b2f6..dc63c9fd0b65 100644
--- a/net/samba33/files/patch-Makefile.in
+++ b/net/samba33/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./Makefile.in	2009-03-14 05:49:10.000000000 +0000
-@@ -124,7 +124,7 @@
+--- Makefile.in.orig	2009-04-01 11:48:54.000000000 +0000
++++ Makefile.in	2009-04-07 01:38:20.000000000 +0000
+@@ -125,7 +125,7 @@
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
  LOGFILEBASE = @logfilebase@
@@ -9,7 +9,7 @@
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  
  # This is where smbpasswd et al go
-@@ -152,10 +152,10 @@
+@@ -153,10 +153,10 @@
  # the directory where pid files go
  PIDDIR = @piddir@
  
@@ -22,17 +22,19 @@
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
  FLAGS  = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
  
-@@ -787,7 +787,8 @@
+@@ -791,8 +791,9 @@
  	     $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
  	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) 
  
 -PAM_WINBIND_OBJ = nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \
+-		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@ @LIBTALLOC_STATIC@
 +PAM_WINBIND_OBJ = nsswitch/pam_winbind.o localedir.o \
 +		  @LIBTALLOC_STATIC@ @LIBWBCLIENT_STATIC@ \
- 		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
++		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
  
  LIBSMBCLIENT_OBJ0 = \
-@@ -1218,6 +1219,7 @@
+ 		    libsmb/libsmb_cache.o \
+@@ -1222,6 +1223,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .o .lo
@@ -40,7 +42,7 @@
  
  SHOWFLAGS::
  	@echo "Using FLAGS      = $(FLAGS)"
-@@ -1260,6 +1262,9 @@
+@@ -1264,6 +1266,9 @@
  		$(COMPILE_CC) >/dev/null 2>&1
  @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
  
@@ -50,7 +52,7 @@
  PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
  
  # this adds support for precompiled headers. To use it, install a snapshot
-@@ -2208,8 +2213,11 @@
+@@ -2212,8 +2217,11 @@
  
  bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@
  	@echo "Linking shared library $@"
@@ -64,7 +66,7 @@
  
  bin/builtin.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
  	@echo "Building plugin $@"
-@@ -2486,7 +2494,8 @@
+@@ -2494,7 +2502,8 @@
  	@echo "Linking shared library $@"
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
  		$(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
@@ -74,7 +76,7 @@
  
  bin/tdbbackup@EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
  	@echo Linking $@
-@@ -2785,7 +2794,7 @@
+@@ -2793,7 +2802,7 @@
  	@$(LIB_PATH_VAR)=./bin && \
  	export $(LIB_PATH_VAR) && \
  	for module in $(PAM_MODULES); do \
diff --git a/net/samba33/files/patch-configure.in b/net/samba33/files/patch-configure.in
index e49260fdcb77..919d2937df14 100644
--- a/net/samba33/files/patch-configure.in
+++ b/net/samba33/files/patch-configure.in
@@ -1,5 +1,5 @@
---- ./configure.in.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./configure.in	2009-03-14 14:06:27.000000000 +0000
+--- ./configure.in.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./configure.in	2009-04-07 01:39:14.000000000 +0000
 @@ -189,16 +189,6 @@
         fi
  fi
@@ -178,7 +178,7 @@
  
  AC_SUBST(WINBIND_KRB5_LOCATOR)
  
-@@ -6240,13 +6264,21 @@
+@@ -6276,13 +6300,21 @@
  # Start
  AC_CHECK_FUNC(getmntent)
  
@@ -201,7 +201,7 @@
  		int main(void)
  		{
  			struct statfs fsd;
-@@ -6502,6 +6534,16 @@
+@@ -6539,6 +6571,16 @@
  
  fi
  
@@ -218,7 +218,7 @@
  dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
  LIB_REMOVE_USR_LIB(LDFLAGS)
  LIB_REMOVE_USR_LIB(LIBS)
-@@ -6558,6 +6600,8 @@
+@@ -6595,6 +6637,8 @@
  	  pkgconfig/wbclient.pc
  	  pkgconfig/netapi.pc
  	  pkgconfig/smbsharemodes.pc
diff --git a/net/samba33/files/patch-include__includes.h b/net/samba33/files/patch-include__includes.h
index 00e8926eafce..67195916ca1c 100644
--- a/net/samba33/files/patch-include__includes.h
+++ b/net/samba33/files/patch-include__includes.h
@@ -1,6 +1,6 @@
---- ./include/includes.h.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./include/includes.h	2009-03-14 05:49:10.000000000 +0000
-@@ -870,7 +870,7 @@
+--- ./include/includes.h.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./include/includes.h	2009-04-07 01:39:14.000000000 +0000
+@@ -873,7 +873,7 @@
  #endif
  
  #ifndef SIGRTMIN
diff --git a/net/samba33/files/patch-lib__replace__libreplace_cc.m4 b/net/samba33/files/patch-lib__replace__libreplace_cc.m4
index 35d41d8648d3..ca60c672b53b 100644
--- a/net/samba33/files/patch-lib__replace__libreplace_cc.m4
+++ b/net/samba33/files/patch-lib__replace__libreplace_cc.m4
@@ -1,5 +1,5 @@
---- ./lib/replace/libreplace_cc.m4.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./lib/replace/libreplace_cc.m4	2009-03-14 05:49:10.000000000 +0000
+--- ./lib/replace/libreplace_cc.m4.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./lib/replace/libreplace_cc.m4	2009-04-07 01:39:14.000000000 +0000
 @@ -145,6 +145,10 @@
  AC_CHECK_TYPE(uintptr_t, unsigned long long)
  AC_CHECK_TYPE(ptrdiff_t, unsigned long long)
diff --git a/net/samba33/files/patch-lib__replace__libreplace_network.m4 b/net/samba33/files/patch-lib__replace__libreplace_network.m4
deleted file mode 100644
index fba88f1b05c5..000000000000
--- a/net/samba33/files/patch-lib__replace__libreplace_network.m4
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./lib/replace/libreplace_network.m4.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./lib/replace/libreplace_network.m4	2009-03-14 05:49:10.000000000 +0000
-@@ -8,12 +8,15 @@
- 
- AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
- AC_CHECK_HEADERS(netinet/in_systm.h)
--AC_CHECK_HEADERS([netinet/ip.h], [], [], [#ifdef HAVE_NETINET_IN_H
--#include <netinet/in.h>
--#endif
--#ifdef HAVE_NETINET_IN_SYSTM_H
--#include <netinet/in_systm.h>
--#endif])
-+AC_CHECK_HEADERS([netinet/ip.h], [], [], [
-+	#include <sys/types.h>
-+	#ifdef HAVE_NETINET_IN_H
-+	#include <netinet/in.h>
-+	#endif
-+	#ifdef HAVE_NETINET_IN_SYSTM_H
-+	#include <netinet/in_systm.h>
-+	#endif
-+])
- AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h)
- AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
- 
diff --git a/net/samba33/files/patch-m4__aclocal.m4 b/net/samba33/files/patch-m4__aclocal.m4
index 1e831a9699ee..fbed8139ced0 100644
--- a/net/samba33/files/patch-m4__aclocal.m4
+++ b/net/samba33/files/patch-m4__aclocal.m4
@@ -1,5 +1,5 @@
---- ./m4/aclocal.m4.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./m4/aclocal.m4	2009-03-14 05:49:10.000000000 +0000
+--- ./m4/aclocal.m4.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./m4/aclocal.m4	2009-04-07 01:39:14.000000000 +0000
 @@ -97,14 +97,14 @@
  		build_lib=yes
  		;;
diff --git a/net/samba33/files/patch-nsswitch__pam_winbind.c b/net/samba33/files/patch-nsswitch__pam_winbind.c
index 184fdcf6248c..a871eb2c7f21 100644
--- a/net/samba33/files/patch-nsswitch__pam_winbind.c
+++ b/net/samba33/files/patch-nsswitch__pam_winbind.c
@@ -1,5 +1,5 @@
---- ./nsswitch/pam_winbind.c.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./nsswitch/pam_winbind.c	2009-03-14 05:49:10.000000000 +0000
+--- ./nsswitch/pam_winbind.c.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./nsswitch/pam_winbind.c	2009-04-07 01:39:14.000000000 +0000
 @@ -161,7 +161,6 @@
  }
  #endif
diff --git a/net/samba33/files/patch-nsswitch__wins_freebsd.c b/net/samba33/files/patch-nsswitch__wins_freebsd.c
index f3e3bfd95c0d..623d78217149 100644
--- a/net/samba33/files/patch-nsswitch__wins_freebsd.c
+++ b/net/samba33/files/patch-nsswitch__wins_freebsd.c
@@ -1,5 +1,5 @@
---- ./nsswitch/wins_freebsd.c.orig	2009-03-14 05:49:10.000000000 +0000
-+++ ./nsswitch/wins_freebsd.c	2009-03-14 05:49:10.000000000 +0000
+--- ./nsswitch/wins_freebsd.c.orig	2009-04-07 01:39:14.000000000 +0000
++++ ./nsswitch/wins_freebsd.c	2009-04-07 01:39:14.000000000 +0000
 @@ -0,0 +1,108 @@
 +/* 
 +   Unix SMB/CIFS implementation.
diff --git a/net/samba33/files/patch-script__tests__dlopen.sh b/net/samba33/files/patch-script__tests__dlopen.sh
index 786b914f89ad..7be26fa13308 100644
--- a/net/samba33/files/patch-script__tests__dlopen.sh
+++ b/net/samba33/files/patch-script__tests__dlopen.sh
@@ -1,5 +1,5 @@
---- ./script/tests/dlopen.sh.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./script/tests/dlopen.sh	2009-03-14 05:49:10.000000000 +0000
+--- ./script/tests/dlopen.sh.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./script/tests/dlopen.sh	2009-04-07 01:39:14.000000000 +0000
 @@ -67,7 +67,7 @@
  	esac
  done
diff --git a/net/samba33/files/patch-smbd__aio.c b/net/samba33/files/patch-smbd__aio.c
index d6b52dbe8e7e..4c782759c077 100644
--- a/net/samba33/files/patch-smbd__aio.c
+++ b/net/samba33/files/patch-smbd__aio.c
@@ -1,5 +1,5 @@
---- ./smbd/aio.c.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./smbd/aio.c	2009-03-14 05:49:10.000000000 +0000
+--- ./smbd/aio.c.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./smbd/aio.c	2009-04-07 01:39:14.000000000 +0000
 @@ -24,9 +24,6 @@
  
  /* The signal we'll use to signify aio done. */
diff --git a/net/samba33/files/patch-smbd__quotas.c b/net/samba33/files/patch-smbd__quotas.c
index 55409ebf68ab..dd8ef51c7d1f 100644
--- a/net/samba33/files/patch-smbd__quotas.c
+++ b/net/samba33/files/patch-smbd__quotas.c
@@ -1,5 +1,5 @@
---- ./smbd/quotas.c.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./smbd/quotas.c	2009-03-14 05:49:10.000000000 +0000
+--- ./smbd/quotas.c.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./smbd/quotas.c	2009-04-07 01:39:14.000000000 +0000
 @@ -1023,6 +1023,8 @@
  	enum clnt_stat clnt_stat;
  	bool ret = True;
diff --git a/net/samba33/files/patch-smbd__statvfs.c b/net/samba33/files/patch-smbd__statvfs.c
index 44cdda7a1eaa..a6703f60d359 100644
--- a/net/samba33/files/patch-smbd__statvfs.c
+++ b/net/samba33/files/patch-smbd__statvfs.c
@@ -1,5 +1,5 @@
---- ./smbd/statvfs.c.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./smbd/statvfs.c	2009-03-14 05:49:10.000000000 +0000
+--- ./smbd/statvfs.c.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./smbd/statvfs.c	2009-04-07 01:39:14.000000000 +0000
 @@ -3,6 +3,7 @@
     VFS API's statvfs abstraction
     Copyright (C) Alexander Bokovoy			2005
diff --git a/net/samba33/files/patch-utils__net_time.c b/net/samba33/files/patch-utils__net_time.c
index 84623bb9fe2c..55372465aca9 100644
--- a/net/samba33/files/patch-utils__net_time.c
+++ b/net/samba33/files/patch-utils__net_time.c
@@ -1,5 +1,5 @@
---- ./utils/net_time.c.orig	2009-03-12 09:47:20.000000000 +0000
-+++ ./utils/net_time.c	2009-03-14 05:49:10.000000000 +0000
+--- ./utils/net_time.c.orig	2009-04-01 11:48:54.000000000 +0000
++++ ./utils/net_time.c	2009-04-07 01:39:14.000000000 +0000
 @@ -84,9 +84,15 @@
  		return "unknown";
  	}