CVS commit: pkgsrc/net/samba4

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/samba4
From: "Dr. Thomas Orgis" <thor%netbsd.org@localhost>
Date: Mon, 7 Mar 2022 21:40:38 +0000

Module Name:    pkgsrc
Committed By:   thor
Date:           Mon Mar  7 21:40:38 UTC 2022

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST distinfo options.mk
        pkgsrc/net/samba4/patches: patch-lib_replace_wscript
            patch-source4_heimdal__build_roken.h
            patch-source4_scripting_wsript_build
            patch-source4_utils_oLschema2ldif_wscript__build
Added Files:
        pkgsrc/net/samba4/patches: patch-source3_smbd_open.c
            patch-source3_utils_net__offlinejoin.c
Removed Files:
        pkgsrc/net/samba4/patches: patch-source3_libsmb_libsmb__stat.c
            patch-source4_torture_libsmbclient_libsmbclient.c

Log Message:
net/samba4: version 4.15.4

This includes a patch (already posted upstream) to fix updated Samba on
NetBSD's /proc, so the upgrade is not blocked anymore.

Release notes for 4.15:

EW FEATURES/CHANGES
====================

VFS
---

The effort to modernize Samba's VFS interface is complete and Samba 4.15.0 ships
with a modernized VFS designed for the post SMB1 world.

For details please refer to the documentation at source3/modules/The_New_VFS.txt
or visit the <https://wiki.samba.org/index.php/The_New_VFS>.

Bind DLZ: add the ability to set allow/deny lists for zone transfer clients
---------------------------------------------------------------------------

Up to now, any client could use a DNS zone transfer request to the
bind server, and get an answer from Samba. Now the default behaviour
will be to deny those request. Two new options have been added to
manage the list of authorized/denied clients for zone transfer
requests. In order to be accepted, the request must be issued by a
client that is in the allow list and NOT in the deny list.

"server multi channel support" no longer experimental
-----------------------------------------------------

This option is enabled by default starting with 4.15 (on Linux and FreeBSD).
Due to dependencies on kernel APIs of Linux or FreeBSD, it's only possible
to use this feature on Linux and FreeBSD for now.

samba-tool available without the ad-dc
--------------------------------------

The 'samba-tool' command is now available when samba is configured
"--without-ad-dc". Not all features will work, and some ad-dc specific options
have been disabled. The 'samba-tool domain' options, for example, are limited
when no ad-dc is present. Samba must still be built with ads in order to enable
'samba-tool'.

Improved command line user experience
-------------------------------------

Samba utilities did not consistently implement their command line interface. A
number of options were requiring to specify values in one tool and not in the
other, some options meant different in different tools.

These should be stories of the past now. A new command line parser has been
implemented with sanity checking. Also the command line interface has been
simplified and provides better control for encryption, signing and kerberos.

Previously many tools silently ignored unknown options. To prevent unexpected
behaviour all tools will now consistently reject unknown options.

Also several command line options have a smb.conf variable to control the
default now.

All tools are now logging to stderr by default. You can use "--debug-stdout" to
change the behavior. All servers will log to stderr at early startup until logging
is setup to go to a file by default.

### Common parser:

Options added:
--client-protection=off|sign|encrypt

Options renamed:
--kerberos       ->    --use-kerberos=required|desired|off
--krb5-ccache    ->    --use-krb5-ccache=CCACHE
--scope          ->    --netbios-scope=SCOPE
--use-ccache     ->    --use-winbind-ccache

Options removed:
-e|--encrypt
-C removed from --use-winbind-ccache
-i removed from --netbios-scope
-S|--signing

### Duplicates in command line utils

ldbadd/ldbdel/ldbedit/ldbmodify/ldbrename/ldbsearch:
-e is still available as an alias for --editor,
   as it used to be.
-s is no longer reported as an alias for --configfile,
   it never worked that way as it was shadowed by '-s' for '--scope'.

ndrdump:
-l is not available for --load-dso anymore

net:
-l is not available for --long anymore

sharesec:
-V is not available for --viewsddl anymore

smbcquotas:
--user        ->    --quota-user

nmbd:
--log-stdout  ->    --debug-stdout

smbd:
--log-stdout  ->    --debug-stdout

winbindd:
--log-stdout  ->    --debug-stdout

Scanning of trusted domains and enterprise principals
-----------------------------------------------------

As an artifact from the NT4 times, we still scanned the list of trusted domains
on winbindd startup. This is wrong as we never can get a full picture in Active
Directory. It is time to change the default value to "No". Also with this change
we always use enterprise principals for Kerberos so that the DC will be able
to redirect ticket requests to the right DC. This is e.g. needed for one way
trusts. The options `winbind use krb5 enterprise principals` and
`winbind scan trusted domains` will be deprecated in one of the next releases.

Support for Offline Domain Join (ODJ)
-------------------------------------

The net utility is now able to support the offline domain join feature
as known from the Windows djoin.exe command for many years. Samba's
implementation is accessible via the 'net offlinejoin' subcommand. It
can provision computers and request offline joining for both Windows
and Unix machines. It is also possible to provision computers from
Windows (using djoin.exe) and use the generated data in Samba's 'net'
utility. The existing options for the provisioning and joining steps
are documented in the net(8) manpage.

'samba-tool dns zoneoptions' for aging control
----------------------------------------------

The 'samba-tool dns zoneoptions' command can be used to turn aging on
and off, alter the refresh and no-refresh periods, and manipulate the
timestamps of existing records.

To turn aging on for a zone, you can use something like this:

  samba-tool dns zoneoptions --aging=1 --refreshinterval=306600

which turns on aging and ensures no records less than five years old
are aged out and scavenged. After aging has been on for sufficient
time for records to be renewed, the command

  samba-tool dns zoneoptions --refreshinterval=168

will set the refresh period to the standard seven days. Using this two
step process will help prevent the temporary loss of dynamic records
if scavenging happens before their first renewal.

Marking old records as static or dynamic with 'samba-tool'
----------------------------------------------------------

A bug in Samba versions prior to 4.9 meant records that were meant to
be static were marked as dynamic and vice versa. To fix the timestamps
in these domains, it is possible to use the following options,
preferably before turning aging on.

   --mark-old-records-static
   --mark-records-dynamic-regex
   --mark-records-static-regex

The "--mark-old-records-static" option will make records older than the
specified date static (that is, with a zero timestamp). For example,
if you upgraded to Samba 4.9 in November 2018, you could use ensure no
old records will be mistakenly interpreted as dynamic using the
following option:

  samba-tool dns zoneoptions --mark-old-records-static=2018-11-30

Then, if you know that that will have marked some records as static
that should be dynamic, and you know which those are due to your
naming scheme, you can use commands like:

  samba-tool dns zoneoptions --mark-records-dynamic-regex='\w+-desktop'

where '\w+-desktop' is a perl-compatible regular expression that will
match 'bob-desktop', 'alice-desktop', and so on.

These options are deliberately long and cumbersome to type, so people
have a chance to think before they get to the end. You can make a
mess if you get it wrong.

All 'samba-tool dns zoneoptions' modes can be given a "--dry-run/-n"
argument that allows you to inspect the likely results before going
ahead.

NOTE: for aging to work, you need to have "dns zone scavenging = yes"
set in the smb.conf of at least one server.

DNS tombstones are now deleted as appropriate
---------------------------------------------

When all the records for a DNS name have been deleted, the node is put
in a tombstoned state (separate from general AD object tombstoning,
which deleted nodes also go through). These tombstones should be
cleaned up periodically. Due to a conflation of scavenging and
tombstoning, we have only been deleting tombstones when aging is
enabled.

If you have a lot of tombstoned DNS nodes (that is, DNS names for
which you have removed all the records), cleaning up these DNS
tombstones may take a noticeable time.

DNS tombstones use a consistent timestamp format
------------------------------------------------

DNS records use an hours-since-1601 timestamp format except for in the
case of tombstone records where a 100-nanosecond-intervals-since-1601
format is used (this latter format being the most common in Windows).
We had mixed that up, which might have had strange effects in zones
where aging was enabled (and hence tombstone timestamps were used).

samba-tool dns update and RPC changes
-------------------------------------

The dnsserver DCERPC pipe can be used by 'samba-tool' and Windows tools
to manipulate dns records on the remote server. A bug in Samba meant
it was not possible to update an existing DNS record to change the
TTL. The general behaviour of RPC updates is now closer to that of
Windows.

'samba-tool dns update' is now a bit more careful in rejecting and
warning you about malformed IPv4 and IPv6 addresses.

CVE-2021-3671: Crash in Heimdal KDC and updated security release policy
-----------------------------------------------------------------------

An unuthenticated user can crash the AD DC KDC by omitting the server
name in a TGS-REQ.  Per Samba's updated security process a specific
security release was not made for this issue as it is a recoverable
Denial Of Service.

See https://wiki.samba.org/index.php/Samba_Security_Proces

samba-tool domain backup offline with the LMDB backend
------------------------------------------------------

samba-tool domain backup offline, when operating with the LMDB backend
now correctly takes out locks against concurrent modification of the
database during the backup.  If you use this tool on a Samba AD DC
using LMDB, you should upgrade to this release for safer backups.

REMOVED FEATURES
================

Tru64 ACL support has been removed from this release. The last
supported release of Tru64 UNIX was in 2012.

NIS support has been removed from this release. This is not
available in Linux distributions anymore.

The DLZ DNS plugin is no longer built for Bind versions 9.8 and 9.9,
which have been out of support since 2018.

