svn commit: r457124 - in head/net/samba46: . files

[Timur I. Bakeyev]

Author: timur
Date: Sun Dec 24 04:26:17 2017
New Revision: 457124
URL: https://svnweb.freebsd.org/changeset/ports/457124

Log:
  Update net/samba46 to 4.6.12 version.

Added:
  head/net/samba46/files/patch-buildtools__wafsamba__samba_autoconf.py   (contents, props changed)
  head/net/samba46/files/patch-source3__libads__kerberos_keytab.c   (contents, props changed)
Deleted:
  head/net/samba46/files/patch-source3__modules__vfs_zfsacl.c
Modified:
  head/net/samba46/Makefile
  head/net/samba46/distinfo
  head/net/samba46/pkg-plist

Modified: head/net/samba46/Makefile
==============================================================================
--- head/net/samba46/Makefile	Sun Dec 24 03:00:16 2017	(r457123)
+++ head/net/samba46/Makefile	Sun Dec 24 04:26:17 2017	(r457124)
@@ -21,7 +21,7 @@ CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-57-9]-4.* p
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.6.11
+SAMBA4_VERSION=			4.6.12
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -327,7 +327,7 @@ SAMBA_MAN8+=			cifsdd.8 eventlogadm.8 idmap_ad.8 idmap
 				vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \
 				vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \
 				vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \
-				vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8
+				vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8 vfs_zfsacl.8
 
 PORTDOCS=			README.FreeBSD
 

Modified: head/net/samba46/distinfo
==============================================================================
--- head/net/samba46/distinfo	Sun Dec 24 03:00:16 2017	(r457123)
+++ head/net/samba46/distinfo	Sun Dec 24 04:26:17 2017	(r457124)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511283638
-SHA256 (samba-4.6.11.tar.gz) = 051b7ab0fa088d77dc0df039ff5d6b8fd998372f0c29ecb455b149457c20ed1d
-SIZE (samba-4.6.11.tar.gz) = 21157318
+TIMESTAMP = 1514070924
+SHA256 (samba-4.6.12.tar.gz) = 18f1c89bb6687b94080f5ec8aa73c14acdad1106425403945a32928a4b1e54a1
+SIZE (samba-4.6.12.tar.gz) = 21160637

Added: head/net/samba46/files/patch-buildtools__wafsamba__samba_autoconf.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/samba46/files/patch-buildtools__wafsamba__samba_autoconf.py	Sun Dec 24 04:26:17 2017	(r457124)
@@ -0,0 +1,11 @@
+--- buildtools/wafsamba/samba_autoconf.py.orig	2017-07-04 10:05:25 UTC
++++ buildtools/wafsamba/samba_autoconf.py
+@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+ 
+     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
+-        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
++        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
+             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
+ 
+ @conf

Added: head/net/samba46/files/patch-source3__libads__kerberos_keytab.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/samba46/files/patch-source3__libads__kerberos_keytab.c	Sun Dec 24 04:26:17 2017	(r457124)
@@ -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
+ ***********************************************************************/

Modified: head/net/samba46/pkg-plist
==============================================================================
--- head/net/samba46/pkg-plist	Sun Dec 24 03:00:16 2017	(r457123)
+++ head/net/samba46/pkg-plist	Sun Dec 24 04:26:17 2017	(r457124)
@@ -832,6 +832,7 @@ man/man8/vfs_tsmsm.8.gz
 man/man8/vfs_unityed_media.8.gz
 man/man8/vfs_worm.8.gz
 man/man8/vfs_xattr_tdb.8.gz
+man/man8/vfs_zfsacl.8.gz
 man/man8/winbindd.8.gz
 @dir /var/run/samba4
 @dir /var/log/samba4