py-twine: updated to 1.13.0

Twine is a utility for publishing Python packages on PyPI. It provides build
system independent uploads of source and binary distribution artifacts for both
new and existing projects.

17 files changed, 169 insertions, 91 deletions

diff --git a/net/Makefile b/net/Makefile
index 6efefde443e..1197fe827ce 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1242 2019/03/11 16:28:58 kamil Exp $
+# $NetBSD: Makefile,v 1.1243 2019/03/13 18:02:31 adam Exp $
 #
 
 COMMENT=	Networking tools
@@ -716,6 +716,7 @@ SUBDIR+=	py-softlayer_messaging
 SUBDIR+=	py-subunit
 SUBDIR+=	py-tldextract
 SUBDIR+=	py-tweepy
+SUBDIR+=	py-twine
 SUBDIR+=	py-twisted
 SUBDIR+=	py-twisted-docs
 SUBDIR+=	py-twython
diff --git a/net/py-foolscap/Makefile b/net/py-foolscap/Makefile
index 7426b5dced1..ce864139b6b 100644
--- a/net/py-foolscap/Makefile
+++ b/net/py-foolscap/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.29 2018/07/03 05:03:28 adam Exp $
+# $NetBSD: Makefile,v 1.30 2019/03/13 18:02:31 adam Exp $
 
-DISTNAME=	foolscap-0.12.7
+DISTNAME=	foolscap-0.13.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/foolscap/}
 
 MAINTAINER=	kamel.derouiche@gmail.com
-#MAINTAINER+=	gdt@NetBSD.org
 HOMEPAGE=	http://foolscap.lothar.com/trac
 COMMENT=	Foolscap contains an RPC protocol for Twisted
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface
 DEPENDS+=	${PYPKGPREFIX}-twisted>=16.0:../../net/py-twisted
-DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # as of 0.12.7
 
diff --git a/net/py-ncclient/Makefile b/net/py-ncclient/Makefile
index 5325ab12125..66946ee6438 100644
--- a/net/py-ncclient/Makefile
+++ b/net/py-ncclient/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/07/14 19:14:47 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/03/13 18:02:31 adam Exp $
 
-DISTNAME=	ncclient-0.6.0
+DISTNAME=	ncclient-0.6.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/ncclient/}
@@ -12,7 +12,9 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-lxml>=3.3.0:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-paramiko>=1.15.0:../../security/py-paramiko
+DEPENDS+=	${PYPKGPREFIX}-setuptools>0.6:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+# TODO selectors2>=2.0.1
 
 USE_LANGUAGES=	# none
 
diff --git a/net/py-ncclient/PLIST b/net/py-ncclient/PLIST
index d097ab96eca..90ddc62ce48 100644
--- a/net/py-ncclient/PLIST
+++ b/net/py-ncclient/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/07/14 19:14:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/03/13 18:02:31 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -7,6 +7,9 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/ncclient/__init__.py
 ${PYSITELIB}/ncclient/__init__.pyc
 ${PYSITELIB}/ncclient/__init__.pyo
+${PYSITELIB}/ncclient/_version.py
+${PYSITELIB}/ncclient/_version.pyc
+${PYSITELIB}/ncclient/_version.pyo
 ${PYSITELIB}/ncclient/capabilities.py
 ${PYSITELIB}/ncclient/capabilities.pyc
 ${PYSITELIB}/ncclient/capabilities.pyo
@@ -34,6 +37,9 @@ ${PYSITELIB}/ncclient/devices/hpcomware.pyo
 ${PYSITELIB}/ncclient/devices/huawei.py
 ${PYSITELIB}/ncclient/devices/huawei.pyc
 ${PYSITELIB}/ncclient/devices/huawei.pyo
+${PYSITELIB}/ncclient/devices/huaweiyang.py
+${PYSITELIB}/ncclient/devices/huaweiyang.pyc
+${PYSITELIB}/ncclient/devices/huaweiyang.pyo
 ${PYSITELIB}/ncclient/devices/iosxe.py
 ${PYSITELIB}/ncclient/devices/iosxe.pyc
 ${PYSITELIB}/ncclient/devices/iosxe.pyo