smb.conf changes
================

  Parameter Name                          Description     Default
  --------------                          -----------     -------
  client use kerberos                     New             desired
  client max protocol                     Values Removed
  client min protocol                     Values Removed
  client protection                       New             default
  client smb3 signing algorithms          New             see man smb.conf
  client smb3 encryption algorithms       New             see man smb.conf
  preopen:posix-basic-regex               New             No
  preopen:nomatch_log_level               New             5
  preopen:match_log_level                 New             5
  preopen:nodigits_log_level              New             1
  preopen:founddigits_log_level           New             3
  preopen:reset_log_level                 New             5
  preopen:push_log_level                  New             3
  preopen:queue_log_level                 New             10
  server max protocol                     Values Removed
  server min protocol                     Values Removed
  server multi channel support            Changed         Yes (on Linux and FreeBSD)
  server smb3 signing algorithms          New             see man smb.conf
  server smb3 encryption algorithms       New             see man smb.conf
  winbind use krb5 enterprise principals  Changed         Yes
  winbind scan trusted domains            Changed         No

Release notes for 4.14:

NEW FEATURES/CHANGES
====================

Here is a copy of a clarification note added to the Samba code
in the file: VFS-License-clarification.txt.
--------------------------------------------------------------

A clarification of our GNU GPL License enforcement boundary within the Samba
Virtual File System (VFS) layer.

Samba is licensed under the GNU GPL. All code committed to the Samba
project or that creates a "modified version" or software "based on" Samba must
be either licensed under the GNU GPL or a compatible license.

Samba has several plug-in interfaces where external code may be called
from Samba GNU GPL licensed code. The most important of these is the
Samba VFS layer.

Samba VFS modules are intimately connected by header files and API
definitions to the part of the Samba code that provides file services,
and as such, code that implements a plug-in Samba VFS module must be
licensed under the GNU GPL or a compatible license.

However, Samba VFS modules may themselves call third-party external
libraries that are not part of the Samba project and are externally
developed and maintained.

As long as these third-party external libraries do not use any of the
Samba internal structure, APIs or interface definitions created by the
Samba project (to the extent that they would be considered subject to the GNU
GPL), then the Samba Team will not consider such third-party external
libraries called from Samba VFS modules as "based on" and/or creating a
"modified version" of the Samba code for the purposes of GNU GPL.
Accordingly, we do not require such libraries be licensed under the GNU GPL
or a GNU GPL compatible license.

VFS
---

The effort to modernize Samba's VFS interface has reached a major milestone with
the next release Samba 4.14.

For details please refer to the documentation at source3/modules/The_New_VFS.txt or
visit the <https://wiki.samba.org/index.php/The_New_VFS>.

Printing
--------

Publishing printers in AD is more reliable and more printer features are
added to the published information in AD. Samba now also supports Windows
drivers for the ARM64 architecture.

Client Group Policy
-------------------
This release extends Samba to support Group Policy functionality for Winbind
clients. Active Directory Administrators can set policies that apply Sudoers
configuration, and cron jobs to run hourly, daily, weekly or monthly.

To enable the application of Group Policies on a client, set the global
smb.conf option 'apply group policies' to 'yes'. Policies are applied on an
interval of every 90 minutes, plus a random offset between 0 and 30 minutes.

Policies applied by Samba are 'non-tattooing', meaning that changes can be
reverted by executing the `samba-gpupdate --unapply` command. Policies can be
re-applied using the `samba-gpupdate --force` command.
To view what policies have been or will be applied to a system, use the
`samba-gpupdate --rsop` command.

Administration of Samba policy requires that a Samba ADMX template be uploaded
to the SYSVOL share. The samba-tool command `samba-tool gpo admxload` is
provided as a convenient method for adding this policy. Once uploaded, policies
can be modified in the Group Policy Management Editor under Computer
Configuration/Policies/Administrative Templates. Alternatively, Samba policy
may be managed using the `samba-tool gpo manage` command. This tool does not
require the admx templates to be installed.

Python 3.6 or later required
----------------------------

Samba's minimum runtime requirement for python was raised to Python
3.6 with samba 4.13.  Samba 4.14 raises this minimum version to Python
3.6 also to build Samba. It is no longer possible to build Samba
(even just the file server) with Python versions 2.6 and 2.7.

As Python 2.7 has been End Of Life upstream since April 2020, Samba
is dropping ALL Python 2.x support in this release.

Miscellaneous samba-tool changes
--------------------------------

The 'samba-tool' subcommands to manage AD objects (e.g. users, computers and
groups) now consistently use the "add" command when adding a new object to
the AD. The previous deprecation warnings when using the 'add' commands
have been removed. For compatibility reasons, both the 'add' and 'create'
commands can be used now.

Users, groups and contacts can now be renamed with the respective rename
commands.

Locked users can be unlocked with the new 'samba-tool user unlock' command.

The 'samba-tool user list' and 'samba-tool group listmembers' commands
provide additional options to hide expired and disabled user accounts
(--hide-expired and --hide-disabled).

CTDB CHANGES
============

* The NAT gateway and LVS features now uses the term "leader" to refer
  to the main node in a group through which traffic is routed and
  "follower" for other members of a group.  The command for
  determining the leader has changed to "ctdb natgw leader" (from
  "ctdb natgw master").  The configuration keyword for indicating that
  a node can not be the leader of a group has changed to
  "follower-only" (from "slave-only").  Identical changes were made
  for LVS.

* Remove "ctdb isnotrecmaster" command.  It isn't used by CTDB's
  scripts and can be checked by users with "ctdb pnn" and "ctdb
  recmaster".

smb.conf changes
================

  Parameter Name                     Description                Default
  --------------                     -----------                -------
  smb encrypt                        Removed
  async dns timeout                  New                        10
  client smb encrypt                 New                        default
  honor change notify privilege      New                        No
  smbd force process locks           New                        No
  server smb encrypt                 New                        default


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/samba4/PLIST
cvs rdiff -u -r1.72 -r1.73 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/samba4/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/samba4/patches/patch-lib_replace_wscript \
    pkgsrc/net/samba4/patches/patch-source4_heimdal__build_roken.h
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/net/samba4/patches/patch-source3_libsmb_libsmb__stat.c \
    pkgsrc/net/samba4/patches/patch-source4_torture_libsmbclient_libsmbclient.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/samba4/patches/patch-source3_smbd_open.c \
    pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/samba4/patches/patch-source4_scripting_wsript_build
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/samba4/patches/patch-source4_utils_oLschema2ldif_wscript__build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.137 pkgsrc/net/samba4/Makefile:1.138
--- pkgsrc/net/samba4/Makefile:1.137    Mon Jan 31 13:45:12 2022
+++ pkgsrc/net/samba4/Makefile  Mon Mar  7 21:40:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2022/01/31 13:45:12 taca Exp $
+# $NetBSD: Makefile,v 1.138 2022/03/07 21:40:37 thor Exp $
 
 # WARNING: DO NOT UPDATE WITHOUT RESOLVING THIS ISSUE:
 #
@@ -7,9 +7,7 @@
 #
 # Please do not update without testing on NetBSD 9.2!
 #
-# https://bugzilla.samba.org/show_bug.cgi?id=14727
-#
-DISTNAME=      samba-4.13.17
+DISTNAME=      samba-4.15.4
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 
@@ -168,7 +166,6 @@ SUBST_SED.docbook+= -e 's,http://docbook
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing paths.
 SUBST_FILES.paths=     ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
-SUBST_FILES.paths+=    source3/script/findsmb.in source4/heimdal_build/roken.h
 SUBST_STAGE.paths=     pre-configure
 SUBST_SED.paths+=      -e 's,@PERL@,${PERL5},g'
 SUBST_VARS.paths=      AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE
