9 files changed, 60 insertions, 89 deletions

diff --git a/net/samba47/Makefile b/net/samba47/Makefile
index 5935169d0e3e..741c3dae409a 100644
--- a/net/samba47/Makefile
+++ b/net/samba47/Makefile
@@ -22,7 +22,7 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-Freenas-master-mdns-fixes-22.patch:-p1
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.7.3
+SAMBA4_VERSION=			4.7.4
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -75,6 +75,7 @@ CONFIGURE_LOG=			bin/config.log
 PKGCONFIGDIR?=			${PREFIX}/libdata/pkgconfig
 PKGCONFIGDIR_REL?=		${PKGCONFIGDIR:S,^${PREFIX}/,,}
 PLIST_SUB+=			PKGCONFIGDIR=${PKGCONFIGDIR_REL}
+SUB_LIST+=			PKGCONFIGDIR=${PKGCONFIGDIR_REL}
 ##############################################################################
 # Options
 OPTIONS_SUB=			yes
@@ -159,8 +160,8 @@ SAMBA4_LDB=			12
 BUILD_DEPENDS+=			ldb13>=1.3.0:databases/ldb13
 RUN_DEPENDS+=			ldb13>=1.3.0:databases/ldb13
 .elif ${SAMBA4_LDB} == 12
-BUILD_DEPENDS+=			ldb12>=1.2.2:databases/ldb12
-RUN_DEPENDS+=			ldb12>=1.2.2:databases/ldb12
+BUILD_DEPENDS+=			ldb12>=1.2.3:databases/ldb12
+RUN_DEPENDS+=			ldb12>=1.2.3:databases/ldb12
 .elif ${SAMBA4_LDB} == 11
 BUILD_DEPENDS+=			ldb>=1.1.29:databases/ldb
 RUN_DEPENDS+=			ldb>=1.1.29:databases/ldb
@@ -169,6 +170,11 @@ SAMBA4_BUNDLED_LIBS+=		!ldb,!pyldb,!pyldb-util
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=		com_err
 
+# Set the test environment variables
+TEST_ENV+=			PYTHON="${PYTHON_CMD}" \
+				SHA1SUM=/sbin/sha1 \
+				SHA256SUM=/sbin/sha256 \
+				MD5SUM=/sbin/md5
 TEST_DEPENDS+=			python:lang/python \
 				bash:shells/bash \
 				tshark:net/tshark
@@ -204,24 +210,25 @@ MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 ##############################################################################
 DEBUG_CONFIGURE_ON=		--verbose --enable-debug
 DEBUG_MAKE_ARGS=		--verbose
-DEBUG_VARS_ON=			WITH_DEBUG=yes
 DEBUG_CFLAGS=			-g -ggdb -gdwarf-2 -gstrict-dwarf -O0
+DEBUG_VARS=			WITH_DEBUG=yes
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046
 GDB_CMD?=			${LOCALBASE}/bin/gdb
 # https://bugzilla.samba.org/show_bug.cgi?id=8969
+PICKY_DEVELOPER_IMPLIES=	DEVELOPER
+PICKY_DEVELOPER_CONFIGURE_ON=	--picky-developer
+
 DEVELOPER_IMPLIES=		NTVFS
 DEVELOPER_CONFIGURE_ON=		--enable-developer --enable-selftest --abi-check-disable
 DEVELOPER_BUILD_DEPENDS=	${GDB_CMD}:devel/gdb
 DEVELOPER_TEST_DEPENDS=		${GDB_CMD}:devel/gdb
 DEVELOPER_VARS_OFF=		GDB_CMD=true
-
-PICKY_DEVELOPER_CONFIGURE_ON=	--picky-developer
-# XXX: Mostly used in conjuction with DEVELOPER option, don't enable it if you don't know what you are doing
+# XXX: Mostly used in conjuction with the DEVELOPER option, don't enable it
+# if you don't know what you are doing
+#NTVFS_PREVENTS=			AD_DC
+#NTVFS_PREVENTS_MSG=		NTVFS can't be combined with AD_DC
 NTVFS_CONFIGURE_WITH=		ntvfs-fileserver
 ##############################################################################
