[pkgsrc/trunk]: pkgsrc/net/samba4 samba4: updated to 4.12.0

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8a998a08c92
branches:  trunk
changeset: 414808:a8a998a08c92
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Apr 02 11:21:41 2020 +0000

description:
samba4: updated to 4.12.0

samba 4.12.0:

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

Python 3.5 Required
-------------------

Samba's minimum runtime requirement for python was raised to Python
3.4 with samba 4.11.  Samba 4.12 raises this minimum version to Python
3.5 both to access new features and because this is the oldest version
we test with in our CI infrastructure.

(Build time support for the file server with Python 2.6 has not
changed)

Removing in-tree cryptography: GnuTLS 3.4.7 required
----------------------------------------------------

Samba is making efforts to remove in-tree cryptographic functionality,
and to instead rely on externally maintained libraries.  To this end,
Samba has chosen GnuTLS as our standard cryptographic provider.

Samba now requires GnuTLS 3.4.7 to be installed (including development
headers at build time) for all configurations, not just the Samba AD
DC.

Thanks to this work Samba no longer ships an in-tree DES
implementation and on GnuTLS 3.6.5 or later Samba will include no
in-tree cryptography other than the MD4 hash and that
implemented in our copy of Heimdal.

Using GnuTLS for SMB3 encryption you will notice huge performance and copy
speed improvements. Tests with the CIFS Kernel client from Linux Kernel 5.3
show a 3x speed improvement for writing and a 2.5x speed improvement for reads!

NOTE WELL: The use of GnuTLS means that Samba will honour the
system-wide 'FIPS mode' (a reference to the US FIPS-140 cryptographic
standard) and so will not operate in many still common situations if
this system-wide parameter is in effect, as many of our protocols rely
on outdated cryptography.

A future Samba version will mitigate this to some extent where good
cryptography effectively wraps bad cryptography, but for now that above
applies.

zlib library is now required to build Samba
-------------------------------------------

Samba no longer includes a local copy of zlib in our source tarball.
By removing this we do not need to ship (even where we did not
build) the old, broken zip encryption code found there.

New Spotlight backend for Elasticsearch
---------------------------------------

Support for the macOS specific Spotlight search protocol has been enhanced
significantly. Starting with 4.12 Samba supports using Elasticsearch as search
backend. Various new parameters have been added to configure this:

  spotlight backend = noindex | elasticsearch | tracker
  elasticsearch:address = ADDRESS
  elasticsearch:port = PORT
  elasticsearch:use tls = BOOLEAN
  elasticsearch:index = INDEXNAME
  elasticsearch:mappings = PATH
  elasticsearch:max results = NUMBER

Samba also ships a Spotlight client command "mdfind" which can be used to search
any SMB server that runs the Spotlight RPC service. See the manpage of mdfind
for details.

Note that when upgrading existing installations that are using the previous
default Spotlight backend Gnome Tracker must explicitly set "spotlight backend =
tracker" as the new default is "noindex".

'net ads kerberos pac save' and 'net eventlog export'
-----------------------------------------------------

The 'net ads kerberos pac save' and 'net eventlog export' tools will
no longer silently overwrite an existing file during data export.  If
the filename given exits, an error will be shown.

Fuzzing
-------

A large number of fuzz targets have been added to Samba, and Samba has
been registered in Google's oss-fuzz cloud fuzzing service.  In
particular, we now have good fuzzing coverage of our generated NDR
parsing code.

A large number of issues have been found and fixed thanks to this
effort.

'samba-tool' improvements add contacts as member to groups
----------------------------------------------------------

Previously 'samba-tool group addmemers' can just add users, groups and
computers as members to groups. But also contacts can be members of
groups. Samba 4.12 adds the functionality to add contacts to
groups. Since contacts have no sAMAccountName, it's possible that
there are more than one contact with the same name in different
organizational units. Therefore it's necessary to have an option to
handle group members by their DN.

To get the DN of an object there is now the "--full-dn" option available
for all necessary commands.

The MS Windows UI allows to search for specific types of group members
when searching for new members for a group. This feature is included
here with the new samba-tool group addmembers "--object-type=OBJECTYPE"
option. The different types are selected accordingly to the Windows
UI. The default samba-toole behaviour shouldn't be changed.