@@ -217,7 +214,7 @@ REPLACE_PYTHON+=    source4/scripting/bin/*
 .endif
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ldb+=    ldb>=2.2.3
+BUILDLINK_API_DEPENDS.ldb+=    ldb>=2.4.2
 .include "../../databases/ldb/buildlink3.mk"
 .include "../../databases/lmdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.41 pkgsrc/net/samba4/PLIST:1.42
--- pkgsrc/net/samba4/PLIST:1.41        Sat Dec 25 03:36:01 2021
+++ pkgsrc/net/samba4/PLIST     Mon Mar  7 21:40:37 2022
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.41 2021/12/25 03:36:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.42 2022/03/07 21:40:37 thor Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
-bin/findsmb
 bin/gentest
 bin/locktest
 bin/masktest
-bin/mdfind
+bin/mdsearch
 bin/mvxattr
 bin/ndrdump
 bin/net
@@ -20,7 +19,7 @@ bin/regpatch
 bin/regshell
 bin/regtree
 bin/rpcclient
-bin/samba-tool
+${PLIST.ads}bin/samba-tool
 bin/sharesec
 bin/smbcacls
 bin/smbclient
@@ -35,8 +34,6 @@ bin/smbtorture
 bin/smbtree
 bin/testparm
 bin/wbinfo
-@pkgdir bind-dns
-@pkgdir etc/samba
 include/charset.h
 include/core/doserr.h
 include/core/error.h
@@ -47,7 +44,7 @@ include/core/werror.h
 include/core/werror_gen.h
 include/credentials.h
 include/dcerpc.h
-include/dcerpc_server.h
+${PLIST.ads}include/dcerpc_server.h
 include/dcesrv_core.h
 include/domain_credentials.h
 include/gen_ndr/atsvc.h
@@ -111,7 +108,6 @@ include/util/genrand.h
 include/util/idtree.h
 include/util/idtree_random.h
 include/util/signal.h
-include/util/string_wrappers.h
 include/util/substitute.h
 include/util/tevent_ntstatus.h
 include/util/tevent_unix.h
@@ -129,9 +125,9 @@ lib/libdcerpc-samr.so.0.0.1
 lib/libdcerpc-server-core.so
 lib/libdcerpc-server-core.so.0
 lib/libdcerpc-server-core.so.0.0.1
-lib/libdcerpc-server.so
-lib/libdcerpc-server.so.0
-lib/libdcerpc-server.so.0.0.1
+${PLIST.ads}lib/libdcerpc-server.so
+${PLIST.ads}lib/libdcerpc-server.so.0
+${PLIST.ads}lib/libdcerpc-server.so.0.0.1
 lib/libdcerpc.so
 lib/libdcerpc.so.0
 lib/libdcerpc.so.0.0.1
@@ -145,14 +141,15 @@ lib/libndr-standard.so
 lib/libndr-standard.so.0
 lib/libndr-standard.so.0.0.1
 lib/libndr.so
-lib/libndr.so.1
-lib/libndr.so.1.0.0
+lib/libndr.so.2
+lib/libndr.so.2.0.0
 lib/libnetapi.so
-lib/libnetapi.so.0
+lib/libnetapi.so.1
+lib/libnetapi.so.1.0.0
 lib/libnss_winbind.so
 lib/libsamba-credentials.so
-lib/libsamba-credentials.so.0
-lib/libsamba-credentials.so.0.0.1
+lib/libsamba-credentials.so.1
+lib/libsamba-credentials.so.1.0.0
 lib/libsamba-errors.so
 lib/libsamba-errors.so.1
 lib/libsamba-hostconfig.so
@@ -172,11 +169,12 @@ lib/libsamdb.so.0
 lib/libsamdb.so.0.0.1
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-lib/libsmbclient.so.0.6.0
+lib/libsmbclient.so.0.7.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
 ${PLIST.ldap}lib/libsmbldap.so
 ${PLIST.ldap}lib/libsmbldap.so.2
+${PLIST.ldap}lib/libsmbldap.so.2.1.0
 lib/libtevent-util.so
 lib/libtevent-util.so.0
 lib/libtevent-util.so.0.0.1
@@ -185,7 +183,7 @@ lib/libwbclient.so.0
 lib/libwbclient.so.0.15
 lib/pkgconfig/dcerpc.pc
 lib/pkgconfig/dcerpc_samr.pc
-lib/pkgconfig/dcerpc_server.pc
+${PLIST.ads}lib/pkgconfig/dcerpc_server.pc
 lib/pkgconfig/ndr.pc
 lib/pkgconfig/ndr_krb5pac.pc
 lib/pkgconfig/ndr_nbt.pc
@@ -205,7 +203,6 @@ ${PYSITELIB}/samba/auth.so
 ${PYSITELIB}/samba/auth_util.py
 ${PYSITELIB}/samba/colour.py
 ${PYSITELIB}/samba/common.py
-${PYSITELIB}/samba/compat.py
 ${PYSITELIB}/samba/credentials.so
 ${PYSITELIB}/samba/crypto.so
 ${PYSITELIB}/samba/dbchecker.py
@@ -251,7 +248,7 @@ ${PYSITELIB}/samba/dcerpc/winspool.so
 ${PYSITELIB}/samba/dcerpc/witness.so
 ${PYSITELIB}/samba/dcerpc/wkssvc.so
 ${PYSITELIB}/samba/dcerpc/xattr.so
-${PYSITELIB}/samba/dckeytab.so
+${PLIST.ads}${PYSITELIB}/samba/dckeytab.so
 ${PYSITELIB}/samba/descriptor.py
 ${PYSITELIB}/samba/dnsresolver.py
 ${PYSITELIB}/samba/dnsserver.py
@@ -266,6 +263,8 @@ ${PYSITELIB}/samba/forest_update.py
 ${PYSITELIB}/samba/gensec.so
 ${PYSITELIB}/samba/getopt.py
 ${PYSITELIB}/samba/gp_ext_loader.py
+${PYSITELIB}/samba/gp_gnome_settings_ext.py
+${PYSITELIB}/samba/gp_msgs_ext.py
 ${PYSITELIB}/samba/gp_parse/__init__.py
 ${PYSITELIB}/samba/gp_parse/gp_aas.py
 ${PYSITELIB}/samba/gp_parse/gp_csv.py
@@ -274,6 +273,8 @@ ${PYSITELIB}/samba/gp_parse/gp_ini.py
 ${PYSITELIB}/samba/gp_parse/gp_pol.py
 ${PYSITELIB}/samba/gp_scripts_ext.py
 ${PYSITELIB}/samba/gp_sec_ext.py
+${PYSITELIB}/samba/gp_smb_conf_ext.py
+${PYSITELIB}/samba/gp_sudoers_ext.py
 ${PYSITELIB}/samba/gpclass.py
 ${PYSITELIB}/samba/gpo.so
 ${PYSITELIB}/samba/graph.py
@@ -295,6 +296,7 @@ ${PYSITELIB}/samba/ms_schema.py
 ${PYSITELIB}/samba/ms_schema_markdown.py
 ${PYSITELIB}/samba/ndr.py
 ${PYSITELIB}/samba/net.so
+${PYSITELIB}/samba/net_s3.so
 ${PYSITELIB}/samba/netbios.so
 ${PYSITELIB}/samba/netcmd/__init__.py
 ${PYSITELIB}/samba/netcmd/common.py
@@ -339,7 +341,8 @@ ${PYSITELIB}/samba/provision/sambadns.py
 ${PYSITELIB}/samba/registry.so
 ${PYSITELIB}/samba/remove_dc.py
 ${PYSITELIB}/samba/samba3/__init__.py
-${PYSITELIB}/samba/samba3/libsmb_samba_internal.so
+${PYSITELIB}/samba/samba3/libsmb_samba_cwrapper.so
+${PYSITELIB}/samba/samba3/libsmb_samba_internal.py
 ${PYSITELIB}/samba/samba3/mdscli.so
 ${PYSITELIB}/samba/samba3/param.so
 ${PYSITELIB}/samba/samba3/passdb.so
@@ -370,12 +373,14 @@ ${PYSITELIB}/samba/tests/blackbox/__init
 ${PYSITELIB}/samba/tests/blackbox/bug13653.py
 ${PYSITELIB}/samba/tests/blackbox/check_output.py
 ${PYSITELIB}/samba/tests/blackbox/downgradedatabase.py
-${PYSITELIB}/samba/tests/blackbox/mdfind.py
+${PYSITELIB}/samba/tests/blackbox/mdsearch.py
 ${PYSITELIB}/samba/tests/blackbox/ndrdump.py
 ${PYSITELIB}/samba/tests/blackbox/netads_json.py
 ${PYSITELIB}/samba/tests/blackbox/samba_dnsupdate.py
 ${PYSITELIB}/samba/tests/blackbox/smbcacls.py
 ${PYSITELIB}/samba/tests/blackbox/smbcacls_basic.py
+${PYSITELIB}/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
+${PYSITELIB}/samba/tests/blackbox/smbcacls_propagate_inhertance.py
 ${PYSITELIB}/samba/tests/blackbox/smbcontrol.py
 ${PYSITELIB}/samba/tests/blackbox/smbcontrol_process.py
 ${PYSITELIB}/samba/tests/blackbox/traffic_learner.py
@@ -384,10 +389,13 @@ ${PYSITELIB}/samba/tests/blackbox/traffi
 ${PYSITELIB}/samba/tests/common.py
 ${PYSITELIB}/samba/tests/complex_expressions.py
 ${PYSITELIB}/samba/tests/core.py
+${PYSITELIB}/samba/tests/cred_opt.py
 ${PYSITELIB}/samba/tests/credentials.py
 ${PYSITELIB}/samba/tests/dcerpc/__init__.py
 ${PYSITELIB}/samba/tests/dcerpc/array.py
 ${PYSITELIB}/samba/tests/dcerpc/bare.py
+${PYSITELIB}/samba/tests/dcerpc/binding.py
+${PYSITELIB}/samba/tests/dcerpc/createtrustrelax.py
 ${PYSITELIB}/samba/tests/dcerpc/dnsserver.py
 ${PYSITELIB}/samba/tests/dcerpc/integer.py
 ${PYSITELIB}/samba/tests/dcerpc/lsa.py
@@ -399,12 +407,14 @@ ${PYSITELIB}/samba/tests/dcerpc/registry
 ${PYSITELIB}/samba/tests/dcerpc/rpc_talloc.py
 ${PYSITELIB}/samba/tests/dcerpc/rpcecho.py
 ${PYSITELIB}/samba/tests/dcerpc/sam.py
+${PYSITELIB}/samba/tests/dcerpc/samr_change_password.py
 ${PYSITELIB}/samba/tests/dcerpc/srvsvc.py
 ${PYSITELIB}/samba/tests/dcerpc/string_tests.py
 ${PYSITELIB}/samba/tests/dcerpc/testrpc.py
 ${PYSITELIB}/samba/tests/dcerpc/unix.py
 ${PYSITELIB}/samba/tests/dckeytab.py
 ${PYSITELIB}/samba/tests/dns.py
+${PYSITELIB}/samba/tests/dns_aging.py
 ${PYSITELIB}/samba/tests/dns_base.py
 ${PYSITELIB}/samba/tests/dns_forwarder.py
 ${PYSITELIB}/samba/tests/dns_forwarder_helpers/server.py
@@ -417,6 +427,7 @@ ${PYSITELIB}/samba/tests/domain_backup.p
 ${PYSITELIB}/samba/tests/domain_backup_offline.py
 ${PYSITELIB}/samba/tests/dsdb.py
 ${PYSITELIB}/samba/tests/dsdb_api.py
+${PYSITELIB}/samba/tests/dsdb_dns.py
 ${PYSITELIB}/samba/tests/dsdb_lock.py
 ${PYSITELIB}/samba/tests/dsdb_schema_attributes.py
 ${PYSITELIB}/samba/tests/emulate/__init__.py
@@ -428,9 +439,11 @@ ${PYSITELIB}/samba/tests/get_opt.py
 ${PYSITELIB}/samba/tests/getdcname.py
 ${PYSITELIB}/samba/tests/glue.py
 ${PYSITELIB}/samba/tests/gpo.py
+${PYSITELIB}/samba/tests/gpo_member.py
 ${PYSITELIB}/samba/tests/graph.py
 ${PYSITELIB}/samba/tests/group_audit.py
 ${PYSITELIB}/samba/tests/hostconfig.py
+${PYSITELIB}/samba/tests/imports.py
 ${PYSITELIB}/samba/tests/join.py
 ${PYSITELIB}/samba/tests/kcc/__init__.py
 ${PYSITELIB}/samba/tests/kcc/graph.py
@@ -471,6 +484,7 @@ ${PYSITELIB}/samba/tests/libsmb.py
 ${PYSITELIB}/samba/tests/loadparm.py
 ${PYSITELIB}/samba/tests/lsa_string.py
 ${PYSITELIB}/samba/tests/messaging.py
+${PYSITELIB}/samba/tests/ndr.py
 ${PYSITELIB}/samba/tests/net_join.py
 ${PYSITELIB}/samba/tests/net_join_no_spnego.py
 ${PYSITELIB}/samba/tests/netbios.py
@@ -501,6 +515,7 @@ ${PYSITELIB}/samba/tests/provision.py
 ${PYSITELIB}/samba/tests/pso.py
 ${PYSITELIB}/samba/tests/py_credentials.py
 ${PYSITELIB}/samba/tests/registry.py
+${PYSITELIB}/samba/tests/s3_net_join.py
 ${PYSITELIB}/samba/tests/s3idmapdb.py
 ${PYSITELIB}/samba/tests/s3param.py
 ${PYSITELIB}/samba/tests/s3passdb.py
@@ -518,6 +533,7 @@ ${PYSITELIB}/samba/tests/samba_tool/dsac
 ${PYSITELIB}/samba/tests/samba_tool/forest.py
 ${PYSITELIB}/samba/tests/samba_tool/fsmo.py
 ${PYSITELIB}/samba/tests/samba_tool/gpo.py
+${PYSITELIB}/samba/tests/samba_tool/gpo_exts.py
 ${PYSITELIB}/samba/tests/samba_tool/group.py
 ${PYSITELIB}/samba/tests/samba_tool/help.py
 ${PYSITELIB}/samba/tests/samba_tool/join.py
@@ -529,6 +545,7 @@ ${PYSITELIB}/samba/tests/samba_tool/proc
 ${PYSITELIB}/samba/tests/samba_tool/promote_dc_lmdb_size.py
 ${PYSITELIB}/samba/tests/samba_tool/provision_lmdb_size.py
 ${PYSITELIB}/samba/tests/samba_tool/provision_password_check.py
+${PYSITELIB}/samba/tests/samba_tool/provision_userPassword_crypt.py
 ${PYSITELIB}/samba/tests/samba_tool/rodc.py
 ${PYSITELIB}/samba/tests/samba_tool/schema.py
 ${PYSITELIB}/samba/tests/samba_tool/sites.py
@@ -545,8 +562,10 @@ ${PYSITELIB}/samba/tests/samba_tool/visu
 ${PYSITELIB}/samba/tests/samba_upgradedns_lmdb.py
 ${PYSITELIB}/samba/tests/samdb.py
 ${PYSITELIB}/samba/tests/samdb_api.py
+${PYSITELIB}/samba/tests/sddl.py
 ${PYSITELIB}/samba/tests/security.py
 ${PYSITELIB}/samba/tests/segfault.py
+${PYSITELIB}/samba/tests/smb-notify.py
 ${PYSITELIB}/samba/tests/smb.py
 ${PYSITELIB}/samba/tests/smbd_base.py
 ${PYSITELIB}/samba/tests/smbd_fuzztest.py
@@ -559,83 +578,90 @@ ${PYSITELIB}/samba/tests/upgradeprovisio
 ${PYSITELIB}/samba/tests/upgradeprovisionneeddc.py
 ${PYSITELIB}/samba/tests/usage.py
 ${PYSITELIB}/samba/tests/xattr.py
-${PYSITELIB}/samba/third_party/__init__.py
+${PYSITELIB}/samba/trust_utils.py
 ${PYSITELIB}/samba/upgrade.py
 ${PYSITELIB}/samba/upgradehelpers.py
 ${PYSITELIB}/samba/uptodateness.py
+${PYSITELIB}/samba/vgp_access_ext.py
+${PYSITELIB}/samba/vgp_files_ext.py
+${PYSITELIB}/samba/vgp_issue_ext.py
+${PYSITELIB}/samba/vgp_motd_ext.py
+${PYSITELIB}/samba/vgp_openssh_ext.py
+${PYSITELIB}/samba/vgp_startup_scripts_ext.py
+${PYSITELIB}/samba/vgp_sudoers_ext.py
+${PYSITELIB}/samba/vgp_symlink_ext.py
 ${PYSITELIB}/samba/werror.so
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
-lib/samba/bind9/dlz_bind9.${SOEXT}
-lib/samba/bind9/dlz_bind9_10.${SOEXT}
-lib/samba/bind9/dlz_bind9_11.${SOEXT}
-lib/samba/bind9/dlz_bind9_12.${SOEXT}
-lib/samba/bind9/dlz_bind9_14.${SOEXT}
-lib/samba/bind9/dlz_bind9_16.${SOEXT}
-lib/samba/bind9/dlz_bind9_9.${SOEXT}
-lib/samba/gensec/krb5.${SOEXT}
-${PLIST.ads}lib/samba/idmap/ad.${SOEXT}
-lib/samba/idmap/autorid.${SOEXT}
-lib/samba/idmap/hash.${SOEXT}
-${PLIST.ads}lib/samba/idmap/rfc2307.${SOEXT}
-lib/samba/idmap/rid.${SOEXT}
-lib/samba/idmap/script.${SOEXT}
-lib/samba/idmap/tdb2.${SOEXT}
-lib/samba/krb5/winbind_krb5_locator.${SOEXT}
-lib/samba/ldb/acl.${SOEXT}
-lib/samba/ldb/aclread.${SOEXT}
-lib/samba/ldb/anr.${SOEXT}
-lib/samba/ldb/audit_log.${SOEXT}
-lib/samba/ldb/count_attrs.${SOEXT}
-lib/samba/ldb/descriptor.${SOEXT}
-lib/samba/ldb/dirsync.${SOEXT}
-lib/samba/ldb/dns_notify.${SOEXT}
-lib/samba/ldb/dsdb_notification.${SOEXT}
-lib/samba/ldb/encrypted_secrets.${SOEXT}
-lib/samba/ldb/extended_dn_in.${SOEXT}
-lib/samba/ldb/extended_dn_out.${SOEXT}
-lib/samba/ldb/extended_dn_store.${SOEXT}
-lib/samba/ldb/group_audit_log.${SOEXT}
-lib/samba/ldb/ildap.${SOEXT}
-lib/samba/ldb/instancetype.${SOEXT}
-lib/samba/ldb/lazy_commit.${SOEXT}
-lib/samba/ldb/ldbsamba_extensions.${SOEXT}
-lib/samba/ldb/linked_attributes.${SOEXT}
-lib/samba/ldb/new_partition.${SOEXT}
-lib/samba/ldb/objectclass.${SOEXT}
-lib/samba/ldb/objectclass_attrs.${SOEXT}
-lib/samba/ldb/objectguid.${SOEXT}
-lib/samba/ldb/operational.${SOEXT}
-lib/samba/ldb/paged_results.${SOEXT}
-lib/samba/ldb/partition.${SOEXT}
-lib/samba/ldb/password_hash.${SOEXT}
-lib/samba/ldb/ranged_results.${SOEXT}
-lib/samba/ldb/repl_meta_data.${SOEXT}
-lib/samba/ldb/resolve_oids.${SOEXT}
-lib/samba/ldb/rootdse.${SOEXT}
-lib/samba/ldb/samba3sam.${SOEXT}
-lib/samba/ldb/samba3sid.${SOEXT}
-lib/samba/ldb/samba_dsdb.${SOEXT}
-lib/samba/ldb/samba_secrets.${SOEXT}
-lib/samba/ldb/samldb.${SOEXT}
-lib/samba/ldb/schema_data.${SOEXT}
-lib/samba/ldb/schema_load.${SOEXT}
-lib/samba/ldb/secrets_tdb_sync.${SOEXT}
-lib/samba/ldb/show_deleted.${SOEXT}
-lib/samba/ldb/subtree_delete.${SOEXT}
-lib/samba/ldb/subtree_rename.${SOEXT}
-lib/samba/ldb/tombstone_reanimate.${SOEXT}
-lib/samba/ldb/unique_object_sids.${SOEXT}
-lib/samba/ldb/update_keytab.${SOEXT}
-lib/samba/ldb/vlv.${SOEXT}
-lib/samba/ldb/wins_ldb.${SOEXT}
-lib/samba/nss_info/hash.${SOEXT}
-${PLIST.ads}lib/samba/nss_info/rfc2307.${SOEXT}
-${PLIST.ads}lib/samba/nss_info/sfu.${SOEXT}
-${PLIST.ads}lib/samba/nss_info/sfu20.${SOEXT}
+${PLIST.ads}lib/samba/bind9/dlz_bind9_10.so
+${PLIST.ads}lib/samba/bind9/dlz_bind9_11.so
+${PLIST.ads}lib/samba/bind9/dlz_bind9_12.so
+${PLIST.ads}lib/samba/bind9/dlz_bind9_14.so
+${PLIST.ads}lib/samba/bind9/dlz_bind9_16.so
+${PLIST.ads}lib/samba/gensec/krb5.so
+${PLIST.ads}lib/samba/idmap/ad.so
+lib/samba/idmap/autorid.so
+lib/samba/idmap/hash.so
+${PLIST.ads}lib/samba/idmap/rfc2307.so
+lib/samba/idmap/rid.so
+lib/samba/idmap/script.so
+lib/samba/idmap/tdb2.so
+lib/samba/krb5/async_dns_krb5_locator.so
+lib/samba/krb5/winbind_krb5_locator.so
+${PLIST.ads}lib/samba/ldb/acl.so
+${PLIST.ads}lib/samba/ldb/aclread.so
+${PLIST.ads}lib/samba/ldb/anr.so
+${PLIST.ads}lib/samba/ldb/audit_log.so
+${PLIST.ads}lib/samba/ldb/count_attrs.so
+${PLIST.ads}lib/samba/ldb/descriptor.so
+${PLIST.ads}lib/samba/ldb/dirsync.so
+${PLIST.ads}lib/samba/ldb/dns_notify.so
+${PLIST.ads}lib/samba/ldb/dsdb_notification.so
+${PLIST.ads}lib/samba/ldb/encrypted_secrets.so
+${PLIST.ads}lib/samba/ldb/extended_dn_in.so
+${PLIST.ads}lib/samba/ldb/extended_dn_out.so
+${PLIST.ads}lib/samba/ldb/extended_dn_store.so
+${PLIST.ads}lib/samba/ldb/group_audit_log.so
+lib/samba/ldb/ildap.so
+${PLIST.ads}lib/samba/ldb/instancetype.so
+${PLIST.ads}lib/samba/ldb/lazy_commit.so
+lib/samba/ldb/ldbsamba_extensions.so
+${PLIST.ads}lib/samba/ldb/linked_attributes.so
+${PLIST.ads}lib/samba/ldb/new_partition.so
+${PLIST.ads}lib/samba/ldb/objectclass.so
+${PLIST.ads}lib/samba/ldb/objectclass_attrs.so
+${PLIST.ads}lib/samba/ldb/objectguid.so
+${PLIST.ads}lib/samba/ldb/operational.so
+${PLIST.ads}lib/samba/ldb/paged_results.so
+${PLIST.ads}lib/samba/ldb/partition.so
+${PLIST.ads}lib/samba/ldb/password_hash.so
+${PLIST.ads}lib/samba/ldb/ranged_results.so
+${PLIST.ads}lib/samba/ldb/repl_meta_data.so
+${PLIST.ads}lib/samba/ldb/resolve_oids.so
+${PLIST.ads}lib/samba/ldb/rootdse.so
+${PLIST.ads}lib/samba/ldb/samba3sam.so
+${PLIST.ads}lib/samba/ldb/samba3sid.so
+${PLIST.ads}lib/samba/ldb/samba_dsdb.so
+${PLIST.ads}lib/samba/ldb/samba_secrets.so
+${PLIST.ads}lib/samba/ldb/samldb.so
+${PLIST.ads}lib/samba/ldb/schema_data.so
+${PLIST.ads}lib/samba/ldb/schema_load.so
+${PLIST.ads}lib/samba/ldb/secrets_tdb_sync.so
+${PLIST.ads}lib/samba/ldb/show_deleted.so
+${PLIST.ads}lib/samba/ldb/subtree_delete.so
+${PLIST.ads}lib/samba/ldb/subtree_rename.so
+${PLIST.ads}lib/samba/ldb/tombstone_reanimate.so
+${PLIST.ads}lib/samba/ldb/unique_object_sids.so
+${PLIST.ads}lib/samba/ldb/update_keytab.so
+${PLIST.ads}lib/samba/ldb/vlv.so
+${PLIST.ads}lib/samba/ldb/wins_ldb.so
+lib/samba/nss_info/hash.so
+${PLIST.ads}lib/samba/nss_info/rfc2307.so
+${PLIST.ads}lib/samba/nss_info/sfu.so
+${PLIST.ads}lib/samba/nss_info/sfu20.so
 lib/samba/private/libCHARSET3-samba4.so
-lib/samba/private/libHDB-SAMBA4-samba4.so
+${PLIST.ads}lib/samba/private/libHDB-SAMBA4-samba4.so
 lib/samba/private/libLIBWBCLIENT-OLD-samba4.so
 lib/samba/private/libMESSAGING-SEND-samba4.so
 lib/samba/private/libMESSAGING-samba4.so
@@ -658,19 +684,19 @@ lib/samba/private/libcliauth-samba4.so
 lib/samba/private/libclidns-samba4.so
 lib/samba/private/libcluster-samba4.so
 lib/samba/private/libcmdline-contexts-samba4.so
-lib/samba/private/libcmdline-credentials-samba4.so
+lib/samba/private/libcmdline-samba4.so
 lib/samba/private/libcom_err-samba4.so.0
 lib/samba/private/libcom_err-samba4.so.0.25
 lib/samba/private/libcommon-auth-samba4.so
-lib/samba/private/libdb-glue-samba4.so
+${PLIST.ads}lib/samba/private/libdb-glue-samba4.so
 lib/samba/private/libdbwrap-samba4.so
 lib/samba/private/libdcerpc-pkt-auth-samba4.so
 lib/samba/private/libdcerpc-samba-samba4.so
 lib/samba/private/libdcerpc-samba4.so
-lib/samba/private/libdfs-server-ad-samba4.so
-lib/samba/private/libdlz-bind9-for-torture-samba4.so
+${PLIST.ads}lib/samba/private/libdfs-server-ad-samba4.so
+${PLIST.ads}lib/samba/private/libdlz-bind9-for-torture-samba4.so
 lib/samba/private/libdnsserver-common-samba4.so
-lib/samba/private/libdsdb-garbage-collect-tombstones-samba4.so
+${PLIST.ads}lib/samba/private/libdsdb-garbage-collect-tombstones-samba4.so
 lib/samba/private/libdsdb-module-samba4.so
 lib/samba/private/libevents-samba4.so
 lib/samba/private/libflag-mapping-samba4.so
@@ -715,13 +741,11 @@ lib/samba/private/libnet-keytab-samba4.s
 lib/samba/private/libnetif-samba4.so
 lib/samba/private/libnpa-tstream-samba4.so
 lib/samba/private/libnss-info-samba4.so
-lib/samba/private/libpac-samba4.so
-lib/samba/private/libpopt-samba3-cmdline-samba4.so
-lib/samba/private/libpopt-samba3-samba4.so
+${PLIST.ads}lib/samba/private/libpac-samba4.so
 lib/samba/private/libposix-eadb-samba4.so
 lib/samba/private/libprinter-driver-samba4.so
 lib/samba/private/libprinting-migrate-samba4.so
-lib/samba/private/libprocess-model-samba4.so
+${PLIST.ads}lib/samba/private/libprocess-model-samba4.so
 lib/samba/private/libregistry-samba4.so
 lib/samba/private/libreplace-samba4.so
 lib/samba/private/libroken-samba4.so.19
@@ -735,11 +759,11 @@ lib/samba/private/libsamba-security-samb
 lib/samba/private/libsamba-sockets-samba4.so
 lib/samba/private/libsamba3-util-samba4.so
 lib/samba/private/libsamdb-common-samba4.so
-lib/samba/private/libscavenge-dns-records-samba4.so
+${PLIST.ads}lib/samba/private/libscavenge-dns-records-samba4.so
 lib/samba/private/libsecrets3-samba4.so
 lib/samba/private/libserver-id-db-samba4.so
 lib/samba/private/libserver-role-samba4.so
-lib/samba/private/libservice-samba4.so
+${PLIST.ads}lib/samba/private/libservice-samba4.so
 lib/samba/private/libshares-samba4.so
 lib/samba/private/libsmb-transport-samba4.so
 lib/samba/private/libsmbclient-raw-samba4.so
@@ -755,7 +779,6 @@ lib/samba/private/libtdb-wrap-samba4.so
 lib/samba/private/libtime-basic-samba4.so
 lib/samba/private/libtorture-samba4.so
 lib/samba/private/libtrusts-util-samba4.so
-lib/samba/private/libutil-cmdline-samba4.so
 lib/samba/private/libutil-reg-samba4.so
 lib/samba/private/libutil-setid-samba4.so
 lib/samba/private/libutil-tdb-samba4.so
@@ -763,66 +786,67 @@ lib/samba/private/libwinbind-client-samb
 lib/samba/private/libwind-samba4.so.0
 lib/samba/private/libwind-samba4.so.0.0.0
 lib/samba/private/libxattr-tdb-samba4.so
-lib/samba/process_model/prefork.${SOEXT}
-lib/samba/process_model/standard.${SOEXT}
-${PLIST.pam}lib/samba/security/pam_winbind.${SOEXT}
-lib/samba/service/cldap.${SOEXT}
-lib/samba/service/dcerpc.${SOEXT}
-lib/samba/service/dns.${SOEXT}
-lib/samba/service/dns_update.${SOEXT}
-lib/samba/service/drepl.${SOEXT}
-lib/samba/service/kcc.${SOEXT}
-lib/samba/service/kdc.${SOEXT}
-lib/samba/service/ldap.${SOEXT}
-lib/samba/service/nbtd.${SOEXT}
-lib/samba/service/ntp_signd.${SOEXT}
-lib/samba/service/s3fs.${SOEXT}
-lib/samba/service/winbindd.${SOEXT}
-lib/samba/service/wrepl.${SOEXT}
-lib/samba/vfs/acl_tdb.${SOEXT}
-lib/samba/vfs/acl_xattr.${SOEXT}
-lib/samba/vfs/aio_fork.${SOEXT}
-lib/samba/vfs/aio_pthread.${SOEXT}
-lib/samba/vfs/audit.${SOEXT}
-lib/samba/vfs/cap.${SOEXT}
-lib/samba/vfs/catia.${SOEXT}
-lib/samba/vfs/commit.${SOEXT}
-lib/samba/vfs/crossrename.${SOEXT}
-lib/samba/vfs/default_quota.${SOEXT}
-lib/samba/vfs/dirsort.${SOEXT}
-lib/samba/vfs/expand_msdfs.${SOEXT}
-lib/samba/vfs/extd_audit.${SOEXT}
-lib/samba/vfs/fake_perms.${SOEXT}
-lib/samba/vfs/fruit.${SOEXT}
-lib/samba/vfs/full_audit.${SOEXT}
-lib/samba/vfs/linux_xfs_sgid.${SOEXT}
-lib/samba/vfs/media_harmony.${SOEXT}
-lib/samba/vfs/offline.${SOEXT}
-lib/samba/vfs/posix_eadb.${SOEXT}
-lib/samba/vfs/preopen.${SOEXT}
-lib/samba/vfs/readahead.${SOEXT}
-lib/samba/vfs/readonly.${SOEXT}
-lib/samba/vfs/recycle.${SOEXT}
-lib/samba/vfs/shadow_copy.${SOEXT}
-lib/samba/vfs/shadow_copy2.${SOEXT}
-lib/samba/vfs/shell_snap.${SOEXT}
-${PLIST.snapper}lib/samba/vfs/snapper.${SOEXT}
-lib/samba/vfs/streams_depot.${SOEXT}
-lib/samba/vfs/streams_xattr.${SOEXT}
-lib/samba/vfs/syncops.${SOEXT}
-lib/samba/vfs/time_audit.${SOEXT}
-lib/samba/vfs/unityed_media.${SOEXT}
-lib/samba/vfs/virusfilter.${SOEXT}
-lib/samba/vfs/widelinks.${SOEXT}
-lib/samba/vfs/worm.${SOEXT}
-lib/samba/vfs/xattr_tdb.${SOEXT}
+${PLIST.ads}lib/samba/process_model/prefork.so
+${PLIST.ads}lib/samba/process_model/standard.so
+${PLIST.pam}lib/samba/security/pam_winbind.so
+${PLIST.ads}lib/samba/service/cldap.so
+${PLIST.ads}lib/samba/service/dcerpc.so
+${PLIST.ads}lib/samba/service/dns.so
+${PLIST.ads}lib/samba/service/dns_update.so
+${PLIST.ads}lib/samba/service/drepl.so
+${PLIST.ads}lib/samba/service/kcc.so
+${PLIST.ads}lib/samba/service/kdc.so
+${PLIST.ads}lib/samba/service/ldap.so
+${PLIST.ads}lib/samba/service/nbtd.so
+${PLIST.ads}lib/samba/service/ntp_signd.so
+${PLIST.ads}lib/samba/service/s3fs.so
+${PLIST.ads}lib/samba/service/winbindd.so
+${PLIST.ads}lib/samba/service/wrepl.so
+lib/samba/vfs/acl_tdb.so
+lib/samba/vfs/acl_xattr.so
+lib/samba/vfs/aio_fork.so
+lib/samba/vfs/aio_pthread.so
+lib/samba/vfs/audit.so
+lib/samba/vfs/cap.so
+lib/samba/vfs/catia.so
+lib/samba/vfs/commit.so
+lib/samba/vfs/crossrename.so
+lib/samba/vfs/default_quota.so
+lib/samba/vfs/dirsort.so
+lib/samba/vfs/expand_msdfs.so
+lib/samba/vfs/extd_audit.so
+lib/samba/vfs/fake_perms.so
+lib/samba/vfs/fruit.so
+lib/samba/vfs/full_audit.so
+lib/samba/vfs/linux_xfs_sgid.so
+lib/samba/vfs/media_harmony.so
+lib/samba/vfs/offline.so
+${PLIST.ads}lib/samba/vfs/posix_eadb.so
+lib/samba/vfs/preopen.so
+lib/samba/vfs/readahead.so
+lib/samba/vfs/readonly.so
+lib/samba/vfs/recycle.so
+lib/samba/vfs/shadow_copy.so
+lib/samba/vfs/shadow_copy2.so
+lib/samba/vfs/shell_snap.so
+${PLIST.snapper}lib/samba/vfs/snapper.so
+lib/samba/vfs/streams_depot.so
+lib/samba/vfs/streams_xattr.so
+lib/samba/vfs/syncops.so
+lib/samba/vfs/time_audit.so
+lib/samba/vfs/unityed_media.so
+lib/samba/vfs/virusfilter.so
+lib/samba/vfs/widelinks.so
+lib/samba/vfs/worm.so
+lib/samba/vfs/xattr_tdb.so
+libexec/samba/samba-bgqd
+${PLIST.cups}libexec/samba/smbspool_krb5_wrapper
 man/man1/dbwrap_tool.1
-man/man1/findsmb.1
 man/man1/gentest.1
 man/man1/locktest.1
 man/man1/log2pcap.1
 man/man1/masktest.1
-man/man1/mdfind.1
+man/man1/mdsearch.1
 man/man1/mvxattr.1
 man/man1/ndrdump.1
 man/man1/nmblookup.1
@@ -848,7 +872,7 @@ man/man1/testparm.1
 man/man1/vfstest.1
 man/man1/wbinfo.1
 man/man5/lmhosts.5
-man/man5/pam_winbind.conf.5
+${PLIST.pam}man/man5/pam_winbind.conf.5
 man/man5/smb.conf.5
 man/man5/smbgetrc.5
 man/man5/smbpasswd.5
@@ -870,8 +894,9 @@ man/man8/idmap_tdb.8
 man/man8/idmap_tdb2.8
 man/man8/net.8
 man/man8/nmbd.8
-man/man8/pam_winbind.8
+${PLIST.pam}man/man8/pam_winbind.8
 man/man8/pdbedit.8
+man/man8/samba-bgqd.8
 man/man8/samba-gpupdate.8
 man/man8/samba-regedit.8
 man/man8/samba-tool.8
@@ -920,13 +945,13 @@ man/man8/winbind_krb5_locator.8
 man/man8/winbindd.8
 sbin/eventlogadm
 sbin/nmbd
-sbin/samba
+${PLIST.ads}sbin/samba
 sbin/samba-gpupdate
-sbin/samba_dnsupdate
-sbin/samba_downgrade_db
-sbin/samba_kcc
-sbin/samba_spnupdate
-sbin/samba_upgradedns
+${PLIST.ads}sbin/samba_dnsupdate
+${PLIST.ads}sbin/samba_downgrade_db
+${PLIST.ads}sbin/samba_kcc
+${PLIST.ads}sbin/samba_spnupdate
+${PLIST.ads}sbin/samba_upgradedns
 sbin/smbd
 ${PLIST.winbind}sbin/winbindd
 share/doc/samba/NT4-Locking.reg
@@ -944,87 +969,91 @@ share/doc/samba/WinXP_PlainPassword.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/examples/samba/adduser.sh
 share/examples/samba/deluser.sh
-@pkgdir share/examples/samba/pam_smbpass
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
-share/samba/samba/admx/en-US/samba.adml
-share/samba/samba/admx/samba.admx
-share/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf
-share/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf
-share/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf
-share/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2016.ldf
-share/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2008_R2.ldf
-share/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2012.ldf
-share/samba/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2008_R2.ldf
-share/samba/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2012.ldf
-share/samba/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
-share/samba/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
-share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
-share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
-share/samba/setup/ad-schema/licence.txt
-share/samba/setup/adprep/WindowsServerDocs/Forest-Wide-Updates.md
-share/samba/setup/adprep/WindowsServerDocs/Sch49.ldf.diff
-share/samba/setup/adprep/WindowsServerDocs/Sch50.ldf.diff
-share/samba/setup/adprep/WindowsServerDocs/Sch51.ldf.diff
-share/samba/setup/adprep/WindowsServerDocs/Sch57.ldf.diff
-share/samba/setup/adprep/WindowsServerDocs/Sch59.ldf.diff
-share/samba/setup/adprep/WindowsServerDocs/Schema-Updates.md
-share/samba/setup/adprep/fix-forest-rev.ldf
-share/samba/setup/aggregate_schema.ldif
-share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
-share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
-share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
-share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
-share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
-share/samba/setup/dns_update_list
-share/samba/setup/extended-rights.ldif
-share/samba/setup/idmap_init.ldif
-share/samba/setup/krb5.conf
-share/samba/setup/named.conf
-share/samba/setup/named.conf.dlz
-share/samba/setup/named.conf.update
-share/samba/setup/named.txt
-share/samba/setup/prefixMap.txt
-share/samba/setup/provision.ldif
-share/samba/setup/provision.reg
-share/samba/setup/provision.zone
-share/samba/setup/provision_basedn.ldif
-share/samba/setup/provision_basedn_modify.ldif
-share/samba/setup/provision_basedn_options.ldif
-share/samba/setup/provision_basedn_references.ldif
-share/samba/setup/provision_computers_add.ldif
-share/samba/setup/provision_computers_modify.ldif
-share/samba/setup/provision_configuration.ldif
-share/samba/setup/provision_configuration_basedn.ldif
-share/samba/setup/provision_configuration_modify.ldif
-share/samba/setup/provision_configuration_references.ldif
-share/samba/setup/provision_dns_accounts_add.ldif
-share/samba/setup/provision_dns_add_samba.ldif
-share/samba/setup/provision_dnszones_add.ldif
-share/samba/setup/provision_dnszones_modify.ldif
-share/samba/setup/provision_dnszones_partitions.ldif
-share/samba/setup/provision_group_policy.ldif
-share/samba/setup/provision_init.ldif
-share/samba/setup/provision_partitions.ldif
-share/samba/setup/provision_privilege.ldif
-share/samba/setup/provision_rootdse_add.ldif
-share/samba/setup/provision_rootdse_modify.ldif
-share/samba/setup/provision_schema_basedn.ldif
-share/samba/setup/provision_schema_basedn_modify.ldif
-share/samba/setup/provision_self_join.ldif
-share/samba/setup/provision_self_join_config.ldif
-share/samba/setup/provision_self_join_modify.ldif
-share/samba/setup/provision_self_join_modify_config.ldif
-share/samba/setup/provision_self_join_modify_schema.ldif
-share/samba/setup/provision_users.ldif
-share/samba/setup/provision_users_add.ldif
-share/samba/setup/provision_users_modify.ldif
-share/samba/setup/provision_well_known_sec_princ.ldif
-share/samba/setup/schema_samba4.ldif
-share/samba/setup/secrets.ldif
-share/samba/setup/secrets_dns.ldif
-share/samba/setup/secrets_init.ldif
-share/samba/setup/share.ldif
-share/samba/setup/spn_update_list
-share/samba/setup/ypServ30.ldif
-@pkgdir var/db/samba4
+${PLIST.ads}share/samba/samba/admx/en-US/samba.adml
+${PLIST.ads}share/samba/samba/admx/samba.admx
+${PLIST.ads}share/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf
+${PLIST.ads}share/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf
+${PLIST.ads}share/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf
+${PLIST.ads}share/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2016.ldf
+${PLIST.ads}share/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2008_R2.ldf
+${PLIST.ads}share/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2012.ldf
+${PLIST.ads}share/samba/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2008_R2.ldf
+${PLIST.ads}share/samba/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2012.ldf
+${PLIST.ads}share/samba/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
+${PLIST.ads}share/samba/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
+${PLIST.ads}share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
+${PLIST.ads}share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
+${PLIST.ads}share/samba/setup/ad-schema/licence.txt
+${PLIST.ads}share/samba/setup/adprep/WindowsServerDocs/Forest-Wide-Updates.md
+${PLIST.ads}share/samba/setup/adprep/WindowsServerDocs/Sch49.ldf.diff
+${PLIST.ads}share/samba/setup/adprep/WindowsServerDocs/Sch50.ldf.diff
+${PLIST.ads}share/samba/setup/adprep/WindowsServerDocs/Sch51.ldf.diff
+${PLIST.ads}share/samba/setup/adprep/WindowsServerDocs/Sch57.ldf.diff
+${PLIST.ads}share/samba/setup/adprep/WindowsServerDocs/Sch59.ldf.diff
+${PLIST.ads}share/samba/setup/adprep/WindowsServerDocs/Schema-Updates.md
+${PLIST.ads}share/samba/setup/adprep/fix-forest-rev.ldf
+${PLIST.ads}share/samba/setup/aggregate_schema.ldif
+${PLIST.ads}share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
+${PLIST.ads}share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
+${PLIST.ads}share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
+${PLIST.ads}share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
+${PLIST.ads}share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
+${PLIST.ads}share/samba/setup/dns_update_list
+${PLIST.ads}share/samba/setup/extended-rights.ldif
+${PLIST.ads}share/samba/setup/idmap_init.ldif
+${PLIST.ads}share/samba/setup/krb5.conf
+${PLIST.ads}share/samba/setup/named.conf
+${PLIST.ads}share/samba/setup/named.conf.dlz
+${PLIST.ads}share/samba/setup/named.conf.update
+${PLIST.ads}share/samba/setup/named.txt
+${PLIST.ads}share/samba/setup/prefixMap.txt
+${PLIST.ads}share/samba/setup/provision.ldif
+${PLIST.ads}share/samba/setup/provision.reg
+${PLIST.ads}share/samba/setup/provision.zone
+${PLIST.ads}share/samba/setup/provision_basedn.ldif
+${PLIST.ads}share/samba/setup/provision_basedn_modify.ldif
+${PLIST.ads}share/samba/setup/provision_basedn_options.ldif
+${PLIST.ads}share/samba/setup/provision_basedn_references.ldif
+${PLIST.ads}share/samba/setup/provision_computers_add.ldif
+${PLIST.ads}share/samba/setup/provision_computers_modify.ldif
+${PLIST.ads}share/samba/setup/provision_configuration.ldif
+${PLIST.ads}share/samba/setup/provision_configuration_basedn.ldif
+${PLIST.ads}share/samba/setup/provision_configuration_modify.ldif
+${PLIST.ads}share/samba/setup/provision_configuration_references.ldif
+${PLIST.ads}share/samba/setup/provision_dns_accounts_add.ldif
+${PLIST.ads}share/samba/setup/provision_dns_add_samba.ldif
+${PLIST.ads}share/samba/setup/provision_dnszones_add.ldif
+${PLIST.ads}share/samba/setup/provision_dnszones_modify.ldif
+${PLIST.ads}share/samba/setup/provision_dnszones_partitions.ldif
+${PLIST.ads}share/samba/setup/provision_group_policy.ldif
+${PLIST.ads}share/samba/setup/provision_init.ldif
+${PLIST.ads}share/samba/setup/provision_partitions.ldif
+${PLIST.ads}share/samba/setup/provision_privilege.ldif
+${PLIST.ads}share/samba/setup/provision_rootdse_add.ldif
+${PLIST.ads}share/samba/setup/provision_rootdse_modify.ldif
+${PLIST.ads}share/samba/setup/provision_schema_basedn.ldif
+${PLIST.ads}share/samba/setup/provision_schema_basedn_modify.ldif
+${PLIST.ads}share/samba/setup/provision_self_join.ldif
+${PLIST.ads}share/samba/setup/provision_self_join_config.ldif
+${PLIST.ads}share/samba/setup/provision_self_join_modify.ldif
+${PLIST.ads}share/samba/setup/provision_self_join_modify_config.ldif
+${PLIST.ads}share/samba/setup/provision_self_join_modify_schema.ldif
+${PLIST.ads}share/samba/setup/provision_users.ldif
+${PLIST.ads}share/samba/setup/provision_users_add.ldif
+${PLIST.ads}share/samba/setup/provision_users_modify.ldif
+${PLIST.ads}share/samba/setup/provision_well_known_sec_princ.ldif
+${PLIST.ads}share/samba/setup/schema_samba4.ldif
+${PLIST.ads}share/samba/setup/secrets.ldif
+${PLIST.ads}share/samba/setup/secrets_dns.ldif
+${PLIST.ads}share/samba/setup/secrets_init.ldif
+${PLIST.ads}share/samba/setup/share.ldif
+${PLIST.ads}share/samba/setup/spn_update_list
+${PLIST.ads}share/samba/setup/ypServ30.ldif
+@pkgdir var/run
+@pkgdir var/log
+@pkgdir var/db/samba4/private
+@pkgdir share/examples/samba/pam_smbpass
+@pkgdir etc/samba
+@pkgdir bind-dns

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.72 pkgsrc/net/samba4/distinfo:1.73
--- pkgsrc/net/samba4/distinfo:1.72     Mon Jan 31 13:45:12 2022
+++ pkgsrc/net/samba4/distinfo  Mon Mar  7 21:40:37 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.72 2022/01/31 13:45:12 taca Exp $
+$NetBSD: distinfo,v 1.73 2022/03/07 21:40:37 thor Exp $
 
-BLAKE2s (samba-4.13.17.tar.gz) = 0f3a2899ad8c92c9506500fef617e05201b00d169ecb31784ea12b85000dc69b
-SHA512 (samba-4.13.17.tar.gz) = 3f47cc588c370510a11a1d5dc1a9f64872d765a2940a0dd39f02718f9a81b134dda9c9cb593f291f2aa1657de65b26458adcda33369c0858e16edf7f088edaf4
-Size (samba-4.13.17.tar.gz) = 18952829 bytes
+BLAKE2s (samba-4.15.4.tar.gz) = e0555b6353bbbd77a39f7c725b77c9c1c608a36d8e144a321f73f1104edbf3ac
+SHA512 (samba-4.15.4.tar.gz) = e55473dd4971816a01880870309ca44f022625cd529511bcf386c865a2e7e79118577ee4866559f607952de47dc0d310d6426bd08dd4293db95ddbbe3982383d
+Size (samba-4.15.4.tar.gz) = 19280813 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
@@ -12,7 +12,7 @@ SHA1 (patch-dynconfig_wscript) = 1858e5f
 SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
 SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c
 SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d
-SHA1 (patch-lib_replace_wscript) = 2a754e7310850b376d5881b82a8467041284fce9
+SHA1 (patch-lib_replace_wscript) = 4250bdfd8ee82fcdb43315f24a124b7ae8d7e36f
 SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983
 SHA1 (patch-lib_tevent_tevent.c) = dc782c5b7214abf52a4c8c242018b1989bca08e3
 SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4
@@ -24,12 +24,12 @@ SHA1 (patch-libcli_dns_wscript__build) =
 SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
-SHA1 (patch-source3_libsmb_libsmb__stat.c) = 1f88759babfd64b525df8087ea143c7bc3171549
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
+SHA1 (patch-source3_smbd_open.c) = 002f26f77dad54617bf9c0fe4fa12f093ef3b66c
 SHA1 (patch-source3_smbd_process.c) = 3a6f9682aca6473e364d0be0f601774df4fd1296
+SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
-SHA1 (patch-source4_heimdal__build_roken.h) = f467a541fa09e2aa483d10ed9d49df9167a3443a
+SHA1 (patch-source4_heimdal__build_roken.h) = 4d2b5ab1f5db994263c3a451175f01ff688ad20d
 SHA1 (patch-source4_heimdal_include_heim__threads.h) = 1108fe804f235c72a93bcda0ec14454828ed030f
-SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511
-SHA1 (patch-source4_torture_libsmbclient_libsmbclient.c) = 38bb8b53581d5f0b5b0e9f0fce58f51148e91c20
-SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = b0cbbcd4ebedd443dc9f9a59d1dad2e039bb9663
+SHA1 (patch-source4_scripting_wsript_build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159
+SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = cbba15c2c0e1eee9d07424510a96b596f46992b4

Index: pkgsrc/net/samba4/options.mk
diff -u pkgsrc/net/samba4/options.mk:1.16 pkgsrc/net/samba4/options.mk:1.17
--- pkgsrc/net/samba4/options.mk:1.16   Mon Jul 12 22:30:44 2021
+++ pkgsrc/net/samba4/options.mk        Mon Mar  7 21:40:37 2022
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.16 2021/07/12 22:30:44 nia Exp $
+# $NetBSD: options.mk,v 1.17 2022/03/07 21:40:37 thor Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.samba4
-PKG_SUPPORTED_OPTIONS= ads avahi fam ldap pam winbind # cups # cups option is broken for me.
+PKG_SUPPORTED_OPTIONS= ads avahi fam ldap pam winbind cups # cups option is broken for me.
 PKG_SUGGESTED_OPTIONS= avahi ldap pam winbind
 
 .include "../../mk/bsd.fast.prefs.mk"

Index: pkgsrc/net/samba4/patches/patch-lib_replace_wscript
diff -u pkgsrc/net/samba4/patches/patch-lib_replace_wscript:1.2 pkgsrc/net/samba4/patches/patch-lib_replace_wscript:1.3
--- pkgsrc/net/samba4/patches/patch-lib_replace_wscript:1.2     Wed Mar 20 19:09:10 2019
+++ pkgsrc/net/samba4/patches/patch-lib_replace_wscript Mon Mar  7 21:40:38 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_replace_wscript,v 1.2 2019/03/20 19:09:10 adam Exp $
+$NetBSD: patch-lib_replace_wscript,v 1.3 2022/03/07 21:40:38 thor Exp $
 
 Skip epoll tests on SunOS, implementation is Linux-specific.
 
---- lib/replace/wscript.orig   2019-01-15 10:07:00.000000000 +0000
+--- lib/replace/wscript.orig   2021-08-26 09:01:35.530309000 +0000
 +++ lib/replace/wscript
-@@ -424,7 +424,9 @@ def configure(conf):
+@@ -451,7 +451,9 @@ def configure(conf):
      conf.CHECK_FUNCS('gai_strerror get_current_dir_name')
      conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups syscall setsid')
      conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist getpagesize')
@@ -14,4 +14,4 @@ Skip epoll tests on SunOS, implementatio
 +        conf.CHECK_FUNCS('epoll_create')
      conf.CHECK_FUNCS('port_create')
      conf.CHECK_FUNCS('getprogname')
- 
+     if not conf.CHECK_FUNCS('copy_file_range'):
Index: pkgsrc/net/samba4/patches/patch-source4_heimdal__build_roken.h
diff -u pkgsrc/net/samba4/patches/patch-source4_heimdal__build_roken.h:1.2 pkgsrc/net/samba4/patches/patch-source4_heimdal__build_roken.h:1.3
--- pkgsrc/net/samba4/patches/patch-source4_heimdal__build_roken.h:1.2  Thu Apr  2 11:21:42 2020
+++ pkgsrc/net/samba4/patches/patch-source4_heimdal__build_roken.h      Mon Mar  7 21:40:38 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-source4_heimdal__build_roken.h,v 1.2 2020/04/02 11:21:42 adam Exp $
+$NetBSD: patch-source4_heimdal__build_roken.h,v 1.3 2022/03/07 21:40:38 thor Exp $
 
 Substitute SYSCONFDIR in embedded Heimdal too.
 
---- source4/heimdal_build/roken.h.orig 2020-01-31 10:25:36.000000000 +0000
+--- source4/heimdal_build/roken.h.orig 2021-08-09 13:38:36.703383700 +0000
 +++ source4/heimdal_build/roken.h
 @@ -7,7 +7,7 @@
  #include "config.h"
  
  /* path to sysconf - should we force this to samba LIBDIR ? */
 -#define SYSCONFDIR "/etc"
