svn commit: r509383 - in head/net/samba410: . files files/man
Timur I. Bakeyev
timur at FreeBSD.org
Mon Aug 19 22:22:35 UTC 2019
Author: timur
Date: Mon Aug 19 22:22:33 2019
New Revision: 509383
URL: https://svnweb.freebsd.org/changeset/ports/509383
Log:
Upgrade samba410 port to 4.10.6 version. Fixed vfs_freebsd to match newer
configure test. This release should fix provisioning on UFS2 systems, ZFS
provisioning is still broken...
PR: 239105
Added:
head/net/samba410/files/patch-lib_tdb_wscript (contents, props changed)
Deleted:
head/net/samba410/files/man/ldb.3
Modified:
head/net/samba410/Makefile
head/net/samba410/distinfo
head/net/samba410/files/patch-lib_ldb_wscript
head/net/samba410/files/patch-listen-backlog
head/net/samba410/files/patch-vfs_freebsd
head/net/samba410/pkg-plist
Modified: head/net/samba410/Makefile
==============================================================================
--- head/net/samba410/Makefile Mon Aug 19 22:09:56 2019 (r509382)
+++ head/net/samba410/Makefile Mon Aug 19 22:22:33 2019 (r509383)
@@ -3,7 +3,7 @@
PORTNAME= ${SAMBA4_BASENAME}410
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -22,7 +22,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.pat
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.10.5
+SAMBA4_VERSION= 4.10.6
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
@@ -85,7 +85,7 @@ OPTIONS_SUB= yes
OPTIONS_DEFINE= AD_DC ADS DEBUG DOCS FAM LDAP \
QUOTAS SYSLOG UTMP PROFILE
# Make those default options
-OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} GSSAPI_BUILTIN
+OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} GSSAPI_BUILTIN AVAHI
# This shouldn't be default in the release
OPTIONS_DEFINE+= DEVELOPER MANDOC
@@ -95,13 +95,13 @@ OPTIONS_DEFAULT_amd64= AESNI
OPTIONS_DEFINE+= CLUSTER CUPS GLUSTERFS GPGME NTVFS SPOTLIGHT
#OPTIONS_DEFINE+= MEMORY_DEBUG
-OPTIONS_SINGLE= GSSAPI
+OPTIONS_SINGLE= GSSAPI ZEROCONF
# GSSAPI_HEIMDAL
OPTIONS_SINGLE_GSSAPI= GSSAPI_BUILTIN GSSAPI_MIT
+OPTIONS_SINGLE_ZEROCONF= AVAHI MDNSRESPONDER
-OPTIONS_RADIO= DNS ZEROCONF
-OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND913 BIND914
-OPTIONS_RADIO_ZEROCONF= MDNSRESPONDER AVAHI
+OPTIONS_RADIO= DNS
+OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND914
##############################################################################
AD_DC_DESC= Active Directory Domain Controller
ADS_DESC= Active Directory client(implies LDAP)
@@ -125,7 +125,6 @@ UTMP_DESC= UTMP accounting
GSSAPI_BUILTIN_DESC= GSSAPI support via bundled Heimdal
BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend
-BIND913_DESC= Use Bind 9.13 as AD DC DNS server frontend
BIND914_DESC= Use Bind 9.14 as AD DC DNS server frontend
NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC
##############################################################################
@@ -160,10 +159,10 @@ SAMBA4_BUNDLED_TALLOC?= no
SAMBA4_BUNDLED_TEVENT?= no
SAMBA4_BUNDLED_TDB?= no
SAMBA4_BUNDLED_LDB?= yes
-SAMBA4_LDB= 15
# cmocka
.if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
SAMBA4_BUNDLED_LIBS+= cmocka
+SAMBA4_BUILTIN_LIBS+= cmocka
CONFLICTS+= cmocka-1.*
PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA=""
SUB_LIST+= SAMBA4_BUNDLED_CMOCKA=""
@@ -177,6 +176,7 @@ SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment "
# talloc
.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
SAMBA4_BUNDLED_LIBS+= talloc
+SAMBA4_BUILTIN_LIBS+= talloc
CONFLICTS+= talloc-* talloc1-*
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""
SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""
@@ -190,6 +190,7 @@ SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment "
# tevent
.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
SAMBA4_BUNDLED_LIBS+= tevent
+SAMBA4_BUILTIN_LIBS+= tevent
CONFLICTS+= tevent-* tevent1-*
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""
SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""
@@ -203,6 +204,7 @@ SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment "
# tdb
.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
SAMBA4_BUNDLED_LIBS+= tdb
+SAMBA4_BUILTIN_LIBS+= tdb
CONFLICTS+= tdb-* tdb1-*
PLIST_SUB+= SAMBA4_BUNDLED_TDB=""
SUB_LIST+= SAMBA4_BUNDLED_TDB=""
@@ -214,16 +216,17 @@ PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment "
.endif
# ldb
-.if (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) || !defined(SAMBA4_LDB)
+.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
SAMBA4_BUNDLED_LDB= yes
SAMBA4_BUNDLED_LIBS+= ldb
+SAMBA4_BUILTIN_LIBS+= ldb
PLIST_SUB+= SAMBA4_BUNDLED_LDB=""
SUB_LIST+= SAMBA4_BUNDLED_LDB=""
SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/modules
.else
SAMBA4_BUNDLED_LIBS+= !ldb
-BUILD_DEPENDS+= ldb14>=1.5.4:databases/ldb15
-RUN_DEPENDS+= ldb14>=1.5.4:databases/ldb15
+BUILD_DEPENDS+= ldb15>=1.5.4:databases/ldb15
+RUN_DEPENDS+= ldb15>=1.5.4:databases/ldb15
PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment "
SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules
@@ -231,8 +234,10 @@ SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules
.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TEVENT} == yes) \
|| (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \
+ || (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \
|| (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)
SAMBA4_BUNDLED_LIBS+= replace
+#SAMBA4_BUILTIN_LIBS+= replace
.endif
# Don't use external libcom_err
SAMBA4_BUNDLED_LIBS+= com_err
@@ -264,8 +269,6 @@ CONFIGURE_ARGS+= \
${ICONV_CONFIGURE_BASE}
##############################################################################
BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911
-BIND912_RUN_DEPENDS= bind912>=9.12.0.0:dns/bind912
-BIND913_RUN_DEPENDS= bind913>=9.13.0.0:dns/bind913
BIND914_RUN_DEPENDS= bind914>=9.14.0.0:dns/bind914
NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate
@@ -299,7 +302,7 @@ DEVELOPER_TEST_DEPENDS= ${GDB_CMD}:devel/gdb
DEVELOPER_VARS_OFF= GDB_CMD=true
# XXX: Mostly used in conjuction with the DEVELOPER option, don't enable it
# if you don't know what you are doing
-NTVS_IMPLIES= AD_DC
+NTVFS_IMPLIES= AD_DC
NTVFS_CONFIGURE_WITH= ntvfs-fileserver
NTVFS_PLIST_FILES= ${SAMBA4_MODULEDIR}/service/smb.so \
lib/samba4/private/libntvfs-samba4.so
@@ -390,23 +393,6 @@ SAMBA4_MODULES+= auth_skel pdb_test gpext_security gp
vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \
vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject
.endif
-
-.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
-SAMBA4_MODULES+= ${WANT_EXP_MODULES}
-.endif
-
-.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
-CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
-.endif
-
-.if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
-CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}"
-.endif
-# XXX: Hack for nss-info_* -> nss_info/* modules
-# Add selected modules to the plist
-.for module in ${SAMBA4_MODULES}
-PLIST_FILES+= ${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so
-.endfor
# Python bindings
.if defined(NO_PYTHON)
USES+= python:2.7+,build,test
@@ -418,17 +404,28 @@ USES+= python:3.4+
PLIST_SUB+= SAMBA4_PYTHON=""
SUB_LIST+= SAMBA4_PYTHON=""
-.if !defined(SAMBA4_BUNDLED_TALLOC)
+.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
+SAMBA4_BUNDLED_LIBS+= pytalloc-util
+.else
SAMBA4_BUNDLED_LIBS+= !pytalloc-util
.endif
-.if !defined(SAMBA4_BUNDLED_TEVENT)
+
+.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
+SAMBA4_BUNDLED_LIBS+= pytevent
+.else
SAMBA4_BUNDLED_LIBS+= !pytevent
.endif
-.if !defined(SAMBA4_BUNDLED_TDB)
+
+.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
+SAMBA4_BUNDLED_LIBS+= pytdb
+.else
SAMBA4_BUNDLED_LIBS+= !pytdb
.endif
-.if !defined(SAMBA4_BUNDLED_LDB)
-SAMBA4_BUNDLED_LIBS+= !pyldb,!pyldb-util
+
+.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
+SAMBA4_BUNDLED_LIBS+= pyldb pyldb-util
+.else
+SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util
.endif
# External Python modules
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR}
@@ -437,6 +434,24 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
.endif
+
+.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
+SAMBA4_MODULES+= ${WANT_EXP_MODULES}
+.endif
+
+.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
+CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
+CONFIGURE_ARGS+= --builtin-libraries="${SAMBA4_BUILTIN_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}"
+.endif
+
+.if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
+CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}"
+.endif
+# XXX: Hack for nss-info_* -> nss_info/* modules
+# Add selected modules to the plist
+.for module in ${SAMBA4_MODULES}
+PLIST_FILES+= ${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so
+.endfor
# !SAMBA4_SUBPORT
.endif
@@ -555,7 +570,6 @@ pre-build-MANDOC-off:
lib/tdb/man/tdbtool.8 \
lib/talloc/man/talloc.3 \
lib/tdb/man/tdbrestore.8 \
- lib/ldb/man/ldb.3 \
lib/ldb/man/ldbadd.1 \
lib/ldb/man/ldbsearch.1 \
lib/ldb/man/ldbmodify.1 \
@@ -576,15 +590,27 @@ pre-build-MANDOC-off:
.endif
post-install-rm-junk:
-.for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8
- ${RM} ${STAGEDIR}${PREFIX}/man/man8/${f}
-.endfor
.if defined(NO_PYTHON)
${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/dns \
${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party/iso8601
.endif
-post-install: post-install-rm-junk
+post-install-fix-manpages:
+.for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8
+ ${RM} ${STAGEDIR}${PREFIX}/man/man8/${f}
+.endfor
+.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
+. for f in ldbadd.1 ldbdel.1 ldbedit.1 ldbmodify.1 ldbrename.1 ldbsearch.1
+ ${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/samba-${f}
+. endfor
+.endif
+.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
+. for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8
+ ${MV} ${STAGEDIR}${PREFIX}/man/man8/${f} ${STAGEDIR}${PREFIX}/man/man8/samba-${f}
+. endfor
+.endif
+
+post-install: post-install-rm-junk post-install-fix-manpages
${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
# Run post-install script
.for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR}
@@ -601,6 +627,12 @@ post-install-DOCS-on:
.for doc in ${PORTDOCS}
${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor
+
+post-install-CLUSTER-on:
+ ${LN} -nfs ../../../../share/ctdb/events/legacy/00.ctdb.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/00.ctdb.script
+ ${LN} -nfs ../../../../share/ctdb/events/legacy/10.interface.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/10.interface.script
+ ${LN} -nfs ../../../../share/ctdb/events/legacy/05.system.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/05.system.script
+ ${LN} -nfs ../../../../share/ctdb/events/legacy/01.reclock.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/01.reclock.script
# !SAMBA4_SUBPORT
.endif
Modified: head/net/samba410/distinfo
==============================================================================
--- head/net/samba410/distinfo Mon Aug 19 22:09:56 2019 (r509382)
+++ head/net/samba410/distinfo Mon Aug 19 22:22:33 2019 (r509383)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560986236
-SHA256 (samba-4.10.5.tar.gz) = 6c10266d5e8c44ce1ea17dc993ace67a83607b4d9a830959c75e3188c6af6375
-SIZE (samba-4.10.5.tar.gz) = 18290612
+TIMESTAMP = 1562972432
+SHA256 (samba-4.10.6.tar.gz) = 9efbeb52db1203dc779b118f1c48c161e569f7a6af5101e745497ee6296eef42
+SIZE (samba-4.10.6.tar.gz) = 18306135
Modified: head/net/samba410/files/patch-lib_ldb_wscript
==============================================================================
--- head/net/samba410/files/patch-lib_ldb_wscript Mon Aug 19 22:09:56 2019 (r509382)
+++ head/net/samba410/files/patch-lib_ldb_wscript Mon Aug 19 22:22:33 2019 (r509383)
@@ -1,7 +1,24 @@
---- lib/ldb/wscript.orig 2019-05-07 08:38:21 UTC
+--- lib/ldb/wscript.orig 2019-07-08 12:47:51 UTC
+++ lib/ldb/wscript
-@@ -451,7 +451,7 @@ def build(bld):
+@@ -218,7 +218,7 @@ def build(bld):
+ if bld.env.standalone_ldb:
+ if not 'PACKAGE_VERSION' in bld.env:
+ bld.env.PACKAGE_VERSION = VERSION
+- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
++ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
+ private_library = False
+ else:
+ private_library = True
+@@ -298,7 +298,6 @@ def build(bld):
+ pc_files='ldb.pc',
+ vnum=VERSION,
+ private_library=private_library,
+- manpages='man/ldb.3',
+ abi_directory='ABI',
+ abi_match = abi_match)
+@@ -451,7 +450,7 @@ def build(bld):
+
LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
for t in LDB_TOOLS.split():
- bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb',
@@ -9,7 +26,7 @@
manpages='man/%s.1' % t)
# ldbtest doesn't get installed
-@@ -463,10 +463,10 @@ def build(bld):
+@@ -463,10 +462,10 @@ def build(bld):
else:
lmdb_deps = ''
# ldbdump doesn't get installed
@@ -22,3 +39,25 @@
bld.SAMBA_LIBRARY('ldb-cmdline',
source='tools/ldbutil.c tools/cmdline.c',
+@@ -511,11 +510,6 @@ def build(bld):
+ deps='cmocka ldb',
+ install=False)
+
+- bld.SAMBA_BINARY('ldb_match_test',
+- source='tests/ldb_match_test.c',
+- deps='cmocka ldb',
+- install=False)
+-
+ if bld.CONFIG_SET('HAVE_LMDB'):
+ bld.SAMBA_BINARY('ldb_mdb_mod_op_test',
+ source='tests/ldb_mod_op_test.c',
+@@ -583,8 +577,7 @@ def test(ctx):
+ # we don't want to run ldb_lmdb_size_test (which proves we can
+ # fit > 4G of data into the DB), it would fill up the disk on
+ # many of our test instances
+- 'ldb_mdb_kv_ops_test',
+- 'ldb_match_test']
++ 'ldb_mdb_kv_ops_test']
+
+ for test_exe in test_exes:
+ cmd = os.path.join(Context.g_module.out, test_exe)
Added: head/net/samba410/files/patch-lib_tdb_wscript
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/samba410/files/patch-lib_tdb_wscript Mon Aug 19 22:22:33 2019 (r509383)
@@ -0,0 +1,27 @@
+--- lib/tdb/wscript.orig 2019-07-02 22:39:54 UTC
++++ lib/tdb/wscript
+@@ -145,20 +145,20 @@ def build(bld):
+ 'tdb',
+ install=False)
+
+- bld.SAMBA_BINARY('tdbrestore',
++ bld.SAMBA_BINARY('samba-tdbrestore',
+ 'tools/tdbrestore.c',
+ 'tdb', manpages='man/tdbrestore.8')
+
+- bld.SAMBA_BINARY('tdbdump',
++ bld.SAMBA_BINARY('samba-tdbdump',
+ 'tools/tdbdump.c',
+ 'tdb', manpages='man/tdbdump.8')
+
+- bld.SAMBA_BINARY('tdbbackup',
++ bld.SAMBA_BINARY('samba-tdbbackup',
+ 'tools/tdbbackup.c',
+ 'tdb',
+ manpages='man/tdbbackup.8')
+
+- bld.SAMBA_BINARY('tdbtool',
++ bld.SAMBA_BINARY('samba-tdbtool',
+ 'tools/tdbtool.c',
+ 'tdb', manpages='man/tdbtool.8')
+
Modified: head/net/samba410/files/patch-listen-backlog
==============================================================================
--- head/net/samba410/files/patch-listen-backlog Mon Aug 19 22:09:56 2019 (r509382)
+++ head/net/samba410/files/patch-listen-backlog Mon Aug 19 22:22:33 2019 (r509383)
@@ -5,7 +5,7 @@
}
- ret = listen(listen_sock, 5);
-+ ret = listen(listen_sock, -1);
++ ret = listen(listen_sock, DEFAULT_LISTEN_BACKLOG);
if (ret == -1) {
perror("listen() failed");
exit(1);
Modified: head/net/samba410/files/patch-vfs_freebsd
==============================================================================
--- head/net/samba410/files/patch-vfs_freebsd Mon Aug 19 22:09:56 2019 (r509382)
+++ head/net/samba410/files/patch-vfs_freebsd Mon Aug 19 22:22:33 2019 (r509383)
@@ -27,7 +27,7 @@
bld.SAMBA_GENERATOR('nfs41acl-xdr-c',
--- source3/modules/vfs_freebsd.c.orig 2019-06-22 11:56:57 UTC
+++ source3/modules/vfs_freebsd.c
-@@ -0,0 +1,808 @@
+@@ -0,0 +1,800 @@
+/*
+ * This module implements VFS calls specific to FreeBSD
+ *
@@ -229,17 +229,13 @@
+ ssize_t result;
+
+ switch(arg.method) {
-+#if defined(HAVE_EXTATTR_GET_FILE)
++#if defined(HAVE_XATTR_EXTATTR)
+ case EXTATTR_FILE:
+ result = extattr_get_file(arg.param.path, attr->namespace, attr->name, NULL, 0);
+ break;
-+#endif
-+#if defined(HAVE_EXTATTR_GET_LINK)
+ case EXTATTR_LINK:
+ result = extattr_get_link(arg.param.path, attr->namespace, attr->name, NULL, 0);
+ break;
-+#endif
-+#if defined(HAVE_EXTATTR_GET_FD)
+ case EXTATTR_FDES:
+ result = extattr_get_fd(arg.param.filedes, attr->namespace, attr->name, NULL, 0);
+ break;
@@ -291,17 +287,13 @@
+ /* Iterate through extattr(2) namespaces */
+ for(; ns < ARRAY_SIZE(extattr); ns++) {
+ switch(arg.method) {
-+#if defined(HAVE_EXTATTR_LIST_FILE)
++#if defined(HAVE_XATTR_EXTATTR)
+ case EXTATTR_FILE:
+ list_size = extattr_list_file(arg.param.path, extattr[ns].namespace, list, size);
+ break;
-+#endif
-+#if defined(HAVE_EXTATTR_LIST_LINK)
+ case EXTATTR_LINK:
+ list_size = extattr_list_link(arg.param.path, extattr[ns].namespace, list, size);
+ break;
-+#endif
-+#if defined(HAVE_EXTATTR_LIST_FD)
+ case EXTATTR_FDES:
+ list_size = extattr_list_fd(arg.param.filedes, extattr[ns].namespace, list, size);
+ break;
@@ -431,7 +423,7 @@
+ void *value,
+ size_t size)
+{
-+#if defined(HAVE_EXTATTR_GET_FILE)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+ extattr_arg arg = { EXTATTR_FILE, .param.path = smb_fname->base_name };
+ extattr_attr attr;
@@ -484,7 +476,7 @@
+ struct files_struct *fsp, const char *name,
+ void *value, size_t size)
+{
-+#if defined(HAVE_EXTATTR_GET_FD)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd };
+ extattr_attr attr;
@@ -538,7 +530,7 @@
+ char *list,
+ size_t size)
+{
-+#if defined(HAVE_EXTATTR_LIST_FILE)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+
+ SMB_VFS_HANDLE_GET_DATA(handle, data,
@@ -559,7 +551,7 @@
+ struct files_struct *fsp, char *list,
+ size_t size)
+{
-+#if defined(HAVE_EXTATTR_LIST_FD)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+ extattr_arg arg = { EXTATTR_FDES, .param.filedes = fsp->fh->fd };
+
@@ -578,7 +570,7 @@
+ const struct smb_filename *smb_fname,
+ const char *name)
+{
-+#if defined(HAVE_EXTATTR_DELETE_FILE)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+ extattr_attr attr;
+
@@ -604,7 +596,7 @@
+static int freebsd_fremovexattr(vfs_handle_struct *handle,
+ struct files_struct *fsp, const char *name)
+{
-+#if defined(HAVE_EXTATTR_DELETE_FD)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+ extattr_attr attr;
+
@@ -638,7 +630,7 @@
+ size_t size,
+ int flags)
+{
-+#if defined(HAVE_EXTATTR_SET_FILE)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+ extattr_attr attr;
+ ssize_t res;
@@ -692,7 +684,7 @@
+ const char *name, const void *value, size_t size,
+ int flags)
+{
-+#if defined(HAVE_EXTATTR_SET_FD)
++#if defined(HAVE_XATTR_EXTATTR)
+ struct freebsd_handle_data *data;
+ extattr_attr attr;
+ ssize_t res;
Modified: head/net/samba410/pkg-plist
==============================================================================
--- head/net/samba410/pkg-plist Mon Aug 19 22:09:56 2019 (r509382)
+++ head/net/samba410/pkg-plist Mon Aug 19 22:22:33 2019 (r509383)
@@ -238,8 +238,6 @@ lib/samba4/private/libiov-buf-samba4.so
%%GSSAPI_BUILTIN%%lib/samba4/private/libkdc-samba4.so.2
%%GSSAPI_BUILTIN%%lib/samba4/private/libkrb5-samba4.so.26
lib/samba4/private/libkrb5samba-samba4.so
-lib/samba4/private/libldb-tdb-err-map-samba4.so
-lib/samba4/private/libldb-tdb-int-samba4.so
lib/samba4/private/libldbsamba-samba4.so
lib/samba4/private/liblibcli-lsa3-samba4.so
lib/samba4/private/liblibcli-netlogon3-samba4.so
@@ -310,6 +308,7 @@ lib/samba4/private/libxattr-tdb-samba4.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/acl.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/aclread.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/anr.so
+%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/audit_log.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/descriptor.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dirsync.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dns_notify.so
@@ -318,6 +317,7 @@ lib/samba4/private/libxattr-tdb-samba4.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_in.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_out.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_store.so
+%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/group_audit_log.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ildap.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/instancetype.so
%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/lazy_commit.so
@@ -556,6 +556,7 @@ lib/samba4/private/libxattr-tdb-samba4.so
%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif
%%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif
%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif
+%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_schema.ldif
%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif
%%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif
%%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif
@@ -775,58 +776,7 @@ man/man8/winbindd.8.gz
%%CLUSTER%%@dir /var/lib/ctdb
%%CLUSTER%%@dir /var/lib
%%CLUSTER%%@dir /var/run/ctdb
- at comment Use bundled libraries
-%%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_ldb_text.py
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/ldb.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%lib/samba4/private/libpyldb-util.so.1
-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump
-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd
-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdel
-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbedit
-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbmodify
-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbrename
-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbsearch
-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-cmdline-samba4.so
-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-key-value-samba4.so
-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb.so.1
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/asq.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/ldb.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/paged_searches.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/rdn_name.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/sample.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/skel.so
-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so
- at comment %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/audit_log.so
- at comment %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/group_audit_log.so
- at comment %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/mdb.so
-%%SAMBA4_BUNDLED_LDB%%man/man1/ldbadd.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/ldbdel.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/ldbedit.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/ldbmodify.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/ldbrename.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/ldbsearch.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man3/ldb.3.gz
-%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/talloc.so
-%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%lib/samba4/private/libpytalloc-util.so.2
-%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2
-%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
-%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
-%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tdb.so
-%%SAMBA4_BUNDLED_TDB%%bin/tdbbackup
-%%SAMBA4_BUNDLED_TDB%%bin/tdbdump
-%%SAMBA4_BUNDLED_TDB%%bin/tdbrestore
-%%SAMBA4_BUNDLED_TDB%%bin/tdbtool
-%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1
-%%SAMBA4_BUNDLED_TDB%%man/man8/tdbbackup.8.gz
-%%SAMBA4_BUNDLED_TDB%%man/man8/tdbdump.8.gz
-%%SAMBA4_BUNDLED_TDB%%man/man8/tdbrestore.8.gz
-%%SAMBA4_BUNDLED_TDB%%man/man8/tdbtool.8.gz
-%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent.so
-%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py
-%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0
- at comment Python2 block
+ at comment Python block
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
@@ -1055,6 +1005,7 @@ man/man8/winbindd.8.gz
%%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py
%%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py
%%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py
+%%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py
%%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py
%%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py
%%PYTHON_SITELIBDIR%%/samba/tests/lsa_string.py
@@ -1141,7 +1092,6 @@ man/man8/winbindd.8.gz
%%PYTHON_SITELIBDIR%%/samba/uptodateness.py
%%PYTHON_SITELIBDIR%%/samba/werror.so
%%PYTHON_SITELIBDIR%%/samba/xattr.py
- at unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1
@dir %%PYTHON_SITELIBDIR%%/samba/web_server
@dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
@dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
@@ -1152,3 +1102,52 @@ man/man8/winbindd.8.gz
@dir %%PYTHON_SITELIBDIR%%/samba/netcmd
@dir %%PYTHON_SITELIBDIR%%/samba/dcerpc
@dir %%PYTHON_SITELIBDIR%%/samba
+ at comment Use bundled libraries
+%%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_ldb_text.py
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/ldb.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%lib/samba4/private/libpyldb-util.so.1
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdel
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbedit
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbmodify
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbrename
+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbsearch
+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-cmdline-samba4.so
+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-key-value-samba4.so
+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-tdb-err-map-samba4.so
+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-tdb-int-samba4.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/asq.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/ldb.so
+%%AD_DC%%%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/mdb.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/paged_searches.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/rdn_name.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/sample.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/skel.so
+%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so
+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/talloc.so
+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%lib/samba4/private/libpytalloc-util.so.2
+%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2
+%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
+%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
+%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tdb.so
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbbackup
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbdump
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbrestore
+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbtool
+%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1
+%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent.so
+%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py
+%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0
+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbadd.1.gz
+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbdel.1.gz
+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbedit.1.gz
+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbmodify.1.gz
+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbrename.1.gz
+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbsearch.1.gz
+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbbackup.8.gz
+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbdump.8.gz
+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbrestore.8.gz
+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbtool.8.gz
More information about the svn-ports-all
mailing list