-AESNI_CONFIGURE_ON=		--accel-aes=intelaesni
-AESNI_CONFIGURE_OFF=		--accel-aes=none
-
 CLUSTER_CONFIGURE_WITH=		cluster-support
 
 CUPS_CONFIGURE_ENABLE=		cups iprint
@@ -324,9 +331,11 @@ PLIST_FILES+=			lib/shared-modules/${module:C|_|/|:C|-|_|}.so
 USES+=				python:2.7,build,test
 CONFIGURE_ARGS+=		--disable-python
 PLIST_SUB+=			SAMBA4_PYTHON2="@comment " SAMBA4_PYTHON3="@comment "
+SUB_LIST+=			SAMBA4_PYTHON2="@comment " SAMBA4_PYTHON3="@comment "
 .else
 USES+=				python:2.7
 PLIST_SUB+=			SAMBA4_PYTHON2=""
+SUB_LIST+=			SAMBA4_PYTHON2=""
 # External Python modules
 BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
 RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
@@ -358,8 +367,10 @@ CONFIGURE_ENV+=			PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
 CONFIGURE_ARGS+=		--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
 
 PLIST_SUB+=			SAMBA4_PYTHON3="" SAMBA4_PYTHON3_SITELIBDIR="${SAMBA4_PYTHON3_SITELIBDIR}"
+SUB_LIST+=			SAMBA4_PYTHON3="" SAMBA4_PYTHON3_SITELIBDIR="${SAMBA4_PYTHON3_SITELIBDIR}"
 .else
 PLIST_SUB+=			SAMBA4_PYTHON3="@comment "
+SUB_LIST+=			SAMBA4_PYTHON3="@comment "
 .endif
 .endif
 
@@ -371,19 +382,21 @@ PLIST_SUB+=			SAMBA4_PYTHON3="@comment "
 ##############################################################################
 
 .if !defined(SAMBA4_SUBPORT)
-
+# Require llvm 4.0 and AMD64
+.if ${PORT_OPTIONS:MAESNI} && ${ARCH} == "amd64" && ${OSVERSION} >= 1200511
+CONFIGURE_ARGS+=		--accel-aes=intelaesni
+PLIST_FILES+=			lib/samba4/private/libaesni-intel-samba4.so
+.else
+CONFIGURE_ARGS+=		--accel-aes=none
+.endif
 # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
 CFLAGS_amd64+=			-fno-omit-frame-pointer
 # No fancy color error messages
 CONFIGURE_ENV+=			NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 MAKE_ENV+=			NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
-
-TEST_ENV+=			PYTHON="${PYTHON_CMD}" SHA1SUM=/sbin/sha1
-
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=			-fno-color-diagnostics
 .endif
-
 .if ${readline_ARGS} == port
 CFLAGS+=			-D_FUNCTION_DEF
 .endif
diff --git a/net/samba47/distinfo b/net/samba47/distinfo
index 7d5bb68a6211..ac8e8273a9ce 100644
--- a/net/samba47/distinfo
+++ b/net/samba47/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511474282
-SHA256 (samba-4.7.3.tar.gz) = 06e4152ca1cb803f005e92eb6baedb6cc874998b44ee37c2a7819e77a55bfd2c
-SIZE (samba-4.7.3.tar.gz) = 16845436
+TIMESTAMP = 1514004480
+SHA256 (samba-4.7.4.tar.gz) = fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247
+SIZE (samba-4.7.4.tar.gz) = 16853555
diff --git a/net/samba47/files/patch-docs-xml__smbdotconf__tuning__getwdcache.xml b/net/samba47/files/patch-docs-xml__smbdotconf__tuning__getwdcache.xml
deleted file mode 100644
index 67afb938caf8..000000000000
--- a/net/samba47/files/patch-docs-xml__smbdotconf__tuning__getwdcache.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs-xml/smbdotconf/tuning/getwdcache.xml.orig	2017-11-16 03:58:51 UTC
-+++ docs-xml/smbdotconf/tuning/getwdcache.xml
-@@ -6,7 +6,7 @@
-     <para>This is a tuning option. When this is enabled a 
-     caching algorithm will be used to reduce the time taken for getwd() 
-     calls. This can have a significant impact on performance, especially 
--    when the <smbconfoption name="wide smbconfoptions"/> parameter is set to <constant>no</constant>.</para>
-+    when the <smbconfoption name="wide links"/> parameter is set to <constant>no</constant>.</para>
- </description>
- 
- <value type="default">yes</value>
diff --git a/net/samba47/files/patch-docs-xml__wscript_build b/net/samba47/files/patch-docs-xml__wscript_build
deleted file mode 100644
index 2cd71502efd1..000000000000
--- a/net/samba47/files/patch-docs-xml__wscript_build
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
-index 0bd08d11cdb..6c5a74d2c73 100644
---- docs-xml/wscript_build
-+++ docs-xml/wscript_build
-@@ -160,3 +160,6 @@ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
- 
-     if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
-         bld.SAMBAMANPAGES(krb5_locator_manpages)
-+
-+    if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
-+        bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
diff --git a/net/samba47/files/patch-glusterfs b/net/samba47/files/patch-glusterfs
index b4e4d64e00ba..6de8af880100 100644
--- a/net/samba47/files/patch-glusterfs
+++ b/net/samba47/files/patch-glusterfs
@@ -12,7 +12,7 @@
  #endif
  
  