-+#define SYSCONFDIR "@PKG_SYSCONFBASE@"
++#define SYSCONFDIR "/data/pkg/etc"
  
  #define rk_PATH_DELIM '/'
  

Index: pkgsrc/net/samba4/patches/patch-source4_scripting_wsript_build
diff -u pkgsrc/net/samba4/patches/patch-source4_scripting_wsript_build:1.3 pkgsrc/net/samba4/patches/patch-source4_scripting_wsript_build:1.4
--- pkgsrc/net/samba4/patches/patch-source4_scripting_wsript_build:1.3  Fri Nov 23 07:30:02 2018
+++ pkgsrc/net/samba4/patches/patch-source4_scripting_wsript_build      Mon Mar  7 21:40:38 2022
@@ -1,12 +1,12 @@
-$NetBSD: patch-source4_scripting_wsript_build,v 1.3 2018/11/23 07:30:02 ryoon Exp $
+$NetBSD: patch-source4_scripting_wsript_build,v 1.4 2022/03/07 21:40:38 thor Exp $
 
 Avoid getting strange ending # character on interpreter 
 name like: 
 #!/usr/pkg/bin/python2.7#
 
---- source4/scripting/wscript_build.orig       2018-07-12 08:23:36.000000000 +0000
+--- source4/scripting/wscript_build.orig       2021-08-09 13:38:36.779384600 +0000
 +++ source4/scripting/wscript_build
