6 files changed, 37 insertions, 90 deletions

diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 9571355bb222..2c89c9ad16ef 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		${SAMBA_BASENAME}35
-PORTVERSION=		3.5.9
+PORTVERSION=		3.5.11
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
@@ -16,7 +16,7 @@ DISTNAME=		${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alph
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
-CONFLICTS?=		*samba3[2-4]-3.*
+CONFLICTS?=		*samba3[2-46]-3.*
 # Additional patches from Sernet.de
 PATCH_STRIP=		-p1
 EXTRA_PATCHES=		${PATCHDIR}/sernet.patch
@@ -77,7 +77,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" \
 			PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
-# pkg-config is used to find talloc
+# pkg-config is used to find talloc, tevent and tdb
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
 
@@ -94,6 +94,10 @@ CONFIGURE_ARGS+=	--without-libtdb --enable-external-libtdb
 BUILD_DEPENDS+=		talloc>=2.0.1:${PORTSDIR}/devel/talloc
 RUN_DEPENDS+=		talloc>=2.0.1:${PORTSDIR}/devel/talloc
 CONFIGURE_ARGS+=	--without-libtalloc --enable-external-libtalloc
+# tevent
+#BUILD_DEPENDS+=	tevent>=0.9.13:${PORTSDIR}/devel/tevent
+#RUN_DEPENDS+=		tevent>=0.9.13:${PORTSDIR}/devel/tevent
+#CONFIGURE_ARGS+=	--without-libtevent --enable-external-libtevent
 # These options are common for all (sub)ports
 CONFIGURE_ARGS+=	--with-libiconv="${LOCALBASE}"
 
@@ -238,7 +242,8 @@ WANT_EXP_MODULES=	idmap_tdb2 idmap_ad idmap_adex idmap_hash idmap_rid \
 WANT_EXP_MODULES+=	rpc_echo
 .		endif
 WANT_EXP_MODULES+=	vfs_cacheprime vfs_catia vfs_commit vfs_dirsort \
-			vfs_readahead vfs_streams_depot vfs_syncops
+			vfs_readahead vfs_streams_depot vfs_syncops \
+			vfs_crossrename
 .	endif
 .endif
 
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index 3d6759795ebd..b0e530c327df 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-3.5.9.tar.gz) = 8af8dccbb87a70a71f795180d873102b5cccba7012d66f2620cea8b87174380a
-SIZE (samba-3.5.9.tar.gz) = 30750297
+SHA256 (samba-3.5.11.tar.gz) = fba5b7bced99a0651148d74f40031ac3ca3fc7869e2998bc85bf6fb3ddb16597
+SIZE (samba-3.5.11.tar.gz) = 30752782
diff --git a/net/samba35/files/patch-lib__replace__system__config.m4 b/net/samba35/files/patch-lib__replace__system__config.m4
index 49593dbcfd1b..66ddf454a9e0 100644
--- a/net/samba35/files/patch-lib__replace__system__config.m4
+++ b/net/samba35/files/patch-lib__replace__system__config.m4
@@ -4,8 +4,8 @@
  # filesys
  AC_HEADER_DIRENT 
  AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
--AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
-+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sunacl.h)
+-AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sys/file.h)
++AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sunacl.h sys/file.h)
  
  # select
  AC_CHECK_HEADERS(sys/select.h)
diff --git a/net/samba35/files/patch-source3__modules__vfs_zfsacl.c b/net/samba35/files/patch-source3__modules__vfs_zfsacl.c
new file mode 100644
index 000000000000..43ada220b584
--- /dev/null
+++ b/net/samba35/files/patch-source3__modules__vfs_zfsacl.c
@@ -0,0 +1,21 @@
+--- ./source3/modules/vfs_zfsacl.c.orig	2011-07-24 22:04:44.000000000 +0200
++++ ./source3/modules/vfs_zfsacl.c	2011-07-29 19:11:57.000000000 +0200
+@@ -251,8 +251,7 @@
+ 	return (SMB_ACL_T)NULL;
+ }
+ SMB_ACL_T zfsacl_fail__sys_acl_get_fd(vfs_handle_struct *handle,
+-				      files_struct *fsp,
+-				      int fd)
++				      files_struct *fsp)
+ {
+ 	return (SMB_ACL_T)NULL;
+ }
+@@ -267,7 +266,7 @@
+ 
+ int zfsacl_fail__sys_acl_set_fd(vfs_handle_struct *handle,
+ 				files_struct *fsp,
+-				int fd, SMB_ACL_T theacl)
++				SMB_ACL_T theacl)
+ {
+ 	return -1;
+ }
diff --git a/net/samba35/files/sernet.patch b/net/samba35/files/sernet.patch
index 0a61074f9a44..1e801fad0043 100644
--- a/net/samba35/files/sernet.patch
+++ b/net/samba35/files/sernet.patch
@@ -616,83 +616,3 @@ index 675c92e..f5a4444 100644
 -- 
 1.7.0.2
 
