Update to 4.9.2

Changelog:
* Many bugfixes
* Update some bundled libraries

9 files changed, 194 insertions, 105 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index d24dcb667cf..29b5fa529c6 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2018/11/14 22:22:14 kleink Exp $
+# $NetBSD: Makefile,v 1.51 2018/11/23 07:30:02 ryoon Exp $
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	http://download.samba.org/pub/samba/stable/
 
@@ -12,7 +11,7 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-VERSION=	4.6.8
+VERSION=	4.9.2
 CONFLICTS+=	ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 GCC_REQD+=	4.4
@@ -97,6 +96,7 @@ CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS}
 .else
 CONFIGURE_ARGS+=	--jobs=1
 .endif
+CONFIGURE_ARGS+=	--without-gpgme
 
 # Depends on ncurses, explicitly disable for now.
 CONFIGURE_ARGS+=	--without-regedit
@@ -204,7 +204,9 @@ PY_PATCHPLIST=	yes
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../databases/lmdb/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
 BUILDLINK_API_DEPENDS.talloc+=	talloc>=2.1.9
 .include "../../devel/talloc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index 9dec59a9ff3..c7102ea9fab 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.13 2018/02/28 03:38:49 nonaka Exp $
+@comment $NetBSD: PLIST,v 1.14 2018/11/23 07:30:02 ryoon Exp $
 bin/cifsdd
 bin/dbwrap_tool
-bin/eventlogadm
 bin/findsmb
 bin/gentest
 bin/ldbadd
@@ -50,7 +49,9 @@ include/core/doserr.h
 include/core/error.h
 include/core/hresult.h
 include/core/ntstatus.h
+include/core/ntstatus_gen.h
 include/core/werror.h
+include/core/werror_gen.h
 include/credentials.h
 include/dcerpc.h
 include/dcerpc_server.h
@@ -124,6 +125,7 @@ include/util/talloc_stack.h
 include/util/tevent_ntstatus.h
 include/util/tevent_unix.h
 include/util/tevent_werror.h
+include/util/tfork.h
 include/util/time.h
 include/util_ldb.h
 include/wbclient.h
@@ -150,7 +152,7 @@ lib/libndr-standard.so.0
 lib/libndr-standard.so.0.0.1
 lib/libndr.so
 lib/libndr.so.0
-lib/libndr.so.0.0.8
+lib/libndr.so.0.1.0
 lib/libnetapi.so
 lib/libnetapi.so.0
 lib/libnss_winbind.so
@@ -164,7 +166,7 @@ lib/libsamba-hostconfig.so.0
 lib/libsamba-hostconfig.so.0.0.1
 lib/libsamba-passdb.so
 lib/libsamba-passdb.so.0
-lib/libsamba-passdb.so.0.26.0
+lib/libsamba-passdb.so.0.27.1
 lib/libsamba-policy.so
 lib/libsamba-policy.so.0
 lib/libsamba-policy.so.0.0.1
@@ -176,17 +178,17 @@ lib/libsamdb.so.0
 lib/libsamdb.so.0.0.1
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-lib/libsmbclient.so.0.2.3
+lib/libsmbclient.so.0.4.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
 ${PLIST.ldap}lib/libsmbldap.so
-${PLIST.ldap}lib/libsmbldap.so.0
+${PLIST.ldap}lib/libsmbldap.so.2
 lib/libtevent-util.so
 lib/libtevent-util.so.0
 lib/libtevent-util.so.0.0.1
 lib/libwbclient.so
 lib/libwbclient.so.0
-lib/libwbclient.so.0.13
+lib/libwbclient.so.0.14
 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/CUtil.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Compat.pm
@@ -236,8 +238,9 @@ ${PYSITELIB}/samba/__init__.py
 ${PYSITELIB}/samba/_glue.so
 ${PYSITELIB}/samba/_ldb.so
 ${PYSITELIB}/samba/auth.so
-${PYSITELIB}/samba/com.so
+${PYSITELIB}/samba/colour.py
 ${PYSITELIB}/samba/common.py
+${PYSITELIB}/samba/compat.py
 ${PYSITELIB}/samba/credentials.so
 ${PYSITELIB}/samba/crypto.so
 ${PYSITELIB}/samba/dbchecker.py
@@ -259,10 +262,12 @@ ${PYSITELIB}/samba/dcerpc/initshutdown.so
 ${PYSITELIB}/samba/dcerpc/irpc.so
 ${PYSITELIB}/samba/dcerpc/krb5pac.so
 ${PYSITELIB}/samba/dcerpc/lsa.so
