samba4: updated to 4.9.4

Release Notes for Samba 4.9.4

Major bug fixes include:
   o dns: Fix CNAME loop prevention using counter regression.

Changes since 4.9.3:
   * BUG 9175: libcli/smb: Don't overwrite status code.
   * BUG 12164: wbinfo --group-info 'NT AUTHORITY\System' does not work.
   * BUG 13661: Session setup reauth fails to sign response.
   * BUG 13677: vfs_fruit: Validation of writes on AFP_AfpInfo stream.
   * BUG 13688: vfs_shadow_copy2: Nicely deal with attempts to open previous
     version for writing.
   * BUG 13455: Restoring previous version of stream with vfs_shadow_copy2 fails
     with NT_STATUS_OBJECT_NAME_INVALID fsp->base_fsp->fsp_name.
   * BUG 13571: CVE-2018-16853: Fix S4U2Self crash with MIT KDC build.
   * BUG 13708: s3-vfs: Prevent NULL pointer dereference in vfs_glusterfs.
   * PEP8: fix E231: missing whitespace after ','.
   * BUG 13629: winbindd: Fix crash when taking profiles.
   * BUG 13600: CVE-2018-14629 dns: Fix CNAME loop prevention using counter
     regression.
   * BUG 13686: 'samba-tool user syscpasswords' fails on a domain with many DCs.
   * BUG 13571: CVE-2018-16853: Do not segfault if client is not set.
   * BUG 13679: lib:util: Fix DEBUGCLASS pointer initializiation.
   * BUG 13696: ctdb-daemon: Exit with error if a database directory does not
     exist.
   * BUG 13498: s3:libads: Add net ads leave keep-account option.

2 files changed, 18 insertions, 22 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index a02d5482960..9ad7ec63324 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2018/12/10 00:14:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.56 2018/12/20 21:18:22 adam Exp $
 
-DISTNAME=	samba-${VERSION}
-PKGREVISION=	1
+DISTNAME=	samba-4.9.4
 CATEGORIES=	net
 MASTER_SITES=	http://download.samba.org/pub/samba/stable/
 
@@ -12,7 +11,6 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-VERSION=	4.9.3
 CONFLICTS+=	ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 GCC_REQD+=	4.4
@@ -103,7 +101,7 @@ CONFIGURE_ARGS+=	--without-gpgme
 CONFIGURE_ARGS+=	--without-regedit
 
 # for winbind option build.
-.if ${OPSYS} != "SunOS"
+.if "${OPSYS}" != "Darwin" && "${OPSYS}" != "SunOS"
 LDFLAGS+=		-Wl,--allow-shlib-undefined
 .endif
 LDFLAGS+=		${BUILDLINK_LDADD.gettext}
@@ -141,7 +139,6 @@ FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 PLIST_VARS+=	64bit
 .if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
 	(defined(ABI) && ${ABI} == "64")
-CONFIGURE_ARGS+=	--with-ldb-lmdb
 PLIST.64bit=		yes
 .else
 CONFIGURE_ARGS+=	--without-ldb-lmdb
@@ -193,30 +190,29 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \
 		${DESTDIR}${PREFIX}/${EGDIR}
 
-REPLACE_PERL+=	pidl/pidl
-REPLACE_PYTHON=	buildtools/bin/waf \
-		source4/setup/* \
-		source4/scripting/bin/* \
-		lib/tevent/tevent.py
+REPLACE_PERL+=		pidl/pidl
+REPLACE_PYTHON+=	buildtools/bin/waf
+REPLACE_PYTHON+=	source4/setup/wscript_build
+REPLACE_PYTHON+=	source4/scripting/bin/*
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # as of 4.3.2
-
-.include "../../lang/python/application.mk"
+PYTHON_VERSIONS_ACCEPTED=	27 # as of 4.3.2
 
 PY_PATCHPLIST=	yes
+.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 
 .if ${OPSYS} == "Linux"
 .include "../../devel/libuuid/buildlink3.mk"
 .endif
+.include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/lmdb/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.talloc+=	talloc>=2.1.9
+.include "../../devel/talloc/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../databases/lmdb/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
-BUILDLINK_API_DEPENDS.talloc+=	talloc>=2.1.9
-.include "../../devel/talloc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index bbc9a154675..a0f500c7102 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2018/11/29 14:46:46 taca Exp $
+$NetBSD: distinfo,v 1.21 2018/12/20 21:18:22 adam Exp $
 
-SHA1 (samba-4.9.3.tar.gz) = 99d9006495aa5d0c4b904ff8ab0b8daf0e694183
-RMD160 (samba-4.9.3.tar.gz) = 830c0052e6704f97e1d3c6d07564e9cb0fc4d928
-SHA512 (samba-4.9.3.tar.gz) = bdcba835857f1f41d47932e5c06cff446301c916b78195124814eac89dfce93f12e6e7aa1b53cfff30fdd12d8ce6409dda4e454d8f26fb7ea8e0a97996f93783
-Size (samba-4.9.3.tar.gz) = 18043670 bytes
+SHA1 (samba-4.9.4.tar.gz) = 7f8e15709e03e52d14bd9c85dd717366c106993f
+RMD160 (samba-4.9.4.tar.gz) = d0a43b85b85906f860de12b0b0abb1fcc5643b7a
+SHA512 (samba-4.9.4.tar.gz) = ecd9937caa12d409b9b4cf34982b1670346fa64c7ecd111b390e296771476e13eb7b868997bfe489f36b7bdc5c9fc3af42cd5ad276e9d85aaedfa8ac4cfc0617
+Size (samba-4.9.4.tar.gz) = 18053738 bytes
 SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
 SHA1 (patch-dynconfig_wscript) = 4d769a4d07487b5f62c112d3b0095196bb058117
 SHA1 (patch-lib_ldb_ldb__mdb_ldb__mdb.c) = 3dcee7618a15058351d488ad003929effa100e41