Pullup ticket #6047 - requested by taca

databases/ldb: dependent update
net/samba4: security fix

Revisions pulled up:
- databases/ldb/Makefile                                        1.6
- databases/ldb/buildlink3.mk                                   1.2
- databases/ldb/distinfo                                        1.3
- net/samba4/Makefile                                           1.75,1.77-1.78
- net/samba4/PLIST                                              1.23
- net/samba4/distinfo                                           1.33-1.35

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sat Jul 20 22:46:59 UTC 2019

   Modified Files:

   	pkgsrc/net/samba4: Makefile buildlink3.mk


   Log Message:
   *: recursive bump for nettle 3.5.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sun Jul 21 22:26:08 UTC 2019

   Modified Files:

   	pkgsrc/net/samba4: Makefile


   Log Message:
   *: recursive bump for gdk-pixbuf2-2.38.1

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Sat Aug  3 06:54:39 UTC 2019

   Modified Files:
   	pkgsrc/net/samba4: Makefile PLIST distinfo

   Log Message:
   samba4: updated to 4.10.6

   Changes 4.10.6:
   * BUG 13956: s3: winbind: Fix crash when invoking winbind idmap scripts.
   * BUG 13964: smbd does not correctly parse arguments passed to dfree and
     quota scripts.
   * BUG 13965: samba-tool dns: use bytes for inet_ntop.
   * BUG 13828: samba-tool domain provision: Fix --interactive module in
     python3.
   * BUG 13893: ldb_kv: Skip @ records early in a search full scan.
   * BUG 13981: docs: Improve documentation of "lanman auth" and "ntlm auth"
     connection.
   * BUG 14002: python/ntacls: Use correct "state directory" smb.conf option
     instead of "state dir".
   * BUG 13840: registry: Add a missing include.
   * BUG 13944: Fix SMB guest authentication.
   * BUG 13958: AppleDouble conversion breaks Resourceforks.
   * BUG 13968: vfs_fruit makes direct use of syscalls like mmap() and pread().
   * BUG 13987: s3:mdssvc: Fix flex compilation error.
   * BUG 13872: s3/vfs_glusterfs[_fuse]: Avoid using NAME_MAX directly:
   * BUG 13799: dsdb:samdb: schemainfo update with relax control.
   * BUG 13964: s3:util: Move static file_pload() function to lib/util.
   * BUG 13957: smbd: Fix a panic.
   * BUG 12478: ldap server: Generate correct referral schemes.
   * BUG 13941: s4 dsdb/repl_meta_data: fix use after free in
     dsdb_audit_add_ldb_value.
   * BUG 13942: s4 dsdb: Fix use after free in
     samldb_rename_search_base_callback.
   * BUG 12204: dsdb/repl: we need to replicate the whole schema before we can
     apply it.
   * BUG 12478: ldb: Release ldb 1.5.5
   * BUG 13713: Schema replication fails if link crosses chunk boundary
     backwards.
   * BUG 13799: 'samba-tool domain schemaupgrade' uses relax control and skips
     the schemaInfo update provision.
   * BUG 13916: dsdb_audit: avoid printing "... remote host [Unknown]
     SID [(NULL SID)] ..."
   * BUG 13917: python/ntacls: We only need security.SEC_STD_READ_CONTROL in
     order to get the ACL.
   * BUG 13947: s3:loadparm: Ensure to truncate FS Volume Label at multibyte
     boundary.
   * BUG 13939: Using Kerberos credentials to print using spoolss doesn't work.
   * BUG 13998: wafsamba: Use native waf timer.
   * BUG 13984: ctdb-scripts: Fix tcp_tw_recycle existence check.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sun Aug 11 13:25:21 UTC 2019

   Modified Files:

   	pkgsrc/net/samba4: Makefile


   Log Message:
   Bump PKGREVISIONs for perl 5.30.0

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Fri Aug 23 10:52:41 UTC 2019

   Modified Files:
   	pkgsrc/net/samba4: Makefile distinfo

   Log Message:
   samba4: updated to 4.10.7

   Samba 4.10.7
   * BUG 14010: Unable to create or rename file/directory inside shares
     configured with vfs_glusterfs_fuse module.
   * BUG 13844: build: Allow build when '--disable-gnutls' is set.
   * BUG 13973: samba-tool: Add 'import samba.drs_utils' to fsmo.py.
   * BUG 14008: Fix 'Error 32 determining PSOs in system' message on old DB
     with FL upgrade.
   * BUG 14021: s4/libnet: Fix joining a Windows pre-2008R2 DC.
   * BUG 14046: join: Use a specific attribute order for the DsAddEntry
     nTDSDSA object.
   * BUG 14015: vfs_catia: Pass stat info to synthetic_smb_fname().
   * BUG 14091: lookup_name: Allow own domain lookup when flags == 0.
   * BUG 13932: s4 librpc rpc pyrpc: Ensure tevent_context deleted last.
   * BUG 13915: DEBUGC and DEBUGADDC doesn't print into a class specific log
     file.
   * BUG 13949: Request to keep deprecated option "server schannel",
     VMWare Quickprep requires "auto".
   * BUG 13967: dbcheck: Fallback to the default tombstoneLifetime of 180 days.
   * BUG 13969: dnsProperty fails to decode values from older Windows versions.
   * BUG 13973: samba-tool: Use only one LDAP modify for dns partition fsmo
     role transfer.
   * BUG 13960: third_party: Update waf to version 2.0.17.
   * BUG 14051: netcmd: Allow 'drs replicate --local' to create partitions.
   * BUG 14017: ctdb-config: Depend on /etc/ctdb/nodes file.

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Tue Sep  3 19:11:58 UTC 2019

   Modified Files:
   	pkgsrc/net/samba4: Makefile distinfo

   Log Message:
   samba4: updated to 4.10.8

   Samba 4.10.8:

   This is a security release in order to address the following defect:

   o  CVE-2019-10197: Combination of parameters and permissions can allow user
                      to escape from the share path definition.

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Sat Aug  3 06:52:32 UTC 2019

   Modified Files:
   	pkgsrc/databases/ldb: Makefile buildlink3.mk distinfo

   Log Message:
   ldb: updated to 1.5.5

   1.5.5:
   Unknown changes