+${PYSITELIB}/samba/dcerpc/messaging.so
 ${PYSITELIB}/samba/dcerpc/mgmt.so
 ${PYSITELIB}/samba/dcerpc/misc.so
 ${PYSITELIB}/samba/dcerpc/nbt.so
 ${PYSITELIB}/samba/dcerpc/netlogon.so
+${PYSITELIB}/samba/dcerpc/ntlmssp.so
 ${PYSITELIB}/samba/dcerpc/samr.so
 ${PYSITELIB}/samba/dcerpc/security.so
 ${PYSITELIB}/samba/dcerpc/server_id.so
@@ -276,11 +281,21 @@ ${PYSITELIB}/samba/dcerpc/wkssvc.so
 ${PYSITELIB}/samba/dcerpc/xattr.so
 ${PYSITELIB}/samba/dckeytab.so
 ${PYSITELIB}/samba/descriptor.py
+${PYSITELIB}/samba/dnsserver.py
+${PYSITELIB}/samba/domain_update.py
 ${PYSITELIB}/samba/drs_utils.py
 ${PYSITELIB}/samba/dsdb.so
 ${PYSITELIB}/samba/dsdb_dns.so
+${PYSITELIB}/samba/emulate/__init__.py
+${PYSITELIB}/samba/emulate/traffic.py
+${PYSITELIB}/samba/emulate/traffic_packets.py
+${PYSITELIB}/samba/forest_update.py
 ${PYSITELIB}/samba/gensec.so
 ${PYSITELIB}/samba/getopt.py
+${PYSITELIB}/samba/gp_sec_ext.py
+${PYSITELIB}/samba/gpclass.py
+${PYSITELIB}/samba/gpo.so
+${PYSITELIB}/samba/graph.py
 ${PYSITELIB}/samba/hostconfig.py
 ${PYSITELIB}/samba/idmap.py
 ${PYSITELIB}/samba/join.py
@@ -290,20 +305,26 @@ ${PYSITELIB}/samba/kcc/graph.py
 ${PYSITELIB}/samba/kcc/graph_utils.py
 ${PYSITELIB}/samba/kcc/kcc_utils.py
 ${PYSITELIB}/samba/kcc/ldif_import_export.py
+${PYSITELIB}/samba/mdb_util.py
 ${PYSITELIB}/samba/messaging.so
 ${PYSITELIB}/samba/ms_display_specifiers.py
+${PYSITELIB}/samba/ms_forest_updates_markdown.py
 ${PYSITELIB}/samba/ms_schema.py
+${PYSITELIB}/samba/ms_schema_markdown.py
 ${PYSITELIB}/samba/ndr.py
 ${PYSITELIB}/samba/net.so
 ${PYSITELIB}/samba/netbios.so
 ${PYSITELIB}/samba/netcmd/__init__.py
 ${PYSITELIB}/samba/netcmd/common.py
+${PYSITELIB}/samba/netcmd/computer.py
 ${PYSITELIB}/samba/netcmd/dbcheck.py
 ${PYSITELIB}/samba/netcmd/delegation.py
 ${PYSITELIB}/samba/netcmd/dns.py
 ${PYSITELIB}/samba/netcmd/domain.py
+${PYSITELIB}/samba/netcmd/domain_backup.py
 ${PYSITELIB}/samba/netcmd/drs.py
 ${PYSITELIB}/samba/netcmd/dsacl.py
+${PYSITELIB}/samba/netcmd/forest.py
 ${PYSITELIB}/samba/netcmd/fsmo.py
 ${PYSITELIB}/samba/netcmd/gpo.py
 ${PYSITELIB}/samba/netcmd/group.py
@@ -311,19 +332,26 @@ ${PYSITELIB}/samba/netcmd/ldapcmp.py
 ${PYSITELIB}/samba/netcmd/main.py
 ${PYSITELIB}/samba/netcmd/nettime.py
 ${PYSITELIB}/samba/netcmd/ntacl.py
+${PYSITELIB}/samba/netcmd/ou.py
 ${PYSITELIB}/samba/netcmd/processes.py
+${PYSITELIB}/samba/netcmd/pso.py
 ${PYSITELIB}/samba/netcmd/rodc.py
+${PYSITELIB}/samba/netcmd/schema.py
 ${PYSITELIB}/samba/netcmd/sites.py
 ${PYSITELIB}/samba/netcmd/spn.py
 ${PYSITELIB}/samba/netcmd/testparm.py
 ${PYSITELIB}/samba/netcmd/user.py
