Date: Fri, 5 Mar 2021 03:16:52 +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: r567357 - in head/net/samba413: . files Message-ID: <202103050316.1253GqPg079184@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Fri Mar 5 03:16:52 2021 New Revision: 567357 URL: https://svnweb.freebsd.org/changeset/ports/567357 Log: Bump net/samba413 to 4.13.4 version. Split pkg-plist into managable chunks. Made PYTHON3 bindings a selectable option. PR: 252164 Added: head/net/samba413/pkg-plist.ad_dc (contents, props changed) head/net/samba413/pkg-plist.cluster (contents, props changed) head/net/samba413/pkg-plist.python (contents, props changed) Deleted: head/net/samba413/files/patch-source3_lib_messages.c Modified: head/net/samba413/Makefile head/net/samba413/distinfo head/net/samba413/files/patch-bind head/net/samba413/files/patch-buildtools_scripts_abi__gen.sh head/net/samba413/files/patch-buildtools_wafsamba_samba__install.py head/net/samba413/files/patch-source3_modules_vfs__fruit.c head/net/samba413/files/patch-vfs_freebsd head/net/samba413/pkg-plist Modified: head/net/samba413/Makefile ============================================================================== --- head/net/samba413/Makefile Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/Makefile Fri Mar 5 03:16:52 2021 (r567357) @@ -3,7 +3,7 @@ PORTNAME= ${SAMBA4_BASENAME}413 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -23,10 +23,11 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.pat SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.13.1 +SAMBA4_VERSION= 4.13.4 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} +PLIST?= ${PKGDIR}/pkg-plist CPE_VENDOR= samba CPE_PRODUCT= samba @@ -42,6 +43,8 @@ SAMBA4_LIBDIR= ${PREFIX}/lib/${SAMBA4_PORTNAME} SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf +SAMBA4_MODULES_CLASS= auth bind9 gensec gpext idmap ldb nss_info \ + pdb perfcount process_model service vfs CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ @@ -80,10 +83,9 @@ SUB_LIST+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} OPTIONS_SUB= yes OPTIONS_DEFINE= AD_DC ADS CLUSTER CUPS DOCS FAM GPGME \ - LDAP NTVFS PROFILE QUOTAS SPOTLIGHT SYSLOG UTMP -# This shouldn't be default in the release -OPTIONS_DEFINE+= DEVELOPER MANDOC -#OPTIONS_DEFINE+= MEMORY_DEBUG + LDAP MANDOC NTVFS PROFILE PYTHON3 QUOTAS \ + SPOTLIGHT SYSLOG UTMP +#OPTIONS_DEFINE+= DEVELOPER MEMORY_DEBUG OPTIONS_GROUP= VFS OPTIONS_GROUP_VFS= FRUIT GLUSTERFS @@ -98,11 +100,11 @@ OPTIONS_RADIO= DNS OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND916 # Make those default options OPTIONS_DEFAULT= AD_DC ADS DOCS FAM LDAP \ - QUOTAS SYSLOG UTMP PROFILE \ + PROFILE PYTHON3 QUOTAS SYSLOG UTMP \ FRUIT GSSAPI_BUILTIN AVAHI ############################################################################## -AD_DC_DESC= Active Directory Domain Controller ADS_DESC= Active Directory client(implies LDAP) +AD_DC_DESC= Active Directory Domain Controller(implies PYTHON3) CLUSTER_DESC= Clustering support DEVELOPER_DESC= With developer framework(implies NTVFS) FAM_DESC= File Alteration Monitor @@ -281,15 +283,15 @@ CONFIGURE_ARGS+= \ FRUIT_PREVENTS= ZEROCONF_NONE FRUIT_PREVENTS_MSG= MacOSX support requires Zeroconf(AVAHI or MDNSRESPONDER) FRUIT_VARS= SAMBA4_MODULES+=vfs_fruit -FRUIT_PLIST_FILES+= man/man8/vfs_fruit.8.gz +FRUIT_PLIST_FILES= man/man8/vfs_fruit.8.gz GLUSTERFS_CONFIGURE_ENABLE= glusterfs GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs GLUSTERFS_VARS= SAMBA4_MODULES+=vfs_glusterfs -GLUSTERFS_PLIST_FILES+= man/man8/vfs_glusterfs.8.gz -############################################################################## -ZEROCONF_NONE_VARS= MAKE_ENV+=ZEROCONF=none +GLUSTERFS_PLIST_FILES= man/man8/vfs_glusterfs.8.gz +ZEROCONF_NONE_MAKE_ENV= ZEROCONF=none +############################################################################## AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_VARS= SAMBA4_SERVICES+=avahi_daemon @@ -323,10 +325,20 @@ DEVELOPER_VARS_OFF= GDB_CMD=true # if you don't know what you are doing NTVFS_IMPLIES= AD_DC NTVFS_CONFIGURE_WITH= ntvfs-fileserver -NTVFS_PLIST_FILES= ${SAMBA4_MODULEDIR}/service/smb.so \ - lib/samba4/private/libntvfs-samba4.so +NTVFS_VARS= SAMBA4_MODULES+=service_smb +NTVFS_PLIST_FILES= lib/samba4/private/libntvfs-samba4.so ############################################################################## +AD_DC_IMPLIES= PYTHON3 +AD_DC_CONFIGURE_OFF= --without-ad-dc +AD_DC_BUILD_DEPENDS= ${SAMBA4_LMDB_DEPENDS} +AD_DC_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} +AD_DC_VARS= PLIST+=${PKGDIR}/pkg-plist.ad_dc + +ADS_IMPLIES= LDAP +ADS_CONFIGURE_WITH= ads dnsupdate + CLUSTER_CONFIGURE_WITH= cluster-support +CLUSTER_VARS= PLIST+=${PKGDIR}/pkg-plist.cluster CUPS_CONFIGURE_ENABLE= cups iprint CUPS_LIB_DEPENDS= libcups.so:print/cups @@ -337,34 +349,6 @@ FAM_CONFIGURE_WITH= fam GPGME_CONFIGURE_WITH= gpgme GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme -PROFILE_CONFIGURE_WITH= profiling-data - -QUOTAS_CONFIGURE_WITH= quotas - -SPOTLIGHT_CONFIGURE_ENABLE= spotlight -SPOTLIGHT_BUILD_DEPENDS= tracker>=1.4.1:sysutils/tracker -SPOTLIGHT_RUN_DEPENDS= tracker>=1.4.1:sysutils/tracker -# ICU -SPOTLIGHT_LIB_DEPENDS+= libicuuc.so:devel/icu -SPOTLIGHT_USES= bison gnome -SPOTLIGHT_USE= gnome=glib20 - -SYSLOG_CONFIGURE_WITH= syslog - -UTMP_CONFIGURE_WITH= utmp - -AD_DC_CONFIGURE_OFF= --without-ad-dc -AD_DC_BUILD_DEPENDS= ${SAMBA4_LMDB_DEPENDS} -AD_DC_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} - -ADS_IMPLIES= LDAP -ADS_CONFIGURE_WITH= ads dnsupdate - -LDAP_CONFIGURE_WITH= ldap -LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} -LDAP_USE= OPENLDAP=yes -LDAP_VARS= SAMBA4_MODULES+=idmap_ldap - GSSAPI_MIT_CONFIGURE_ON= --with-system-mitkrb5 ${GSSAPIBASEDIR} \ --with-system-mitkdc=${GSSAPIBASEDIR}/sbin/krb5kdc \ --with-experimental-mit-ad-dc @@ -375,6 +359,11 @@ GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_PREVENTS= AD_DC GSSAPI_HEIMDAL_PREVENTS_MSG= GSSAPI_HEIMDAL and AD_DC enable conflicting options +LDAP_CONFIGURE_WITH= ldap +LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} +LDAP_USE= OPENLDAP=yes +LDAP_VARS= SAMBA4_MODULES+=idmap_ldap + LIBZFS_CONFIGURE_WITH= libzfs LIBZFS_VARS= SAMBA4_MODULES+=vfs_zfs_space @@ -382,6 +371,22 @@ MANDOC_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/ xsltproc:textproc/libxslt MANDOC_CONFIGURE_ENV_OFF= XSLTPROC="true" +PROFILE_CONFIGURE_WITH= profiling-data + +QUOTAS_CONFIGURE_WITH= quotas + +SPOTLIGHT_CONFIGURE_ENABLE= spotlight +SPOTLIGHT_BUILD_DEPENDS= tracker>=1.4.1:sysutils/tracker +SPOTLIGHT_RUN_DEPENDS= tracker>=1.4.1:sysutils/tracker +# ICU +SPOTLIGHT_LIB_DEPENDS= libicuuc.so:devel/icu +SPOTLIGHT_USES= bison gnome +SPOTLIGHT_USE= gnome=glib20 + +SYSLOG_CONFIGURE_WITH= syslog + +UTMP_CONFIGURE_WITH= utmp + ############################################################################## .include <bsd.port.options.mk> ############################################################################## @@ -396,30 +401,43 @@ LIB_DEPENDS+= libdbus-1.so:devel/dbus LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib .endif -SAMBA4_MODULES+= vfs_freebsd - -SAMBA4_MODULES+= idmap_nss idmap_autorid idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script nss-info_hash +SAMBA4_MODULES+= krb5_winbind_krb5_locator idmap_nss idmap_autorid \ + idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script \ + nss-info_hash # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 .if ${PORT_OPTIONS:MADS} -SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_template nss-info_rfc2307 nss-info_sfu nss-info_sfu20 +SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_template \ + nss-info_rfc2307 nss-info_sfu nss-info_sfu20 .endif +# This kind of special for this distribution +SAMBA4_MODULES+= vfs_freebsd +SAMBA4_MODULES+= vfs_acl_tdb vfs_acl_xattr vfs_aio_fork vfs_aio_pthread \ + vfs_audit vfs_cap vfs_catia vfs_commit vfs_crossrename \ + vfs_default_quota vfs_dirsort vfs_expand_msdfs \ + vfs_extd_audit vfs_fake_perms vfs_full_audit \ + vfs_linux_xfs_sgid vfs_media_harmony vfs_offline \ + vfs_preopen vfs_readahead vfs_readonly vfs_recycle \ + vfs_shadow_copy vfs_shadow_copy2 vfs_shell_snap \ + vfs_streams_depot vfs_streams_xattr vfs_syncops \ + vfs_time_audit vfs_unityed_media vfs_virusfilter \ + vfs_widelinks vfs_worm vfs_xattr_tdb vfs_zfsacl + .if ${PORT_OPTIONS:MDEVELOPER} -SAMBA4_MODULES+= auth_skel pdb_test gpext_security gpext_registry gpext_scripts perfcount_test \ - vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \ +SAMBA4_MODULES+= auth_skel pdb_test gpext_security gpext_registry \ + gpext_scripts perfcount_test 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 # Python bindings -.if defined(NO_PYTHON) +.if ! ${PORT_OPTIONS:MPYTHON3} || defined(NO_PYTHON) USES+= python:build,test CONFIGURE_ARGS+= --disable-python -PLIST_SUB+= SAMBA4_PYTHON="@comment " -SUB_LIST+= SAMBA4_PYTHON="@comment " .else USES+= python:3.6+ -PLIST_SUB+= SAMBA4_PYTHON="" -SUB_LIST+= SAMBA4_PYTHON="" +PLIST+= ${PKGDIR}/pkg-plist.python # Don't cache Python modules CONFIGURE_ARGS+= --nopycache MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 @@ -451,9 +469,9 @@ SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util . if ${PORT_OPTIONS:MAD_DC} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} -. if ${PORT_OPTIONS:MGPGME} +. if ${PORT_OPTIONS:MGPGME} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gpgme>=1.14.0:security/py-gpgme@${PY_FLAVOR} -. endif +. endif . endif .endif @@ -474,6 +492,11 @@ CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODU PLIST_FILES+= ${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so .endfor +.for module_class in ${SAMBA4_MODULES_CLASS} +PLIST_DIRS+= ${SAMBA4_MODULEDIR}/${module_class} +.endfor +PLIST_DIRS+= ${SAMBA4_MODULEDIR} + .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --verbose --enable-debug MAKE_ARGS+= --verbose @@ -495,7 +518,7 @@ CONFIGURE_ARGS+= --accel-aes=none . if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER}) # LMDB SAMBA4_LMDB_DEPENDS= lmdb>=0.9.16:databases/lmdb -PLIST_FILES+= lib/samba4/private/libldb-mdb-int-samba4.so \ +PLIST_FILES+= ${SAMBA4_LIBDIR}/private/libldb-mdb-int-samba4.so \ ${SAMBA4_MODULEDIR}/ldb/mdb.so . endif .endif @@ -504,7 +527,7 @@ PLIST_FILES+= lib/samba4/private/libldb-mdb-int-samb PLIST_FILES+= ${SAMBA4_MODULEDIR}/krb5/winbind_krb5_localauth.so \ man/man8/winbind_krb5_localauth.8.gz . if ${PORT_OPTIONS:MAD_DC} -PLIST_FILES+= lib/samba4/krb5/plugins/kdb/samba.so +PLIST_FILES+= ${SAMBA4_LIBDIR}/krb5/plugins/kdb/samba.so . endif .endif # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) @@ -528,6 +551,7 @@ SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ + SAMBA4_LIBDIR="${SAMBA4_LIBDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_BINDDNSDIR="${SAMBA4_BINDDNSDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ @@ -558,12 +582,18 @@ post-patch: # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: -.if ! ${PORT_OPTIONS:MAD_DC} && ${PORT_OPTIONS:MNTVFS} +.if !${PORT_OPTIONS:MAD_DC} && ${PORT_OPTIONS:MNTVFS} @${ECHO_CMD}; \ ${ECHO_MSG} "===> NTVFS option requires AD_DC to be set"; \ ${ECHO_CMD}; \ ${FALSE} .endif +.if (!${PORT_OPTIONS:MPYTHON3} || defined(NO_PYTHON)) && ${PORT_OPTIONS:MAD_DC} + @${ECHO_CMD}; \ + ${ECHO_MSG} "===> AD_DC option requires PYTHON3 to be set"; \ + ${ECHO_CMD}; \ + ${FALSE} +.endif @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ @@ -639,8 +669,8 @@ post-install: post-install-rm-junk post-install-fix-ma .endfor ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_BINDDNSDIR}" ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" -.for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs - ${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" +.for module_class in ${SAMBA4_MODULES_CLASS} + ${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${module_class}" .endfor .if !defined(WITH_DEBUG) -${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin ${STAGEDIR}${PREFIX}/libexec \ Modified: head/net/samba413/distinfo ============================================================================== --- head/net/samba413/distinfo Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/distinfo Fri Mar 5 03:16:52 2021 (r567357) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604112152 -SHA256 (samba-4.13.1.tar.gz) = 2458213b5e9abd5060228909bbe7f28fbb3ab344a7bdf34c9d0fd1566501285f -SIZE (samba-4.13.1.tar.gz) = 18413369 +TIMESTAMP = 1613866662 +SHA256 (samba-4.13.4.tar.gz) = a1b34c63f7100cc8626902d80f335c7cb0b45d4707dd3c4b010f7a28ed615c78 +SIZE (samba-4.13.4.tar.gz) = 18429050 Modified: head/net/samba413/files/patch-bind ============================================================================== --- head/net/samba413/files/patch-bind Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/files/patch-bind Fri Mar 5 03:16:52 2021 (r567357) @@ -1,4 +1,4 @@ ---- python/samba/provision/sambadns.py.orig 2020-03-26 08:58:46 UTC +--- python/samba/provision/sambadns.py.orig 2020-11-03 14:33:19 UTC +++ python/samba/provision/sambadns.py @@ -27,6 +27,7 @@ import time import ldb @@ -8,7 +8,7 @@ import samba from samba.tdb_util import tdb_copy from samba.mdb_util import mdb_copy -@@ -965,34 +966,35 @@ def create_named_conf(paths, realm, dnsdomain, dns_bac +@@ -957,47 +958,38 @@ def create_named_conf(paths, realm, dnsdomain, dns_bac stderr=subprocess.STDOUT, cwd='.').communicate()[0] bind_info = get_string(bind_info) @@ -17,6 +17,8 @@ - bind9_10 = '#' - bind9_11 = '#' - bind9_12 = '#' +- bind9_14 = '#' +- bind9_16 = '#' - if bind_info.upper().find('BIND 9.8') != -1: - bind9_8 = '' - elif bind_info.upper().find('BIND 9.9') != -1: @@ -27,8 +29,19 @@ - bind9_11 = '' - elif bind_info.upper().find('BIND 9.12') != -1: - bind9_12 = '' +- elif bind_info.upper().find('BIND 9.14') != -1: +- bind9_14 = '' +- elif bind_info.upper().find('BIND 9.16') != -1: +- bind9_16 = '' - elif bind_info.upper().find('BIND 9.7') != -1: - raise ProvisioningError("DLZ option incompatible with BIND 9.7.") +- elif bind_info.upper().find('BIND_9.13') != -1: +- raise ProvisioningError("Only stable/esv releases of BIND are supported.") +- elif bind_info.upper().find('BIND_9.15') != -1: +- raise ProvisioningError("Only stable/esv releases of BIND are supported.") +- elif bind_info.upper().find('BIND_9.17') != -1: +- raise ProvisioningError("Only stable/esv releases of BIND are supported.") ++ + bind9_release = re.search('BIND (9)\.(\d+)\.', bind_info, re.I) + if bind9_release: + bind9_disabled = '' @@ -39,6 +52,8 @@ + raise ProvisioningError("DLZ option incompatible with BIND 9.7.") + elif bind9_version_minor == 8: + bind9_dlz_version = "9" ++ elif bind9_version_minor in [13, 15, 17]: ++ raise ProvisioningError("Only stable/esv releases of BIND are supported.") + else: + bind9_dlz_version = "%d_%d" % (bind9_version_major, bind9_version_minor) else: @@ -61,53 +76,71 @@ - "BIND9_9": bind9_9, - "BIND9_10": bind9_10, - "BIND9_11": bind9_11, -- "BIND9_12": bind9_12 -- +- "BIND9_12": bind9_12, +- "BIND9_14": bind9_14, +- "BIND9_16": bind9_16 + "BIND9_DLZ": bind9_dlz }) --- source4/dns_server/dlz_minimal.h.orig 2019-12-06 10:10:30 UTC +++ source4/dns_server/dlz_minimal.h -@@ -23,22 +23,23 @@ - #ifndef DLZ_MINIMAL_H - #define DLZ_MINIMAL_H 1 +@@ -26,32 +26,31 @@ + #include <stdint.h> + #include <stdbool.h> -#if defined (BIND_VERSION_9_8) -# define DLZ_DLOPEN_VERSION 1 -#elif defined (BIND_VERSION_9_9) -# define DLZ_DLOPEN_VERSION 2 -# define DNS_CLIENTINFO_VERSION 1 +-# define ISC_BOOLEAN_AS_BOOL 0 -#elif defined (BIND_VERSION_9_10) -# define DLZ_DLOPEN_VERSION 3 -# define DNS_CLIENTINFO_VERSION 1 +-# define ISC_BOOLEAN_AS_BOOL 0 -#elif defined (BIND_VERSION_9_11) -# define DLZ_DLOPEN_VERSION 3 -# define DNS_CLIENTINFO_VERSION 2 +-# define ISC_BOOLEAN_AS_BOOL 0 -#elif defined (BIND_VERSION_9_12) -# define DLZ_DLOPEN_VERSION 3 -# define DNS_CLIENTINFO_VERSION 2 +-# define ISC_BOOLEAN_AS_BOOL 0 +-#elif defined (BIND_VERSION_9_14) +-# define DLZ_DLOPEN_VERSION 3 +-# define DNS_CLIENTINFO_VERSION 2 +-#elif defined (BIND_VERSION_9_16) +-# define DLZ_DLOPEN_VERSION 3 +-# define DNS_CLIENTINFO_VERSION 2 +#if defined (BIND_VERSION) +# if BIND_VERSION == 908 +# define DLZ_DLOPEN_VERSION 1 +# elif BIND_VERSION == 909 +# define DLZ_DLOPEN_VERSION 2 +# define DNS_CLIENTINFO_VERSION 1 ++# define ISC_BOOLEAN_AS_BOOL 0 +# elif BIND_VERSION == 910 +# define DLZ_DLOPEN_VERSION 3 +# define DNS_CLIENTINFO_VERSION 1 -+# elif BIND_VERSION >= 911 ++# define ISC_BOOLEAN_AS_BOOL 0 ++# elif BIND_VERSION == 911 || BIND_VERSION == 912 +# define DLZ_DLOPEN_VERSION 3 +# define DNS_CLIENTINFO_VERSION 2 ++# define ISC_BOOLEAN_AS_BOOL 0 ++# elif BIND_VERSION >= 914 ++# define DLZ_DLOPEN_VERSION 3 ++# define DNS_CLIENTINFO_VERSION 2 ++# define ISC_BOOLEAN_AS_BOOL 1 +# else +# error Unsupported BIND version +# endif #else --# error Unsupported BIND version + # error Unsupported BIND version +# error BIND_VERSION undefined #endif - #if DLZ_DLOPEN_VERSION > 1 + #ifndef ISC_BOOLEAN_AS_BOOL --- source4/dns_server/wscript_build.orig 2019-12-06 10:11:08 UTC +++ source4/dns_server/wscript_build @@ -20,7 +20,7 @@ bld.SAMBA_MODULE('service_dns', @@ -119,12 +152,12 @@ private_library=True, link_name='modules/bind9/dlz_bind9.so', realname='dlz_bind9.so', -@@ -28,49 +28,21 @@ bld.SAMBA_LIBRARY('dlz_bind9', +@@ -28,69 +28,21 @@ bld.SAMBA_LIBRARY('dlz_bind9', deps='samba-hostconfig samdb-common gensec popt dnsserver_common', enabled=bld.AD_DC_BUILD_IS_ENABLED()) -bld.SAMBA_LIBRARY('dlz_bind9_9', -+for bind_version in (909, 910, 911, 912, 913, 914, 916): ++for bind_version in (909, 910, 911, 912, 914, 916): + string_version='%d_%d' % (bind_version//100, bind_version % 100) + bld.SAMBA_LIBRARY('dlz_bind%s' % (string_version), source='dlz_bind9.c', @@ -169,6 +202,26 @@ - deps='samba-hostconfig samdb-common gensec popt dnsserver_common', - enabled=bld.AD_DC_BUILD_IS_ENABLED()) - +-bld.SAMBA_LIBRARY('dlz_bind9_14', +- source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_14', +- private_library=True, +- link_name='modules/bind9/dlz_bind9_14.so', +- realname='dlz_bind9_14.so', +- install_path='${MODULESDIR}/bind9', +- deps='samba-hostconfig samdb-common gensec popt dnsserver_common', +- enabled=bld.AD_DC_BUILD_IS_ENABLED()) +- +-bld.SAMBA_LIBRARY('dlz_bind9_16', +- source='dlz_bind9.c', +- cflags='-DBIND_VERSION_9_16', +- private_library=True, +- link_name='modules/bind9/dlz_bind9_16.so', +- realname='dlz_bind9_16.so', +- install_path='${MODULESDIR}/bind9', +- deps='samba-hostconfig samdb-common gensec popt dnsserver_common', +- enabled=bld.AD_DC_BUILD_IS_ENABLED()) +- bld.SAMBA_LIBRARY('dlz_bind9_for_torture', source='dlz_bind9.c', - cflags='-DBIND_VERSION_9_8', @@ -178,7 +231,7 @@ enabled=bld.AD_DC_BUILD_IS_ENABLED()) --- source4/setup/named.conf.dlz.orig 2019-12-06 10:10:31 UTC +++ source4/setup/named.conf.dlz -@@ -7,22 +7,10 @@ +@@ -7,28 +7,10 @@ # # This configures dynamically loadable zones (DLZ) from AD schema @@ -200,6 +253,12 @@ - - # For BIND 9.12.x - ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; +- +- # For BIND 9.14.x +- ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so"; +- +- # For BIND 9.16.x +- ${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so"; }; --- source4/torture/dns/wscript_build.orig 2020-04-11 03:26:46 UTC Modified: head/net/samba413/files/patch-buildtools_scripts_abi__gen.sh ============================================================================== --- head/net/samba413/files/patch-buildtools_scripts_abi__gen.sh Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/files/patch-buildtools_scripts_abi__gen.sh Fri Mar 5 03:16:52 2021 (r567357) @@ -16,6 +16,6 @@ ) > $GDBSCRIPT # forcing the terminal avoids a problem on Fedora12 --TERM=none gdb -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null -+TERM=none %%GDB_CMD%% -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null | sed -e 's/:type =/:/g' +-TERM=none gdb -n -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null ++TERM=none %%GDB_CMD%% -n -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null | sed -e 's/:type =/:/g' rm -f $GDBSCRIPT Modified: head/net/samba413/files/patch-buildtools_wafsamba_samba__install.py ============================================================================== --- head/net/samba413/files/patch-buildtools_wafsamba_samba__install.py Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/files/patch-buildtools_wafsamba_samba__install.py Fri Mar 5 03:16:52 2021 (r567357) @@ -8,4 +8,4 @@ + install_name = bld.make_libname(target_name, version=vnum_base) install_link = bld.make_libname(target_name, version=vnum_base) inst_name = bld.make_libname(t.target) - if not self.private_library: + if not self.private_library or not t.env.SONAME_ST: Modified: head/net/samba413/files/patch-source3_modules_vfs__fruit.c ============================================================================== --- head/net/samba413/files/patch-source3_modules_vfs__fruit.c Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/files/patch-source3_modules_vfs__fruit.c Fri Mar 5 03:16:52 2021 (r567357) @@ -50,19 +50,29 @@ Signed-off-by: Ralph Boehme <slow@samba.org> } return ai; ---- source3/modules/vfs_fruit.c.orig 2020-05-08 09:37:56 UTC +--- source3/modules/vfs_fruit.c.orig 2021-01-26 08:16:58 UTC +++ source3/modules/vfs_fruit.c -@@ -2191,9 +2191,20 @@ static ssize_t fruit_pread_meta_stream(vfs_handle_stru - { +@@ -2146,13 +2146,30 @@ static ssize_t fruit_pread_meta_stream(vfs_handle_stru + struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp); ssize_t nread; int ret; + char *p = (char *)data; + if (fio->fake_fd) { + return -1; + } + nread = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset); - if (nread == -1 || nread == n) { -+ -+ if (nread == -1) { -+ return -1; ++ if (nread <= 0) { ++ /* ++ * fruit_meta_open_stream() removes O_CREAT flag ++ * from xattr open. This results in vfs_streams_xattr ++ * not generating an FSP extension for the files_struct ++ * and causes subsequent pread() of stream to return ++ * nread=0 if pread() occurs before pwrite(). ++ */ ++ return nread; + } + + if (nread == n) { Modified: head/net/samba413/files/patch-vfs_freebsd ============================================================================== --- head/net/samba413/files/patch-vfs_freebsd Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/files/patch-vfs_freebsd Fri Mar 5 03:16:52 2021 (r567357) @@ -10,11 +10,10 @@ 'vfs_glusterfs', --- source3/modules/wscript_build.orig 2019-05-07 08:38:21 UTC +++ source3/modules/wscript_build -@@ -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')) -+ +@@ -630,6 +630,14 @@ bld.SAMBA3_MODULE('vfs_delay_inject', + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject'), + install=False) + +bld.SAMBA3_MODULE('vfs_freebsd', + subsystem='vfs', + source='vfs_freebsd.c', @@ -22,7 +21,10 @@ + init_function='', + internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_freebsd'), + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_freebsd')) - bld.SAMBA_GENERATOR('nfs41acl-xdr-c', ++ + bld.SAMBA3_MODULE('vfs_widelinks', + subsystem='vfs', + source='vfs_widelinks.c', --- source3/modules/vfs_freebsd.c.orig 2019-06-22 11:56:57 UTC +++ source3/modules/vfs_freebsd.c @@ -0,0 +1,800 @@ Modified: head/net/samba413/pkg-plist ============================================================================== --- head/net/samba413/pkg-plist Fri Mar 5 03:13:59 2021 (r567356) +++ head/net/samba413/pkg-plist Fri Mar 5 03:16:52 2021 (r567357) @@ -20,7 +20,6 @@ bin/regshell bin/regtree bin/rpcclient bin/samba-regedit -%%AD_DC%%bin/samba-tool bin/sharesec bin/smbcacls bin/smbclient @@ -31,22 +30,14 @@ bin/smbpasswd bin/smbspool bin/smbstatus bin/smbtar -%%SAMBA4_PYTHON%%bin/smbtorture bin/smbtree bin/testparm bin/vfstest bin/wbinfo sbin/eventlogadm sbin/nmbd -%%AD_DC%%sbin/samba_downgrade_db sbin/smbd sbin/winbindd -%%AD_DC%%sbin/samba -%%AD_DC%%sbin/samba_dnsupdate -%%AD_DC%%sbin/samba-gpupdate -%%AD_DC%%sbin/samba_kcc -%%AD_DC%%sbin/samba_spnupdate -%%AD_DC%%sbin/samba_upgradedns include/samba4/charset.h include/samba4/core/doserr.h include/samba4/core/error.h @@ -58,7 +49,6 @@ include/samba4/core/werror.h include/samba4/credentials.h include/samba4/dcerpc.h include/samba4/dcesrv_core.h -%%AD_DC%%include/samba4/dcerpc_server.h %%LDAP%%include/samba4/smb_ldap.h %%LDAP%%include/samba4/smbldap.h include/samba4/domain_credentials.h @@ -101,7 +91,6 @@ include/samba4/ndr/ndr_svcctl.h include/samba4/netapi.h include/samba4/param.h include/samba4/passdb.h -%%SAMBA4_PYTHON%%include/samba4/policy.h include/samba4/rpc_common.h include/samba4/samba/session.h include/samba4/samba/version.h @@ -136,296 +125,158 @@ include/samba4/wbclient.h @dir include/samba4/gen_ndr @dir include/samba4/core @dir include/samba4 -lib/samba4/libdcerpc-binding.so -lib/samba4/libdcerpc-binding.so.0 -lib/samba4/libdcerpc-samr.so -lib/samba4/libdcerpc-samr.so.0 -lib/samba4/libdcerpc-server-core.so -lib/samba4/libdcerpc-server-core.so.0 -%%AD_DC%%lib/samba4/libdcerpc-server.so -%%AD_DC%%lib/samba4/libdcerpc-server.so.0 -lib/samba4/libdcerpc.so -lib/samba4/libdcerpc.so.0 -lib/samba4/libndr-krb5pac.so -lib/samba4/libndr-krb5pac.so.0 -lib/samba4/libndr-nbt.so -lib/samba4/libndr-nbt.so.0 -lib/samba4/libndr-standard.so -lib/samba4/libndr-standard.so.0 -lib/samba4/libndr.so -lib/samba4/libndr.so.1 -lib/samba4/libnetapi.so -lib/samba4/libnetapi.so.0 -lib/samba4/libsamba-credentials.so -lib/samba4/libsamba-credentials.so.0 -lib/samba4/libsamba-errors.so -lib/samba4/libsamba-errors.so.1 -lib/samba4/libsamba-hostconfig.so -lib/samba4/libsamba-hostconfig.so.0 -lib/samba4/libsamba-passdb.so -lib/samba4/libsamba-passdb.so.0 -%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy%%PYTHON_EXT_SUFFIX%%.so -%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy%%PYTHON_EXT_SUFFIX%%.so.0 -lib/samba4/libsamba-util.so -lib/samba4/libsamba-util.so.0 -lib/samba4/libsamdb.so -lib/samba4/libsamdb.so.0 -lib/samba4/libsmbclient.so -lib/samba4/libsmbclient.so.0 -lib/samba4/libsmbconf.so -lib/samba4/libsmbconf.so.0 -%%LDAP%%lib/samba4/libsmbldap.so -%%LDAP%%lib/samba4/libsmbldap.so.2 -lib/samba4/libtevent-util.so -lib/samba4/libtevent-util.so.0 -lib/samba4/libwbclient.so -lib/samba4/libwbclient.so.0 +%%SAMBA4_LIBDIR%%/libdcerpc-binding.so +%%SAMBA4_LIBDIR%%/libdcerpc-binding.so.0 +%%SAMBA4_LIBDIR%%/libdcerpc-samr.so +%%SAMBA4_LIBDIR%%/libdcerpc-samr.so.0 +%%SAMBA4_LIBDIR%%/libdcerpc-server-core.so +%%SAMBA4_LIBDIR%%/libdcerpc-server-core.so.0 +%%SAMBA4_LIBDIR%%/libdcerpc.so +%%SAMBA4_LIBDIR%%/libdcerpc.so.0 +%%SAMBA4_LIBDIR%%/libndr-krb5pac.so +%%SAMBA4_LIBDIR%%/libndr-krb5pac.so.0 +%%SAMBA4_LIBDIR%%/libndr-nbt.so +%%SAMBA4_LIBDIR%%/libndr-nbt.so.0 +%%SAMBA4_LIBDIR%%/libndr-standard.so +%%SAMBA4_LIBDIR%%/libndr-standard.so.0 +%%SAMBA4_LIBDIR%%/libndr.so +%%SAMBA4_LIBDIR%%/libndr.so.1 +%%SAMBA4_LIBDIR%%/libnetapi.so +%%SAMBA4_LIBDIR%%/libnetapi.so.0 +%%SAMBA4_LIBDIR%%/libsamba-credentials.so +%%SAMBA4_LIBDIR%%/libsamba-credentials.so.0 +%%SAMBA4_LIBDIR%%/libsamba-errors.so +%%SAMBA4_LIBDIR%%/libsamba-errors.so.1 +%%SAMBA4_LIBDIR%%/libsamba-hostconfig.so +%%SAMBA4_LIBDIR%%/libsamba-hostconfig.so.0 +%%SAMBA4_LIBDIR%%/libsamba-passdb.so +%%SAMBA4_LIBDIR%%/libsamba-passdb.so.0 +%%SAMBA4_LIBDIR%%/libsamba-util.so +%%SAMBA4_LIBDIR%%/libsamba-util.so.0 +%%SAMBA4_LIBDIR%%/libsamdb.so +%%SAMBA4_LIBDIR%%/libsamdb.so.0 +%%SAMBA4_LIBDIR%%/libsmbclient.so +%%SAMBA4_LIBDIR%%/libsmbclient.so.0 +%%SAMBA4_LIBDIR%%/libsmbconf.so +%%SAMBA4_LIBDIR%%/libsmbconf.so.0 +%%LDAP%%%%SAMBA4_LIBDIR%%/libsmbldap.so +%%LDAP%%%%SAMBA4_LIBDIR%%/libsmbldap.so.2 +%%SAMBA4_LIBDIR%%/libtevent-util.so +%%SAMBA4_LIBDIR%%/libtevent-util.so.0 +%%SAMBA4_LIBDIR%%/libwbclient.so +%%SAMBA4_LIBDIR%%/libwbclient.so.0 lib/nss_winbind.so.1 lib/nss_wins.so.1 lib/pam_winbind.so %%CUPS%%libexec/samba/smbspool_krb5_wrapper -%%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 -%%AD_DC%%lib/samba4/private/libservice-samba4.so -lib/samba4/private/libCHARSET3-samba4.so -%%AD_DC%%%%GSSAPI_BUILTIN%%lib/samba4/private/libHDB-SAMBA4-samba4.so -lib/samba4/private/libLIBWBCLIENT-OLD-samba4.so -lib/samba4/private/libMESSAGING-samba4.so -lib/samba4/private/libMESSAGING-SEND-samba4.so -lib/samba4/private/libaddns-samba4.so -lib/samba4/private/libads-samba4.so -%%GSSAPI_BUILTIN%%lib/samba4/private/libasn1-samba4.so.8 -lib/samba4/private/libasn1util-samba4.so -lib/samba4/private/libauth-samba4.so -lib/samba4/private/libauth-unix-token-samba4.so -lib/samba4/private/libauth4-samba4.so -lib/samba4/private/libauthkrb5-samba4.so -lib/samba4/private/libcli-cldap-samba4.so -lib/samba4/private/libcli-ldap-common-samba4.so -lib/samba4/private/libcli-ldap-samba4.so -lib/samba4/private/libcli-nbt-samba4.so -lib/samba4/private/libcli-smb-common-samba4.so -lib/samba4/private/libclidns-samba4.so -lib/samba4/private/libcli-spoolss-samba4.so -lib/samba4/private/libcliauth-samba4.so -lib/samba4/private/libcluster-samba4.so -lib/samba4/private/libcmdline-contexts-samba4.so -lib/samba4/private/libcmdline-credentials-samba4.so -%%GSSAPI_BUILTIN%%lib/samba4/private/libcom_err-samba4.so.0 -lib/samba4/private/libcommon-auth-samba4.so -%%AD_DC%%lib/samba4/private/libdb-glue-samba4.so -lib/samba4/private/libdbwrap-samba4.so -lib/samba4/private/libdcerpc-samba-samba4.so -lib/samba4/private/libdcerpc-samba4.so -%%AD_DC%%lib/samba4/private/libdfs-server-ad-samba4.so -%%AD_DC%%lib/samba4/private/libdnsserver-common-samba4.so -lib/samba4/private/libdsdb-module-samba4.so -%%AD_DC%%lib/samba4/private/libdsdb-garbage-collect-tombstones-samba4.so -lib/samba4/private/libevents-samba4.so -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 -%%GSSAPI_BUILTIN%%lib/samba4/private/libhdb-samba4.so.11 -%%GSSAPI_BUILTIN%%lib/samba4/private/libheimbase-samba4.so.1 -%%GSSAPI_BUILTIN%%lib/samba4/private/libheimntlm-samba4.so.1 -lib/samba4/private/libhttp-samba4.so -%%GSSAPI_BUILTIN%%lib/samba4/private/libhx509-samba4.so.5 -lib/samba4/private/libidmap-samba4.so -lib/samba4/private/libinterfaces-samba4.so -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/libldbsamba-samba4.so -lib/samba4/private/liblibcli-lsa3-samba4.so -lib/samba4/private/liblibcli-netlogon3-samba4.so -lib/samba4/private/liblibsmb-samba4.so -lib/samba4/private/libmessages-dgm-samba4.so -lib/samba4/private/libmessages-util-samba4.so -lib/samba4/private/libmscat-samba4.so -lib/samba4/private/libmsghdr-samba4.so -lib/samba4/private/libmsrpc3-samba4.so -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/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 -%%GSSAPI_BUILTIN%%lib/samba4/private/libroken-samba4.so.19 -lib/samba4/private/libsamba-cluster-support-samba4.so -lib/samba4/private/libsamba-debug-samba4.so -lib/samba4/private/libsamba-modules-samba4.so -%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-net%%PYTHON_EXT_SUFFIX%%-samba4.so -%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-python%%PYTHON_EXT_SUFFIX%%-samba4.so -lib/samba4/private/libsamba-security-samba4.so -lib/samba4/private/libsamba-sockets-samba4.so -lib/samba4/private/libsamba3-util-samba4.so -lib/samba4/private/libsamdb-common-samba4.so -%%AD_DC%%lib/samba4/private/libscavenge-dns-records-samba4.so -lib/samba4/private/libsecrets3-samba4.so -lib/samba4/private/libserver-id-db-samba4.so -lib/samba4/private/libserver-role-samba4.so -lib/samba4/private/libshares-samba4.so -lib/samba4/private/libsmb-transport-samba4.so -lib/samba4/private/libsmbclient-raw-samba4.so -lib/samba4/private/libsmbd-base-samba4.so -lib/samba4/private/libsmbd-conn-samba4.so -lib/samba4/private/libsmbd-shim-samba4.so -%%LDAP%%lib/samba4/private/libsmbldaphelper-samba4.so -lib/samba4/private/libsmbpasswdparser-samba4.so -lib/samba4/private/libsocket-blocking-samba4.so -lib/samba4/private/libsys-rw-samba4.so -lib/samba4/private/libtalloc-report-printf-samba4.so -lib/samba4/private/libtalloc-report-samba4.so -lib/samba4/private/libtdb-wrap-samba4.so -lib/samba4/private/libtime-basic-samba4.so -lib/samba4/private/libtorture-samba4.so -lib/samba4/private/libtrusts-util-samba4.so -lib/samba4/private/libutil-cmdline-samba4.so -lib/samba4/private/libutil-reg-samba4.so -lib/samba4/private/libutil-setid-samba4.so -lib/samba4/private/libutil-tdb-samba4.so -lib/samba4/private/libwinbind-client-samba4.so -%%GSSAPI_BUILTIN%%lib/samba4/private/libwind-samba4.so.0 -lib/samba4/private/libxattr-tdb-samba4.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.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 -%%AD_DC%%%%SAMBA4_MODULEDIR%%/krb5/winbind_krb5_locator.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 -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dsdb_notification.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/encrypted_secrets.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 -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ldbsamba_extensions.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/linked_attributes.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/new_partition.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectclass_attrs.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectclass.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectguid.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/operational.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/paged_results.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/partition.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/password_hash.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ranged_results.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/repl_meta_data.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/resolve_oids.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/rootdse.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba_dsdb.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba_secrets.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba3sam.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba3sid.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samldb.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/schema_data.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/schema_load.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/secrets_tdb_sync.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/show_deleted.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/subtree_delete.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/subtree_rename.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/tombstone_reanimate.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/unique_object_sids.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/update_keytab.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/vlv.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/wins_ldb.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/process_model/prefork.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/process_model/standard.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/cldap.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dcerpc.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dns_update.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dns.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/drepl.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/kcc.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/kdc.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/ldap.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/winbindd.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/wrepl.so -%%AD_DC%%%%SAMBA4_MODULEDIR%%/vfs/posix_eadb.so -%%SAMBA4_MODULEDIR%%/vfs/acl_tdb.so -%%SAMBA4_MODULEDIR%%/vfs/acl_xattr.so -%%SAMBA4_MODULEDIR%%/vfs/aio_fork.so -%%SAMBA4_MODULEDIR%%/vfs/aio_pthread.so -%%SAMBA4_MODULEDIR%%/vfs/audit.so -%%SAMBA4_MODULEDIR%%/vfs/cap.so -%%SAMBA4_MODULEDIR%%/vfs/catia.so -%%SAMBA4_MODULEDIR%%/vfs/commit.so -%%SAMBA4_MODULEDIR%%/vfs/crossrename.so -%%SAMBA4_MODULEDIR%%/vfs/default_quota.so -%%SAMBA4_MODULEDIR%%/vfs/dirsort.so -%%SAMBA4_MODULEDIR%%/vfs/expand_msdfs.so -%%SAMBA4_MODULEDIR%%/vfs/extd_audit.so -%%SAMBA4_MODULEDIR%%/vfs/fake_perms.so -%%SAMBA4_MODULEDIR%%/vfs/full_audit.so -%%SAMBA4_MODULEDIR%%/vfs/linux_xfs_sgid.so -%%SAMBA4_MODULEDIR%%/vfs/media_harmony.so -%%SAMBA4_MODULEDIR%%/vfs/offline.so -%%SAMBA4_MODULEDIR%%/vfs/preopen.so -%%SAMBA4_MODULEDIR%%/vfs/readahead.so -%%SAMBA4_MODULEDIR%%/vfs/readonly.so -%%SAMBA4_MODULEDIR%%/vfs/recycle.so -%%SAMBA4_MODULEDIR%%/vfs/shadow_copy.so -%%SAMBA4_MODULEDIR%%/vfs/shadow_copy2.so -%%SAMBA4_MODULEDIR%%/vfs/shell_snap.so -%%SAMBA4_MODULEDIR%%/vfs/streams_depot.so -%%SAMBA4_MODULEDIR%%/vfs/streams_xattr.so -%%SAMBA4_MODULEDIR%%/vfs/syncops.so -%%SAMBA4_MODULEDIR%%/vfs/time_audit.so -%%SAMBA4_MODULEDIR%%/vfs/unityed_media.so -%%SAMBA4_MODULEDIR%%/vfs/virusfilter.so -%%SAMBA4_MODULEDIR%%/vfs/widelinks.so -%%SAMBA4_MODULEDIR%%/vfs/worm.so -%%SAMBA4_MODULEDIR%%/vfs/xattr_tdb.so -%%SAMBA4_MODULEDIR%%/vfs/zfsacl.so -@dir %%SAMBA4_MODULEDIR%%/vfs -%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/service -%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/process_model -@dir %%SAMBA4_MODULEDIR%%/perfcount -@dir %%SAMBA4_MODULEDIR%%/pdb -@dir %%SAMBA4_MODULEDIR%%/nss_info -@dir %%SAMBA4_MODULEDIR%%/ldb -@dir %%SAMBA4_MODULEDIR%%/idmap -@dir %%SAMBA4_MODULEDIR%%/gpext -@dir %%SAMBA4_MODULEDIR%%/gensec -@dir %%SAMBA4_MODULEDIR%%/bind9 -@dir %%SAMBA4_MODULEDIR%%/auth -@dir %%SAMBA4_MODULEDIR%% -@dir lib/samba4/private -@dir lib/samba4 +%%SAMBA4_LIBDIR%%/private/libCHARSET3-samba4.so +%%SAMBA4_LIBDIR%%/private/libLIBWBCLIENT-OLD-samba4.so +%%SAMBA4_LIBDIR%%/private/libMESSAGING-samba4.so +%%SAMBA4_LIBDIR%%/private/libMESSAGING-SEND-samba4.so +%%SAMBA4_LIBDIR%%/private/libaddns-samba4.so +%%SAMBA4_LIBDIR%%/private/libads-samba4.so +%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libasn1-samba4.so.8 +%%SAMBA4_LIBDIR%%/private/libasn1util-samba4.so +%%SAMBA4_LIBDIR%%/private/libauth-samba4.so +%%SAMBA4_LIBDIR%%/private/libauth-unix-token-samba4.so +%%SAMBA4_LIBDIR%%/private/libauth4-samba4.so +%%SAMBA4_LIBDIR%%/private/libauthkrb5-samba4.so +%%SAMBA4_LIBDIR%%/private/libcli-cldap-samba4.so +%%SAMBA4_LIBDIR%%/private/libcli-ldap-common-samba4.so +%%SAMBA4_LIBDIR%%/private/libcli-ldap-samba4.so *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103050316.1253GqPg079184>