6 files changed, 21 insertions, 20 deletions

diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index 8f69e91e0e8..79cacb7eb45 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/04/25 07:32:40 maya Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2019/09/15 09:11:02 bsiegert Exp $
 
 # Before updating, make sure net/samba4 supports the newer version.
-DISTNAME=	ldb-1.5.4
-PKGREVISION=	2
+DISTNAME=	ldb-1.5.5
 CATEGORIES=	databases
 MASTER_SITES=	http://www.samba.org/ftp/ldb/
 
diff --git a/databases/ldb/buildlink3.mk b/databases/ldb/buildlink3.mk
index dc70e2a2e73..cd950555a2d 100644
--- a/databases/ldb/buildlink3.mk
+++ b/databases/ldb/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/03/20 19:06:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.1.4.1 2019/09/15 09:11:02 bsiegert Exp $
 
 BUILDLINK_TREE+=	ldb
 
 .if !defined(LDB_BUILDLINK3_MK)
 LDB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ldb+=	ldb>=1.5.4
+BUILDLINK_API_DEPENDS.ldb+=	ldb>=1.5.5
 BUILDLINK_PKGSRCDIR.ldb?=	../../databases/ldb
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/databases/ldb/distinfo b/databases/ldb/distinfo
index 8788c03b383..32cb1115364 100644
--- a/databases/ldb/distinfo
+++ b/databases/ldb/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/06/22 12:56:31 jmcneill Exp $
+$NetBSD: distinfo,v 1.2.2.1 2019/09/15 09:11:02 bsiegert Exp $
 