+${PYSITELIB}/samba/netcmd/visualize.py
 ${PYSITELIB}/samba/ntacls.py
+${PYSITELIB}/samba/ntstatus.so
 ${PYSITELIB}/samba/param.so
 ${PYSITELIB}/samba/policy.so
 ${PYSITELIB}/samba/posix_eadb.so
 ${PYSITELIB}/samba/provision/__init__.py
 ${PYSITELIB}/samba/provision/backend.py
 ${PYSITELIB}/samba/provision/common.py
+${PYSITELIB}/samba/provision/kerberos.py
+${PYSITELIB}/samba/provision/kerberos_implementation.py
 ${PYSITELIB}/samba/provision/sambadns.py
 ${PYSITELIB}/samba/registry.so
 ${PYSITELIB}/samba/remove_dc.py
@@ -343,11 +371,26 @@ ${PYSITELIB}/samba/subunit/__init__.py
 ${PYSITELIB}/samba/subunit/run.py
 ${PYSITELIB}/samba/tdb_util.py
 ${PYSITELIB}/samba/tests/__init__.py
+${PYSITELIB}/samba/tests/audit_log_base.py
+${PYSITELIB}/samba/tests/audit_log_dsdb.py
+${PYSITELIB}/samba/tests/audit_log_pass_change.py
 ${PYSITELIB}/samba/tests/auth.py
+${PYSITELIB}/samba/tests/auth_log.py
+${PYSITELIB}/samba/tests/auth_log_base.py
+${PYSITELIB}/samba/tests/auth_log_ncalrpc.py
+${PYSITELIB}/samba/tests/auth_log_netlogon.py
+${PYSITELIB}/samba/tests/auth_log_netlogon_bad_creds.py
+${PYSITELIB}/samba/tests/auth_log_pass_change.py
+${PYSITELIB}/samba/tests/auth_log_samlogon.py
 ${PYSITELIB}/samba/tests/blackbox/__init__.py
+${PYSITELIB}/samba/tests/blackbox/bug13653.py
+${PYSITELIB}/samba/tests/blackbox/check_output.py
 ${PYSITELIB}/samba/tests/blackbox/ndrdump.py
 ${PYSITELIB}/samba/tests/blackbox/samba_dnsupdate.py
-${PYSITELIB}/samba/tests/blackbox/samba_tool_drs.py
+${PYSITELIB}/samba/tests/blackbox/smbcontrol.py
+${PYSITELIB}/samba/tests/blackbox/traffic_learner.py
+${PYSITELIB}/samba/tests/blackbox/traffic_replay.py
+${PYSITELIB}/samba/tests/blackbox/traffic_summary.py
 ${PYSITELIB}/samba/tests/common.py
 ${PYSITELIB}/samba/tests/core.py
 ${PYSITELIB}/samba/tests/credentials.py
@@ -358,6 +401,7 @@ ${PYSITELIB}/samba/tests/dcerpc/dnsserver.py
 ${PYSITELIB}/samba/tests/dcerpc/integer.py
 ${PYSITELIB}/samba/tests/dcerpc/misc.py
 ${PYSITELIB}/samba/tests/dcerpc/raw_protocol.py
+${PYSITELIB}/samba/tests/dcerpc/raw_testcase.py
 ${PYSITELIB}/samba/tests/dcerpc/registry.py
 ${PYSITELIB}/samba/tests/dcerpc/rpc_talloc.py
 ${PYSITELIB}/samba/tests/dcerpc/rpcecho.py
@@ -366,50 +410,106 @@ ${PYSITELIB}/samba/tests/dcerpc/srvsvc.py
 ${PYSITELIB}/samba/tests/dcerpc/string.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_base.py
 ${PYSITELIB}/samba/tests/dns_forwarder.py
 ${PYSITELIB}/samba/tests/dns_forwarder_helpers/server.py
+${PYSITELIB}/samba/tests/dns_invalid.py
 ${PYSITELIB}/samba/tests/dns_tkey.py
+${PYSITELIB}/samba/tests/dns_wildcard.py
 ${PYSITELIB}/samba/tests/docs.py
+${PYSITELIB}/samba/tests/domain_backup.py
 ${PYSITELIB}/samba/tests/dsdb.py
+${PYSITELIB}/samba/tests/dsdb_lock.py
+${PYSITELIB}/samba/tests/dsdb_schema_attributes.py
+${PYSITELIB}/samba/tests/emulate/__init__.py
+${PYSITELIB}/samba/tests/emulate/traffic.py
+${PYSITELIB}/samba/tests/emulate/traffic_packet.py
+${PYSITELIB}/samba/tests/encrypted_secrets.py
 ${PYSITELIB}/samba/tests/gensec.py
 ${PYSITELIB}/samba/tests/get_opt.py