Allow filtering by OU or subtree in samba-tool
----------------------------------------------

A new "--base-dn" and "--member-base-dn" option is added to relevant
samba-tool user, group and ou management commands to allow operation
on just one part of the AD tree, such as a single OU.

VFS
===

SMB_VFS_NTIMES
--------------

Samba now uses a sentinel value based on utimensat(2) UTIME_OMIT to denote
to-be-ignored timestamp variables passed to the SMB_VFS_NTIMES() VFS function.

VFS modules can check whether any of the time values inside a struct
smb_file_time is to be ignored by calling is_omit_timespec() on the value.

'io_uring' vfs module
---------------------

The module makes use of the new io_uring infrastructure
(intruduced in Linux 5.1), see https://lwn.net/Articles/776703/

Currently this implements SMB_VFS_{PREAD,PWRITE,FSYNC}_SEND/RECV
and avoids the overhead of the userspace threadpool in the default
vfs backend. See also vfs_io_uring(8).

In order to build the module you need the liburing userspace library
and its developement headers installed, see
https://git.kernel.dk/cgit/liburing/

At runtime you'll need a Linux kernel with version 5.1 or higher.
Note that 5.4.14 and 5.4.15 have a regression that breaks the Samba
module! The regression was fixed in Linux 5.4.16 again.

MS-DFS changes in the VFS
-------------------------

This release changes set getting and setting of MS-DFS redirects
on the filesystem to go through two new VFS functions:

SMB_VFS_CREATE_DFS_PATHAT()
SMB_VFS_READ_DFS_PATHAT()

instead of smbd explicitly storing MS-DFS redirects inside
symbolic links on the filesystem. The underlying default
implementations of this has not changed, the redirects are
still stored inside symbolic links on the filesystem, but
moving the creation and reading of these links into the VFS
as first-class functions now allows alternate methods of
storing them (maybe in extended attributes) for OEMs who
don't want to mis-use filesystem symbolic links in this
way.


CTDB changes
============

* The ctdb_mutex_fcntl_helper periodically re-checks the lock file

  The re-check period is specified using a 2nd argument to this
  helper.  The default re-check period is 5s.

  If the file no longer exists or the inode number changes then the
  helper exits.  This triggers an election.


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

The smb.conf parameter "write cache size" has been removed.

Since the in-memory write caching code was written, our write path has
changed significantly. In particular we have gained very flexible
support for async I/O, with the new linux io_uring interface in
development.  The old write cache concept which cached data in main
memory followed by a blocking pwrite no longer gives any improvement
on modern systems, and may make performance worse on memory-contrained
systems, so this functionality should not be enabled in core smbd
code.

In addition, it complicated the write code, which is a performance
critical code path.

If required for specialist purposes, it can be recreated as a VFS
module.

Retiring DES encryption types in Kerberos.
------------------------------------------
With this release, support for DES encryption types has been removed from
Samba, and setting DES_ONLY flag for an account will cause Kerberos
authentication to fail for that account (see RFC-6649).

Samba-DC: DES keys no longer saved in DB.
-----------------------------------------
When a new password is set for an account, Samba DC will store random keys
in DB instead of DES keys derived from the password.  If the account is being
migrated to Windbows or to an older version of Samba in order to use DES keys,
the password must be reset to make it work.

Heimdal-DC: removal of weak-crypto.
-----------------------------------
Following removal of DES encryption types from Samba, the embedded Heimdal
build has been updated to not compile weak crypto code (HEIM_WEAK_CRYPTO).

vfs_netatalk: The netatalk VFS module has been removed.
-------------------------------------------------------

The netatalk VFS module has been removed. It was unmaintained and is not needed
any more.

BIND9_FLATFILE deprecated
-------------------------

The BIND9_FLATFILE DNS backend is deprecated in this release and will
be removed in the future.  This was only practically useful on a single
domain controller or under expert care and supervision.

This release removes the 'rndc command' smb.conf parameter, which
supported this configuration by writing out a list of DCs permitted to
make changes to the DNS Zone and nudging the 'named' server if a new
DC was added to the domain.  Administrators using BIND9_FLATFILE will
need to maintain this manually from now on.