@@ -46,6 +52,9 @@ ${PYSITELIB}/ncclient/devices/junos.pyo
 ${PYSITELIB}/ncclient/devices/nexus.py
 ${PYSITELIB}/ncclient/devices/nexus.pyc
 ${PYSITELIB}/ncclient/devices/nexus.pyo
+${PYSITELIB}/ncclient/logging_.py
+${PYSITELIB}/ncclient/logging_.pyc
+${PYSITELIB}/ncclient/logging_.pyo
 ${PYSITELIB}/ncclient/manager.py
 ${PYSITELIB}/ncclient/manager.pyc
 ${PYSITELIB}/ncclient/manager.pyo
diff --git a/net/py-ncclient/distinfo b/net/py-ncclient/distinfo
index eca0bceac36..0fa43a3a6d4 100644
--- a/net/py-ncclient/distinfo
+++ b/net/py-ncclient/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2018/07/14 19:14:47 adam Exp $
+$NetBSD: distinfo,v 1.11 2019/03/13 18:02:31 adam Exp $
 
-SHA1 (ncclient-0.6.0.tar.gz) = 33c0ddfc1238791f0cb718174984fad181aa2f1d
-RMD160 (ncclient-0.6.0.tar.gz) = 57a5b06a982cd6b102d01c84f6183ed0a2a1f90b
-SHA512 (ncclient-0.6.0.tar.gz) = a9e47778dc49100729a2e7d518220a8266d1aa4860e347ebb6edcd27902d7d2954410478515e48a93a78a8e38313e0b43376cc739acbf9e937af21dc2e9ab8bf
-Size (ncclient-0.6.0.tar.gz) = 69473 bytes
+SHA1 (ncclient-0.6.3.tar.gz) = 360e449f8053b7c4b766843a6fb0ab9caa3a2c06
+RMD160 (ncclient-0.6.3.tar.gz) = 996a4d54e85453530a58f625304423f18f6901a7
+SHA512 (ncclient-0.6.3.tar.gz) = 80d3b7b1f03b62988bab9db5666b709e5825097c6b608e3a2528c471a1e41e6335d549d4fabc0fa180cdf84f0ba8242f7e953f42c601b6455a3f92bd45ece936
+Size (ncclient-0.6.3.tar.gz) = 88022 bytes
 SHA1 (patch-README.rst) = d053d8371219f04ff3ff9cf8e43dcbadf8dd7761