-SHA1 (ldb-1.5.4.tar.gz) = 870e4112053ae350f5de27b00aa8703d3e7dc34d
-RMD160 (ldb-1.5.4.tar.gz) = d2bbb808990f7dc80a4d0d1278756f13a4526f85
-SHA512 (ldb-1.5.4.tar.gz) = fc323e4283671c14d6dd4feb7e9ca943a63a166688077dbf3591f9d957cf821f9e739869842e15ca1ec4fd3764123d5afc6f4954b1af437bd1ec54df58366a22
-Size (ldb-1.5.4.tar.gz) = 1629123 bytes
+SHA1 (ldb-1.5.5.tar.gz) = bb56c58707e7479ab9b3201b43973d4f33bdd4ca
+RMD160 (ldb-1.5.5.tar.gz) = 410618399179fd9b8bd36bc2e43c8c3f22812482
+SHA512 (ldb-1.5.5.tar.gz) = 562e08b3d6564d08fed80dc43ca299c38fbd958dbe27ed1400e5eb5c3df0f4c7b7eaf502b13eec5544b168f26c5e6537615f65e28dcaeb6473d2ff3c3c7a4e4b
+Size (ldb-1.5.5.tar.gz) = 1629070 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 4d2727e1ca3d65c26200bf699b93b5bf3198bfd0
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 15eacf2f2dd..6e8c4d47e22 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.72 2019/06/28 17:13:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.72.2.1 2019/09/15 09:11:02 bsiegert Exp $
 
-DISTNAME=	samba-4.10.5
-PKGREVISION=	1
+DISTNAME=	samba-4.10.8
 CATEGORIES=	net
 MASTER_SITES=	http://download.samba.org/pub/samba/stable/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.samba.org/
+HOMEPAGE=	https://www.samba.org/
 COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
@@ -208,6 +207,7 @@ REPLACE_PYTHON+=	source4/scripting/bin/*
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/ldb/buildlink3.mk"
+.include "../../databases/lmdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index c0bb81f94ab..7f751fca672 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2019/04/08 18:35:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.22.2.1 2019/09/15 09:11:02 bsiegert Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -444,6 +444,7 @@ ${PYSITELIB}/samba/tests/kcc/graph_utils.py
 ${PYSITELIB}/samba/tests/kcc/kcc_utils.py
 ${PYSITELIB}/samba/tests/kcc/ldif_import_export.py
 ${PYSITELIB}/samba/tests/krb5_credentials.py
+${PYSITELIB}/samba/tests/ldap_referrals.py
 ${PYSITELIB}/samba/tests/libsmb.py
 ${PYSITELIB}/samba/tests/loadparm.py
 ${PYSITELIB}/samba/tests/lsa_string.py
@@ -1001,6 +1002,7 @@ 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
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 27b5f5cb733..d90c6f4ad89 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2019/06/28 17:13:50 jperkin Exp $
+$NetBSD: distinfo,v 1.32.2.1 2019/09/15 09:11:02 bsiegert Exp $
 
-SHA1 (samba-4.10.5.tar.gz) = 9444a1a0cafd2c734eab39d76908c5344421df99
-RMD160 (samba-4.10.5.tar.gz) = c6ebda08f6dba92446383b18d0f3cce3a2199312
-SHA512 (samba-4.10.5.tar.gz) = 82961791a43511aa42f0d648edd13f0533cb20e1d673903e6a1f6235b0df19dfc0755ab0c8e6d4518ca19c188968a38a6c8e8c80d05a20141c097fb0b3e2b795
-Size (samba-4.10.5.tar.gz) = 18290612 bytes
+SHA1 (samba-4.10.8.tar.gz) = e0fafe34e7205c4f9ab54f96ab2ee72d1b9cfaca
+RMD160 (samba-4.10.8.tar.gz) = ee2f253b30e1ecdd796c8c92f3d7c5fae7ec0694
+SHA512 (samba-4.10.8.tar.gz) = 14d463dfba36473f4a1d2b306ff2a18c664e1a01bc8077ef62afc6796cf4dd65461d72b519b8df3a777eaf322cb98653b416468d770541cd21fab2383c8dce66
+Size (samba-4.10.8.tar.gz) = 18316560 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 0f9ca14e3a77d7dfad06aa8c4d2de2f6cc3c0646
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = a7cc41a55ce032c3fe1e0b660f88fa7871710e0e