CVS commit: pkgsrc/net/samba4

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/samba4
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sat, 22 Dec 2018 01:13:52 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Dec 22 01:13:52 UTC 2018

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST distinfo options.mk
        pkgsrc/net/samba4/patches: patch-dynconfig_wscript
            patch-lib_ldb_ldb__mdb_ldb__mdb.c
Added Files:
        pkgsrc/net/samba4: buildlink3.mk
        pkgsrc/net/samba4/patches: patch-buildtools_wafsamba_samba__install.py
            patch-buildtools_wafsamba_samba__pidl.py
            patch-docs-xml_wscript__build
            patch-source4_torture_local_nss__tests.c
Removed Files:
        pkgsrc/net/samba4/patches: patch-pidl_lib_wscript__build

Log Message:
samba4: buidling fixes

PkgSrc changes:
* fix building on Darwin and probably other systems as well
* install manpages
* use correct install_name on Darwin
* does not collide with p5-Parse-Yapp anymore
* use cmocka and libgcrypt
* clean-ups


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/samba4/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/net/samba4/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/samba4/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__install.py \
    pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py \
    pkgsrc/net/samba4/patches/patch-docs-xml_wscript__build \
    pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/samba4/patches/patch-dynconfig_wscript \
    pkgsrc/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/samba4/patches/patch-pidl_lib_wscript__build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.56 pkgsrc/net/samba4/Makefile:1.57
--- pkgsrc/net/samba4/Makefile:1.56     Thu Dec 20 21:18:22 2018
+++ pkgsrc/net/samba4/Makefile  Sat Dec 22 01:13:52 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2018/12/20 21:18:22 adam Exp $
+# $NetBSD: Makefile,v 1.57 2018/12/22 01:13:52 adam Exp $
 
 DISTNAME=      samba-4.9.4
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://download.samba.org/pub/samba/stable/
 
@@ -9,14 +10,16 @@ HOMEPAGE=    http://www.samba.org/
 COMMENT=       SMB/CIFS protocol server suite
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-
 CONFLICTS+=    ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 GCC_REQD+=     4.4
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+=      ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
+BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=        docbook-xml-[0-9]*:../../textproc/docbook-xml
+BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+DEPENDS+=      p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp
 DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
+DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+DEPENDS+=      ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
 
 BUILD_DEFS+=           VARBASE
 
@@ -52,8 +55,6 @@ FILES_SUBST+=         SMB_PID=${SMB_PID}
 # a full dependency since it's not actually needed by samba.
 USE_TOOLS+=            gmake mktemp perl:run pkg-config
 
-REPLACE_PERL=          script/findsmb.in
-
 USE_GNU_ICONV=         yes     # FIXME: something doesn't work on NetBSD
 BROKEN_GETTEXT_DETECTION=yes
 
@@ -63,8 +64,6 @@ BROKEN_GETTEXT_DETECTION=yes
 #CONFIGURE_ARGS+=      --fatal-errors
 
 HAS_CONFIGURE=         yes
-CONFIGURE_ENV+=                XSLTPROC=${FALSE} # suppress generation of man pages
-CONFIGURE_ARGS+=       --libdir=${SAMBA_LIB}
 CONFIG_SHELL=          ${PYTHONBIN}
 CONFIGURE_SCRIPT=      ${WRKSRC}/buildtools/bin/waf
 CONFIGURE_ARGS+=       configure
@@ -72,6 +71,7 @@ CONFIGURE_ARGS+=      --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --infodir=${SMB_INFO}
 CONFIGURE_ARGS+=       --mandir=${SMB_MAN}
 CONFIGURE_ARGS+=       --datarootdir=${SMB_DATAROOT}
+CONFIGURE_ARGS+=       --libdir=${SAMBA_LIB}
 CONFIGURE_ARGS+=       --localedir=${SMB_LOCALE}
 CONFIGURE_ARGS+=       --docdir=${SMB_DOC}
 CONFIGURE_ARGS+=       --with-statedir=${SMB_STATE}
@@ -87,8 +87,9 @@ CONFIGURE_ARGS+=      --with-privileged-socke
 CONFIGURE_ARGS+=       --with-configdir=${SMB_CONFIG}
 CONFIGURE_ARGS+=       --with-libiconv=${BUILDLINK_PREFIX.iconv}
 #CONFIGURE_ARGS+=      --bundled-libraries=com_err
-CONFIGURE_ARGS+=       --enable-gnutls
 CONFIGURE_ARGS+=       --abi-check-disable
+CONFIGURE_ARGS+=       --disable-symbol-versions
+CONFIGURE_ARGS+=       --enable-gnutls
 #CONFIGURE_ARGS+=      --bundled-libraries=!crypto,ldb,ntdb,!talloc,tdb,tevent
 .if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]))
 CONFIGURE_ARGS+=       --jobs=${MAKE_JOBS}
