Date: Tue, 21 Apr 2020 08:35:39 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532260 - in head: databases/ldb20 databases/ldb20/files net/samba411 net/samba411/files Message-ID: <202004210835.03L8ZdqS080199@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Tue Apr 21 08:35:38 2020 New Revision: 532260 URL: https://svnweb.freebsd.org/changeset/ports/532260 Log: Introduce new ports databases/ldb20 and net/samba411 Added: head/net/samba411/files/patch-source4_dsdb_samdb_ldb__modules_count_attrs.c (contents, props changed) Deleted: head/net/samba411/files/0001-provision-use-ASCII-quotes.patch head/net/samba411/files/patch-lib_crypto_wscript__configure head/net/samba411/files/patch-source4_heimdal__build_wscript__configure Modified: head/databases/ldb20/Makefile head/databases/ldb20/distinfo head/databases/ldb20/files/patch-buildtools_wafsamba_samba__autoconf.py head/databases/ldb20/files/patch-wscript head/net/samba411/Makefile head/net/samba411/distinfo head/net/samba411/files/0001-Zfs-provision-1.patch head/net/samba411/files/patch-bind head/net/samba411/files/patch-buildtools_wafsamba_samba__autoconf.py head/net/samba411/files/patch-buildtools_wafsamba_wafsamba.py head/net/samba411/files/patch-ctdb_wscript head/net/samba411/files/patch-lib_ldb_wscript head/net/samba411/files/patch-source3_lib_sysquotas__4B.c head/net/samba411/files/patch-source3_wscript head/net/samba411/files/patch-vfs_freebsd head/net/samba411/pkg-plist Modified: head/databases/ldb20/Makefile ============================================================================== --- head/databases/ldb20/Makefile Tue Apr 21 08:31:33 2020 (r532259) +++ head/databases/ldb20/Makefile Tue Apr 21 08:35:38 2020 (r532260) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.5.6 +PORTVERSION= 2.0.9 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA -PKGNAMESUFFIX?= 15 +PKGNAMESUFFIX?= 20 MAINTAINER= timur@FreeBSD.org COMMENT= LDAP-like embedded database @@ -25,13 +25,8 @@ LDB_DEPENDS= talloc>=2.2.0:devel/talloc \ cmocka>=1.1.3:sysutils/cmocka \ popt>=0:devel/popt -CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-46]-1.* +CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-9]-1.* ldb2[1-9]-2.* -#FLAVORS= default nopython -#nopython_PKGNAMESUFFIX= -nopython -#nopython_CONFLICTS= ldb -#default_CONFLICTS= ldb-nopython - USES= compiler pkgconfig waf USE_LDCONFIG= yes WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf @@ -49,7 +44,7 @@ CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,! --disable-rpath \ --without-gettext -OPTIONS_DEFINE= MANPAGES DEBUG +OPTIONS_DEFINE= MANPAGES DEBUG PYTHON3 MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) DEBUG_CONFIGURE_ON= --verbose --enable-debug @@ -66,7 +61,7 @@ LDB_BINS= bin/ldbedit \ bin/ldbrename LDB_LIBS= lib/libldb.so \ - lib/libldb.so.1 \ + lib/libldb.so.2 \ lib/ldb/libldb-tdb-int.so \ lib/ldb/libldb-tdb-err-map.so \ lib/ldb/libldb-key-value.so \ @@ -95,30 +90,32 @@ PLIST_FILES= include/ldb_version.h \ ${LDB_LIBS} \ ${PKGCONFIGDIR}/ldb.pc -.if defined(NO_PYTHON) -USES+= python:build,test + +.include <bsd.port.pre.mk> + +CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib + +.if ! ${PORT_OPTIONS:MMANPAGES} +CONFIGURE_ENV+= XSLTPROC="true" +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ + xsltproc:textproc/libxslt +.endif + +.if ! ${PORT_OPTIONS:MPYTHON3} || defined(NO_PYTHON) +USES+= python:2.7+,build,test CONFIGURE_ARGS+= --disable-python .else USES+= python:3.4+ PLIST_FILES+= include/pyldb.h \ lib/libpyldb-util.so \ - lib/libpyldb-util.so.1 \ + lib/libpyldb-util.so.2 \ ${PYTHON_SITELIBDIR}/ldb.so \ ${PYTHON_SITELIBDIR}/_ldb_text.py \ ${PKGCONFIGDIR}/pyldb-util.pc .endif -.include <bsd.port.pre.mk> - -.if ! ${PORT_OPTIONS:MMANPAGES} -CONFIGURE_ENV+= XSLTPROC="true" -.else -BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ - xsltproc:textproc/libxslt -.endif -CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib - # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics @@ -160,7 +157,7 @@ post-install: .for lib in ${LDB_BINS} ${LDB_LIBS} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib} .endfor -.if !defined(NO_PYTHON) +.if ${PORT_OPTIONS:MPYTHON3} && !defined(NO_PYTHON) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so .endif Modified: head/databases/ldb20/distinfo ============================================================================== --- head/databases/ldb20/distinfo Tue Apr 21 08:31:33 2020 (r532259) +++ head/databases/ldb20/distinfo Tue Apr 21 08:35:38 2020 (r532260) @@ -1,3 +1,3 @@ -TIMESTAMP = 1572420489 -SHA256 (ldb-1.5.6.tar.gz) = ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b -SIZE (ldb-1.5.6.tar.gz) = 1637795 +TIMESTAMP = 1585957021 +SHA256 (ldb-2.0.9.tar.gz) = 64c1e9866e59c791db683298627f0313b8fa6c9d7a205f98a01ced5e78cb18c8 +SIZE (ldb-2.0.9.tar.gz) = 1676176 Modified: head/databases/ldb20/files/patch-buildtools_wafsamba_samba__autoconf.py ============================================================================== --- head/databases/ldb20/files/patch-buildtools_wafsamba_samba__autoconf.py Tue Apr 21 08:31:33 2020 (r532259) +++ head/databases/ldb20/files/patch-buildtools_wafsamba_samba__autoconf.py Tue Apr 21 08:35:38 2020 (r532260) @@ -1,4 +1,4 @@ ---- buildtools/wafsamba/samba_autoconf.py.orig 2019-03-21 10:12:32 UTC +--- buildtools/wafsamba/samba_autoconf.py.orig 2019-09-04 10:53:16 UTC +++ buildtools/wafsamba/samba_autoconf.py @@ -573,7 +573,7 @@ def library_flags(self, libs): @@ -9,7 +9,7 @@ '''check if a set of libraries exist as system libraries returns the sublist of libs that do exist as a syslib or [] -@@ -593,11 +593,14 @@ int foo() +@@ -593,11 +593,29 @@ int foo() ret.append(lib) continue @@ -17,20 +17,34 @@ + msg = 'Checking for library %s' % lib + (ccflags, ldflags, cpppath) = library_flags(conf, lib) ++ if shlib: - res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) -+ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) ++ res = conf.check(features='c cshlib', ++ fragment=fragment, ++ lib=lib, ++ uselib_store=lib, ++ cflags=ccflags, ++ ldflags=ldflags, ++ uselib=lib.upper(), ++ mandatory=False, ++ msg=msg) else: - res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) -+ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) ++ res = conf.check(lib=lib, ++ uselib_store=lib, ++ cflags=ccflags, ++ ldflags=ldflags, ++ uselib=lib.upper(), ++ mandatory=False, ++ msg=msg) if not res: if mandatory: -@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c +@@ -944,5 +962,5 @@ 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): + if (conf.env.undefined_ignore_ldflags == [] and +- conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])): ++ conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)): conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] -- Modified: head/databases/ldb20/files/patch-wscript ============================================================================== --- head/databases/ldb20/files/patch-wscript Tue Apr 21 08:31:33 2020 (r532259) +++ head/databases/ldb20/files/patch-wscript Tue Apr 21 08:35:38 2020 (r532260) @@ -1,6 +1,6 @@ ---- wscript.orig 2019-02-26 17:12:23 UTC +--- wscript.orig 2019-09-04 10:53:16 UTC +++ wscript -@@ -218,7 +218,7 @@ def build(bld): +@@ -207,7 +207,7 @@ def build(bld): if bld.env.standalone_ldb: if not 'PACKAGE_VERSION' in bld.env: bld.env.PACKAGE_VERSION = VERSION @@ -9,7 +9,7 @@ private_library = False else: private_library = True -@@ -511,11 +511,6 @@ def build(bld): +@@ -497,11 +497,6 @@ def build(bld): deps='cmocka ldb', install=False) @@ -18,16 +18,14 @@ - 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 +578,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) + bld.SAMBA_BINARY('ldb_key_value_test', + source='tests/ldb_key_value_test.c', + deps='cmocka ldb ldb_tdb_err_map', +@@ -614,7 +609,6 @@ def test(ctx): + 'ldb_msg_test', + 'ldb_tdb_kv_ops_test', + 'ldb_tdb_test', +- 'ldb_match_test', + 'ldb_key_value_test', + # we currently don't run ldb_key_value_sub_txn_tdb_test as it + # tests the nested/sub transaction handling Modified: head/net/samba411/Makefile ============================================================================== --- head/net/samba411/Makefile Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/Makefile Tue Apr 21 08:35:38 2020 (r532260) @@ -1,7 +1,7 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ -PORTNAME= ${SAMBA4_BASENAME}410 +PORTNAME= ${SAMBA4_BASENAME}411 PORTVERSION= ${SAMBA4_VERSION} PORTREVISION= 0 CATEGORIES?= net @@ -15,16 +15,15 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support -CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-9]-4.* p5-Parse-Pidl-4.* +CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-9]-4.* samba410-4.10.* p5-Parse-Pidl-4.* USES= cpe EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-provision-use-ASCII-quotes.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.10.14 +SAMBA4_VERSION= 4.11.7 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -218,8 +217,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_TDB="" SUB_LIST+= SAMBA4_BUNDLED_TDB="" .else SAMBA4_BUNDLED_LIBS+= !tdb -BUILD_DEPENDS+= tdb>=1.4.0:databases/tdb -RUN_DEPENDS+= tdb>=1.4.0:databases/tdb +BUILD_DEPENDS+= tdb>=1.4.2:databases/tdb +RUN_DEPENDS+= tdb>=1.4.2:databases/tdb PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " .endif @@ -232,8 +231,8 @@ SUB_LIST+= SAMBA4_BUNDLED_LDB="" SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/modules .else SAMBA4_BUNDLED_LIBS+= !ldb -BUILD_DEPENDS+= ldb15>=1.5.4:databases/ldb15 -RUN_DEPENDS+= ldb15>=1.5.4:databases/ldb15 +BUILD_DEPENDS+= ldb20>=2.0.8:databases/ldb20 +RUN_DEPENDS+= ldb20>=2.0.8:databases/ldb20 PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment " SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules @@ -268,7 +267,6 @@ CONFIGURE_ARGS+= \ --enable-pthreadpool \ --without-fake-kaserver \ --without-systemd \ - --enable-gnutls \ --with-libarchive \ --with-acl-support \ --with-sendfile-support \ @@ -574,7 +572,7 @@ pre-build-MANDOC-off: source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ - source4/utils/man/oLschema2ldif.1 \ + source4/utils/oLschema2ldif/oLschema2ldif.1 \ lib/tdb/man/tdbdump.8 \ lib/tdb/man/tdbbackup.8 \ lib/tdb/man/tdbtool.8 \ Modified: head/net/samba411/distinfo ============================================================================== --- head/net/samba411/distinfo Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/distinfo Tue Apr 21 08:35:38 2020 (r532260) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585962923 -SHA256 (samba-4.10.14.tar.gz) = dc67f8ef9093c4fc63551cf24b05e77551dabaefcf5761945b938bbe2c036ea0 -SIZE (samba-4.10.14.tar.gz) = 18352989 +TIMESTAMP = 1586645355 +SHA256 (samba-4.11.7.tar.gz) = 79b6f9ebc357373f885153e2d5d26dc6def9f4511ee4bcbe8a8e2622acc42143 +SIZE (samba-4.11.7.tar.gz) = 18541292 Modified: head/net/samba411/files/0001-Zfs-provision-1.patch ============================================================================== --- head/net/samba411/files/0001-Zfs-provision-1.patch Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/0001-Zfs-provision-1.patch Tue Apr 21 08:35:38 2020 (r532260) @@ -120,7 +120,7 @@ diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysm index 63fc5d68c33..f5a536ee186 100644 --- a/source3/smbd/pysmbd.c +++ b/source3/smbd/pysmbd.c -@@ -392,6 +392,20 @@ static SMB_ACL_T make_simple_acl(TALLOC_ +@@ -393,6 +393,20 @@ static SMB_ACL_T make_simple_acl(TALLOC_ return acl; } @@ -141,7 +141,7 @@ index 63fc5d68c33..f5a536ee186 100644 /* set a simple ACL on a file, as a test */ -@@ -437,6 +451,57 @@ static PyObject *py_smbd_set_simple_acl( +@@ -438,6 +452,57 @@ static PyObject *py_smbd_set_simple_acl( Py_RETURN_NONE; } @@ -199,16 +199,16 @@ index 63fc5d68c33..f5a536ee186 100644 /* chown a file */ -@@ -536,7 +601,7 @@ static PyObject *py_smbd_unlink(PyObject +@@ -537,7 +602,7 @@ static PyObject *py_smbd_unlink(PyObject } /* - check if we have ACL support + check if we have POSIX.1e ACL support */ - static PyObject *py_smbd_have_posix_acls(PyObject *self) - { -@@ -547,6 +612,86 @@ static PyObject *py_smbd_have_posix_acls + static PyObject *py_smbd_have_posix_acls(PyObject *self, + PyObject *Py_UNUSED(ignored)) +@@ -549,6 +614,86 @@ static PyObject *py_smbd_have_posix_acls #endif } @@ -295,31 +295,35 @@ index 63fc5d68c33..f5a536ee186 100644 /* set the NT ACL on a file */ -@@ -881,9 +1026,24 @@ static PyMethodDef py_smbd_methods[] = { +@@ -883,10 +1028,28 @@ static PyMethodDef py_smbd_methods[] = { { "have_posix_acls", (PyCFunction)py_smbd_have_posix_acls, METH_NOARGS, NULL }, + { "has_posix_acls", -+ (PyCFunction)py_smbd_has_posix_acls, METH_VARARGS|METH_KEYWORDS, ++ PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_has_posix_acls), ++ METH_VARARGS|METH_KEYWORDS, + NULL }, + { "have_nfsv4_acls", + (PyCFunction)py_smbd_have_nfsv4_acls, METH_NOARGS, + NULL }, + { "has_nfsv4_acls", -+ (PyCFunction)py_smbd_has_nfsv4_acls, METH_VARARGS|METH_KEYWORDS, ++ PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_has_nfsv4_acls), ++ METH_VARARGS|METH_KEYWORDS, + NULL }, + { "set_nfsv4_defaults", + (PyCFunction)py_smbd_set_nfsv4_defaults, METH_NOARGS, + NULL }, { "set_simple_acl", - (PyCFunction)py_smbd_set_simple_acl, METH_VARARGS|METH_KEYWORDS, + PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_simple_acl), + METH_VARARGS|METH_KEYWORDS, NULL }, + { "set_simple_nfsv4_acl", -+ (PyCFunction)py_smbd_set_simple_nfsv4_acl, METH_VARARGS|METH_KEYWORDS, ++ PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_simple_nfsv4_acl), ++ METH_VARARGS|METH_KEYWORDS, + NULL }, { "set_nt_acl", - (PyCFunction)py_smbd_set_nt_acl, METH_VARARGS|METH_KEYWORDS, - NULL }, + PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_nt_acl), + METH_VARARGS|METH_KEYWORDS, -- 2.14.2 Modified: head/net/samba411/files/patch-bind ============================================================================== --- head/net/samba411/files/patch-bind Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-bind Tue Apr 21 08:35:38 2020 (r532260) @@ -124,7 +124,7 @@ enabled=bld.AD_DC_BUILD_IS_ENABLED()) -bld.SAMBA_LIBRARY('dlz_bind9_9', -+for bind_version in (909, 910, 911, 912, 914, 916): ++for bind_version in (909, 910, 911, 912, 913, 914, 916): + string_version='%d_%d' % (bind_version//100, bind_version % 100) + bld.SAMBA_LIBRARY('dlz_bind%s' % (string_version), source='dlz_bind9.c', Modified: head/net/samba411/files/patch-buildtools_wafsamba_samba__autoconf.py ============================================================================== --- head/net/samba411/files/patch-buildtools_wafsamba_samba__autoconf.py Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-buildtools_wafsamba_samba__autoconf.py Tue Apr 21 08:35:38 2020 (r532260) @@ -1,6 +1,6 @@ ---- buildtools/wafsamba/samba_autoconf.py.orig 2019-01-15 10:07:00 UTC +--- buildtools/wafsamba/samba_autoconf.py.orig 2019-08-20 15:35:08 UTC +++ buildtools/wafsamba/samba_autoconf.py -@@ -575,7 +575,7 @@ def library_flags(self, libs): +@@ -573,7 +573,7 @@ def library_flags(self, libs): @conf @@ -9,7 +9,7 @@ '''check if a set of libraries exist as system libraries returns the sublist of libs that do exist as a syslib or [] -@@ -595,11 +595,29 @@ int foo() +@@ -593,11 +593,14 @@ int foo() ret.append(lib) continue @@ -17,35 +17,19 @@ + msg = 'Checking for library %s' % lib + (ccflags, ldflags, cpppath) = library_flags(conf, lib) -+ if shlib: - res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) -+ res = conf.check(features='c cshlib', -+ fragment=fragment, -+ lib=lib, -+ uselib_store=lib, -+ cflags=ccflags, -+ ldflags=ldflags, -+ uselib=lib.upper(), -+ mandatory=False, -+ msg=msg) ++ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) else: - res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) -+ res = conf.check(lib=lib, -+ uselib_store=lib, -+ cflags=ccflags, -+ ldflags=ldflags, -+ uselib=lib.upper(), -+ mandatory=False, -+ msg=msg) ++ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) if not res: if mandatory: -@@ -927,6 +945,6 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c +@@ -949,5 +952,5 @@ 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): + if (conf.env.undefined_ignore_ldflags == [] and +- conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])): ++ conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)): conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] - Modified: head/net/samba411/files/patch-buildtools_wafsamba_wafsamba.py ============================================================================== --- head/net/samba411/files/patch-buildtools_wafsamba_wafsamba.py Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-buildtools_wafsamba_wafsamba.py Tue Apr 21 08:35:38 2020 (r532260) @@ -1,9 +1,9 @@ --- ./buildtools/wafsamba/wafsamba.py.orig 2015-07-21 09:47:48 UTC +++ ./buildtools/wafsamba/wafsamba.py -@@ -892,7 +892,7 @@ +@@ -919,7 +919,7 @@ def SAMBAMANPAGES(bld, manpages, extra_s bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl' bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl' - bld.env.SAMBA_CATALOG = bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' + bld.env.SAMBA_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml' - bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG + bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://%%LOCALBASE%%/share/xml/catalog file://' + bld.env.SAMBA_CATALOG Modified: head/net/samba411/files/patch-ctdb_wscript ============================================================================== --- head/net/samba411/files/patch-ctdb_wscript Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-ctdb_wscript Tue Apr 21 08:35:38 2020 (r532260) @@ -10,7 +10,7 @@ opt.add_option('--with-logdir', help=("Path to log directory"), -@@ -260,7 +263,7 @@ def configure(conf): +@@ -263,7 +266,7 @@ def configure(conf): conf.env['LIBPATH_CEPH-COMMON'] = conf.env['LIBPATH_RADOS'] + '/ceph' if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and @@ -19,7 +19,7 @@ conf.CHECK_LIB('ceph-common', shlib=True) Logs.info('Building with Ceph librados recovery lock support') conf.define('HAVE_LIBRADOS', 1) -@@ -300,8 +303,14 @@ def configure(conf): +@@ -303,8 +306,14 @@ def configure(conf): conf.env.CTDB_VARDIR, conf.env.CTDB_RUNDIR)) @@ -36,20 +36,20 @@ # Allow unified compilation and separate compilation of utilities # to find includes -@@ -679,9 +688,9 @@ def build(bld): - if bld.env.HAVE_LIBRADOS: +@@ -685,9 +694,9 @@ def build(bld): + rados_inc = bld.CONFIG_GET('CPPPATH_RADOS') + rados_inc bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper', source='utils/ceph/ctdb_mutex_ceph_rados_helper.c', - deps='talloc tevent rados ceph-common', -- includes='include', +- includes=rados_inc, - install_path='${CTDB_HELPER_BINDIR}') + deps='talloc tevent rados ceph-common', -+ includes='include', ++ includes=rados_inc, + install_path='${CTDB_HELPER_BINDIR}') sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR) sed_expr2 = 's|/usr/local/etc/ctdb|%s|g' % (bld.env.CTDB_ETCDIR) -@@ -858,6 +867,9 @@ def build(bld): +@@ -864,6 +873,9 @@ def build(bld): for d in ['volatile', 'persistent', 'state']: bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d)) Modified: head/net/samba411/files/patch-lib_ldb_wscript ============================================================================== --- head/net/samba411/files/patch-lib_ldb_wscript Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-lib_ldb_wscript Tue Apr 21 08:35:38 2020 (r532260) @@ -1,6 +1,6 @@ --- lib/ldb/wscript.orig 2019-07-08 12:47:51 UTC +++ lib/ldb/wscript -@@ -218,7 +218,7 @@ def build(bld): +@@ -207,7 +207,7 @@ def build(bld): if bld.env.standalone_ldb: if not 'PACKAGE_VERSION' in bld.env: bld.env.PACKAGE_VERSION = VERSION @@ -9,7 +9,7 @@ private_library = False else: private_library = True -@@ -298,7 +298,6 @@ def build(bld): +@@ -284,7 +284,6 @@ def build(bld): pc_files='ldb.pc', vnum=VERSION, private_library=private_library, @@ -17,7 +17,7 @@ abi_directory='ABI', abi_match = abi_match) -@@ -451,7 +450,7 @@ def build(bld): +@@ -437,7 +436,7 @@ def build(bld): LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename' for t in LDB_TOOLS.split(): @@ -26,7 +26,7 @@ manpages='man/%s.1' % t) # ldbtest doesn't get installed -@@ -463,10 +462,10 @@ def build(bld): +@@ -449,10 +448,10 @@ def build(bld): else: lmdb_deps = '' # ldbdump doesn't get installed @@ -39,7 +39,7 @@ bld.SAMBA_LIBRARY('ldb-cmdline', source='tools/ldbutil.c tools/cmdline.c', -@@ -511,11 +510,6 @@ def build(bld): +@@ -497,11 +496,6 @@ def build(bld): deps='cmocka ldb', install=False) @@ -48,16 +48,14 @@ - 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) + bld.SAMBA_BINARY('ldb_key_value_test', + source='tests/ldb_key_value_test.c', + deps='cmocka ldb ldb_tdb_err_map', +@@ -609,7 +603,6 @@ def test(ctx): + 'ldb_msg_test', + 'ldb_tdb_kv_ops_test', + 'ldb_tdb_test', +- 'ldb_match_test', + 'ldb_key_value_test', + # we currently don't run ldb_key_value_sub_txn_tdb_test as it + # tests the nested/sub transaction handling Modified: head/net/samba411/files/patch-source3_lib_sysquotas__4B.c ============================================================================== --- head/net/samba411/files/patch-source3_lib_sysquotas__4B.c Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-source3_lib_sysquotas__4B.c Tue Apr 21 08:35:38 2020 (r532260) @@ -1,6 +1,6 @@ --- source3/lib/sysquotas_4B.c.orig 2019-01-15 10:07:00 UTC +++ source3/lib/sysquotas_4B.c -@@ -141,7 +141,14 @@ static int sys_quotactl_4B(const char * +@@ -140,7 +140,14 @@ static int sys_quotactl_4B(const char * /* ENOTSUP means quota support is not compiled in. EINVAL * means that quotas are not configured (commonly). */ @@ -13,6 +13,6 @@ + && errno != ENOENT +#endif + ) { - DEBUG(0, ("failed to %s quota for %s ID %u on %s: %s\n", + DEBUG(5, ("failed to %s quota for %s ID %u on %s: %s\n", (cmd & QCMD(Q_GETQUOTA, 0)) ? "get" : "set", (cmd & QCMD(0, GRPQUOTA)) ? "group" : "user", Modified: head/net/samba411/files/patch-source3_wscript ============================================================================== --- head/net/samba411/files/patch-source3_wscript Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-source3_wscript Tue Apr 21 08:35:38 2020 (r532260) @@ -1,14 +1,14 @@ ---- source3/wscript.orig 2019-05-07 08:38:21 UTC +--- source3/wscript.orig 2019-07-09 10:08:41 UTC +++ source3/wscript @@ -50,6 +50,7 @@ def options(opt): - opt.SAMBA3_ADD_OPTION('sendfile-support', default=None) - opt.SAMBA3_ADD_OPTION('utmp') - opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable") -+ opt.SAMBA3_ADD_OPTION('dnssd', with_name="enable", without_name="disable") - opt.SAMBA3_ADD_OPTION('iconv') - opt.SAMBA3_ADD_OPTION('acl-support') - opt.SAMBA3_ADD_OPTION('dnsupdate') -@@ -787,34 +788,39 @@ msg.msg_accrightslen = sizeof(fd); + opt.samba_add_onoff_option('sendfile-support', default=None) + opt.samba_add_onoff_option('utmp') + opt.samba_add_onoff_option('avahi', with_name="enable", without_name="disable") ++ opt.samba_add_onoff_option('dnssd', with_name="enable", without_name="disable") + opt.samba_add_onoff_option('iconv') + opt.samba_add_onoff_option('acl-support') + opt.samba_add_onoff_option('dnsupdate') +@@ -784,34 +785,39 @@ msg.msg_accrightslen = sizeof(fd); if Options.options.with_utmp: conf.env.with_utmp = True @@ -64,7 +64,7 @@ define='SIZEOF_UTMP_UT_LINE', critical=False) if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'): conf.env.with_utmp = False -@@ -836,6 +842,17 @@ msg.msg_accrightslen = sizeof(fd); +@@ -833,6 +839,17 @@ msg.msg_accrightslen = sizeof(fd); conf.SET_TARGET_TYPE('avahi-common', 'EMPTY') conf.SET_TARGET_TYPE('avahi-client', 'EMPTY') @@ -82,7 +82,7 @@ if Options.options.with_iconv: conf.env.with_iconv = True if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'): -@@ -1730,9 +1747,6 @@ main() { +@@ -1778,9 +1795,6 @@ main() { if conf.CONFIG_SET('HAVE_VXFS'): default_shared_modules.extend(TO_LIST('vfs_vxfs')) Added: head/net/samba411/files/patch-source4_dsdb_samdb_ldb__modules_count_attrs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba411/files/patch-source4_dsdb_samdb_ldb__modules_count_attrs.c Tue Apr 21 08:35:38 2020 (r532260) @@ -0,0 +1,20 @@ +--- source4/dsdb/samdb/ldb_modules/count_attrs.c.orig 2019-09-20 00:03:10 UTC ++++ source4/dsdb/samdb/ldb_modules/count_attrs.c +@@ -222,7 +222,7 @@ static const char **get_sorted_attrs(TAL + attrs[i] = a; + } + +- qsort(attrs, n_attrs, sizeof(char *), (__compar_fn_t)strcasecmp_ptr); ++ qsort(attrs, n_attrs, sizeof(char *), QSORT_CAST(strcasecmp_ptr)); + return attrs; + } + +@@ -313,7 +313,7 @@ static int count_attrs_search_callback(s + } + + qsort(found_attrs, msg->num_elements, sizeof(char *), +- (__compar_fn_t)strcasecmp_ptr); ++ QSORT_CAST(strcasecmp_ptr)); + + + /* find and report duplicates */ Modified: head/net/samba411/files/patch-vfs_freebsd ============================================================================== --- head/net/samba411/files/patch-vfs_freebsd Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/files/patch-vfs_freebsd Tue Apr 21 08:35:38 2020 (r532260) @@ -10,10 +10,11 @@ 'vfs_glusterfs', --- source3/modules/wscript_build.orig 2019-05-07 08:38:21 UTC +++ source3/modules/wscript_build -@@ -243,6 +243,14 @@ bld.SAMBA3_MODULE('vfs_zfsacl', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl')) - +@@ -613,3 +613,11 @@ bld.SAMBA3_MODULE('vfs_delay_inject', + init_function='', + internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_delay_inject'), + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject')) ++ +bld.SAMBA3_MODULE('vfs_freebsd', + subsystem='vfs', + source='vfs_freebsd.c', @@ -21,9 +22,6 @@ + init_function='', + internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_freebsd'), + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_freebsd')) -+ - xdr_buf_hack = 'sed -e "s@^\([ \t]*register int32_t \*buf\);@\\1 = buf;@"' - bld.SAMBA_GENERATOR('nfs41acl-xdr-c', --- source3/modules/vfs_freebsd.c.orig 2019-06-22 11:56:57 UTC +++ source3/modules/vfs_freebsd.c Modified: head/net/samba411/pkg-plist ============================================================================== --- head/net/samba411/pkg-plist Tue Apr 21 08:31:33 2020 (r532259) +++ head/net/samba411/pkg-plist Tue Apr 21 08:35:38 2020 (r532260) @@ -12,7 +12,6 @@ bin/nmblookup bin/ntlm_auth bin/oLschema2ldif bin/pdbedit -bin/pidl bin/profiles bin/regdiff bin/regpatch @@ -38,6 +37,7 @@ bin/vfstest bin/wbinfo sbin/eventlogadm sbin/nmbd +%%AD_DC%%sbin/samba_downgrade_db sbin/smbd sbin/winbindd %%AD_DC%%sbin/samba @@ -224,6 +224,7 @@ lib/samba4/private/libflag-mapping-samba4.so lib/samba4/private/libgenrand-samba4.so lib/samba4/private/libgensec-samba4.so lib/samba4/private/libgpext-samba4.so +lib/samba4/private/libgpo-samba4.so lib/samba4/private/libgse-samba4.so %%GSSAPI_BUILTIN%%lib/samba4/private/libgssapi-samba4.so.2 %%GSSAPI_BUILTIN%%lib/samba4/private/libhcrypto-samba4.so.5 @@ -251,12 +252,12 @@ lib/samba4/private/libndr-samba-samba4.so lib/samba4/private/libndr-samba4.so lib/samba4/private/libnet-keytab-samba4.so lib/samba4/private/libnetif-samba4.so -lib/samba4/private/libnon-posix-acls-samba4.so lib/samba4/private/libnpa-tstream-samba4.so lib/samba4/private/libnss-info-samba4.so %%AD_DC%%lib/samba4/private/libpac-samba4.so lib/samba4/private/libpopt-samba3-cmdline-samba4.so lib/samba4/private/libpopt-samba3-samba4.so +lib/samba4/private/libprinter-driver-samba4.so lib/samba4/private/libprinting-migrate-samba4.so lib/samba4/private/libregistry-samba4.so lib/samba4/private/libreplace-samba4.so @@ -301,6 +302,7 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_10.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_11.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_12.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_13.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_16.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so @@ -367,7 +369,6 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/service/nbtd.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/service/ntp_signd.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/service/s3fs.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/web.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/service/winbindd.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/service/wrepl.so %%AD_DC%%%%SAMBA4_MODULEDIR%%/vfs/posix_eadb.so @@ -437,40 +438,7 @@ lib/samba4/private/libxattr-tdb-samba4.so %%PKGCONFIGDIR%%/samdb.pc %%PKGCONFIGDIR%%/smbclient.pc %%PKGCONFIGDIR%%/wbclient.pc -@comment Pidl block -%%DATADIR%%/perl5/Parse/Pidl.pm -%%DATADIR%%/perl5/Parse/Pidl/CUtil.pm -%%DATADIR%%/perl5/Parse/Pidl/Compat.pm -%%DATADIR%%/perl5/Parse/Pidl/Dump.pm -%%DATADIR%%/perl5/Parse/Pidl/Expr.pm -%%DATADIR%%/perl5/Parse/Pidl/IDL.pm -%%DATADIR%%/perl5/Parse/Pidl/NDR.pm -%%DATADIR%%/perl5/Parse/Pidl/ODL.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba3/ClientNDR.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba3/ServerNDR.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Header.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Proxy.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Stub.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/Header.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Client.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Parser.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Server.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/Python.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/TDR.pm -%%DATADIR%%/perl5/Parse/Pidl/Samba4/Template.pm -%%DATADIR%%/perl5/Parse/Pidl/Typelist.pm -%%DATADIR%%/perl5/Parse/Pidl/Util.pm -%%DATADIR%%/perl5/Parse/Pidl/Wireshark/Conformance.pm -%%DATADIR%%/perl5/Parse/Pidl/Wireshark/NDR.pm -@dir %%DATADIR%%/perl5/Parse/Pidl/Wireshark -@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR -@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM -@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4 -@dir %%DATADIR%%/perl5/Parse/Pidl/Samba3 -@dir %%DATADIR%%/perl5/Parse/Pidl -@dir %%DATADIR%%/perl5/Parse -@dir %%DATADIR%%/perl5 +@comment Setup files %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf @@ -593,7 +561,6 @@ man/man1/ndrdump.1.gz man/man1/nmblookup.1.gz man/man1/ntlm_auth.1.gz man/man1/oLschema2ldif.1.gz -man/man1/pidl.1.gz man/man1/profiles.1.gz man/man1/regdiff.1.gz man/man1/regpatch.1.gz @@ -613,11 +580,6 @@ man/man1/smbtree.1.gz man/man1/testparm.1.gz man/man1/vfstest.1.gz man/man1/wbinfo.1.gz -man/man3/Parse::Pidl::Dump.3.gz -man/man3/Parse::Pidl::NDR.3.gz -man/man3/Parse::Pidl::Util.3.gz -man/man3/Parse::Pidl::Wireshark::Conformance.3.gz -man/man3/Parse::Pidl::Wireshark::NDR.3.gz man/man5/lmhosts.5.gz man/man5/pam_winbind.conf.5.gz man/man5/smb.conf.5.gz @@ -644,6 +606,7 @@ man/man8/net.8.gz man/man8/nmbd.8.gz man/man8/pam_winbind.8.gz man/man8/pdbedit.8.gz +man/man8/samba_downgrade_db.8.gz man/man8/samba-gpupdate.8.gz man/man8/samba-regedit.8.gz man/man8/samba-tool.8.gz @@ -872,6 +835,7 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py %%PYTHON_SITELIBDIR%%/samba/netcmd/common.py %%PYTHON_SITELIBDIR%%/samba/netcmd/computer.py +%%PYTHON_SITELIBDIR%%/samba/netcmd/contact.py %%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py %%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py %%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py @@ -919,7 +883,6 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/sd_utils.py %%PYTHON_SITELIBDIR%%/samba/security.so %%PYTHON_SITELIBDIR%%/samba/sites.py -%%PYTHON_SITELIBDIR%%/samba/smb.so %%PYTHON_SITELIBDIR%%/samba/subnets.py %%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py %%PYTHON_SITELIBDIR%%/samba/subunit/run.py @@ -934,11 +897,13 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon.py %%PYTHON_SITELIBDIR%%/samba/tests/auth_log_pass_change.py %%PYTHON_SITELIBDIR%%/samba/tests/auth_log_samlogon.py +%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_winbind.py %%PYTHON_SITELIBDIR%%/samba/tests/auth_log.py %%PYTHON_SITELIBDIR%%/samba/tests/auth.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/bug13653.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/check_output.py +%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/downgradedatabase.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/netads_json.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py @@ -947,7 +912,6 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py -%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/undoguididx.py %%PYTHON_SITELIBDIR%%/samba/tests/common.py %%PYTHON_SITELIBDIR%%/samba/tests/complex_expressions.py %%PYTHON_SITELIBDIR%%/samba/tests/core.py @@ -970,7 +934,6 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py %%PYTHON_SITELIBDIR%%/samba/tests/dckeytab.py %%PYTHON_SITELIBDIR%%/samba/tests/dns_base.py -%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/dns_hub.py %%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py %%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder.py %%PYTHON_SITELIBDIR%%/samba/tests/dns_invalid.py @@ -1045,18 +1008,24 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/computer.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/contact.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/demote.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dsacl.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/forest.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/help.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join_lmdb_size.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ou.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/passwordsettings.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/promote_dc_lmdb_size.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_lmdb_size.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/rodc.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/schema.py @@ -1073,6 +1042,7 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/samdb_api.py %%PYTHON_SITELIBDIR%%/samba/tests/samdb.py %%PYTHON_SITELIBDIR%%/samba/tests/security.py +%%PYTHON_SITELIBDIR%%/samba/tests/segfault.py %%PYTHON_SITELIBDIR%%/samba/tests/smb.py %%PYTHON_SITELIBDIR%%/samba/tests/smbd_base.py %%PYTHON_SITELIBDIR%%/samba/tests/smbd_fuzztest.py @@ -1083,15 +1053,14 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py +%%PYTHON_SITELIBDIR%%/samba/tests/usage.py %%PYTHON_SITELIBDIR%%/samba/tests/xattr.py %%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py %%PYTHON_SITELIBDIR%%/samba/upgrade.py %%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py -%%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py %%PYTHON_SITELIBDIR%%/samba/uptodateness.py %%PYTHON_SITELIBDIR%%/samba/werror.so %%PYTHON_SITELIBDIR%%/samba/xattr.py -@dir %%PYTHON_SITELIBDIR%%/samba/web_server @dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool @dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc @dir %%PYTHON_SITELIBDIR%%/samba/tests/blackbox @@ -1105,7 +1074,7 @@ man/man8/winbindd.8.gz %%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%%%%SAMBA4_PYTHON%%lib/samba4/private/libpyldb-util.so.2 %%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump %%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd %%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdel @@ -1117,7 +1086,8 @@ man/man8/winbindd.8.gz %%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%%lib/samba4/private/libldb.so.1 +%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb.so.2 +%%AD_DC%%%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/count_attrs.so %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004210835.03L8ZdqS080199>