-@@ -11,13 +11,13 @@ man_files = 'man/samba-gpupdate.8'
+@@ -12,13 +12,13 @@ if not bld.env.disable_python:
  if sbin_files:
      bld.INSTALL_FILES('${SBINDIR}',
                        sbin_files,
@@ -15,7 +15,7 @@ name like: 
      if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
          bld.MANPAGES(man_files, True)
  
- if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+ if bld.CONFIG_SET('WITH_ADS'):
      bld.INSTALL_FILES('${BINDIR}',
                    'bin/samba-tool',
 -                  chmod=MODE_755, python_fixup=True, flat=True)

Index: pkgsrc/net/samba4/patches/patch-source4_utils_oLschema2ldif_wscript__build
diff -u pkgsrc/net/samba4/patches/patch-source4_utils_oLschema2ldif_wscript__build:1.1 pkgsrc/net/samba4/patches/patch-source4_utils_oLschema2ldif_wscript__build:1.2
--- pkgsrc/net/samba4/patches/patch-source4_utils_oLschema2ldif_wscript__build:1.1      Wed Jan  8 10:40:03 2020
+++ pkgsrc/net/samba4/patches/patch-source4_utils_oLschema2ldif_wscript__build  Mon Mar  7 21:40:38 2022
@@ -1,8 +1,6 @@
-$NetBSD: patch-source4_utils_oLschema2ldif_wscript__build,v 1.1 2020/01/08 10:40:03 jperkin Exp $
+$NetBSD: patch-source4_utils_oLschema2ldif_wscript__build,v 1.2 2022/03/07 21:40:38 thor Exp $
 
-Don't build test_oLschema2ldif on SunOS (lacks fmemopen).
-
---- source4/utils/oLschema2ldif/wscript_build.orig     2019-12-06 09:49:26.000000000 +0000
+--- source4/utils/oLschema2ldif/wscript_build.orig     2021-08-09 13:38:37.571391800 +0000
 +++ source4/utils/oLschema2ldif/wscript_build
 @@ -1,5 +1,7 @@
  #!/usr/bin/env python
@@ -12,13 +10,3 @@ Don't build test_oLschema2ldif on SunOS 
  bld.SAMBA_SUBSYSTEM('oLschema2ldif-lib',
        source='lib.c',
        deps='samdb',
-@@ -11,7 +13,8 @@ bld.SAMBA_BINARY('oLschema2ldif',
-       deps='oLschema2ldif-lib POPT_SAMBA',
-       )
- 
--bld.SAMBA_BINARY('test_oLschema2ldif',
-+if not sys.platform.startswith('sunos'):
-+  bld.SAMBA_BINARY('test_oLschema2ldif',
-       source='test.c',
-       deps='cmocka oLschema2ldif-lib',
-       local_include=False,

Added files:

Index: pkgsrc/net/samba4/patches/patch-source3_smbd_open.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source3_smbd_open.c:1.1
--- /dev/null   Mon Mar  7 21:40:38 2022
+++ pkgsrc/net/samba4/patches/patch-source3_smbd_open.c Mon Mar  7 21:40:38 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-source3_smbd_open.c,v 1.1 2022/03/07 21:40:38 thor Exp $
+
+--- source3/smbd/open.c.orig   2022-01-27 18:20:00.791110968 +0000
++++ source3/smbd/open.c
+@@ -1189,11 +1189,13 @@ static NTSTATUS reopen_from_procfd(struc
+ 
+       fsp->fsp_flags.is_pathref = false;
+ 
++      /* O_CREAT not useful for reopening, and it upsets BSD kernels,
++       * see https://bugzilla.samba.org/show_bug.cgi?id=14727 . */
+       new_fd = SMB_VFS_OPENAT(fsp->conn,
+                               fsp->conn->cwd_fsp,
+                               &proc_fname,
+                               fsp,
+-                              flags,
++                              flags & ~O_CREAT,
+                               mode);
+       if (new_fd == -1) {
+               status = map_nt_error_from_unix(errno);
Index: pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c:1.1
--- /dev/null   Mon Mar  7 21:40:38 2022
+++ pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c    Mon Mar  7 21:40:38 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-source3_utils_net__offlinejoin.c,v 1.1 2022/03/07 21:40:38 thor Exp $
+
+Fix netapi header usage to follow othertools, preferring local paths.
+Otherwise, <netapi.h> can be easily resolved to an instance from an
+old samba install in the system.
+
+--- source3/utils/net_offlinejoin.c.orig       2022-01-28 16:10:18.562082156 +0000
++++ source3/utils/net_offlinejoin.c
+@@ -19,8 +19,8 @@
+ 
+ #include "includes.h"
+ #include "utils/net.h"
+-#include <netapi.h>
+-#include "netapi/netapi_net.h"
++#include "lib/netapi/netapi.h"
++#include "lib/netapi/netapi_net.h"
+ #include "libcli/registry/util_reg.h"
+ 
+ int net_offlinejoin_usage(struct net_context *c, int argc, const char **argv)

Follow-Ups:
- Re: CVS commit: pkgsrc/net/samba4
  - From: Adam

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: Re: CVS commit: pkgsrc/net/samba4
Indexes:

Home | Main Index | Thread Index | Old Index