diff options
| author | ryoon <ryoon> | 2017-04-08 08:56:27 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2017-04-08 08:56:27 +0000 |
| commit | 86612135bdb13e43f1ab6685fd817ccd84bd2415 (patch) | |
| tree | a1a8d0ff6b2642e3d65939c4f955397ce6b38ba2 /net | |
| parent | 3d8c2235260c8d40cdb3ca29aa8642a7c9b71adb (diff) | |
| download | pkgsrc-86612135bdb13e43f1ab6685fd817ccd84bd2415.tar.gz | |
Update to 4.6.2
* Use internal heimdal
Changelog:
Changes since 4.6.1:
--------------------
o Jeremy Allison <jra@samba.org>
* BUG 12721: Fix regression with "follow symlinks = no".
Changes since 4.6.0:
--------------------
o Jeremy Allison <jra@samba.org>
* BUG 12496: CVE-2017-2619: Symlink race permits opening files outside share
directory.
o Ralph Boehme <slow@samba.org>
* BUG 12496: CVE-2017-2619: Symlink race permits opening files outside share
directory.
CHANGES SINCE 4.6.0rc4
======================
o Jeremy Allison <jra@samba.org>
* BUG 12592: Fix several issues found by covscan.
* BUG 12608: s3: smbd: Restart reading the incoming SMB2 fd when the send
queue is drained.
o Ralph Boehme <slow@samba.org>
* BUG 12427: vfs_fruit doesn't work with fruit:metadata=stream.
* BUG 12526: vfs_fruit: Only veto AppleDouble files if "fruit:resource" is
set to "file".
* BUG 12604: vfs_fruit: Enabling AAPL extensions must be a global switch.
o Volker Lendecke <vl@samba.org>
* BUG 12612: Re-enable token groups fallback.
o Stefan Metzmacher <metze@samba.org>
* BUG 9048: Samba4 ldap error codes.
* BUG 12557: gensec:spnego: Add debug message for the failed principal.
* BUG 12605: s3:winbindd: Fix endless forest trust scan.
* BUG 12612: winbindd: Find the domain based on the sid within
wb_lookupusergroups_send().
o Andreas Schneider <asn@samba.org>
* BUG 12557: s3:librpc: Handle gss_min in gse_get_client_auth_token()
correctly.
* BUG 12582: idmap_hash: Add a deprecation message, improve the idmap_hash
manpage.
* BUG 12592: Fix several issues found by covscan.
o Martin Schwenke <martin@meltin.net>
* BUG 12592: ctdb-logging: CID 1396883 Dereference null return value
(NULL_RETURNS).
CHANGES SINCE 4.6.0rc3
======================
o Jeremy Allison <jra@samba.org>
* BUG 12545: s3: rpc_server/mdssvc: Add attribute "kMDItemContentType".
* BUG 12572: s3: smbd: Don't loop infinitely on bad-symlink resolution.
o Ralph Boehme <slow@samba.org>
* BUG 12490: vfs_fruit: Correct Netatalk metadata xattr on FreeBSD.
* BUG 12536: s3/smbd: Check for invalid access_mask
smbd_calculate_access_mask().
* BUG 12591: vfs_streams_xattr: use fsp, not base_fsp.
o Amitay Isaacs <amitay@gmail.com>
* BUG 12580: ctdb-common: Fix use-after-free error in comm_fd_handler().
* BUG 12595: build: Fix generation of CTDB manpages while creating tarball.
o Bryan Mason <bmason@redhat.com>
* BUG 12575: Modify smbspool_krb5_wrapper to just fall through to smbspool if
AUTH_INFO_REQUIRED is not set or is not "negotiate".
o Stefan Metzmacher <metze@samba.org>
* BUG 11830: s3:winbindd: Try a NETLOGON connection with noauth over NCACN_NP
against trusted domains.
* BUG 12262: 'net ads testjoin' and smb access fails after winbindd changed the
trust password.
* BUG 12585: librpc/rpc: fix regression in
NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE error mapping.
* BUG 12586: netlogon_creds_cli_LogonSamLogon doesn't work without
netr_LogonSamLogonEx.
* BUG 12587: winbindd child segfaults on connect to an NT4 domain.
* BUG 12588: s3:winbindd: Make sure cm_prepare_connection() only returns OK
with a valid tree connect.
* BUG 12598: winbindd (as member) requires kerberos against trusted ad domain,
while it shouldn't.
* BUG 12601: Backport pytalloc_GenericObject_reference() related changes to
4.6.
o Garming Sam <garming@catalyst.net.nz>
* BUG 12600: dbchecker: Stop ignoring linked cases where both objects are
alive.
o Andreas Schneider <asn@samba.org>
* BUG 12571: s3-vfs: Only walk the directory once in open_and_sort_dir().
o Martin Schwenke <martin@meltin.net>
* BUG 12589: CTDB statd-callout does not cause grace period when
CTDB_NFS_CALLOUT="".
* BUG 12595: ctdb-build: Fix RPM build.
CHANGES SINCE 4.6.0rc2
======================
o Jeremy Allison <jra@samba.org>
* BUG 12499: s3: vfs: dirsort doesn't handle opendir of "." correctly.
* BUG 12546: s3: VFS: vfs_streams_xattr.c: Make streams_xattr_open() store
the same path as streams_xattr_recheck().
* BUG 12531: Make vfs_shadow_copy2 cope with server changing directories.
o Andrew Bartlett <abartlet@samba.org>
* BUG 12543: samba-tool: Correct handling of default value for use_ntvfs and
use_xattrs.
* BUG 12573: Samba < 4.7 does not know about compatibleFeatures and
requiredFeatures.
* BUG 12577: 'samba-tool dbcheck' gives errors on one-way links after a
rename.
o Ralph Boehme <slow@samba.org>
* BUG 12184: s3/rpc_server: Shared rpc modules loading.
* BUG 12520: Ensure global "smb encrypt = off" is effective.
* BUG 12524: s3/rpc_server: Move rpc_modules.c to its own subsystem.
* BUG 12541: vfs_fruit: checks wrong AAPL config state and so always uses
readdirattr.
o Volker Lendecke <vl@samba.org>
* BUG 12551: smbd: Fix "map acl inherit" = yes.
o Stefan Metzmacher <metze@samba.org>
* BUG 12398: Replication with DRSUAPI_DRS_CRITICAL_ONLY and
DRSUAPI_DRS_GET_ANC results in WERR_DS_DRA_MISSING_PARENT S
* BUG 12540: s3:smbd: allow "server min protocol = SMB3_00" to go via "SMB
2.???" negprot.
o John Mulligan <jmulligan@nasuni.com>
* BUG 12542: docs: Improve description of "unix_primary_group" parameter in
idmap_ad manpage.
o Andreas Schneider <asn@samba.org>
* BUG 12552: waf: Do not install the unit test binary for krb5samba.
o Amitay Isaacs <amitay@gmail.com>
* BUG 12547: ctdb-build: Install CTDB tests correctly from toplevel.
* BUG 12549: ctdb-common: ioctl(.. FIONREAD ..) returns an int value.
o Garming Sam <garming@catalyst.net.nz>
* BUG 12577: 'samba-tool dbcheck' gives errors on one-way links after a
rename.
o Uri Simchoni <uri@samba.org>
* BUG 12529: waf: Backport finding of pkg-config.
CHANGES SINCE 4.6.0rc1
======================
o Amitay Isaacs <amitay@gmail.com>
* BUG 12469: CTDB lock helper getting stuck trying to lock a record.
* BUG 12500: ctdb-common: Fix a bug in packet reading code for generic socket
I/O.
* BUG 12510: sock_daemon_test 4 crashes with SEGV.
* BUG 12513: ctdb-daemon: Remove stale eventd socket.
o Björn Jacke <bj@sernet.de>
* BUG 12535: vfs_default: Unlock the right file in copy chunk.
o Volker Lendecke <vl@samba.org>
* BUG 12509: messaging: Fix dead but not cleaned-up-yet destination sockets.
* BUG 12538: Backport winbind fixes.
o Stefan Metzmacher <metze@samba.org>
* BUG 12501: s3:winbindd: talloc_steal the extra_data in
winbindd_list_users_recv().
o Martin Schwenke <martin@meltin.net>
* BUG 12511: ctdb-takeover: Handle case where there are no RELEASE_IPs to
send.
* BUG 12512: ctdb-scripts: Fix remaining uses of "ctdb gratiousarp".
* BUG 12516: ctdb-scripts: /etc/iproute2/rt_tables gets populated with multiple
'default' entries.
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba4/Makefile | 15 | ||||
| -rw-r--r-- | net/samba4/PLIST | 323 | ||||
| -rw-r--r-- | net/samba4/distinfo | 14 | ||||
| -rw-r--r-- | net/samba4/options.mk | 9 | ||||
| -rw-r--r-- | net/samba4/patches/patch-lib_param_loadparm.h | 8 | ||||
| -rw-r--r-- | net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh | 13 |
6 files changed, 267 insertions, 115 deletions
diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 3fa51b2741a..7f5ae599009 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2017/02/12 06:25:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2017/04/08 08:56:27 ryoon Exp $ DISTNAME= samba-${VERSION} -PKGREVISION= 6 CATEGORIES= net MASTER_SITES= http://download.samba.org/pub/samba/stable/ @@ -12,8 +11,8 @@ LICENSE= gnu-gpl-v3 DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -VERSION= 4.3.11 -CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* +VERSION= 4.6.2 +CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]* BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601 @@ -87,10 +86,8 @@ CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB} CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS} CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG} CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} -CONFIGURE_ARGS+= --with-gettext=${BUILDLINK_PREFIX.gettext} #CONFIGURE_ARGS+= --bundled-libraries=com_err CONFIGURE_ARGS+= --enable-gnutls -CONFIGURE_ARGS+= --with-system-mitkrb5 CONFIGURE_ARGS+= --abi-check-disable #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])) @@ -145,7 +142,8 @@ RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing paths. -SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh +SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh scripts/findsmb.in +SUBST_FILES.paths+= source3/script/findsmb.in SUBST_STAGE.paths= post-patch SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' SUBST_SED.paths+= -e 's,@CAT@,${CAT},g' @@ -153,6 +151,7 @@ SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' SUBST_SED.paths+= -e 's,@RM@,${RM},g' SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' SUBST_SED.paths+= -e 's,@SH@,${SH},g' +SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g' SUBST_CLASSES+= logpath SUBST_MESSAGE.logpath= Fixing log path. @@ -202,6 +201,4 @@ PY_PATCHPLIST= yes .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" -BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.9.0 -.include "../../security/mit-krb5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/samba4/PLIST b/net/samba4/PLIST index e060732dbf7..ab3c016f6aa 100644 --- a/net/samba4/PLIST +++ b/net/samba4/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.10 2016/08/15 12:05:24 richard Exp $ +@comment $NetBSD: PLIST,v 1.11 2017/04/08 08:56:27 ryoon Exp $ bin/cifsdd bin/dbwrap_tool bin/eventlogadm +bin/findsmb bin/gentest bin/ldbadd bin/ldbdel @@ -11,6 +12,7 @@ bin/ldbrename bin/ldbsearch bin/locktest bin/masktest +bin/mvxattr bin/ndrdump bin/net bin/nmblookup @@ -24,6 +26,7 @@ bin/regpatch bin/regshell bin/regtree bin/rpcclient +bin/samba-tool bin/sharesec bin/smbcacls bin/smbclient @@ -33,7 +36,6 @@ bin/smbget bin/smbpasswd bin/smbspool bin/smbstatus -bin/smbta-util bin/smbtar bin/smbtorture bin/smbtree @@ -51,29 +53,22 @@ include/core/ntstatus.h include/core/werror.h include/credentials.h include/dcerpc.h -include/dlinklist.h +include/dcerpc_server.h include/domain_credentials.h include/gen_ndr/atsvc.h include/gen_ndr/auth.h include/gen_ndr/dcerpc.h include/gen_ndr/drsblobs.h include/gen_ndr/drsuapi.h -include/gen_ndr/epmapper.h include/gen_ndr/krb5pac.h include/gen_ndr/lsa.h -include/gen_ndr/mgmt.h include/gen_ndr/misc.h include/gen_ndr/nbt.h include/gen_ndr/ndr_atsvc.h -include/gen_ndr/ndr_atsvc_c.h include/gen_ndr/ndr_dcerpc.h include/gen_ndr/ndr_drsblobs.h include/gen_ndr/ndr_drsuapi.h -include/gen_ndr/ndr_epmapper.h -include/gen_ndr/ndr_epmapper_c.h include/gen_ndr/ndr_krb5pac.h -include/gen_ndr/ndr_mgmt.h -include/gen_ndr/ndr_mgmt_c.h include/gen_ndr/ndr_misc.h include/gen_ndr/ndr_nbt.h include/gen_ndr/ndr_samr.h @@ -85,11 +80,6 @@ include/gen_ndr/samr.h include/gen_ndr/security.h include/gen_ndr/server_id.h include/gen_ndr/svcctl.h -include/gensec.h -include/ldap-util.h -include/ldap_errors.h -include/ldap_message.h -include/ldap_ndr.h include/ldb_wrap.h include/libsmbclient.h include/lookup_sid.h @@ -98,49 +88,24 @@ include/ndr.h include/ndr/ndr_dcerpc.h include/ndr/ndr_drsblobs.h include/ndr/ndr_drsuapi.h +include/ndr/ndr_krb5pac.h include/ndr/ndr_nbt.h include/ndr/ndr_svcctl.h include/netapi.h include/param.h include/passdb.h include/policy.h -include/pytalloc.h -include/read_smb.h -include/registry.h -include/roles.h include/rpc_common.h include/samba/session.h include/samba/version.h -include/samba_util.h include/share.h -include/smb2.h -include/smb2_constants.h -include/smb2_create_blob.h -include/smb2_lease.h include/smb2_lease_struct.h -include/smb2_signing.h -include/smb_cli.h -include/smb_cliraw.h -include/smb_common.h -include/smb_composite.h -include/smb_constants.h ${PLIST.ldap}include/smb_ldap.h -include/smb_raw.h -include/smb_raw_interfaces.h -include/smb_raw_signing.h -include/smb_raw_trans2.h -include/smb_request.h -include/smb_seal.h -include/smb_signing.h -include/smb_unix_ext.h -include/smb_util.h include/smbconf.h ${PLIST.ldap}include/smbldap.h include/tdr.h -include/torture.h include/tsocket.h include/tsocket_internal.h -include/tstream_smbXcli_np.h include/util/attr.h include/util/blocking.h include/util/byteorder.h @@ -160,24 +125,20 @@ include/util/tevent_ntstatus.h include/util/tevent_unix.h include/util/tevent_werror.h include/util/time.h -include/util/xfile.h include/util_ldb.h include/wbclient.h -lib/libdcerpc-atsvc.so -lib/libdcerpc-atsvc.so.0 -lib/libdcerpc-atsvc.so.0.0.1 lib/libdcerpc-binding.so lib/libdcerpc-binding.so.0 lib/libdcerpc-binding.so.0.0.1 lib/libdcerpc-samr.so lib/libdcerpc-samr.so.0 lib/libdcerpc-samr.so.0.0.1 +lib/libdcerpc-server.so +lib/libdcerpc-server.so.0 +lib/libdcerpc-server.so.0.0.1 lib/libdcerpc.so lib/libdcerpc.so.0 lib/libdcerpc.so.0.0.1 -lib/libgensec.so -lib/libgensec.so.0 -lib/libgensec.so.0.0.1 lib/libndr-krb5pac.so lib/libndr-krb5pac.so.0 lib/libndr-krb5pac.so.0.0.1 @@ -189,22 +150,21 @@ lib/libndr-standard.so.0 lib/libndr-standard.so.0.0.1 lib/libndr.so lib/libndr.so.0 -lib/libndr.so.0.0.5 +lib/libndr.so.0.0.8 lib/libnetapi.so lib/libnetapi.so.0 lib/libnss_winbind.so -lib/libregistry.so -lib/libregistry.so.0 -lib/libregistry.so.0.0.1 lib/libsamba-credentials.so lib/libsamba-credentials.so.0 lib/libsamba-credentials.so.0.0.1 +lib/libsamba-errors.so +lib/libsamba-errors.so.1 lib/libsamba-hostconfig.so 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.24.1 +lib/libsamba-passdb.so.0.26.0 lib/libsamba-policy.so lib/libsamba-policy.so.0 lib/libsamba-policy.so.0.0.1 @@ -214,9 +174,6 @@ lib/libsamba-util.so.0.0.1 lib/libsamdb.so lib/libsamdb.so.0 lib/libsamdb.so.0.0.1 -lib/libsmbclient-raw.so -lib/libsmbclient-raw.so.0 -lib/libsmbclient-raw.so.0.0.1 lib/libsmbclient.so lib/libsmbclient.so.0 lib/libsmbclient.so.0.2.3 @@ -227,12 +184,9 @@ ${PLIST.ldap}lib/libsmbldap.so.0 lib/libtevent-util.so lib/libtevent-util.so.0 lib/libtevent-util.so.0.0.1 -lib/libtorture.so -lib/libtorture.so.0 -lib/libtorture.so.0.0.1 lib/libwbclient.so lib/libwbclient.so.0 -lib/libwbclient.so.0.12 +lib/libwbclient.so.0.13 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl.pm ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/CUtil.pm ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Compat.pm @@ -260,24 +214,21 @@ ${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_atsvc.pc lib/pkgconfig/dcerpc_samr.pc -lib/pkgconfig/gensec.pc +lib/pkgconfig/dcerpc_server.pc lib/pkgconfig/ndr.pc lib/pkgconfig/ndr_krb5pac.pc lib/pkgconfig/ndr_nbt.pc lib/pkgconfig/ndr_standard.pc lib/pkgconfig/netapi.pc -lib/pkgconfig/registry.pc lib/pkgconfig/samba-credentials.pc lib/pkgconfig/samba-hostconfig.pc lib/pkgconfig/samba-policy.pc lib/pkgconfig/samba-util.pc lib/pkgconfig/samdb.pc -lib/pkgconfig/smbclient-raw.pc lib/pkgconfig/smbclient.pc -lib/pkgconfig/torture.pc lib/pkgconfig/wbclient.pc +${PYSITELIB}/_ldb_text.py ${PYSITELIB}/_tdb_text.py ${PYSITELIB}/_tevent.so ${PYSITELIB}/ldb.so @@ -322,9 +273,11 @@ ${PYSITELIB}/samba/dcerpc/winbind.so ${PYSITELIB}/samba/dcerpc/winreg.so ${PYSITELIB}/samba/dcerpc/wkssvc.so ${PYSITELIB}/samba/dcerpc/xattr.so +${PYSITELIB}/samba/dckeytab.so ${PYSITELIB}/samba/descriptor.py ${PYSITELIB}/samba/drs_utils.py ${PYSITELIB}/samba/dsdb.so +${PYSITELIB}/samba/dsdb_dns.so ${PYSITELIB}/samba/gensec.so ${PYSITELIB}/samba/getopt.py ${PYSITELIB}/samba/hostconfig.py @@ -355,23 +308,24 @@ ${PYSITELIB}/samba/netcmd/gpo.py ${PYSITELIB}/samba/netcmd/group.py ${PYSITELIB}/samba/netcmd/ldapcmp.py ${PYSITELIB}/samba/netcmd/main.py +${PYSITELIB}/samba/netcmd/nettime.py ${PYSITELIB}/samba/netcmd/ntacl.py ${PYSITELIB}/samba/netcmd/processes.py ${PYSITELIB}/samba/netcmd/rodc.py ${PYSITELIB}/samba/netcmd/sites.py ${PYSITELIB}/samba/netcmd/spn.py ${PYSITELIB}/samba/netcmd/testparm.py -${PYSITELIB}/samba/netcmd/time.py ${PYSITELIB}/samba/netcmd/user.py -${PYSITELIB}/samba/netcmd/vampire.py ${PYSITELIB}/samba/ntacls.py ${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/sambadns.py ${PYSITELIB}/samba/registry.so +${PYSITELIB}/samba/remove_dc.py ${PYSITELIB}/samba/samba3/__init__.py ${PYSITELIB}/samba/samba3/libsmb_samba_internal.so ${PYSITELIB}/samba/samba3/param.so @@ -383,6 +337,7 @@ ${PYSITELIB}/samba/sd_utils.py ${PYSITELIB}/samba/security.so ${PYSITELIB}/samba/sites.py ${PYSITELIB}/samba/smb.so +${PYSITELIB}/samba/subnets.py ${PYSITELIB}/samba/subunit/__init__.py ${PYSITELIB}/samba/subunit/run.py ${PYSITELIB}/samba/tdb_util.py @@ -390,11 +345,13 @@ ${PYSITELIB}/samba/tests/__init__.py ${PYSITELIB}/samba/tests/auth.py ${PYSITELIB}/samba/tests/blackbox/__init__.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/common.py ${PYSITELIB}/samba/tests/core.py ${PYSITELIB}/samba/tests/credentials.py ${PYSITELIB}/samba/tests/dcerpc/__init__.py +${PYSITELIB}/samba/tests/dcerpc/array.py ${PYSITELIB}/samba/tests/dcerpc/bare.py ${PYSITELIB}/samba/tests/dcerpc/dnsserver.py ${PYSITELIB}/samba/tests/dcerpc/integer.py @@ -405,9 +362,13 @@ ${PYSITELIB}/samba/tests/dcerpc/rpc_talloc.py ${PYSITELIB}/samba/tests/dcerpc/rpcecho.py ${PYSITELIB}/samba/tests/dcerpc/sam.py ${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/dns.py +${PYSITELIB}/samba/tests/dns_forwarder.py +${PYSITELIB}/samba/tests/dns_forwarder_helpers/server.py +${PYSITELIB}/samba/tests/dns_tkey.py ${PYSITELIB}/samba/tests/docs.py ${PYSITELIB}/samba/tests/dsdb.py ${PYSITELIB}/samba/tests/gensec.py @@ -431,13 +392,18 @@ ${PYSITELIB}/samba/tests/samba3.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/dnscmd.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/join.py ${PYSITELIB}/samba/tests/samba_tool/ntacl.py ${PYSITELIB}/samba/tests/samba_tool/processes.py +${PYSITELIB}/samba/tests/samba_tool/rodc.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/samdb.py ${PYSITELIB}/samba/tests/security.py ${PYSITELIB}/samba/tests/source.py @@ -453,10 +419,17 @@ ${PYSITELIB}/samba/upgrade.py ${PYSITELIB}/samba/upgradehelpers.py ${PYSITELIB}/samba/web_server/__init__.py ${PYSITELIB}/samba/xattr.py +${PYSITELIB}/samba/xattr_native.so +${PYSITELIB}/samba/xattr_tdb.so ${PYSITELIB}/talloc.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 @@ -464,25 +437,70 @@ ${PLIST.ldap}lib/samba/idmap/rfc2307.so lib/samba/idmap/rid.so lib/samba/idmap/script.so lib/samba/idmap/tdb2.so +lib/samba/ldb/acl.so +lib/samba/ldb/aclread.so +lib/samba/ldb/anr.so lib/samba/ldb/asq.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/extended_dn_in.so +lib/samba/ldb/extended_dn_out.so +lib/samba/ldb/extended_dn_store.so lib/samba/ldb/ildap.so +lib/samba/ldb/instancetype.so +lib/samba/ldb/lazy_commit.so lib/samba/ldb/ldbsamba_extensions.so +lib/samba/ldb/linked_attributes.so +lib/samba/ldb/local_password.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/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/private/libCHARSET3-samba4.so +lib/samba/private/libHDB-SAMBA4-samba4.so lib/samba/private/libLIBWBCLIENT-OLD-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 @@ -498,24 +516,47 @@ 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/libcom_err-samba4.so.0 +lib/samba/private/libcom_err-samba4.so.0.25 +lib/samba/private/libdb-glue-samba4.so lib/samba/private/libdbwrap-samba4.so lib/samba/private/libdcerpc-samba-samba4.so lib/samba/private/libdcerpc-samba4.so +lib/samba/private/libdfs-server-ad-samba4.so +lib/samba/private/libdlz-bind9-for-torture-samba4.so +lib/samba/private/libdnsserver-common-samba4.so +lib/samba/private/libdsdb-garbage-collect-tombstones-samba4.so lib/samba/private/libdsdb-module-samba4.so -lib/samba/private/liberrors-samba4.so 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/libgse-samba4.so +lib/samba/private/libgssapi-samba4.so.2 +lib/samba/private/libgssapi-samba4.so.2.0.0 +lib/samba/private/libhcrypto-samba4.so.5 +lib/samba/private/libhcrypto-samba4.so.5.0.1 +lib/samba/private/libhdb-samba4.so.11 +lib/samba/private/libhdb-samba4.so.11.0.2 +lib/samba/private/libheimbase-samba4.so.1 +lib/samba/private/libheimbase-samba4.so.1.0.0 +lib/samba/private/libheimntlm-samba4.so.1 +lib/samba/private/libheimntlm-samba4.so.1.0.1 lib/samba/private/libhttp-samba4.so +lib/samba/private/libhx509-samba4.so.5 +lib/samba/private/libhx509-samba4.so.5.0.0 lib/samba/private/libidmap-samba4.so lib/samba/private/libinterfaces-samba4.so lib/samba/private/libiov-buf-samba4.so +lib/samba/private/libkdc-samba4.so.2 +lib/samba/private/libkdc-samba4.so.2.0.0 +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.so.1 -lib/samba/private/libldb.so.1.1.21 +lib/samba/private/libldb.so.1.1.29 lib/samba/private/libldbsamba-samba4.so lib/samba/private/liblibcli-lsa3-samba4.so lib/samba/private/liblibcli-netlogon3-samba4.so @@ -531,13 +572,19 @@ lib/samba/private/libnetif-samba4.so lib/samba/private/libnon-posix-acls-samba4.so lib/samba/private/libnpa-tstream-samba4.so lib/samba/private/libnss-info-samba4.so +lib/samba/private/libpac-samba4.so lib/samba/private/libpopt-samba3-samba4.so +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.21 +lib/samba/private/libpyldb-util.so.1.1.29 lib/samba/private/libpytalloc-util.so.2 -lib/samba/private/libpytalloc-util.so.2.1.3 +lib/samba/private/libpytalloc-util.so.2.1.9 +lib/samba/private/libregistry-samba4.so lib/samba/private/libreplace-samba4.so +lib/samba/private/libroken-samba4.so.19 +lib/samba/private/libroken-samba4.so.19.0.1 lib/samba/private/libsamba-cluster-support-samba4.so lib/samba/private/libsamba-debug-samba4.so lib/samba/private/libsamba-modules-samba4.so @@ -550,38 +597,55 @@ lib/samba/private/libsamdb-common-samba4.so lib/samba/private/libsecrets3-samba4.so lib/samba/private/libserver-id-db-samba4.so lib/samba/private/libserver-role-samba4.so +lib/samba/private/libservice-samba4.so lib/samba/private/libshares-samba4.so lib/samba/private/libsmb-transport-samba4.so +lib/samba/private/libsmbclient-raw-samba4.so lib/samba/private/libsmbd-base-samba4.so lib/samba/private/libsmbd-conn-samba4.so lib/samba/private/libsmbd-shim-samba4.so ${PLIST.ldap}lib/samba/private/libsmbldaphelper-samba4.so lib/samba/private/libsmbpasswdparser-samba4.so -lib/samba/private/libsmbregistry-samba4.so lib/samba/private/libsocket-blocking-samba4.so lib/samba/private/libsys-rw-samba4.so lib/samba/private/libtalloc-report-samba4.so lib/samba/private/libtalloc.so.2 -lib/samba/private/libtalloc.so.2.1.3 +lib/samba/private/libtalloc.so.2.1.9 lib/samba/private/libtdb-wrap-samba4.so lib/samba/private/libtdb.so.1 -lib/samba/private/libtdb.so.1.3.7 +lib/samba/private/libtdb.so.1.3.12 lib/samba/private/libtevent.so.0 -lib/samba/private/libtevent.so.0.9.28 +lib/samba/private/libtevent.so.0.9.31 lib/samba/private/libtime-basic-samba4.so +lib/samba/private/libtorture-samba4.so lib/samba/private/libtrusts-util-samba4.so lib/samba/private/libutil-cmdline-samba4.so lib/samba/private/libutil-reg-samba4.so lib/samba/private/libutil-setid-samba4.so lib/samba/private/libutil-tdb-samba4.so 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 -${PLIST.pam}lib/samba/security/pam_smbpass.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_posix.so lib/samba/vfs/aio_pthread.so lib/samba/vfs/audit.so lib/samba/vfs/cap.so @@ -589,6 +653,7 @@ 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 @@ -597,18 +662,18 @@ lib/samba/vfs/full_audit.so lib/samba/vfs/linux_xfs_sgid.so lib/samba/vfs/media_harmony.so lib/samba/vfs/netatalk.so -${PLIST.fam}lib/samba/vfs/notify_fam.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/scannedonly.so lib/samba/vfs/shadow_copy.so lib/samba/vfs/shadow_copy2.so lib/samba/vfs/shell_snap.so -lib/samba/vfs/smb_traffic_analyzer.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/worm.so @@ -621,6 +686,11 @@ man/man3/Parse::Pidl::Util.3 man/man3/Parse::Pidl::Wireshark::Conformance.3 man/man3/Parse::Pidl::Wireshark::NDR.3 sbin/nmbd +sbin/samba +sbin/samba_dnsupdate +sbin/samba_kcc +sbin/samba_spnupdate +sbin/samba_upgradedns sbin/smbd ${PLIST.winbind}sbin/winbindd share/doc/samba/NT4-Locking.reg @@ -638,10 +708,93 @@ share/doc/samba/WinXP_PlainPassword.reg share/doc/samba/WindowsTerminalServer.reg share/examples/samba/adduser.sh share/examples/samba/deluser.sh -${PLIST.pam}share/examples/samba/pam_smbpass/README -${PLIST.pam}share/examples/samba/pam_smbpass/kdc-pdc -${PLIST.pam}share/examples/samba/pam_smbpass/password-mature -${PLIST.pam}share/examples/samba/pam_smbpass/password-migration -${PLIST.pam}share/examples/samba/pam_smbpass/password-sync share/examples/samba/samba.schema share/examples/samba/smb.conf.default +share/samba/setup/DB_CONFIG +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/aggregate_schema.ldif +share/samba/setup/cn=samba.ldif +share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt +share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt +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/fedora-ds-init.ldif +share/samba/setup/fedorads-dna.ldif +share/samba/setup/fedorads-index.ldif +share/samba/setup/fedorads-linked-attributes.ldif +share/samba/setup/fedorads-pam.ldif +share/samba/setup/fedorads-partitions.ldif +share/samba/setup/fedorads-refint-add.ldif +share/samba/setup/fedorads-refint-delete.ldif +share/samba/setup/fedorads-samba.ldif +share/samba/setup/fedorads-sasl.ldif +share/samba/setup/fedorads.inf +share/samba/setup/idmap_init.ldif +share/samba/setup/krb5.conf +share/samba/setup/memberof.conf +share/samba/setup/mmr_serverids.conf +share/samba/setup/mmr_syncrepl.conf +share/samba/setup/modules.conf +share/samba/setup/named.conf +share/samba/setup/named.conf.dlz +share/samba/setup/named.conf.update +share/samba/setup/named.txt +share/samba/setup/olc_mmr.conf +share/samba/setup/olc_seed.ldif +share/samba/setup/olc_serverid.conf +share/samba/setup/olc_syncrepl.conf +share/samba/setup/olc_syncrepl_seed.conf +share/samba/setup/prefixMap.txt +share/samba/setup/provision.ldif +share/samba/setup/provision.reg +share/samba/setup/provision.zone +share/samba/setup/provision_basedn.ldif +share/samba/setup/provision_basedn_modify.ldif +share/samba/setup/provision_basedn_options.ldif +share/samba/setup/provision_basedn_references.ldif +share/samba/setup/provision_computers_add.ldif +share/samba/setup/provision_computers_modify.ldif +share/samba/setup/provision_configuration.ldif +share/samba/setup/provision_configuration_basedn.ldif +share/samba/setup/provision_configuration_modify.ldif +share/samba/setup/provision_configuration_references.ldif +share/samba/setup/provision_dns_accounts_add.ldif +share/samba/setup/provision_dns_add_samba.ldif +share/samba/setup/provision_dnszones_add.ldif +share/samba/setup/provision_dnszones_modify.ldif +share/samba/setup/provision_dnszones_partitions.ldif +share/samba/setup/provision_group_policy.ldif +share/samba/setup/provision_init.ldif +share/samba/setup/provision_partitions.ldif +share/samba/setup/provision_privilege.ldif +share/samba/setup/provision_rootdse_add.ldif +share/samba/setup/provision_rootdse_modify.ldif +share/samba/setup/provision_schema_basedn.ldif +share/samba/setup/provision_schema_basedn_modify.ldif +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_users.ldif +share/samba/setup/provision_users_add.ldif +share/samba/setup/provision_users_modify.ldif +share/samba/setup/provision_well_known_sec_princ.ldif +share/samba/setup/refint.conf +share/samba/setup/schema-map-fedora-ds-1.0 +share/samba/setup/schema-map-openldap-2.3 +share/samba/setup/schema_samba4.ldif +share/samba/setup/secrets.ldif +share/samba/setup/secrets_dns.ldif +share/samba/setup/secrets_init.ldif +share/samba/setup/secrets_sasl_ldap.ldif +share/samba/setup/secrets_simple_ldap.ldif +share/samba/setup/share.ldif +share/samba/setup/slapd.conf +share/samba/setup/spn_update_list +share/samba/setup/ypServ30.ldif diff --git a/net/samba4/distinfo b/net/samba4/distinfo index 64063fcdb14..43a1105b8e5 100644 --- a/net/samba4/distinfo +++ b/net/samba4/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.11 2016/07/07 16:44:14 taca Exp $ +$NetBSD: distinfo,v 1.12 2017/04/08 08:56:27 ryoon Exp $ -SHA1 (samba-4.3.11.tar.gz) = 44399fdcbcf5eba5f86548781e8aef490264de6b -RMD160 (samba-4.3.11.tar.gz) = 641234bb6e4f1ef8d65ab3f0c9b90ede41dd2f89 -SHA512 (samba-4.3.11.tar.gz) = 7b9bcdf158c64a26c81e5a03a94a521f238a7573ab31c1252e90f2604ae0d1303c998d3bcda18c4feb9049a659371a3af2bdfcc546b5251314f19a500b6a0b7a -Size (samba-4.3.11.tar.gz) = 20573432 bytes +SHA1 (samba-4.6.2.tar.gz) = a369c58a8abe1b0035132d2b3b4919e26d8a840a +RMD160 (samba-4.6.2.tar.gz) = f153cb7259dd211805bffc87536133279bab4eed +SHA512 (samba-4.6.2.tar.gz) = d64129b7fc65bf30cc06e34a07ac5cf04b52bf6639950eff48ae0ec27b0de44614df6a7c44b62b1859553fc7051f493b2d8216739da2232ac1caeaea81d328df +Size (samba-4.6.2.tar.gz) = 21097045 bytes SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5 SHA1 (patch-lib_nss__wrapper_nss__wrapper.c) = c692fa33ec17ed4f1dc1e40c1fadf7846d976824 -SHA1 (patch-lib_param_loadparm.h) = d1c9df37bb9969d2788dd70e613067df6bb64f26 +SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18 SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b SHA1 (patch-lib_tevent_wscript) = 9617b9e40d2ffc8d6297390a20ba9bd44147d669 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb -SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = 26cd7dc3a5a282f5b80e00b52db6abd722555254 +SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = 4b4be0691322afc70769602069c8a1bbd81ab639 SHA1 (patch-source4_scripting_wsript_build) = 6053076427835ac4fe97d93b2ff67d2caccc71f4 SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = 0bd2067b77a1db93e3cb5d80964a7be2b06802ff diff --git a/net/samba4/options.mk b/net/samba4/options.mk index 959c2d5cb39..2798b9f7655 100644 --- a/net/samba4/options.mk +++ b/net/samba4/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2016/08/23 12:49:13 richard Exp $ +# $NetBSD: options.mk,v 1.4 2017/04/08 08:56:27 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.samba4 PKG_SUPPORTED_OPTIONS= ads fam ldap pam winbind # cups # cups option is broken for me. @@ -81,16 +81,9 @@ PLIST_VARS+= pam . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam -CONFIGURE_ARGS+= --with-pam_smbpass CONFIGURE_ARGS+= --with-pammodulesdir=${SMB_PAMMODULES} PLIST.pam= yes INSTALLATION_DIRS+= ${EGDIR}/pam_smbpass - -.PHONY: samba-pam-smbpass-install -post-install: samba-pam-smbpass-install -samba-pam-smbpass-install: - ${INSTALL_DATA} ${WRKSRC}/source3/pam_smbpass/samples/* \ - ${DESTDIR}${PREFIX}/${EGDIR}/pam_smbpass/ .else CONFIGURE_ARGS+= --without-pam .endif diff --git a/net/samba4/patches/patch-lib_param_loadparm.h b/net/samba4/patches/patch-lib_param_loadparm.h index e736952fcbc..3bd4a573c02 100644 --- a/net/samba4/patches/patch-lib_param_loadparm.h +++ b/net/samba4/patches/patch-lib_param_loadparm.h @@ -1,8 +1,8 @@ -$NetBSD: patch-lib_param_loadparm.h,v 1.1 2015/09/28 17:37:04 ryoon Exp $ +$NetBSD: patch-lib_param_loadparm.h,v 1.2 2017/04/08 08:56:27 ryoon Exp $ * Fix NetBSD build. ---- lib/param/loadparm.h.orig 2015-07-21 09:47:48.000000000 +0000 +--- lib/param/loadparm.h.orig 2017-01-11 07:55:14.000000000 +0000 +++ lib/param/loadparm.h @@ -31,6 +31,9 @@ #define _LOADPARM_H @@ -11,6 +11,6 @@ $NetBSD: patch-lib_param_loadparm.h,v 1.1 2015/09/28 17:37:04 ryoon Exp $ +#if defined(__NetBSD__) +#include <sys/time.h> +#endif - #include "../lib/util/parmlist.h" - /* the following are used by loadparm for option lists */ + struct parmlist_entry { + struct parmlist_entry *prev, *next; 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 index 5aaee1cf837..5315df96a9c 100644 --- a/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh +++ b/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh @@ -1,8 +1,8 @@ -$NetBSD: patch-source3_script_tests_test__smbclient__s3.sh,v 1.2 2015/12/13 08:48:36 wiz Exp $ +$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 2015-07-21 09:47:49.000000000 +0000 +--- 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 @@ -13,3 +13,12 @@ Fix unportable test(1) comparison operator. 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 |