---- a/source3/configure	2010-04-06 13:05:13.000000000 +0000
-+++ b/source3/configure	2010-04-14 09:28:51.000000000 +0000
-@@ -13401,6 +13401,7 @@
- default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
- 
- default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly"
-+default_shared_modules="$default_shared_modules vfs_crossrename"
- 
- if test "x$developer" = xyes; then
-    default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
-@@ -87389,6 +87371,43 @@
- 		{ $as_echo "$as_me:$LINENO: result: not" >&5
- $as_echo "not" >&6; }
- 	fi
-+
-+
-+	{ $as_echo "$as_me:$LINENO: checking how to build vfs_crossrename" >&5
-+$as_echo_n "checking how to build vfs_crossrename... " >&6; }
-+	if test "$MODULE_vfs_crossrename"; then
-+		DEST=$MODULE_vfs_crossrename
-+	elif test "$MODULE_vfs" -a "$MODULE_DEFAULT_vfs_crossrename"; then
-+		DEST=$MODULE_vfs
-+	else
-+		DEST=$MODULE_DEFAULT_vfs_crossrename
-+	fi
-+
-+	if test x"$DEST" = xSHARED; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define vfs_crossrename_init init_samba_module
-+_ACEOF
-+
-+		VFS_MODULES="$VFS_MODULES "bin/crossrename.$SHLIBEXT""
-+		{ $as_echo "$as_me:$LINENO: result: shared" >&5
-+$as_echo "shared" >&6; }
-+
-+		string_shared_modules="$string_shared_modules vfs_crossrename"
-+	elif test x"$DEST" = xSTATIC; then
-+		init_static_modules_vfs="$init_static_modules_vfs  vfs_crossrename_init();"
-+ 		decl_static_modules_vfs="$decl_static_modules_vfs extern NTSTATUS vfs_crossrename_init(void);"
-+		string_static_modules="$string_static_modules vfs_crossrename"
-+		VFS_STATIC="$VFS_STATIC \$(VFS_CROSSRENAME_OBJ)"
-+
-+
-+		{ $as_echo "$as_me:$LINENO: result: static" >&5
-+$as_echo "static" >&6; }
-+	else
-+	    string_ignored_modules="$string_ignored_modules vfs_crossrename"
-+		{ $as_echo "$as_me:$LINENO: result: not" >&5
-+$as_echo "not" >&6; }
-+	fi
- 
- 
- 
-From 0b0c5596034a007b71785a0f36aaf40cf74b234d Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <vl@samba.org>
-Date: Thu, 16 Jun 2011 22:20:49 +0200
-Subject: [PATCH] s3: Fix bug 8238 -- KB2536276 prevents access to shares
-
-Without this we were not sending the workgroup name in the negprot reply if
-plain text passwords are used.
----
- source3/smbd/negprot.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
-index 81d29d9..51ad80d 100644
---- a/source3/smbd/negprot.c
-+++ b/source3/smbd/negprot.c
-@@ -382,6 +382,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice)
- 			reply_nterror(req, NT_STATUS_NO_MEMORY);
- 			return;
- 		}
-+		p += ret;
- 		DEBUG(3,("not using SPNEGO\n"));
- 	} else {
- 		DATA_BLOB spnego_blob = negprot_spnego();
--- 
-1.5.6.5
-
diff --git a/net/samba35/files/smb.conf.sample.in b/net/samba35/files/smb.conf.sample.in
index 4c7e56dbdf55..681ff8ec70af 100644
--- a/net/samba35/files/smb.conf.sample.in
+++ b/net/samba35/files/smb.conf.sample.in
@@ -151,7 +151,7 @@
 
 # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
 # via DNS nslookups. The default is NO.
-   dns proxy = no 
+   dns proxy = no
 
 # Charset settings
 ;   display charset = koi8-r
@@ -159,6 +159,7 @@
 ;   dos charset = cp866
 
 # Use extended attributes to store file modes
+;    ea support = yes
 ;    store dos attributes = yes
 ;    map hidden = no
 ;    map system = no
@@ -167,7 +168,7 @@
 # Use inherited ACLs for directories
 ;    nt acl support = yes
 ;    inherit acls = yes
-;    map acl inherit = yes 
+;    map acl inherit = yes
 
 # These scripts are used on a domain controller or stand-alone 
 # machine to add or delete corresponding unix accounts