diffstat:

 net/samba4/Makefile                                                             |   5 +-
 net/samba4/PLIST                                                                |  33 ++++-----
 net/samba4/distinfo                                                             |  17 ++--
 net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py                     |  10 +-
 net/samba4/patches/patch-source4_dsdb_samdb_ldb__modules_count__attrs.c         |  32 ---------
 net/samba4/patches/patch-source4_dsdb_samdb_ldb__modules_wscript__build__server |   8 +-
 net/samba4/patches/patch-source4_heimdal__build_roken.h                         |   8 +-
 7 files changed, 39 insertions(+), 74 deletions(-)

diffs (truncated from 334 to 300 lines):

diff -r 425b9b0f2dc8 -r a8a998a08c92 net/samba4/Makefile
--- a/net/samba4/Makefile       Thu Apr 02 11:19:09 2020 +0000
+++ b/net/samba4/Makefile       Thu Apr 02 11:21:41 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2020/03/10 22:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2020/04/02 11:21:41 adam Exp $
 
-DISTNAME=      samba-4.11.6
-PKGREVISION=   2
+DISTNAME=      samba-4.12.0
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 
diff -r 425b9b0f2dc8 -r a8a998a08c92 net/samba4/PLIST
--- a/net/samba4/PLIST  Thu Apr 02 11:19:09 2020 +0000
+++ b/net/samba4/PLIST  Thu Apr 02 11:21:41 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2020/03/08 12:39:27 tnn Exp $
+@comment $NetBSD: PLIST,v 1.28 2020/04/02 11:21:41 adam Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -6,6 +6,7 @@
 bin/gentest
 bin/locktest
 bin/masktest
+bin/mdfind
 bin/mvxattr
 bin/ndrdump
 bin/net
@@ -47,6 +48,7 @@
 include/credentials.h
 include/dcerpc.h
 include/dcerpc_server.h
+include/dcesrv_core.h
 include/domain_credentials.h
 include/gen_ndr/atsvc.h
 include/gen_ndr/auth.h
@@ -125,6 +127,9 @@
 lib/libdcerpc-samr.so
 lib/libdcerpc-samr.so.0
 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
@@ -141,8 +146,8 @@
 lib/libndr-standard.so.0
 lib/libndr-standard.so.0.0.1
 lib/libndr.so
-lib/libndr.so.0
-lib/libndr.so.0.2.0
+lib/libndr.so.1
+lib/libndr.so.1.0.0
 lib/libnetapi.so
 lib/libnetapi.so.0
 lib/libnss_winbind.so
@@ -168,7 +173,7 @@
 lib/libsamdb.so.0.0.1
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-lib/libsmbclient.so.0.5.0
+lib/libsmbclient.so.0.6.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
 ${PLIST.ldap}lib/libsmbldap.so
@@ -198,6 +203,7 @@
 ${PYSITELIB}/samba/_glue.so
 ${PYSITELIB}/samba/_ldb.so
 ${PYSITELIB}/samba/auth.so
+${PYSITELIB}/samba/auth_util.py
 ${PYSITELIB}/samba/colour.py
 ${PYSITELIB}/samba/common.py
 ${PYSITELIB}/samba/compat.py
@@ -222,6 +228,7 @@
 ${PYSITELIB}/samba/dcerpc/irpc.so
 ${PYSITELIB}/samba/dcerpc/krb5pac.so
 ${PYSITELIB}/samba/dcerpc/lsa.so
+${PYSITELIB}/samba/dcerpc/mdssvc.so
 ${PYSITELIB}/samba/dcerpc/messaging.so
 ${PYSITELIB}/samba/dcerpc/mgmt.so
 ${PYSITELIB}/samba/dcerpc/misc.so
@@ -331,6 +338,7 @@
 ${PYSITELIB}/samba/remove_dc.py
 ${PYSITELIB}/samba/samba3/__init__.py
 ${PYSITELIB}/samba/samba3/libsmb_samba_internal.so
+${PYSITELIB}/samba/samba3/mdscli.so
 ${PYSITELIB}/samba/samba3/param.so
 ${PYSITELIB}/samba/samba3/passdb.so
 ${PYSITELIB}/samba/samba3/smbd.so