diff --git a/net/py-twine/ALTERNATIVES b/net/py-twine/ALTERNATIVES
new file mode 100644
index 00000000000..e4aa8cb5ef4
--- /dev/null
+++ b/net/py-twine/ALTERNATIVES
@@ -0,0 +1 @@
+bin/twine @PREFIX@/bin/twine-@PYVERSSUFFIX@
diff --git a/net/py-twine/DESCR b/net/py-twine/DESCR
new file mode 100644
index 00000000000..95f05327a74
--- /dev/null
+++ b/net/py-twine/DESCR
@@ -0,0 +1,3 @@
+Twine is a utility for publishing Python packages on PyPI. It provides build
+system independent uploads of source and binary distribution artifacts for both
+new and existing projects.
diff --git a/net/py-twine/Makefile b/net/py-twine/Makefile
new file mode 100644
index 00000000000..b18da769019
--- /dev/null
+++ b/net/py-twine/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2019/03/13 18:02:31 adam Exp $
+
+DISTNAME=	twine-1.13.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	net python
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/twine/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://twine.readthedocs.io/
+COMMENT=	Collection of utilities for publishing packages on PyPI
+LICENSE=	apache-2.0
+
+DEPENDS+=	${PYPKGPREFIX}-pkginfo>=1.4.2:../../devel/py-pkginfo
+DEPENDS+=	${PYPKGPREFIX}-readme_renderer>=21.0:../../textproc/py-readme_renderer
+DEPENDS+=	${PYPKGPREFIX}-requests>=2.17:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.9.1:../../devel/py-requests-toolbelt
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.7.0:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-tqdm>=4.14:../../misc/py-tqdm
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+USE_LANGUAGES=	# none
+
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} twine twine-${PYVERSSUFFIX} || ${TRUE}
+
+do-test:
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/py-twine/PLIST b/net/py-twine/PLIST
new file mode 100644
index 00000000000..2c8f336844d
--- /dev/null
+++ b/net/py-twine/PLIST
@@ -0,0 +1,53 @@
+@comment $NetBSD: PLIST,v 1.1 2019/03/13 18:02:31 adam Exp $
+bin/twine-${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/twine/__init__.py
+${PYSITELIB}/twine/__init__.pyc
+${PYSITELIB}/twine/__init__.pyo
+${PYSITELIB}/twine/__main__.py
+${PYSITELIB}/twine/__main__.pyc
+${PYSITELIB}/twine/__main__.pyo
+${PYSITELIB}/twine/_installed.py
+${PYSITELIB}/twine/_installed.pyc
+${PYSITELIB}/twine/_installed.pyo
+${PYSITELIB}/twine/cli.py
+${PYSITELIB}/twine/cli.pyc
+${PYSITELIB}/twine/cli.pyo
+${PYSITELIB}/twine/commands/__init__.py
+${PYSITELIB}/twine/commands/__init__.pyc
+${PYSITELIB}/twine/commands/__init__.pyo
+${PYSITELIB}/twine/commands/check.py
+${PYSITELIB}/twine/commands/check.pyc
+${PYSITELIB}/twine/commands/check.pyo
+${PYSITELIB}/twine/commands/register.py
+${PYSITELIB}/twine/commands/register.pyc
+${PYSITELIB}/twine/commands/register.pyo
+${PYSITELIB}/twine/commands/upload.py
+${PYSITELIB}/twine/commands/upload.pyc
+${PYSITELIB}/twine/commands/upload.pyo
+${PYSITELIB}/twine/exceptions.py
+${PYSITELIB}/twine/exceptions.pyc
+${PYSITELIB}/twine/exceptions.pyo
+${PYSITELIB}/twine/package.py
+${PYSITELIB}/twine/package.pyc
+${PYSITELIB}/twine/package.pyo
+${PYSITELIB}/twine/repository.py
+${PYSITELIB}/twine/repository.pyc
+${PYSITELIB}/twine/repository.pyo
+${PYSITELIB}/twine/settings.py
+${PYSITELIB}/twine/settings.pyc
+${PYSITELIB}/twine/settings.pyo
+${PYSITELIB}/twine/utils.py
+${PYSITELIB}/twine/utils.pyc
+${PYSITELIB}/twine/utils.pyo
+${PYSITELIB}/twine/wheel.py
+${PYSITELIB}/twine/wheel.pyc
+${PYSITELIB}/twine/wheel.pyo
+${PYSITELIB}/twine/wininst.py
+${PYSITELIB}/twine/wininst.pyc
+${PYSITELIB}/twine/wininst.pyo
diff --git a/net/py-twine/distinfo b/net/py-twine/distinfo
new file mode 100644
index 00000000000..bd682e40b87
--- /dev/null
+++ b/net/py-twine/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2019/03/13 18:02:31 adam Exp $
+
+SHA1 (twine-1.13.0.tar.gz) = e4993333243cf14c2950d86d6de247c5aa88df81
+RMD160 (twine-1.13.0.tar.gz) = 7285468d0850144a8d575a40b75a5b53e2f1871c
+SHA512 (twine-1.13.0.tar.gz) = d4ecacfcce995d037c63bb5827132de294289631ac84f20ebaee91fb91b487f79f18db0646c0bfe8743b596004b8241125733a7fa7719978217162dfcc8c3394
+Size (twine-1.13.0.tar.gz) = 68643 bytes
diff --git a/net/py-zeep/Makefile b/net/py-zeep/Makefile
index 5ac821d47de..582b0d745f9 100644
--- a/net/py-zeep/Makefile
+++ b/net/py-zeep/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2018/01/31 11:37:29 adam Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/13 18:02:31 adam Exp $
 
-DISTNAME=	zeep-2.5.0
+DISTNAME=	zeep-3.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=z/zeep/}
@@ -11,17 +11,30 @@ COMMENT=	Fast and modern Python SOAP client
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-appdirs>=1.4.0:../../devel/py-appdirs
+DEPENDS+=	${PYPKGPREFIX}-attrs>=17.2.0:../../devel/py-attrs
+DEPENDS+=	${PYPKGPREFIX}-cached-property>=1.3.0:../../devel/py-cached-property
 DEPENDS+=	${PYPKGPREFIX}-defusedxml>=0.4.1:../../textproc/py-defusedxml
