Pullup ticket #5933 - requested by taca

net/samba4: security fix

Revisions pulled up:
- net/samba4/Makefile                                           1.64-1.65
- net/samba4/PLIST                                              1.22
- net/samba4/distinfo                                           1.26-1.27

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Apr  3 14:23:06 UTC 2019

   Modified Files:
   	pkgsrc/net/samba4: Makefile distinfo

   Log Message:
   samba4: updated to 4.10.1

   Changes since 4.10.0:
   * BUG 13837: py/kcc_utils: py2.6 compatibility.
   * BUG 13869: libcli: permit larger values of DataLength in
     SMB2_ENCRYPTION_CAPABILITIES of negotiate response.
   * BUG 13840: regfio: Improve handling of malformed registry hive files.
   * BUG 13789: ctdb-version: Simplify version string usage.
   * BUG 13859: lib: Make fd_load work for non-regular files.
   * BUG 13816: dbcheck in the middle of the tombstone garbage collection causes
     replication failures, dbcheck: add --selftest-check-expired-tombstones
     cmdline option.
   * BUG 13818: ndr_spoolss_buf: Fix out of scope use of stack variable in
     NDR_SPOOLSS_PUSH_ENUM_OUT().
   * BUG 13854: s4/messaging: Fix undefined reference in linking
     libMESSAGING-samba4.so.
   * BUG 13836: acl_read: Fix regression for empty lists.
   * BUG 13841: s4:dlz make b9_has_soa check dc=@ node.
   * BUG 13832: s3:client: Fix printing via smbspool backend with kerberos auth.
   * BUG 13847: s4:librpc: Fix installation of Samba.
   * BUG 13848: s3:lib: Fix the debug message for adding cache entries.
   * BUG 13793: s3:utils: Add 'smbstatus -L --resolve-uids' to show username.
   * BUG 13848: s3:lib: Fix the debug message for adding cache entries.
   * BUG 13853: s3:waf: Fix the detection of makdev() macro on Linux.
   * BUG 13789: ctdb-build: Drop creation of .distversion in tarball.
   * BUG 13838: ctdb-packaging: Test package requires tcpdump, ctdb package
     should not own system library directory.

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Apr  8 18:35:59 UTC 2019

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

   Log Message:
   samba4: updated to 4.10.2

   Release Notes for Samba 4.10.2

   This is a security release in order to address the following defects:
   o  CVE-2019-3870 (World writable files in Samba AD DC private/ dir)
   o  CVE-2019-3880 (Save registry file outside share as unprivileged user)

   Details

   o  CVE-2019-3870:
      During the provision of a new Active Directory DC, some files in the private/
      directory are created world-writable.

   o  CVE-2019-3880:
      Authenticated users with write permission can trigger a symlink traversal to
      write or detect files outside the Samba share.

   For more details and workarounds, please refer to the security advisories.

   Changes since 4.10.1:
   * BUG 13834: CVE-2019-3870: pysmbd: Ensure a zero umask is set for
     smbd.mkdir().
   * BUG 13851: CVE-2018-14629: rpc: winreg: Remove implementations of
     SaveKey/RestoreKey.

3 files changed, 9 insertions, 8 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 20d14d44278..4a100528b11 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2019/03/27 06:28:05 adam Exp $
+# $NetBSD: Makefile,v 1.63.2.1 2019/04/10 10:27:05 bsiegert Exp $
 
-DISTNAME=	samba-4.10.0
+DISTNAME=	samba-4.10.2
 CATEGORIES=	net
 MASTER_SITES=	http://download.samba.org/pub/samba/stable/
 
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index 38e3d8f11f3..95508571cf9 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2019/03/20 19:09:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.21.2.1 2019/04/10 10:27:05 bsiegert Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -514,6 +514,7 @@ ${PYSITELIB}/samba/tests/samdb.py
 ${PYSITELIB}/samba/tests/samdb_api.py
 ${PYSITELIB}/samba/tests/security.py
 ${PYSITELIB}/samba/tests/smb.py
+${PYSITELIB}/samba/tests/smbd_base.py
 ${PYSITELIB}/samba/tests/source.py
 ${PYSITELIB}/samba/tests/strings.py
 ${PYSITELIB}/samba/tests/subunitrun.py
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 95f74313fa5..45865187433 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2019/03/20 19:09:10 adam Exp $
+$NetBSD: distinfo,v 1.25.2.1 2019/04/10 10:27:05 bsiegert Exp $
 
-SHA1 (samba-4.10.0.tar.gz) = 14769a5f9a296359269e15e989d2995fd79ef2e2
-RMD160 (samba-4.10.0.tar.gz) = 3bfd51a04666ca115cf86e801c2ec021883d263c
-SHA512 (samba-4.10.0.tar.gz) = e82a8ec78cea666a653bddab066eaa22382f5b016b38f7618492e39f470d6f4c3ddd6dc21e9f0e9fde73ab98c4dd3da1a3823fd457f085ac14c36070b447ac90
-Size (samba-4.10.0.tar.gz) = 18270804 bytes
+SHA1 (samba-4.10.2.tar.gz) = b0b5dd49e92b266315cea6530dcfc926f27dd4ed
+RMD160 (samba-4.10.2.tar.gz) = 6d91d2d581e095753deaae1fae28b8a048e103fc
+SHA512 (samba-4.10.2.tar.gz) = 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
+Size (samba-4.10.2.tar.gz) = 18280710 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