+${PYSITELIB}/samba/tests/getdcname.py
+${PYSITELIB}/samba/tests/glue.py
+${PYSITELIB}/samba/tests/gpo.py
+${PYSITELIB}/samba/tests/graph.py
+${PYSITELIB}/samba/tests/group_audit.py
 ${PYSITELIB}/samba/tests/hostconfig.py
+${PYSITELIB}/samba/tests/join.py
 ${PYSITELIB}/samba/tests/kcc/__init__.py
 ${PYSITELIB}/samba/tests/kcc/graph.py
 ${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/libsmb_samba_internal.py
+${PYSITELIB}/samba/tests/loadparm.py
+${PYSITELIB}/samba/tests/lsa_string.py
 ${PYSITELIB}/samba/tests/messaging.py
+${PYSITELIB}/samba/tests/net_join.py
+${PYSITELIB}/samba/tests/net_join_no_spnego.py
+${PYSITELIB}/samba/tests/netbios.py
 ${PYSITELIB}/samba/tests/netcmd.py
+${PYSITELIB}/samba/tests/netlogonsvc.py
 ${PYSITELIB}/samba/tests/ntacls.py
+${PYSITELIB}/samba/tests/ntacls_backup.py
+${PYSITELIB}/samba/tests/ntlmdisabled.py
+${PYSITELIB}/samba/tests/pam_winbind.py
+${PYSITELIB}/samba/tests/pam_winbind_warn_pwd_expire.py
 ${PYSITELIB}/samba/tests/param.py
+${PYSITELIB}/samba/tests/password_hash.py
+${PYSITELIB}/samba/tests/password_hash_fl2003.py
+${PYSITELIB}/samba/tests/password_hash_fl2008.py
+${PYSITELIB}/samba/tests/password_hash_gpgme.py
+${PYSITELIB}/samba/tests/password_hash_ldap.py
+${PYSITELIB}/samba/tests/password_quality.py
+${PYSITELIB}/samba/tests/password_test.py
 ${PYSITELIB}/samba/tests/policy.py
 ${PYSITELIB}/samba/tests/posixacl.py
 ${PYSITELIB}/samba/tests/provision.py
+${PYSITELIB}/samba/tests/pso.py
+${PYSITELIB}/samba/tests/py_credentials.py
 ${PYSITELIB}/samba/tests/registry.py
-${PYSITELIB}/samba/tests/samba3.py
+${PYSITELIB}/samba/tests/s3idmapdb.py
+${PYSITELIB}/samba/tests/s3param.py
+${PYSITELIB}/samba/tests/s3passdb.py
+${PYSITELIB}/samba/tests/s3registry.py
+${PYSITELIB}/samba/tests/s3windb.py
 ${PYSITELIB}/samba/tests/samba3sam.py
 ${PYSITELIB}/samba/tests/samba_tool/__init__.py
 ${PYSITELIB}/samba/tests/samba_tool/base.py
+${PYSITELIB}/samba/tests/samba_tool/computer.py
+${PYSITELIB}/samba/tests/samba_tool/demote.py
 ${PYSITELIB}/samba/tests/samba_tool/dnscmd.py
+${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/group.py
+${PYSITELIB}/samba/tests/samba_tool/help.py
 ${PYSITELIB}/samba/tests/samba_tool/join.py
 ${PYSITELIB}/samba/tests/samba_tool/ntacl.py
+${PYSITELIB}/samba/tests/samba_tool/ou.py
+${PYSITELIB}/samba/tests/samba_tool/passwordsettings.py
 ${PYSITELIB}/samba/tests/samba_tool/processes.py
+${PYSITELIB}/samba/tests/samba_tool/provision_password_check.py
 ${PYSITELIB}/samba/tests/samba_tool/rodc.py
+${PYSITELIB}/samba/tests/samba_tool/schema.py
 ${PYSITELIB}/samba/tests/samba_tool/sites.py
 ${PYSITELIB}/samba/tests/samba_tool/timecmd.py
 ${PYSITELIB}/samba/tests/samba_tool/user.py
 ${PYSITELIB}/samba/tests/samba_tool/user_check_password_script.py
+${PYSITELIB}/samba/tests/samba_tool/user_virtualCryptSHA.py
+${PYSITELIB}/samba/tests/samba_tool/user_wdigest.py
+${PYSITELIB}/samba/tests/samba_tool/visualize.py
+${PYSITELIB}/samba/tests/samba_tool/visualize_drs.py
 ${PYSITELIB}/samba/tests/samdb.py
+${PYSITELIB}/samba/tests/samdb_api.py
 ${PYSITELIB}/samba/tests/security.py
+${PYSITELIB}/samba/tests/smb.py
 ${PYSITELIB}/samba/tests/source.py
 ${PYSITELIB}/samba/tests/strings.py
 ${PYSITELIB}/samba/tests/subunitrun.py
+${PYSITELIB}/samba/tests/tdb_util.py
 ${PYSITELIB}/samba/tests/unicodenames.py
 ${PYSITELIB}/samba/tests/upgrade.py
 ${PYSITELIB}/samba/tests/upgradeprovision.py
@@ -419,6 +519,7 @@ ${PYSITELIB}/samba/third_party/__init__.py
 ${PYSITELIB}/samba/upgrade.py
 ${PYSITELIB}/samba/upgradehelpers.py
 ${PYSITELIB}/samba/web_server/__init__.py
+${PYSITELIB}/samba/werror.so
 ${PYSITELIB}/samba/xattr.py
 ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
@@ -437,23 +538,29 @@ ${PLIST.ldap}lib/samba/idmap/rfc2307.so
 lib/samba/idmap/rid.so
 lib/samba/idmap/script.so
 lib/samba/idmap/tdb2.so
+lib/samba/krb5/winbind_krb5_locator.so
 lib/samba/ldb/acl.so
 lib/samba/ldb/aclread.so
 lib/samba/ldb/anr.so
 lib/samba/ldb/asq.so
+lib/samba/ldb/audit_log.so
 lib/samba/ldb/descriptor.so
 lib/samba/ldb/dirsync.so
 lib/samba/ldb/dns_notify.so
 lib/samba/ldb/dsdb_notification.so
+lib/samba/ldb/encrypted_secrets.so
 lib/samba/ldb/extended_dn_in.so
 lib/samba/ldb/extended_dn_out.so
 lib/samba/ldb/extended_dn_store.so
+lib/samba/ldb/group_audit_log.so
 lib/samba/ldb/ildap.so
 lib/samba/ldb/instancetype.so
 lib/samba/ldb/lazy_commit.so
+lib/samba/ldb/ldb.so
 lib/samba/ldb/ldbsamba_extensions.so
 lib/samba/ldb/linked_attributes.so
 lib/samba/ldb/local_password.so
+lib/samba/ldb/mdb.so
 lib/samba/ldb/new_partition.so
 lib/samba/ldb/objectclass.so
 lib/samba/ldb/objectclass_attrs.so
@@ -486,6 +593,7 @@ lib/samba/ldb/subtree_delete.so
 lib/samba/ldb/subtree_rename.so
 lib/samba/ldb/tdb.so
 lib/samba/ldb/tombstone_reanimate.so
+lib/samba/ldb/unique_object_sids.so
 lib/samba/ldb/update_keytab.so
 lib/samba/ldb/vlv.so
 lib/samba/ldb/wins_ldb.so
@@ -496,13 +604,13 @@ ${PLIST.ldap}lib/samba/nss_info/sfu20.so
 lib/samba/private/libCHARSET3-samba4.so
 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
 lib/samba/private/libaddns-samba4.so
 lib/samba/private/libads-samba4.so
 lib/samba/private/libasn1-samba4.so.8
 lib/samba/private/libasn1-samba4.so.8.0.0
 lib/samba/private/libasn1util-samba4.so
-lib/samba/private/libauth-sam-reply-samba4.so
 lib/samba/private/libauth-samba4.so
 lib/samba/private/libauth-unix-token-samba4.so
 lib/samba/private/libauth4-samba4.so
@@ -516,8 +624,10 @@ lib/samba/private/libcli-spoolss-samba4.so
 lib/samba/private/libcliauth-samba4.so
 lib/samba/private/libcluster-samba4.so
 lib/samba/private/libcmdline-credentials-samba4.so
+lib/samba/private/libcmocka-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
 lib/samba/private/libdbwrap-samba4.so
 lib/samba/private/libdcerpc-samba-samba4.so
@@ -531,7 +641,7 @@ lib/samba/private/libevents-samba4.so
 lib/samba/private/libflag-mapping-samba4.so
 lib/samba/private/libgenrand-samba4.so
 lib/samba/private/libgensec-samba4.so
-lib/samba/private/libgpo-samba4.so
+lib/samba/private/libgpext-samba4.so
 lib/samba/private/libgse-samba4.so
 lib/samba/private/libgssapi-samba4.so.2
 lib/samba/private/libgssapi-samba4.so.2.0.0
@@ -555,8 +665,10 @@ lib/samba/private/libkrb5-samba4.so.26
 lib/samba/private/libkrb5-samba4.so.26.0.0
 lib/samba/private/libkrb5samba-samba4.so
 lib/samba/private/libldb-cmdline-samba4.so
+lib/samba/private/libldb-key-value-samba4.so
+lib/samba/private/libldb-mdb-int-samba4.so
 lib/samba/private/libldb.so.1
-lib/samba/private/libldb.so.1.1.29
+lib/samba/private/libldb.so.1.4.3
 lib/samba/private/libldbsamba-samba4.so
 lib/samba/private/liblibcli-lsa3-samba4.so
 lib/samba/private/liblibcli-netlogon3-samba4.so
@@ -578,7 +690,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.1.29
+lib/samba/private/libpyldb-util.so.1.4.3
 lib/samba/private/libregistry-samba4.so
 lib/samba/private/libreplace-samba4.so
 lib/samba/private/libroken-samba4.so.19
@@ -592,6 +704,7 @@ lib/samba/private/libsamba-security-samba4.so
 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
 lib/samba/private/libsecrets3-samba4.so
 lib/samba/private/libserver-id-db-samba4.so
 lib/samba/private/libserver-role-samba4.so
@@ -609,9 +722,9 @@ lib/samba/private/libsys-rw-samba4.so
 lib/samba/private/libtalloc-report-samba4.so
 lib/samba/private/libtdb-wrap-samba4.so
 lib/samba/private/libtdb.so.1
-lib/samba/private/libtdb.so.1.3.12
+lib/samba/private/libtdb.so.1.3.16
 lib/samba/private/libtevent.so.0
-lib/samba/private/libtevent.so.0.9.31
+lib/samba/private/libtevent.so.0.9.37
 lib/samba/private/libtime-basic-samba4.so
 lib/samba/private/libtorture-samba4.so
 lib/samba/private/libtrusts-util-samba4.so
@@ -623,6 +736,7 @@ lib/samba/private/libwinbind-client-samba4.so
 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.so
 lib/samba/process_model/standard.so
 ${PLIST.pam}lib/samba/security/pam_winbind.so
 lib/samba/service/cldap.so
@@ -672,17 +786,19 @@ 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/worm.so
 lib/samba/vfs/xattr_tdb.so
-lib/winbind_krb5_locator.so
 man/man1/pidl.1
 man/man3/Parse::Pidl::Dump.3
 man/man3/Parse::Pidl::NDR.3
 man/man3/Parse::Pidl::Util.3
 man/man3/Parse::Pidl::Wireshark::Conformance.3
 man/man3/Parse::Pidl::Wireshark::NDR.3
+sbin/eventlogadm
 sbin/nmbd
 sbin/samba
+sbin/samba-gpupdate
 sbin/samba_dnsupdate
 sbin/samba_kcc
 sbin/samba_spnupdate
@@ -707,11 +823,27 @@ share/examples/samba/deluser.sh
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
 share/samba/setup/DB_CONFIG
+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/cn=samba.ldif
 share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
@@ -720,6 +852,7 @@ 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/fedora-ds-init.ldif
 share/samba/setup/fedorads-dna.ldif
 share/samba/setup/fedorads-index.ldif
@@ -794,3 +927,6 @@ share/samba/setup/share.ldif
 share/samba/setup/slapd.conf
 share/samba/setup/spn_update_list
 share/samba/setup/ypServ30.ldif
+@pkgdir share/examples/samba/pam_smbpass
+@pkgdir etc/samba
+@pkgdir bind-dns
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 3b8e0bdd503..73e81ac16ad 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,18 +1,16 @@
-$NetBSD: distinfo,v 1.18 2018/09/20 18:24:08 tnn Exp $
+$NetBSD: distinfo,v 1.19 2018/11/23 07:30:02 ryoon Exp $
 
-SHA1 (samba-4.6.8.tar.gz) = 744fa10e3ad8ea7219e51c27f3792d99e25782be
-RMD160 (samba-4.6.8.tar.gz) = 3ecde1cfe97ce50d4864bf5c8e732127f13468bb
-SHA512 (samba-4.6.8.tar.gz) = fb40144210361bdeab09007aa49fa85077fbc8eeae2c49bcdafb01d33ec40425160882979f0829005a89766ed4fd4e36d7f952f6dbf6e0178f5b0945dc8d8efb
-Size (samba-4.6.8.tar.gz) = 21139872 bytes
+SHA1 (samba-4.9.2.tar.gz) = 3b777a95aed4946717094bbe830279ba5ee2370f
+RMD160 (samba-4.9.2.tar.gz) = 4db2cf6684e724514f3ea1eaa7ed93c756f72f28
+SHA512 (samba-4.9.2.tar.gz) = 67de5faeda45e5c245bf02cc195cdf9ca4b63f17625837badf7c50d97250e94de5309c9ef824bd7890bc771b1dc0a3bfbafea09880850b5167f0bf8a8ef488ed
+Size (samba-4.9.2.tar.gz) = 18042752 bytes
 SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
 SHA1 (patch-dynconfig_wscript) = 4d769a4d07487b5f62c112d3b0095196bb058117
-SHA1 (patch-lib_nss__wrapper_nss__wrapper.c) = c692fa33ec17ed4f1dc1e40c1fadf7846d976824
+SHA1 (patch-lib_ldb_ldb__mdb_ldb__mdb.c) = 3dcee7618a15058351d488ad003929effa100e41
 SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
 SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b
-SHA1 (patch-lib_tevent_wscript) = 9617b9e40d2ffc8d6297390a20ba9bd44147d669
+SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
 SHA1 (patch-pidl_lib_wscript__build) = 82a4b42c20df7e6d8927b53471123f0536c81866
-SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = 4b4be0691322afc70769602069c8a1bbd81ab639
 SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60
-SHA1 (patch-source4_scripting_wsript_build) = 6053076427835ac4fe97d93b2ff67d2caccc71f4
-SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = 0bd2067b77a1db93e3cb5d80964a7be2b06802ff
+SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511
diff --git a/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c b/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c
new file mode 100644
index 00000000000..ee3645a3075
--- /dev/null
+++ b/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_ldb_ldb__mdb_ldb__mdb.c,v 1.1 2018/11/23 07:30:02 ryoon Exp $
+
+--- lib/ldb/ldb_mdb/ldb_mdb.c.orig	2018-07-12 08:23:36.000000000 +0000
++++ lib/ldb/ldb_mdb/ldb_mdb.c
+@@ -40,7 +40,9 @@ int ldb_mdb_err_map(int lmdb_err)
+ 		return LDB_SUCCESS;
+ 	case EIO:
+ 		return LDB_ERR_OPERATIONS_ERROR;
++#if !defined(__NetBSD__)
+ 	case EBADE:
++#endif
+ 	case MDB_INCOMPATIBLE:
+ 	case MDB_CORRUPTED:
+ 	case MDB_INVALID:
diff --git a/net/samba4/patches/patch-lib_nss__wrapper_nss__wrapper.c b/net/samba4/patches/patch-lib_nss__wrapper_nss__wrapper.c
deleted file mode 100644
index e2310ecb91d..00000000000
--- a/net/samba4/patches/patch-lib_nss__wrapper_nss__wrapper.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_nss__wrapper_nss__wrapper.c,v 1.1 2015/05/26 15:11:26 jperkin Exp $
-
-Avoid nss.h on SunOS, incompatible with other nss.h implementations.
-
---- lib/nss_wrapper/nss_wrapper.c.orig	2014-10-01 09:16:21.000000000 +0000
-+++ lib/nss_wrapper/nss_wrapper.c
-@@ -68,7 +68,7 @@
- 
- #include <dlfcn.h>
- 
--#if defined(HAVE_NSS_H)
-+#if defined(HAVE_NSS_H) && !defined(__sun)
- /* Linux and BSD */
- #include <nss.h>
- 
diff --git a/net/samba4/patches/patch-lib_tevent_wscript b/net/samba4/patches/patch-lib_tevent_wscript
index 65bb8c5cf67..8bd036c26fd 100644
--- a/net/samba4/patches/patch-lib_tevent_wscript
+++ b/net/samba4/patches/patch-lib_tevent_wscript
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_tevent_wscript,v 1.1 2015/06/26 16:09:49 jperkin Exp $
+$NetBSD: patch-lib_tevent_wscript,v 1.2 2018/11/23 07:30:02 ryoon Exp $
 
 Skip epoll tests on SunOS, implementation is Linux-specific.
 
---- lib/tevent/wscript.orig	2015-03-04 19:50:43.000000000 +0000
+--- lib/tevent/wscript.orig	2018-07-12 08:23:36.000000000 +0000
 +++ lib/tevent/wscript
-@@ -41,7 +41,7 @@ def configure(conf):
-             if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
+@@ -38,7 +38,7 @@ def configure(conf):
+                 conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
                  conf.define('USING_SYSTEM_PYTEVENT', 1)
  
 -    if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
diff --git a/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh b/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh
deleted file mode 100644
index 5315df96a9c..00000000000
--- a/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-source3_script_tests_test__smbclient__s3.sh,v 1.3 2017/04/08 08:56:27 ryoon Exp $
-
-Fix unportable test(1) comparison operator.
-
---- source3/script/tests/test_smbclient_s3.sh.orig	2017-03-31 06:32:03.000000000 +0000
-+++ source3/script/tests/test_smbclient_s3.sh
-@@ -889,7 +889,7 @@ EOF
- 
-     echo "$out" | grep 'NT_STATUS'
-     ret=$?
--    if [ $ret == 0 ] ; then
-+    if [ $ret = 0 ] ; then
- 	echo "$out"
- 	echo "failed - NT_STATUS_XXXX listing \\manglenames_share\\FF4GBY~Q"
- 	false
-@@ -1027,7 +1027,7 @@ EOF
- 
-     echo "$out" | grep 'NT_STATUS'
-     ret=$?
--    if [ $ret == 0 ] ; then
-+    if [ $ret = 0 ] ; then
- 	echo "$out"
- 	echo "failed - NT_STATUS_XXXX listing \\widelinks_share\\dot"
- 	false
diff --git a/net/samba4/patches/patch-source4_scripting_wsript_build b/net/samba4/patches/patch-source4_scripting_wsript_build
index c9cf8d30245..33a7e94eb42 100644
--- a/net/samba4/patches/patch-source4_scripting_wsript_build
+++ b/net/samba4/patches/patch-source4_scripting_wsript_build
@@ -1,17 +1,24 @@
-$NetBSD: patch-source4_scripting_wsript_build,v 1.2 2015/06/26 16:09:49 jperkin Exp $
+$NetBSD: patch-source4_scripting_wsript_build,v 1.3 2018/11/23 07:30:02 ryoon Exp $
 
 Avoid getting strange ending # character on interpreter 
 name like: 
 #!/usr/pkg/bin/python2.7#
 
---- source4/scripting/wscript_build.orig	2014-10-01 09:16:21.000000000 +0000
+--- source4/scripting/wscript_build.orig	2018-07-12 08:23:36.000000000 +0000
 +++ source4/scripting/wscript_build
-@@ -9,7 +9,7 @@ if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLE
+@@ -11,13 +11,13 @@ man_files = 'man/samba-gpupdate.8'
  if sbin_files:
      bld.INSTALL_FILES('${SBINDIR}',
                        sbin_files,
 -                      chmod=MODE_755, python_fixup=True, flat=True)
 +                      chmod=MODE_755, python_fixup=False, flat=True)
+     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'):
      bld.INSTALL_FILES('${BINDIR}',
+                   'bin/samba-tool',
+-                  chmod=MODE_755, python_fixup=True, flat=True)
++                  chmod=MODE_755, python_fixup=False, flat=True)
+ 
+ bld.RECURSE('bin')
diff --git a/net/samba4/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh b/net/samba4/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh
deleted file mode 100644
index 96a5fbf2ee3..00000000000
--- a/net/samba4/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-testprogs_blackbox_dbcheck-oldrelease.sh,v 1.3 2015/09/28 17:37:04 ryoon Exp $
-
-ERROR: [check-portability.awk] 
-
---- testprogs/blackbox/dbcheck-oldrelease.sh.orig	2015-09-08 13:45:25.000000000 +0000
-+++ testprogs/blackbox/dbcheck-oldrelease.sh
-@@ -208,19 +208,19 @@ dbcheck_clean2() {
- }
- 
- referenceprovision() {
--    if [ x$RELEASE == x"release-4-0-0" ]; then
-+    if [ x$RELEASE = x"release-4-0-0" ]; then
-         $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003
-     fi
- }
- 
- ldapcmp() {
--    if [ x$RELEASE == x"release-4-0-0" ]; then
-+    if [ x$RELEASE = x"release-4-0-0" ]; then
-          $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord
-     fi
- }
- 
- ldapcmp_sd() {
--    if [ x$RELEASE == x"release-4-0-0" ]; then
-+    if [ x$RELEASE = x"release-4-0-0" ]; then
-         $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --sd --skip-missing-dn
-     fi
- }