-DEPENDS+=	${PYPKGPREFIX}-cached-property>=1.0.0:../../devel/py-cached-property
 DEPENDS+=	${PYPKGPREFIX}-isodate>=0.5.4:../../time/py-isodate
-DEPENDS+=	${PYPKGPREFIX}-lxml>=3.0.0:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-lxml>=3.1.0:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.7.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.7.1:../../devel/py-requests-toolbelt
 DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
+TEST_DEPENDS+=	${PYPKGPREFIX}-freezegun>=0.3.8:../../devel/py-freezegun
+#mock==2.0.0
+#pretend==1.0.8
+#pytest-cov==2.5.1
+#pytest==3.1.3
+#requests_mock>=0.7.0
+#pytest-tornado==0.4.5
+#isort==4.2.15
+#flake8==3.3.0
+#flake8-blind-except==0.1.1
+#flake8-debugger==1.4.0
+#flake8-imports==0.1.1
+#aioresponses>=0.4.1
 
 .include "../../lang/python/pyversion.mk"
-
 PLIST_VARS+=	aio
 .if "${PYPKGPREFIX}" != "py27" && "${PYPKGPREFIX}" != "py34"
 DEPENDS+=	${PYPKGPREFIX}-aiohttp>=1.0:../../www/py-aiohttp
diff --git a/net/py-zeep/PLIST b/net/py-zeep/PLIST
index ab26cd3fad5..9da48da3a26 100644
--- a/net/py-zeep/PLIST
+++ b/net/py-zeep/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2018/01/31 11:37:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/03/13 18:02:31 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/pbr.json
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/zeep/__init__.py
@@ -41,6 +42,12 @@ ${PYSITELIB}/zeep/ns.pyo
 ${PYSITELIB}/zeep/plugins.py
 ${PYSITELIB}/zeep/plugins.pyc
 ${PYSITELIB}/zeep/plugins.pyo
+${PYSITELIB}/zeep/proxy.py
+${PYSITELIB}/zeep/proxy.pyc
+${PYSITELIB}/zeep/proxy.pyo
+${PYSITELIB}/zeep/settings.py
+${PYSITELIB}/zeep/settings.pyc
+${PYSITELIB}/zeep/settings.pyo
 ${PYSITELIB}/zeep/tornado/__init__.py
 ${PYSITELIB}/zeep/tornado/__init__.pyc
 ${PYSITELIB}/zeep/tornado/__init__.pyo
diff --git a/net/py-zeep/distinfo b/net/py-zeep/distinfo
index a5a6006ee76..616c1f22274 100644
--- a/net/py-zeep/distinfo
+++ b/net/py-zeep/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2018/01/31 11:37:29 adam Exp $
+$NetBSD: distinfo,v 1.4 2019/03/13 18:02:31 adam Exp $
 
-SHA1 (zeep-2.5.0.tar.gz) = 426eafdfac8ef9e52075f44f4e1012d609918b5e
-RMD160 (zeep-2.5.0.tar.gz) = 6c50df81a501195d19cb4b16d16d1ab31ed650e7
-SHA512 (zeep-2.5.0.tar.gz) = f8eaf4eafd85d1464df28161a2cd39d9ad9079aa4fa39f3da11f352e52d3144b8d2c4b53a642c0ccaf70cac541cf7fca3a89b85b60bac7dd3330f4bb7a9bfc10
-Size (zeep-2.5.0.tar.gz) = 147413 bytes
+SHA1 (zeep-3.1.0.tar.gz) = 5ee7e9475d130d2ac33a5ca491b042e77f2b5379
+RMD160 (zeep-3.1.0.tar.gz) = 3c718c30daf95d094f9c91a6b00b770d41e00532
+SHA512 (zeep-3.1.0.tar.gz) = 392125b2bc6d796bfbe4869dfcfcaeefadbbd627cd92f6fb5006dc16d1692a3d20659b9c662852e47eb2c3f6671466dd836f67d0ad7cc34bf356c8822bfffcf4
+Size (zeep-3.1.0.tar.gz) = 158081 bytes
+SHA1 (patch-setup.py) = 8a71665b68491752d3687ee000298cad81e7883d
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index ec7f4c6d1b0..e66409a9502 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2019/03/01 20:03:24 roy Exp $
+# $NetBSD: Makefile,v 1.61 2019/03/13 18:02:31 adam Exp $
 