---- source3/modules/vfs_glusterfs.c.orig	2017-12-16 01:49:55 UTC
+--- source3/modules/vfs_glusterfs.c.orig	2017-12-23 08:02:15 UTC
 +++ source3/modules/vfs_glusterfs.c
 @@ -36,12 +36,13 @@
   */
@@ -22,7 +22,7 @@
 +#include "smbd/globals.h"
  #include "smbd/smbd.h"
  #include <stdio.h>
- #include "api/glfs.h"
+ #include <glusterfs/api/glfs.h>
  #include "lib/util/dlinklist.h"
  #include "lib/util/tevent_unix.h"
 -#include "smbd/globals.h"
diff --git a/net/samba47/files/patch-source3__libads__kerberos_keytab.c b/net/samba47/files/patch-source3__libads__kerberos_keytab.c
new file mode 100644
index 000000000000..57e8afabf4de
--- /dev/null
+++ b/net/samba47/files/patch-source3__libads__kerberos_keytab.c
@@ -0,0 +1,20 @@
+--- source3/libads/kerberos_keytab.c.orig	2017-12-23 14:23:53.247467000 +0100
++++ source3/libads/kerberos_keytab.c	2017-12-23 18:57:07.135340000 +0100
+@@ -32,8 +32,6 @@
+ 
+ #ifdef HAVE_KRB5
+ 
+-#ifdef HAVE_ADS
+-
+ /* This MAX_NAME_LEN is a constant defined in krb5.h */
+ #ifndef MAX_KEYTAB_NAME_LEN
+ #define MAX_KEYTAB_NAME_LEN 1100
+@@ -85,6 +83,8 @@
+ 	return ret;
+ }
+ 
++#ifdef HAVE_ADS
++
+ /**********************************************************************
+  Adds a single service principal, i.e. 'host' to the system keytab
+ ***********************************************************************/
diff --git a/net/samba47/files/patch-source3__modules__vfs_zfsacl.c b/net/samba47/files/patch-source3__modules__vfs_zfsacl.c
deleted file mode 100644
index 3ddf98a5961e..000000000000
--- a/net/samba47/files/patch-source3__modules__vfs_zfsacl.c
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6a95f51f5ea1c60b5c11e8dd7e4a03ca5ef8049f Mon Sep 17 00:00:00 2001
-From: Ralph Boehme <slow@samba.org>
-Date: Sat, 28 Oct 2017 16:13:16 +0200
-Subject: [PATCH] WIP: vfs_zfsacl: fix compilation error
-
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=6133
---- source3/modules/vfs_zfsacl.c.orig	2017-11-02 11:38:36 UTC
-+++ source3/modules/vfs_zfsacl.c
-@@ -51,6 +51,7 @@ static NTSTATUS zfs_get_nt_acl_common(st
- 	SMB_STRUCT_STAT sbuf;
- 	const SMB_STRUCT_STAT *psbuf = NULL;
- 	int ret;
-+	bool is_dir;
- 
- 	if (VALID_STAT(smb_fname->st)) {
- 		psbuf = &smb_fname->st;
-@@ -65,10 +66,7 @@ static NTSTATUS zfs_get_nt_acl_common(st
- 		}
- 		psbuf = &sbuf;
- 	}
--
--	if (S_ISDIR(psbuf->st_ex_mode) && (ace->aceMask & SMB_ACE4_ADD_FILE)) {
--		ace->aceMask |= SMB_ACE4_DELETE_CHILD;
--	}
-+	is_dir = S_ISDIR(psbuf->st_ex_mode);
- 
- 	/* read the number of file aces */
- 	if((naces = acl(smb_fname->base_name, ACE_GETACLCNT, 0, NULL)) == -1) {
-@@ -115,6 +113,10 @@ static NTSTATUS zfs_get_nt_acl_common(st
- 			aceprop.aceMask |= SMB_ACE4_SYNCHRONIZE;
- 		}
- 
-+		if (is_dir && (aceprop.aceMask & SMB_ACE4_ADD_FILE)) {
-+			aceprop.aceMask |= SMB_ACE4_DELETE_CHILD;
-+		}
-+
- 		if(aceprop.aceFlags & ACE_OWNER) {
- 			aceprop.flags = SMB_ACE4_ID_SPECIAL;
- 			aceprop.who.special_id = SMB_ACE4_WHO_OWNER;
diff --git a/net/samba47/files/patch-third__party_aesni-intel_wscript b/net/samba47/files/patch-third__party_aesni-intel_wscript
index 56c30b16ba1a..64886d1affb0 100644
--- a/net/samba47/files/patch-third__party_aesni-intel_wscript
+++ b/net/samba47/files/patch-third__party_aesni-intel_wscript
@@ -1,6 +1,6 @@
 --- third_party/aesni-intel/wscript.orig	2017-09-17 19:15:34 UTC
 +++ third_party/aesni-intel/wscript
-@@ -4,14 +4,20 @@ import Utils
+@@ -4,14 +4,19 @@ import Utils
  
  def configure(conf):
      if Options.options.accel_aes.lower() == "intelaesni":
@@ -11,23 +11,23 @@
 +            if conf.CHECK_CFLAGS(f, ''):
 +                conf.DEFINE('AESNI_INTEL_CFLAGS', f)
 +                break
-+
 +        if conf.CONFIG_SET('AESNI_INTEL_CFLAGS'):
 +            if conf.env['SYSTEM_UNAME_MACHINE'] in ('x86_64', 'amd64'):
                  print("Compiling with Intel AES instructions")
                  conf.DEFINE('HAVE_AESNI_INTEL', 1)
              else:
-                 raise Utils.WafError('--aes-accel=intelaesni selected and non x86_64 CPU')
+                 raise Utils.WafError('--accel-aes=intelaesni selected and non x86_64 CPU')
          else:
--            raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects -Wp,-E,-lang-asm')
+-            raise Utils.WafError('--accel-aes=intelaesni selected and compiler rejects -Wp,-E,-lang-asm')
 +            raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags))
+         if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'):
+             raise Utils.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack')
  
- def build(bld):
-     if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):
-@@ -19,5 +25,5 @@ def build(bld):
+@@ -21,6 +26,6 @@ def build(bld):
  
      bld.SAMBA_LIBRARY('aesni-intel',
          source='aesni-intel_asm.c',
 -        cflags='-Wp,-E,-lang-asm',
 +        cflags=bld.CONFIG_GET('AESNI_INTEL_CFLAGS'),
+         ldflags='-Wl,-z,noexecstack',
          private_library=True)
diff --git a/net/samba47/pkg-plist b/net/samba47/pkg-plist
index 3996c2e9be9d..761fb11d4527 100644
--- a/net/samba47/pkg-plist
+++ b/net/samba47/pkg-plist
@@ -181,7 +181,6 @@ lib/nss_winbind.so.1
 lib/nss_wins.so.1
 lib/pam_winbind.so
 %%CUPS%%libexec/samba/smbspool_krb5_wrapper
-%%AESNI%%lib/samba4/private/libaesni-intel-samba4.so
 %%AD_DC%%lib/samba4/private/libdlz-bind9-for-torture-samba4.so
 %%AD_DC%%lib/samba4/private/libposix-eadb-samba4.so
 %%AD_DC%%lib/samba4/private/libprocess-model-samba4.so