@@ -360,6 +368,7 @@
 ${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/ndrdump.py
 ${PYSITELIB}/samba/tests/blackbox/netads_json.py
 ${PYSITELIB}/samba/tests/blackbox/samba_dnsupdate.py
@@ -377,6 +386,7 @@
 ${PYSITELIB}/samba/tests/dcerpc/bare.py
 ${PYSITELIB}/samba/tests/dcerpc/dnsserver.py
 ${PYSITELIB}/samba/tests/dcerpc/integer.py
+${PYSITELIB}/samba/tests/dcerpc/mdssvc.py
 ${PYSITELIB}/samba/tests/dcerpc/misc.py
 ${PYSITELIB}/samba/tests/dcerpc/raw_protocol.py
 ${PYSITELIB}/samba/tests/dcerpc/raw_testcase.py
@@ -519,7 +529,6 @@
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
-lib/samba/auth/script.${SOEXT}
 lib/samba/bind9/dlz_bind9.${SOEXT}
 lib/samba/bind9/dlz_bind9_10.${SOEXT}
 lib/samba/bind9/dlz_bind9_11.${SOEXT}
@@ -553,7 +562,6 @@
 lib/samba/ldb/lazy_commit.${SOEXT}
 lib/samba/ldb/ldbsamba_extensions.${SOEXT}
 lib/samba/ldb/linked_attributes.${SOEXT}
-lib/samba/ldb/local_password.${SOEXT}
 lib/samba/ldb/new_partition.${SOEXT}
 lib/samba/ldb/objectclass.${SOEXT}
 lib/samba/ldb/objectclass_attrs.${SOEXT}
@@ -575,8 +583,6 @@
 lib/samba/ldb/schema_load.${SOEXT}
 lib/samba/ldb/secrets_tdb_sync.${SOEXT}
 lib/samba/ldb/show_deleted.${SOEXT}
-lib/samba/ldb/simple_dn.${SOEXT}
-lib/samba/ldb/simple_ldap_map.${SOEXT}
 lib/samba/ldb/subtree_delete.${SOEXT}
 lib/samba/ldb/subtree_rename.${SOEXT}
 lib/samba/ldb/tombstone_reanimate.${SOEXT}
@@ -703,6 +709,7 @@
 lib/samba/private/libsmbpasswdparser-samba4.so
 lib/samba/private/libsocket-blocking-samba4.so
 lib/samba/private/libsys-rw-samba4.so
+lib/samba/private/libtalloc-report-printf-samba4.so
 lib/samba/private/libtalloc-report-samba4.so
 lib/samba/private/libtdb-wrap-samba4.so
 lib/samba/private/libtime-basic-samba4.so
@@ -750,7 +757,6 @@
 lib/samba/vfs/full_audit.${SOEXT}
 lib/samba/vfs/linux_xfs_sgid.${SOEXT}
 lib/samba/vfs/media_harmony.${SOEXT}
-lib/samba/vfs/netatalk.${SOEXT}
 lib/samba/vfs/offline.${SOEXT}
 lib/samba/vfs/posix_eadb.${SOEXT}
 lib/samba/vfs/preopen.${SOEXT}
@@ -775,6 +781,7 @@
 man/man1/locktest.1
 man/man1/log2pcap.1
 man/man1/masktest.1
+man/man1/mdfind.1
 man/man1/mvxattr.1
 man/man1/ndrdump.1
 man/man1/nmblookup.1
@@ -849,7 +856,6 @@
 man/man8/vfs_full_audit.8
 man/man8/vfs_linux_xfs_sgid.8
 man/man8/vfs_media_harmony.8
-man/man8/vfs_netatalk.8
 man/man8/vfs_offline.8
 man/man8/vfs_preopen.8
 man/man8/vfs_readahead.8
@@ -929,17 +935,11 @@
 share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
 share/samba/setup/dns_update_list
 share/samba/setup/extended-rights.ldif
-share/samba/setup/fedora-ds-init.ldif
-share/samba/setup/fedorads-dna.ldif
 share/samba/setup/fedorads-index.ldif
 share/samba/setup/fedorads-linked-attributes.ldif
 share/samba/setup/fedorads-pam.ldif
-share/samba/setup/fedorads-partitions.ldif
-share/samba/setup/fedorads-refint-add.ldif
-share/samba/setup/fedorads-refint-delete.ldif
 share/samba/setup/fedorads-samba.ldif
 share/samba/setup/fedorads-sasl.ldif
-share/samba/setup/fedorads.inf
 share/samba/setup/idmap_init.ldif
 share/samba/setup/krb5.conf
 share/samba/setup/memberof.conf
@@ -1001,6 +1001,5 @@
 share/samba/setup/secrets_sasl_ldap.ldif
 share/samba/setup/secrets_simple_ldap.ldif
 share/samba/setup/share.ldif
-share/samba/setup/slapd.conf
 share/samba/setup/spn_update_list
 share/samba/setup/ypServ30.ldif
diff -r 425b9b0f2dc8 -r a8a998a08c92 net/samba4/distinfo
--- a/net/samba4/distinfo       Thu Apr 02 11:19:09 2020 +0000
+++ b/net/samba4/distinfo       Thu Apr 02 11:21:41 2020 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.42 2020/01/29 12:44:14 adam Exp $
+$NetBSD: distinfo,v 1.43 2020/04/02 11:21:41 adam Exp $
 
-SHA1 (samba-4.11.6.tar.gz) = 29b5c678ddf47dd77fe459c17c183c8273e6c850
-RMD160 (samba-4.11.6.tar.gz) = 28ea01683005e9ec4e7f9adc73035983c6b089f0
-SHA512 (samba-4.11.6.tar.gz) = 3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
-Size (samba-4.11.6.tar.gz) = 18541566 bytes
+SHA1 (samba-4.12.0.tar.gz) = c852939a700d273c78663a47944d944c5bc81498
+RMD160 (samba-4.12.0.tar.gz) = 0ffcc753270568944c5a40193b0307959514ca4e
+SHA512 (samba-4.12.0.tar.gz) = d50be899675b8e3504311e73bb75fbb8264e918e0d1765239ecb5b14e15c0917565f8a9ce1877fb604151bf4f23dfc4c2f7f30a53c872681e3d2571d3ed5ef82
+Size (samba-4.12.0.tar.gz) = 18156651 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
-SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = a7cc41a55ce032c3fe1e0b660f88fa7871710e0e
+SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
 SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
 SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758
 SHA1 (patch-docs-xml_wscript__build) = 5aa5cbf61882604b7ec9d19f0cd1537a23705ad0
@@ -26,9 +26,8 @@
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 50c3aaecf345449e02642e387eeac3dd7043e77a
 SHA1 (patch-source3_smbd_process.c) = 532d2426b9bd2a215d133bc489741558aa07f849
-SHA1 (patch-source4_dsdb_samdb_ldb__modules_count__attrs.c) = a9cb90484e192e8533a39d9afc6ce7d55cac84ac
-SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = c322cf56995192039fa22548d6d6e50641c4c796
-SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60
+SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
+SHA1 (patch-source4_heimdal__build_roken.h) = f467a541fa09e2aa483d10ed9d49df9167a3443a
 SHA1 (patch-source4_heimdal_include_heim__threads.h) = c93e0c80790ea2045333822c80e66d371bf2249c
 SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511
 SHA1 (patch-source4_utils_oLschema2ldif_wscript__build) = b0cbbcd4ebedd443dc9f9a59d1dad2e039bb9663
diff -r 425b9b0f2dc8 -r a8a998a08c92 net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py
--- a/net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py       Thu Apr 02 11:19:09 2020 +0000
+++ b/net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py       Thu Apr 02 11:21:41 2020 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-buildtools_wafsamba_samba__pidl.py,v 1.2 2019/03/20 19:09:10 adam Exp $
+$NetBSD: patch-buildtools_wafsamba_samba__pidl.py,v 1.3 2020/04/02 11:21:42 adam Exp $
 
 Do not set CPP, as it fails when using cwrappers.
 If not provided, it will default to $CC -E (see pidl/idl.yp).
 
---- buildtools/wafsamba/samba_pidl.py.orig     2019-01-15 10:07:00.000000000 +0000
+--- buildtools/wafsamba/samba_pidl.py.orig     2020-01-31 10:25:36.000000000 +0000
 +++ buildtools/wafsamba/samba_pidl.py
-@@ -76,7 +76,7 @@ def SAMBA_PIDL(bld, pname, source,
+@@ -80,7 +80,7 @@ def SAMBA_PIDL(bld, pname, source,
          else:
              cc = 'CC="%s"' % bld.CONFIG_GET("CC")
  
--    t = bld(rule='cd ${PIDL_LAUNCH_DIR} && %s %s ${PERL} ${PIDL} --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${IDLSRC}"' % (cpp, cc),
-+    t = bld(rule='cd ${PIDL_LAUNCH_DIR} && %s ${PERL} ${PIDL} --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${IDLSRC}"' % cc,
+-    t = bld(rule='cd ${PIDL_LAUNCH_DIR} && %s%s %s ${PERL} ${PIDL} --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${IDLSRC}"' % (pidl_dev, cpp, cc),
++    t = bld(rule='cd ${PIDL_LAUNCH_DIR} && %s %s ${PERL} ${PIDL} --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${IDLSRC}"' % (pidl_dev, cc),
              ext_out    = '.c',
              before     = 'c',
              update_outputs = True,
diff -r 425b9b0f2dc8 -r a8a998a08c92 net/samba4/patches/patch-source4_dsdb_samdb_ldb__modules_count__attrs.c
--- a/net/samba4/patches/patch-source4_dsdb_samdb_ldb__modules_count__attrs.c   Thu Apr 02 11:19:09 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-source4_dsdb_samdb_ldb__modules_count__attrs.c,v 1.1 2019/11/10 17:02:34 adam Exp $
-
-Fix for systems without __compar_fn_t.
-
---- source4/dsdb/samdb/ldb_modules/count_attrs.c.orig  2019-11-09 22:30:59.000000000 +0000
-+++ source4/dsdb/samdb/ldb_modules/count_attrs.c
-@@ -222,7 +222,11 @@ static const char **get_sorted_attrs(TAL
-               attrs[i] = a;
-       }
- 
-+#ifdef __COMPAR_FN_T
-       qsort(attrs, n_attrs, sizeof(char *), (__compar_fn_t)strcasecmp_ptr);
-+#else
-+      qsort(attrs, n_attrs, sizeof(char *), strcasecmp_ptr);
-+#endif
-       return attrs;
- }
- 
-@@ -312,8 +316,13 @@ static int count_attrs_search_callback(s
-                               found_attrs[i] = msg->elements[i].name;
-                       }
- 
-+#ifdef __COMPAR_FN_T
-                       qsort(found_attrs, msg->num_elements, sizeof(char *),
-                             (__compar_fn_t)strcasecmp_ptr);
-+#else
-+                      qsort(found_attrs, msg->num_elements, sizeof(char *),
-+                            strcasecmp_ptr);
-+#endif
- 
- 
-                       /* find and report duplicates */
diff -r 425b9b0f2dc8 -r a8a998a08c92 net/samba4/patches/patch-source4_dsdb_samdb_ldb__modules_wscript__build__server
--- a/net/samba4/patches/patch-source4_dsdb_samdb_ldb__modules_wscript__build__server   Thu Apr 02 11:19:09 2020 +0000
+++ b/net/samba4/patches/patch-source4_dsdb_samdb_ldb__modules_wscript__build__server   Thu Apr 02 11:21:41 2020 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-source4_dsdb_samdb_ldb__modules_wscript__build__server,v 1.1 2019/03/20 19:09:10 adam Exp $
+$NetBSD: patch-source4_dsdb_samdb_ldb__modules_wscript__build__server,v 1.2 2020/04/02 11:21:42 adam Exp $
 
 Some linkers do not support --wrap.
 
---- source4/dsdb/samdb/ldb_modules/wscript_build_server.orig   2019-03-20 09:32:08.000000000 +0000
+--- source4/dsdb/samdb/ldb_modules/wscript_build_server.orig   2020-01-31 10:25:36.000000000 +0000
 +++ source4/dsdb/samdb/ldb_modules/wscript_build_server
 @@ -54,6 +54,7 @@ bld.SAMBA_BINARY('test_audit_log_errors'
                       -Wl,--wrap,json_add_version
                       -Wl,--wrap,json_add_timestamp