-DISTNAME=	samba-4.9.4
-PKGREVISION=	3
+DISTNAME=	samba-4.9.5
 CATEGORIES=	net
 MASTER_SITES=	http://download.samba.org/pub/samba/stable/
 
@@ -210,7 +209,7 @@ REPLACE_PYTHON+=	buildtools/bin/waf
 REPLACE_PYTHON+=	source4/setup/wscript_build
 REPLACE_PYTHON+=	source4/scripting/bin/*
 
-PYTHON_VERSIONS_ACCEPTED=	27 # as of 4.3.2
+PYTHON_VERSIONS_ACCEPTED=	27
 
 PY_PATCHPLIST=	yes
 .include "../../lang/python/application.mk"
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index cb4f400d850..05f4db476ef 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2019/01/03 19:36:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2019/03/13 18:02:31 adam Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/findsmb
@@ -226,6 +226,8 @@ lib/pkgconfig/samdb.pc
 lib/pkgconfig/smbclient.pc
 lib/pkgconfig/wbclient.pc
 ${PYSITELIB}/_ldb_text.py
+${PYSITELIB}/_tdb_text.py
+${PYSITELIB}/_tevent.so
 ${PYSITELIB}/ldb.so
 ${PYSITELIB}/samba/__init__.py
 ${PYSITELIB}/samba/_glue.so
@@ -516,6 +518,8 @@ ${PYSITELIB}/samba/werror.so
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
+${PYSITELIB}/tdb.so
+${PYSITELIB}/tevent.py
 lib/samba/auth/script.${SOEXT}
 lib/samba/bind9/dlz_bind9.${SOEXT}
 lib/samba/bind9/dlz_bind9_10.${SOEXT}
@@ -659,7 +663,7 @@ lib/samba/private/libldb-cmdline-samba4.so
 lib/samba/private/libldb-key-value-samba4.so
 ${PLIST.64bit}lib/samba/private/libldb-mdb-int-samba4.so
 lib/samba/private/libldb.so.1
-lib/samba/private/libldb.so.1.4.3
+lib/samba/private/libldb.so.1.4.6
 lib/samba/private/libldbsamba-samba4.so
 lib/samba/private/liblibcli-lsa3-samba4.so
 lib/samba/private/liblibcli-netlogon3-samba4.so
@@ -682,7 +686,7 @@ lib/samba/private/libposix-eadb-samba4.so
 lib/samba/private/libprinting-migrate-samba4.so
 lib/samba/private/libprocess-model-samba4.so
 lib/samba/private/libpyldb-util.so.1
-lib/samba/private/libpyldb-util.so.1.4.3
+lib/samba/private/libpyldb-util.so.1.4.6
 lib/samba/private/libregistry-samba4.so
 lib/samba/private/libreplace-samba4.so
 lib/samba/private/libroken-samba4.so.19
@@ -757,6 +761,7 @@ 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/glusterfs_fuse.${SOEXT}
 lib/samba/vfs/linux_xfs_sgid.${SOEXT}
 lib/samba/vfs/media_harmony.${SOEXT}
 lib/samba/vfs/netatalk.${SOEXT}
@@ -872,6 +877,7 @@ man/man8/vfs_fileid.8
 man/man8/vfs_fruit.8
 man/man8/vfs_full_audit.8
 man/man8/vfs_glusterfs.8
+man/man8/vfs_glusterfs_fuse.8
 man/man8/vfs_gpfs.8
 man/man8/vfs_linux_xfs_sgid.8
 man/man8/vfs_media_harmony.8
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 6ef870395ed..cba82cb7331 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.23 2019/03/01 20:03:24 roy Exp $
+$NetBSD: distinfo,v 1.24 2019/03/13 18:02:31 adam Exp $
 
-SHA1 (samba-4.9.4.tar.gz) = 7f8e15709e03e52d14bd9c85dd717366c106993f
-RMD160 (samba-4.9.4.tar.gz) = d0a43b85b85906f860de12b0b0abb1fcc5643b7a
-SHA512 (samba-4.9.4.tar.gz) = ecd9937caa12d409b9b4cf34982b1670346fa64c7ecd111b390e296771476e13eb7b868997bfe489f36b7bdc5c9fc3af42cd5ad276e9d85aaedfa8ac4cfc0617
-Size (samba-4.9.4.tar.gz) = 18053738 bytes
+SHA1 (samba-4.9.5.tar.gz) = a79e3f75903daa46318cdf1f2c19efb615ec0920
+RMD160 (samba-4.9.5.tar.gz) = a29749fbfd2441ee5989fc26ed133308207b154c
+SHA512 (samba-4.9.5.tar.gz) = 0ce49721dcd1b16148448bdf516c42f8fdeb3cb48e7fa8113fac508f8585251ead23d5b679f99eb7925e7a6fbedc2da75d339946b0cecb15698f3ea0cb542750
+Size (samba-4.9.5.tar.gz) = 18065757 bytes
+SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 0f9ca14e3a77d7dfad06aa8c4d2de2f6cc3c0646
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = 1469d23fd2094ce0ecf979df6ff8cfd69fae53a6
 SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
@@ -14,7 +15,6 @@ SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
 SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b
 SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
-SHA1 (patch-source3_auth_token_util.c) = fbe67b501fa4325c9fb3e37c51bc424847f5e908
 SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60
 SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511
 SHA1 (patch-source4_torture_local_nss__tests.c) = 8c878a8ed771ba996a7a325a1ad41bd13016c70c
diff --git a/net/samba4/patches/patch-source3_auth_token_util.c b/net/samba4/patches/patch-source3_auth_token_util.c
deleted file mode 100644
index d9a8d43c652..00000000000
--- a/net/samba4/patches/patch-source3_auth_token_util.c
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-source3_auth_token_util.c,v 1.1 2019/03/01 20:03:24 roy Exp $
-
-Taken from https://bugzilla.samba.org/show_bug.cgi?id=13697
-
-From 1e8931dfc24a2576a3b1fe9115c4ccbfefbbd298 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Wed, 19 Dec 2018 09:38:33 +0100
-Subject: [PATCH] s3:auth: ignore create_builtin_guests() failing without a
- valid idmap configuration
-
-This happens on standalone servers, where winbindd is automatically
-started by init scripts if it's installed. But it's not really
-used and may not have a valid idmap configuration (
-"idmap config * : range" has no default!)
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=13697
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Alexander Bokovoy <ab@samba.org>
-(cherry picked from commit 865538fabaea33741f5fa542dbc3f2e08308c2c1)
----
- source3/auth/token_util.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
-index f5b0e6944335..ee38d6c9645b 100644
---- source3/auth/token_util.c
-+++ source3/auth/token_util.c
-@@ -745,7 +745,23 @@ NTSTATUS finalize_local_nt_token(struct security_token *result,
- 		status = create_builtin_guests(domain_sid);
- 		unbecome_root();
- 
--		if (NT_STATUS_EQUAL(status, NT_STATUS_PROTOCOL_UNREACHABLE)) {
-+		/*
-+		 * NT_STATUS_PROTOCOL_UNREACHABLE:
-+		 * => winbindd is not running.
-+		 *
-+		 * NT_STATUS_ACCESS_DENIED:
-+		 * => no idmap config at all
-+		 * and wbint_AllocateGid()/winbind_allocate_gid()
-+		 * failed.
-+		 *
-+		 * NT_STATUS_NO_SUCH_GROUP:
-+		 * => no idmap config at all and
-+		 * "tdbsam:map builtin = no" means
-+		 * wbint_Sids2UnixIDs() fails.
-+		 */
-+		if (NT_STATUS_EQUAL(status, NT_STATUS_PROTOCOL_UNREACHABLE) ||
-+		    NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
-+		    NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_GROUP)) {
- 			/*
- 			 * Add BUILTIN\Guests directly to token.
- 			 * But only if the token already indicates