@@ -108,23 +109,16 @@ LDFLAGS+=         ${BUILDLINK_LDADD.gettext}
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB}
 
 CFLAGS.SunOS+=         -DHAVE_SOLARIS_GETGRENT_R
-
 # workaround https://bugzilla.samba.org/show_bug.cgi?id=12502 for now
 CFLAGS.SunOS+=         -DMSG_NOSIGNAL=0
 
 .include "options.mk"
 
-PLIST_VARS+=           macosx
-
-.if ${OPSYS} == "Darwin"
-PLIST.macosx=          yes
-.endif
-
 .if ${SHLIB_TYPE} == "dylib"
-PLIST_SUBST+=  LIBEXT=dylib
+PLIST_SUBST+=  SOEXT=dylib
 SAMBA_LIBEXT=  dylib
 .else
-PLIST_SUBST+=  LIBEXT=so
+PLIST_SUBST+=  SOEXT=so
 SAMBA_LIBEXT=  so
 .endif
 
@@ -152,6 +146,19 @@ CONF_FILES=        ${PREFIX}/${EGDIR}/smb.conf.
 OWN_DIRS_PERMS=        ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 RCD_SCRIPTS+=  samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
 
+SUBST_CLASSES+=                docbook
+SUBST_MESSAGE.docbook= Fixing docbook URLs.
+SUBST_FILES.docbook+=  buildtools/wafsamba/wafsamba.py
+SUBST_FILES.docbook+=  ctdb/doc/*.xml
+SUBST_FILES.docbook+=  docs-xml/xslt/*.xsl
+SUBST_FILES.docbook+=  lib/ldb/docs/builddocs.sh
+SUBST_FILES.docbook+=  librpc/tools/*.xml
+SUBST_FILES.docbook+=  */*/man/*.xml
+SUBST_FILES.docbook+=  */*/*/man/*.xml
+SUBST_STAGE.docbook=   pre-configure
+SUBST_SED.docbook=     -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g'
+SUBST_SED.docbook+=    -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
+
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing paths.
 SUBST_FILES.paths=     ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
@@ -178,7 +185,7 @@ post-extract:
        ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
 
 post-install:
-       set -e ; cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
+       ${RUN} cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
                ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
        done
        ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
@@ -190,7 +197,15 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \
                ${DESTDIR}${PREFIX}/${EGDIR}
 
+REPLACE_PERL+=         librpc/tables.pl
 REPLACE_PERL+=         pidl/pidl
+REPLACE_PERL+=         pidl/tests/*.pl
+REPLACE_PERL+=         script/*.pl
+REPLACE_PERL+=         script/findsmb.in
+REPLACE_PERL+=         source3/script/*.pl
+REPLACE_PERL+=         source4/build/pasn1/pasn1.pl
+REPLACE_PERL+=         source4/script/*.pl
+REPLACE_PERL+=         third_party/nss_wrapper/nss_wrapper.pl
 REPLACE_PYTHON+=       buildtools/bin/waf
 REPLACE_PYTHON+=       source4/setup/wscript_build
 REPLACE_PYTHON+=       source4/scripting/bin/*
@@ -201,18 +216,20 @@ PY_PATCHPLIST=    yes
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 
-.if ${OPSYS} == "Linux"
+.if "${OPSYS}" == "Linux"
 .include "../../devel/libuuid/buildlink3.mk"
 .endif
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/lmdb/buildlink3.mk"
+.include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
-.include "../../devel/talloc/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
+.include "../../devel/talloc/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.17 pkgsrc/net/samba4/PLIST:1.18
--- pkgsrc/net/samba4/PLIST:1.17        Mon Dec 10 14:42:45 2018
+++ pkgsrc/net/samba4/PLIST     Sat Dec 22 01:13:52 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2018/12/10 14:42:45 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/12/22 01:13:52 adam Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/findsmb
@@ -214,7 +214,6 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl
 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Util.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Wireshark/Conformance.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Wireshark/NDR.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Parse/Yapp/Driver.pm
 lib/pkgconfig/dcerpc.pc
 lib/pkgconfig/dcerpc_samr.pc
 lib/pkgconfig/dcerpc_server.pc
@@ -525,82 +524,82 @@ ${PYSITELIB}/samba/xattr_native.so
 ${PYSITELIB}/samba/xattr_tdb.so
 ${PYSITELIB}/tdb.so
 ${PYSITELIB}/tevent.py
-lib/samba/auth/script.so
-lib/samba/bind9/dlz_bind9.so
-lib/samba/bind9/dlz_bind9_10.so
-lib/samba/bind9/dlz_bind9_11.so
-lib/samba/bind9/dlz_bind9_9.so
-lib/samba/gensec/krb5.so
-${PLIST.ldap}lib/samba/idmap/ad.so
-lib/samba/idmap/autorid.so
-lib/samba/idmap/hash.so
-${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
-${PLIST.64bit}lib/samba/ldb/mdb.so
-lib/samba/ldb/new_partition.so
-lib/samba/ldb/objectclass.so
-lib/samba/ldb/objectclass_attrs.so
-lib/samba/ldb/objectguid.so
-lib/samba/ldb/operational.so
-lib/samba/ldb/paged_results.so
-lib/samba/ldb/paged_searches.so
-lib/samba/ldb/partition.so
-lib/samba/ldb/password_hash.so
-lib/samba/ldb/ranged_results.so
-lib/samba/ldb/rdn_name.so
-lib/samba/ldb/repl_meta_data.so
-lib/samba/ldb/resolve_oids.so
-lib/samba/ldb/rootdse.so
-lib/samba/ldb/samba3sam.so
-lib/samba/ldb/samba3sid.so
-lib/samba/ldb/samba_dsdb.so
-lib/samba/ldb/samba_secrets.so
-lib/samba/ldb/samldb.so
-lib/samba/ldb/sample.so
-lib/samba/ldb/schema_data.so
-lib/samba/ldb/schema_load.so
-lib/samba/ldb/secrets_tdb_sync.so
-lib/samba/ldb/server_sort.so
-lib/samba/ldb/show_deleted.so
-lib/samba/ldb/simple_dn.so
-lib/samba/ldb/simple_ldap_map.so
-lib/samba/ldb/skel.so
-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
-lib/samba/nss_info/hash.so
-${PLIST.ldap}lib/samba/nss_info/rfc2307.so
-${PLIST.ldap}lib/samba/nss_info/sfu.so
-${PLIST.ldap}lib/samba/nss_info/sfu20.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}
+lib/samba/bind9/dlz_bind9_9.${SOEXT}
+lib/samba/gensec/krb5.${SOEXT}
+${PLIST.ads}lib/samba/idmap/ad.${SOEXT}
+lib/samba/idmap/autorid.${SOEXT}
+lib/samba/idmap/hash.${SOEXT}
+${PLIST.ads}lib/samba/idmap/rfc2307.${SOEXT}
+lib/samba/idmap/rid.${SOEXT}
+lib/samba/idmap/script.${SOEXT}
+lib/samba/idmap/tdb2.${SOEXT}
+lib/samba/krb5/winbind_krb5_locator.${SOEXT}
+lib/samba/ldb/acl.${SOEXT}
+lib/samba/ldb/aclread.${SOEXT}
+lib/samba/ldb/anr.${SOEXT}
+lib/samba/ldb/asq.${SOEXT}
+lib/samba/ldb/audit_log.${SOEXT}
+lib/samba/ldb/descriptor.${SOEXT}
+lib/samba/ldb/dirsync.${SOEXT}
+lib/samba/ldb/dns_notify.${SOEXT}
+lib/samba/ldb/dsdb_notification.${SOEXT}
+lib/samba/ldb/encrypted_secrets.${SOEXT}
+lib/samba/ldb/extended_dn_in.${SOEXT}
+lib/samba/ldb/extended_dn_out.${SOEXT}
+lib/samba/ldb/extended_dn_store.${SOEXT}
+lib/samba/ldb/group_audit_log.${SOEXT}
+lib/samba/ldb/ildap.${SOEXT}
+lib/samba/ldb/instancetype.${SOEXT}
+lib/samba/ldb/lazy_commit.${SOEXT}
+lib/samba/ldb/ldb.${SOEXT}
+lib/samba/ldb/ldbsamba_extensions.${SOEXT}
+lib/samba/ldb/linked_attributes.${SOEXT}
+lib/samba/ldb/local_password.${SOEXT}
+${PLIST.64bit}lib/samba/ldb/mdb.${SOEXT}
+lib/samba/ldb/new_partition.${SOEXT}
+lib/samba/ldb/objectclass.${SOEXT}
+lib/samba/ldb/objectclass_attrs.${SOEXT}
+lib/samba/ldb/objectguid.${SOEXT}
+lib/samba/ldb/operational.${SOEXT}
+lib/samba/ldb/paged_results.${SOEXT}
+lib/samba/ldb/paged_searches.${SOEXT}
+lib/samba/ldb/partition.${SOEXT}
+lib/samba/ldb/password_hash.${SOEXT}
+lib/samba/ldb/ranged_results.${SOEXT}
+lib/samba/ldb/rdn_name.${SOEXT}
+lib/samba/ldb/repl_meta_data.${SOEXT}
+lib/samba/ldb/resolve_oids.${SOEXT}
+lib/samba/ldb/rootdse.${SOEXT}
+lib/samba/ldb/samba3sam.${SOEXT}
+lib/samba/ldb/samba3sid.${SOEXT}
+lib/samba/ldb/samba_dsdb.${SOEXT}
+lib/samba/ldb/samba_secrets.${SOEXT}
+lib/samba/ldb/samldb.${SOEXT}
+lib/samba/ldb/sample.${SOEXT}
+lib/samba/ldb/schema_data.${SOEXT}
+lib/samba/ldb/schema_load.${SOEXT}
+lib/samba/ldb/secrets_tdb_sync.${SOEXT}
+lib/samba/ldb/server_sort.${SOEXT}
+lib/samba/ldb/show_deleted.${SOEXT}
+lib/samba/ldb/simple_dn.${SOEXT}
+lib/samba/ldb/simple_ldap_map.${SOEXT}
+lib/samba/ldb/skel.${SOEXT}
+lib/samba/ldb/subtree_delete.${SOEXT}
+lib/samba/ldb/subtree_rename.${SOEXT}
+lib/samba/ldb/tdb.${SOEXT}
+lib/samba/ldb/tombstone_reanimate.${SOEXT}
+lib/samba/ldb/unique_object_sids.${SOEXT}
+lib/samba/ldb/update_keytab.${SOEXT}
+lib/samba/ldb/vlv.${SOEXT}
+lib/samba/ldb/wins_ldb.${SOEXT}
+lib/samba/nss_info/hash.${SOEXT}
+${PLIST.ads}lib/samba/nss_info/rfc2307.${SOEXT}
+${PLIST.ads}lib/samba/nss_info/sfu.${SOEXT}
+${PLIST.ads}lib/samba/nss_info/sfu20.${SOEXT}
 lib/samba/private/libCHARSET3-samba4.so
 lib/samba/private/libHDB-SAMBA4-samba4.so
 lib/samba/private/libLIBWBCLIENT-OLD-samba4.so
@@ -625,7 +624,6 @@ lib/samba/private/libcliauth-samba4.so
 lib/samba/private/libcluster-samba4.so
 lib/samba/private/libcmdline-contexts-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
@@ -738,65 +736,184 @@ lib/samba/private/libwinbind-client-samb
 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
-lib/samba/service/dcerpc.so
-lib/samba/service/dns.so
-lib/samba/service/dns_update.so
-lib/samba/service/drepl.so
-lib/samba/service/kcc.so
-lib/samba/service/kdc.so
-lib/samba/service/ldap.so
-lib/samba/service/nbtd.so
-lib/samba/service/ntp_signd.so
-lib/samba/service/s3fs.so
-lib/samba/service/web.so
-lib/samba/service/winbindd.so
-lib/samba/service/wrepl.so
-lib/samba/vfs/acl_tdb.so
-lib/samba/vfs/acl_xattr.so
-lib/samba/vfs/aio_fork.so
-lib/samba/vfs/aio_pthread.so
-lib/samba/vfs/audit.so
-lib/samba/vfs/cap.so
-lib/samba/vfs/catia.so
-lib/samba/vfs/commit.so
-lib/samba/vfs/crossrename.so
-lib/samba/vfs/default_quota.so
-lib/samba/vfs/dirsort.so
-lib/samba/vfs/expand_msdfs.so
-lib/samba/vfs/extd_audit.so
-lib/samba/vfs/fake_perms.so
-lib/samba/vfs/fruit.so
-lib/samba/vfs/full_audit.so
-lib/samba/vfs/linux_xfs_sgid.so
-lib/samba/vfs/media_harmony.so
-lib/samba/vfs/netatalk.so
-lib/samba/vfs/offline.so
-lib/samba/vfs/posix_eadb.so
-lib/samba/vfs/preopen.so
-lib/samba/vfs/readahead.so
-lib/samba/vfs/readonly.so
-lib/samba/vfs/recycle.so
-lib/samba/vfs/shadow_copy.so
-lib/samba/vfs/shadow_copy2.so
-lib/samba/vfs/shell_snap.so
-lib/samba/vfs/streams_depot.so
-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/samba/process_model/prefork.${SOEXT}
+lib/samba/process_model/standard.${SOEXT}
+${PLIST.pam}lib/samba/security/pam_winbind.${SOEXT}
+lib/samba/service/cldap.${SOEXT}
+lib/samba/service/dcerpc.${SOEXT}
+lib/samba/service/dns.${SOEXT}
+lib/samba/service/dns_update.${SOEXT}
+lib/samba/service/drepl.${SOEXT}
+lib/samba/service/kcc.${SOEXT}
+lib/samba/service/kdc.${SOEXT}
+lib/samba/service/ldap.${SOEXT}
+lib/samba/service/nbtd.${SOEXT}
+lib/samba/service/ntp_signd.${SOEXT}
+lib/samba/service/s3fs.${SOEXT}
+lib/samba/service/web.${SOEXT}
+lib/samba/service/winbindd.${SOEXT}
+lib/samba/service/wrepl.${SOEXT}
+lib/samba/vfs/acl_tdb.${SOEXT}
+lib/samba/vfs/acl_xattr.${SOEXT}
+lib/samba/vfs/aio_fork.${SOEXT}
+lib/samba/vfs/aio_pthread.${SOEXT}
+lib/samba/vfs/audit.${SOEXT}
+lib/samba/vfs/cap.${SOEXT}
+lib/samba/vfs/catia.${SOEXT}
+lib/samba/vfs/commit.${SOEXT}
+lib/samba/vfs/crossrename.${SOEXT}
+lib/samba/vfs/default_quota.${SOEXT}
+lib/samba/vfs/dirsort.${SOEXT}
+lib/samba/vfs/expand_msdfs.${SOEXT}
+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/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}
+lib/samba/vfs/readahead.${SOEXT}
+lib/samba/vfs/readonly.${SOEXT}
+lib/samba/vfs/recycle.${SOEXT}
+lib/samba/vfs/shadow_copy.${SOEXT}
+lib/samba/vfs/shadow_copy2.${SOEXT}
+lib/samba/vfs/shell_snap.${SOEXT}
+lib/samba/vfs/streams_depot.${SOEXT}
+lib/samba/vfs/streams_xattr.${SOEXT}
+lib/samba/vfs/syncops.${SOEXT}
+lib/samba/vfs/time_audit.${SOEXT}
+lib/samba/vfs/unityed_media.${SOEXT}
+lib/samba/vfs/virusfilter.${SOEXT}
+lib/samba/vfs/worm.${SOEXT}
+lib/samba/vfs/xattr_tdb.${SOEXT}
+man/man1/dbwrap_tool.1
+man/man1/findsmb.1
+man/man1/gentest.1
+man/man1/ldbadd.1
+man/man1/ldbdel.1
+man/man1/ldbedit.1
+man/man1/ldbmodify.1
+man/man1/ldbrename.1
+man/man1/ldbsearch.1
+man/man1/locktest.1
+man/man1/log2pcap.1
+man/man1/masktest.1
+man/man1/mvxattr.1
+man/man1/ndrdump.1
+man/man1/nmblookup.1
+man/man1/ntlm_auth.1
+man/man1/oLschema2ldif.1
 man/man1/pidl.1
+man/man1/profiles.1
+man/man1/regdiff.1
+man/man1/regpatch.1
+man/man1/regshell.1
+man/man1/regtree.1
+man/man1/rpcclient.1
+man/man1/sharesec.1
+man/man1/smbcacls.1
+man/man1/smbclient.1
+man/man1/smbcontrol.1
+man/man1/smbcquotas.1
+man/man1/smbget.1
+man/man1/smbstatus.1
+man/man1/smbtar.1
+man/man1/smbtorture.1
+man/man1/smbtree.1
+man/man1/testparm.1
+man/man1/vfstest.1
+man/man1/wbinfo.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
+man/man3/ldb.3
+man/man5/lmhosts.5
+man/man5/pam_winbind.conf.5
+man/man5/smbgetrc.5
+man/man5/smbpasswd.5
+man/man7/libsmbclient.7
+man/man7/samba.7
+man/man7/traffic_learner.7
+man/man7/traffic_replay.7
+man/man8/cifsdd.8
+man/man8/eventlogadm.8
+man/man8/idmap_ad.8
+man/man8/idmap_autorid.8
+man/man8/idmap_hash.8
+man/man8/idmap_ldap.8
+man/man8/idmap_nss.8
+man/man8/idmap_rfc2307.8
+man/man8/idmap_rid.8
+man/man8/idmap_script.8
+man/man8/idmap_tdb.8
+man/man8/idmap_tdb2.8
+man/man8/net.8
+man/man8/nmbd.8
+man/man8/pam_winbind.8
+man/man8/pdbedit.8
+man/man8/samba-gpupdate.8
+man/man8/samba-regedit.8
+man/man8/samba-tool.8
+man/man8/samba.8
+man/man8/smbd.8
+man/man8/smbpasswd.8
+man/man8/smbspool.8
+man/man8/smbspool_krb5_wrapper.8
+man/man8/tdbbackup.8
+man/man8/tdbdump.8
+man/man8/tdbrestore.8
+man/man8/tdbtool.8
+man/man8/vfs_acl_tdb.8
+man/man8/vfs_acl_xattr.8
+man/man8/vfs_aio_fork.8
+man/man8/vfs_aio_pthread.8
+man/man8/vfs_audit.8
+man/man8/vfs_btrfs.8
+man/man8/vfs_cacheprime.8
+man/man8/vfs_cap.8
+man/man8/vfs_catia.8
+man/man8/vfs_ceph.8
+man/man8/vfs_commit.8
+man/man8/vfs_crossrename.8
+man/man8/vfs_default_quota.8
+man/man8/vfs_dirsort.8
+man/man8/vfs_extd_audit.8
+man/man8/vfs_fake_perms.8
+man/man8/vfs_fileid.8
+man/man8/vfs_fruit.8
+man/man8/vfs_full_audit.8
+man/man8/vfs_glusterfs.8
+man/man8/vfs_gpfs.8
+man/man8/vfs_linux_xfs_sgid.8
+man/man8/vfs_media_harmony.8
+man/man8/vfs_netatalk.8
+man/man8/vfs_nfs4acl_xattr.8
+man/man8/vfs_offline.8
+man/man8/vfs_prealloc.8
+man/man8/vfs_preopen.8
+man/man8/vfs_readahead.8
+man/man8/vfs_readonly.8
+man/man8/vfs_recycle.8
+man/man8/vfs_shadow_copy.8
+man/man8/vfs_shadow_copy2.8
+man/man8/vfs_shell_snap.8
+man/man8/vfs_snapper.8
+man/man8/vfs_streams_depot.8
+man/man8/vfs_streams_xattr.8
+man/man8/vfs_syncops.8
+man/man8/vfs_time_audit.8
+man/man8/vfs_tsmsm.8
+man/man8/vfs_unityed_media.8
+man/man8/vfs_virusfilter.8
+man/man8/vfs_worm.8
+man/man8/vfs_xattr_tdb.8
+man/man8/winbind_krb5_locator.8
+man/man8/winbindd.8
 sbin/eventlogadm
 sbin/nmbd
 sbin/samba

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.21 pkgsrc/net/samba4/distinfo:1.22
--- pkgsrc/net/samba4/distinfo:1.21     Thu Dec 20 21:18:22 2018
+++ pkgsrc/net/samba4/distinfo  Sat Dec 22 01:13:52 2018
@@ -1,16 +1,19 @@
-$NetBSD: distinfo,v 1.21 2018/12/20 21:18:22 adam Exp $
+$NetBSD: distinfo,v 1.22 2018/12/22 01:13:52 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 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
+SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = 1469d23fd2094ce0ecf979df6ff8cfd69fae53a6
 SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
-SHA1 (patch-dynconfig_wscript) = 4d769a4d07487b5f62c112d3b0095196bb058117
-SHA1 (patch-lib_ldb_ldb__mdb_ldb__mdb.c) = 3dcee7618a15058351d488ad003929effa100e41
+SHA1 (patch-docs-xml_wscript__build) = 5aa5cbf61882604b7ec9d19f0cd1537a23705ad0
+SHA1 (patch-dynconfig_wscript) = b77bc4aabaab2943962112c51dc539a65d015400
+SHA1 (patch-lib_ldb_ldb__mdb_ldb__mdb.c) = e6d10c0eb44bbad4fbdd52a9e66116ead8e1818d
 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-pidl_lib_wscript__build) = 82a4b42c20df7e6d8927b53471123f0536c81866
 SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60
 SHA1 (patch-source4_scripting_wsript_build) = bd4feddcaadf1c3d2d25eb7914e7b5843e4e9511
+SHA1 (patch-source4_torture_local_nss__tests.c) = 8c878a8ed771ba996a7a325a1ad41bd13016c70c

Index: pkgsrc/net/samba4/options.mk
diff -u pkgsrc/net/samba4/options.mk:1.6 pkgsrc/net/samba4/options.mk:1.7
--- pkgsrc/net/samba4/options.mk:1.6    Sun Nov 12 15:36:58 2017
+++ pkgsrc/net/samba4/options.mk        Sat Dec 22 01:13:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2017/11/12 15:36:58 khorben Exp $
+# $NetBSD: options.mk,v 1.7 2018/12/22 01:13:52 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.samba4
 PKG_SUPPORTED_OPTIONS= ads fam ldap pam winbind # cups # cups option is broken for me.
@@ -17,6 +17,8 @@ PKG_SUGGESTED_OPTIONS+=       ads
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=           ads cups fam ldap pam winbind
+
 ###
 ### Access Control List support.
 ###
@@ -31,6 +33,7 @@ CONFIGURE_ARGS+=      --without-acl-support
 ###
 .if !empty(PKG_OPTIONS:Mads)
 CONFIGURE_ARGS+=       --with-ads
+PLIST.ads=             yes
 .else
 CONFIGURE_ARGS+=       --without-ads
 .endif
@@ -38,7 +41,6 @@ CONFIGURE_ARGS+=      --without-ads
 ###
 ### Native CUPS support for providing printing services.
 ###
-PLIST_VARS+=           cups
 .if !empty(PKG_OPTIONS:Mcups)
 .  include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-cups
@@ -51,7 +53,6 @@ CONFIGURE_ARGS+=      --disable-cups
 ###
 ### File Alteration Monitor support.
 ###
-PLIST_VARS+=           fam
 .if !empty(PKG_OPTIONS:Mfam)
 .  include "../../mk/fam.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-fam
@@ -63,7 +64,6 @@ CONFIGURE_ARGS+=      --without-fam
 ###
 ### Support LDAP authentication and storage of Samba account information.
 ###
-PLIST_VARS+=           ldap
 # Active Directory requires ldap
 .if !empty(PKG_OPTIONS:Mldap) || !empty(PKG_OPTIONS:Mads)
 .  include "../../databases/openldap-client/buildlink3.mk"
@@ -76,7 +76,6 @@ CONFIGURE_ARGS+=      --without-ldap
 ###
 ### Support PAM authentication and build smbpass and winbind PAM modules.
 ###
-PLIST_VARS+=           pam
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 
@@ -92,7 +91,6 @@ CONFIGURE_ARGS+=      --without-pam
 ### Support querying a PDC for domain user and group information, e.g.,
 ### through NSS or PAM.
 ###
-PLIST_VARS+=           winbind
 .if !empty(PKG_OPTIONS:Mwinbind)
 CONFIGURE_ARGS+=       --with-winbind
 PLIST.winbind=         yes

Index: pkgsrc/net/samba4/patches/patch-dynconfig_wscript
diff -u pkgsrc/net/samba4/patches/patch-dynconfig_wscript:1.1 pkgsrc/net/samba4/patches/patch-dynconfig_wscript:1.2
--- pkgsrc/net/samba4/patches/patch-dynconfig_wscript:1.1       Sat Nov 11 01:32:46 2017
+++ pkgsrc/net/samba4/patches/patch-dynconfig_wscript   Sat Dec 22 01:13:52 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-dynconfig_wscript,v 1.1 2017/11/11 01:32:46 jklos Exp $
+$NetBSD: patch-dynconfig_wscript,v 1.2 2018/12/22 01:13:52 adam Exp $
+
+Do not check installation prefix.
 
 --- dynconfig/wscript.orig     2017-01-11 07:55:14.000000000 +0000
 +++ dynconfig/wscript
Index: pkgsrc/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c
diff -u pkgsrc/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c:1.1 pkgsrc/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c:1.2
--- pkgsrc/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c:1.1     Fri Nov 23 07:30:02 2018
+++ pkgsrc/net/samba4/patches/patch-lib_ldb_ldb__mdb_ldb__mdb.c Sat Dec 22 01:13:52 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-lib_ldb_ldb__mdb_ldb__mdb.c,v 1.1 2018/11/23 07:30:02 ryoon Exp $
+$NetBSD: patch-lib_ldb_ldb__mdb_ldb__mdb.c,v 1.2 2018/12/22 01:13:52 adam Exp $
+
+Some systems do not define EBADE.
 
 --- lib/ldb/ldb_mdb/ldb_mdb.c.orig     2018-07-12 08:23:36.000000000 +0000
 +++ lib/ldb/ldb_mdb/ldb_mdb.c
@@ -6,7 +8,7 @@ $NetBSD: patch-lib_ldb_ldb__mdb_ldb__mdb
                return LDB_SUCCESS;
        case EIO:
                return LDB_ERR_OPERATIONS_ERROR;
-+#if !defined(__NetBSD__)
++#ifdef EBADE
        case EBADE:
 +#endif
        case MDB_INCOMPATIBLE:

Added files:

Index: pkgsrc/net/samba4/buildlink3.mk
diff -u /dev/null pkgsrc/net/samba4/buildlink3.mk:1.1
--- /dev/null   Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/buildlink3.mk     Sat Dec 22 01:13:52 2018
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/12/22 01:13:52 adam Exp $
+
+BUILDLINK_TREE+=       samba
+
+.if !defined(SAMBA_BUILDLINK3_MK)
+SAMBA_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.samba+=  samba>=4.9.4
+BUILDLINK_PKGSRCDIR.samba?=    ../../net/samba4
+
+.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/lmdb/buildlink3.mk"
+.include "../../devel/cmocka/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/talloc/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.endif # SAMBA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -samba

Index: pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__install.py
diff -u /dev/null pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__install.py:1.1
--- /dev/null   Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__install.py       Sat Dec 22 01:13:52 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.1 2018/12/22 01:13:52 adam Exp $
+
+Apply correct install_name on Darwin.
+
+--- buildtools/wafsamba/samba_install.py.orig  2018-07-12 08:23:36.000000000 +0000
++++ buildtools/wafsamba/samba_install.py
+@@ -150,6 +150,9 @@ def install_library(self):
+             bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
+         if dev_link:
+             bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
++        if getattr(self, 'samba_type', None) != 'PYTHON' and '-dynamiclib' in self.env['LINKFLAGS']:
++            self.env.append_value('LINKFLAGS', '-install_name')
++            self.env.append_value('LINKFLAGS', os.path.join(install_path, install_name))
+     finally:
+         bld.all_envs['default'] = default_env
+ 
Index: pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py
diff -u /dev/null pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py:1.1
--- /dev/null   Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_samba__pidl.py  Sat Dec 22 01:13:52 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-buildtools_wafsamba_samba__pidl.py,v 1.1 2018/12/22 01:13:52 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     2018-12-21 18:12:39.000000000 +0000
++++ buildtools/wafsamba/samba_pidl.py
+@@ -76,7 +76,7 @@ def SAMBA_PIDL(bld, pname, source,
+         else:
+             cc = 'CC="%s"' % bld.CONFIG_GET("CC")
+ 
+-    t = bld(rule='cd .. && %s %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % (cpp, cc),
++    t = bld(rule='cd .. && %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % cc,
+             ext_out    = '.c',
+             before     = 'cc',
+             update_outputs = True,
Index: pkgsrc/net/samba4/patches/patch-docs-xml_wscript__build
diff -u /dev/null pkgsrc/net/samba4/patches/patch-docs-xml_wscript__build:1.1
--- /dev/null   Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/patches/patch-docs-xml_wscript__build     Sat Dec 22 01:13:52 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-docs-xml_wscript__build,v 1.1 2018/12/22 01:13:52 adam Exp $
+
+Buidling smb.conf.5 is problematic.
+
+--- docs-xml/wscript_build.orig        2018-12-21 20:53:06.000000000 +0000
++++ docs-xml/wscript_build
+@@ -154,7 +154,6 @@ def SMBDOTCONF_MANPAGE(bld, target):
+ 
+ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
+ 
+-    SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
+     bld.SAMBAMANPAGES(manpages)
+ 
+     if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
Index: pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.c:1.1
--- /dev/null   Sat Dec 22 01:13:52 2018
+++ pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.c  Sat Dec 22 01:13:52 2018
@@ -0,0 +1,38 @@
+$NetBSD: patch-source4_torture_local_nss__tests.c,v 1.1 2018/12/22 01:13:52 adam Exp $
+
+Fix for systems without getpwent_r() and getgrent_r().
+
+--- source4/torture/local/nss_tests.c.orig     2018-12-21 18:31:03.000000000 +0000
++++ source4/torture/local/nss_tests.c
+@@ -346,6 +346,7 @@ static bool test_enum_r_passwd(struct to
+       torture_comment(tctx, "Testing setpwent\n");
+       setpwent();
+ 
++#ifdef HAVE_GETPWENT_R
+       while (1) {
+               torture_comment(tctx, "Testing getpwent_r\n");
+ 
+@@ -368,6 +369,7 @@ static bool test_enum_r_passwd(struct to
+                       num_pwd++;
+               }
+       }
++#endif /* HAVE_GETPWENT_R */
+ 
+       torture_comment(tctx, "Testing endpwent\n");
+       endpwent();
+@@ -544,6 +546,7 @@ static bool test_enum_r_group(struct tor
+       torture_comment(tctx, "Testing setgrent\n");
+       setgrent();
+ 
++#ifdef HAVE_GETGRENT_R
+       while (1) {
+               torture_comment(tctx, "Testing getgrent_r\n");
+ 
+@@ -566,6 +569,7 @@ static bool test_enum_r_group(struct tor
+                       num_grp++;
+               }
+       }
++#endif /* HAVE_GETGRENT_R */
+ 
+       torture_comment(tctx, "Testing endgrent\n");
+       endgrent();

Prev by Date: CVS commit: pkgsrc/sysutils/qpasswd
Next by Date: CVS commit: pkgsrc/lang/ruby24-base
Previous by Thread: CVS commit: pkgsrc/sysutils/qpasswd
Next by Thread: CVS commit: pkgsrc/lang/ruby24-base
Indexes:

Home | Main Index | Thread Index | Old Index