Received: by mail.netbsd.org (Postfix, from userid 605) id 9A73884F42; Sat, 29 Apr 2023 08:01:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CA1AA84EF0 for ; Sat, 29 Apr 2023 08:01:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 4B8664QBTdrM for ; Sat, 29 Apr 2023 08:01:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D1C4C84EB7 for ; Sat, 29 Apr 2023 08:01:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CF29CFA87; Sat, 29 Apr 2023 08:01:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1682755266173280" MIME-Version: 1.0 Date: Sat, 29 Apr 2023 08:01:06 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net/samba4 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230429080106.CF29CFA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1682755266173280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Apr 29 08:01:06 UTC 2023 Modified Files: pkgsrc/net/samba4: Makefile PLIST distinfo hacks.mk options.mk pkgsrc/net/samba4/patches: patch-lib_replace_wscript Log Message: samba: update to 4.18.2. 4.18.2 Changes since 4.18.1 -------------------- o Jeremy Allison * BUG 15302: Log flood: smbd_calculate_access_mask_fsp: Access denied: message level should be lower. * BUG 15306: Floating point exception (FPE) via cli_pull_send at source3/libsmb/clireadwrite.c. o Andrew Bartlett * BUG 15328: test_tstream_more_tcp_user_timeout_spin fails intermittently on Rackspace GitLab runners. * BUG 15329: Reduce flapping of ridalloc test. * BUG 15351: large_ldap test is unreliable. o Ralph Boehme * BUG 15143: New filename parser doesn't check veto files smb.conf parameter. * BUG 15354: mdssvc may crash when initializing. o Volker Lendecke * BUG 15313: large directory optimization broken for non-lcomp path elements. * BUG 15357: streams_depot fails to create streams. * BUG 15358: shadow_copy2 and streams_depot don't play well together. o Rob van der Linde * BUG 15316: Flapping tests in samba_tool_drs_show_repl.py. o Stefan Metzmacher * BUG 15317: winbindd idmap child contacts the domain controller without a need. * BUG 15318: idmap_autorid may fail to map sids of trusted domains for the first time. * BUG 15319: idmap_hash doesn't use ID_TYPE_BOTH for reverse mappings. * BUG 15323: net ads search -P doesn't work against servers in other domains. * BUG 15353: Temporary smbXsrv_tcon_global.tdb can't be parsed. o Joseph Sutton * BUG 15316: Flapping tests in samba_tool_drs_show_repl.py. * BUG 15343: Tests use depricated and removed methods like assertRegexpMatches. 4.18.1 This is a security release in order to address the following defects: o CVE-2023-0225: An incomplete access check on dnsHostName allows authenticated but otherwise unprivileged users to delete this attribute from any object in the directory. https://www.samba.org/samba/security/CVE-2023-0225.html o CVE-2023-0922: The Samba AD DC administration tool, when operating against a remote LDAP server, will by default send new or reset passwords over a signed-only connection. https://www.samba.org/samba/security/CVE-2023-0922.html o CVE-2023-0614: The fix in 4.6.16, 4.7.9, 4.8.4 and 4.9.7 for CVE-2018-10919 Confidential attribute disclosure via LDAP filters was insufficient and an attacker may be able to obtain confidential BitLocker recovery keys from a Samba AD DC. Installations with such secrets in their Samba AD should assume they have been obtained and need replacing. https://www.samba.org/samba/security/CVE-2023-0614.html Changes since 4.18.0 -------------------- o Douglas Bagnall * BUG 15276: CVE-2023-0225. o Andrew Bartlett * BUG 15270: CVE-2023-0614. * BUG 15331: ldb wildcard matching makes excessive allocations. * BUG 15332: large_ldap test is inefficient. o Rob van der Linde * BUG 15315: CVE-2023-0922. o Joseph Sutton * BUG 15270: CVE-2023-0614. * BUG 15276: CVE-2023-0225. 4.18.0 This is the first stable release of the Samba 4.18 release series. Please read the release notes carefully before upgrading. NEW FEATURES/CHANGES ==================== SMB Server performance improvements ----------------------------------- The security improvements in recent releases (4.13, 4.14, 4.15, 4.16), mainly as protection against symlink races, caused performance regressions for metadata heavy workloads. While 4.17 already improved the situation quite a lot, with 4.18 the locking overhead for contended path based operations is reduced by an additional factor of ~ 3 compared to 4.17. It means the throughput of open/close operations reached the level of 4.12 again. More succinct samba-tool error messages --------------------------------------- Historically samba-tool has reported user error or misconfiguration by means of a Python traceback, showing you where in its code it noticed something was wrong, but not always exactly what is amiss. Now it tries harder to identify the true cause and restrict its output to describing that. Particular cases include: * a username or password is incorrect * an ldb database filename is wrong (including in smb.conf) * samba-tool dns: various zones or records do not exist * samba-tool ntacl: certain files are missing * the network seems to be down * bad --realm or --debug arguments Accessing the old samba-tool messages ------------------------------------- This is not new, but users are reminded they can get the full Python stack trace, along with other noise, by using the argument '-d3'. This may be useful when searching the web. The intention is that when samba-tool encounters an unrecognised problem (especially a bug), it will still output a Python traceback. If you encounter a problem that has been incorrectly identified by samba-tool, please report it on https://bugzilla.samba.org. Colour output with samba-tool --color ------------------------------------- For some time a few samba-tool commands have had a --color=yes|no|auto option, which determines whether the command outputs ANSI colour codes. Now all samba-tool commands support this option, which now also accepts 'always' and 'force' for 'yes', 'never' and 'none' for 'no', and 'tty' and 'if-tty' for 'auto' (this more closely matches convention). With --color=auto, or when --color is omitted, colour codes are only used when output is directed to a terminal. Most commands have very little colour in any case. For those that already used it, the defaults have changed slightly. * samba-tool drs showrepl: default is now 'auto', not 'no' * samba-tool visualize: the interactions between --color-scheme, --color, and --output have changed slightly. When --color-scheme is set it overrides --color for the purpose of the output diagram, but not for other output like error messages. New samba-tool dsacl subcommand for deleting ACES ------------------------------------------------- The samba-tool dsacl tool can now delete entries in directory access control lists. The interface for 'samba-tool dsacl delete' is similar to that of 'samba-tool dsacl set', with the difference being that the ACEs described by the --sddl argument are deleted rather than added. No colour with NO_COLOR environment variable -------------------------------------------- With both samba-tool --color=auto (see above) and some other places where we use ANSI colour codes, the NO_COLOR environment variable will disable colour output. See https://no-color.org/ for a description of this variable. `samba-tool --color=always` will use colour regardless of NO_COLOR. New wbinfo option --change-secret-at ------------------------------------ The wbinfo command has a new option, --change-secret-at= which forces the trust account password to be changed at a specified domain controller. If the specified domain controller cannot be contacted the password change fails rather than trying other DCs. New option to change the NT ACL default location ------------------------------------------------ Usually the NT ACLs are stored in the security.NTACL extended attribute (xattr) of files and directories. The new "acl_xattr:security_acl_name" option allows to redefine the default location. The default "security.NTACL" is a protected location, which means the content of the security.NTACL attribute is not accessible from normal users outside of Samba. When this option is set to use a user-defined value, e.g. user.NTACL then any user can potentially access and overwrite this information. The module prevents access to this xattr over SMB, but the xattr may still be accessed by other means (eg local access, SSH, NFS). This option must only be used when this consequence is clearly understood and when specific precautions are taken to avoid compromising the ACL content. Azure Active Directory / Office365 synchronisation improvements -------------------------------------------------------------- Use of the Azure AD Connect cloud sync tool is now supported for password hash synchronisation, allowing Samba AD Domains to synchronise passwords with this popular cloud environment. REMOVED FEATURES ================ smb.conf changes ================ Parameter Name Description Default -------------- ----------- ------- acl_xattr:security_acl_name New security.NTACL server addresses New CHANGES SINCE 4.18.0rc4 ======================= o Jeremy Allison * BUG 15314: streams_xattr is creating unexpected locks on folders. o Volker Lendecke * BUG 15310: New samba-dcerpc architecture does not scale gracefully. CHANGES SINCE 4.18.0rc3 ======================= o Andreas Schneider * BUG 15308: Avoid that tests fail because other tests didn't do cleanup on failure. o baixiangcpp * BUG 15311: fd_load() function implicitly closes the fd where it should not. CHANGES SINCE 4.18.0rc2 ======================= o Jeremy Allison * BUG 15301: Improve file_modtime() and issues around smb3 unix test. o Ralph Boehme * BUG 15299: Spotlight doesn't work with latest macOS Ventura. o Stefan Metzmacher * BUG 15298: Build failure on solaris with tevent 0.14.0 (and ldb 2.7.0). (tevent 0.14.1 and ldb 2.7.1 are already released...) o John Mulligan * BUG 15307: vfs_ceph incorrectly uses fsp_get_io_fd() instead of fsp_get_pathref_fd() in close and fstat. o Andreas Schneider * BUG 15291: test_chdir_cache.sh doesn't work with SMBD_DONT_LOG_STDOUT=1. * BUG 15301: Improve file_modtime() and issues around smb3 unix test. CHANGES SINCE 4.18.0rc1 ======================= o Andrew Bartlett * BUG 10635: Office365 azure Password Sync not working. o Stefan Metzmacher * BUG 15286: auth3_generate_session_info_pac leaks wbcAuthUserInfo. o Noel Power * BUG 15293: With clustering enabled samba-bgqd can core dump due to use after free. To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 pkgsrc/net/samba4/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/samba4/PLIST cvs rdiff -u -r1.91 -r1.92 pkgsrc/net/samba4/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/samba4/hacks.mk cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/samba4/options.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/samba4/patches/patch-lib_replace_wscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1682755266173280 Content-Disposition: inline Content-Length: 11000 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/samba4/Makefile diff -u pkgsrc/net/samba4/Makefile:1.162 pkgsrc/net/samba4/Makefile:1.163 --- pkgsrc/net/samba4/Makefile:1.162 Wed Apr 19 08:08:38 2023 +++ pkgsrc/net/samba4/Makefile Sat Apr 29 08:01:06 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.162 2023/04/19 08:08:38 adam Exp $ +# $NetBSD: Makefile,v 1.163 2023/04/29 08:01:06 wiz Exp $ -DISTNAME= samba-4.17.7 -PKGREVISION= 1 +DISTNAME= samba-4.18.2 CATEGORIES= net MASTER_SITES= https://download.samba.org/pub/samba/stable/ @@ -208,7 +207,7 @@ REPLACE_PYTHON+= source4/scripting/bin/* .endif .include "../../archivers/libarchive/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -BUILDLINK_API_DEPENDS.ldb+= ldb>=2.6.2<2.7 +BUILDLINK_API_DEPENDS.ldb+= ldb>=2.7.2<2.8 .include "../../databases/ldb/buildlink3.mk" .include "../../databases/lmdb/buildlink3.mk" .include "../../devel/cmocka/buildlink3.mk" Index: pkgsrc/net/samba4/PLIST diff -u pkgsrc/net/samba4/PLIST:1.50 pkgsrc/net/samba4/PLIST:1.51 --- pkgsrc/net/samba4/PLIST:1.50 Tue Jan 10 02:12:40 2023 +++ pkgsrc/net/samba4/PLIST Sat Apr 29 08:01:06 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.50 2023/01/10 02:12:40 tnn Exp $ +@comment $NetBSD: PLIST,v 1.51 2023/04/29 08:01:06 wiz Exp $ bin/cifsdd bin/dbwrap_tool bin/dumpmscat @@ -34,8 +34,6 @@ bin/smbtorture bin/smbtree bin/testparm bin/wbinfo -@pkgdir bind-dns -@pkgdir etc/samba include/charset.h include/core/doserr.h include/core/error.h @@ -51,6 +49,7 @@ include/dcesrv_core.h include/domain_credentials.h include/gen_ndr/atsvc.h include/gen_ndr/auth.h +include/gen_ndr/claims.h include/gen_ndr/dcerpc.h include/gen_ndr/drsblobs.h include/gen_ndr/drsuapi.h @@ -184,7 +183,7 @@ lib/libtevent-util.so.0 lib/libtevent-util.so.0.0.1 lib/libwbclient.so lib/libwbclient.so.0 -lib/libwbclient.so.0.15 +lib/libwbclient.so.0.16 lib/pkgconfig/dcerpc.pc lib/pkgconfig/dcerpc_samr.pc ${PLIST.ads}lib/pkgconfig/dcerpc_server.pc @@ -207,6 +206,7 @@ ${PYSITELIB}/samba/auth.so ${PYSITELIB}/samba/auth_util.py ${PYSITELIB}/samba/colour.py ${PYSITELIB}/samba/common.py +${PYSITELIB}/samba/compression.so ${PYSITELIB}/samba/credentials.so ${PYSITELIB}/samba/crypto.so ${PYSITELIB}/samba/dbchecker.py @@ -214,6 +214,7 @@ ${PYSITELIB}/samba/dcerpc/__init__.py ${PYSITELIB}/samba/dcerpc/atsvc.so ${PYSITELIB}/samba/dcerpc/auth.so ${PYSITELIB}/samba/dcerpc/base.so +${PYSITELIB}/samba/dcerpc/claims.so ${PYSITELIB}/samba/dcerpc/dcerpc.so ${PYSITELIB}/samba/dcerpc/dfs.so ${PYSITELIB}/samba/dcerpc/dns.so @@ -359,6 +360,8 @@ ${PYSITELIB}/samba/provision/kerberos_im ${PYSITELIB}/samba/provision/sambadns.py ${PYSITELIB}/samba/registry.so ${PYSITELIB}/samba/remove_dc.py +${PYSITELIB}/samba/reparse_symlink.so +${PYSITELIB}/samba/safe_tarfile.py ${PYSITELIB}/samba/samba3/__init__.py ${PYSITELIB}/samba/samba3/libsmb_samba_cwrapper.so ${PYSITELIB}/samba/samba3/libsmb_samba_internal.py @@ -410,6 +413,7 @@ ${PYSITELIB}/samba/tests/blackbox/traffi ${PYSITELIB}/samba/tests/blackbox/traffic_summary.py ${PYSITELIB}/samba/tests/common.py ${PYSITELIB}/samba/tests/complex_expressions.py +${PYSITELIB}/samba/tests/compression.py ${PYSITELIB}/samba/tests/core.py ${PYSITELIB}/samba/tests/cred_opt.py ${PYSITELIB}/samba/tests/credentials.py @@ -475,9 +479,11 @@ ${PYSITELIB}/samba/tests/kcc/ldif_import ${PYSITELIB}/samba/tests/krb5/alias_tests.py ${PYSITELIB}/samba/tests/krb5/as_canonicalization_tests.py ${PYSITELIB}/samba/tests/krb5/as_req_tests.py +${PYSITELIB}/samba/tests/krb5/claims_tests.py ${PYSITELIB}/samba/tests/krb5/compatability_tests.py ${PYSITELIB}/samba/tests/krb5/etype_tests.py ${PYSITELIB}/samba/tests/krb5/fast_tests.py +${PYSITELIB}/samba/tests/krb5/group_tests.py ${PYSITELIB}/samba/tests/krb5/kcrypto.py ${PYSITELIB}/samba/tests/krb5/kdc_base_test.py ${PYSITELIB}/samba/tests/krb5/kdc_tests.py @@ -508,6 +514,7 @@ ${PYSITELIB}/samba/tests/ldap_raw.py ${PYSITELIB}/samba/tests/ldap_referrals.py ${PYSITELIB}/samba/tests/ldap_spn.py ${PYSITELIB}/samba/tests/ldap_upn_sam_account.py +${PYSITELIB}/samba/tests/libsmb-basic.py ${PYSITELIB}/samba/tests/libsmb.py ${PYSITELIB}/samba/tests/loadparm.py ${PYSITELIB}/samba/tests/logfiles.py @@ -545,12 +552,14 @@ ${PYSITELIB}/samba/tests/provision.py ${PYSITELIB}/samba/tests/pso.py ${PYSITELIB}/samba/tests/py_credentials.py ${PYSITELIB}/samba/tests/registry.py +${PYSITELIB}/samba/tests/reparsepoints.py ${PYSITELIB}/samba/tests/s3_net_join.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/safe_tarfile.py ${PYSITELIB}/samba/tests/samba3sam.py ${PYSITELIB}/samba/tests/samba_tool/__init__.py ${PYSITELIB}/samba/tests/samba_tool/base.py @@ -599,6 +608,9 @@ ${PYSITELIB}/samba/tests/segfault.py ${PYSITELIB}/samba/tests/sid_strings.py ${PYSITELIB}/samba/tests/smb-notify.py ${PYSITELIB}/samba/tests/smb.py +${PYSITELIB}/samba/tests/smb1posix.py +${PYSITELIB}/samba/tests/smb2symlink.py +${PYSITELIB}/samba/tests/smb3unix.py ${PYSITELIB}/samba/tests/smbconf.py ${PYSITELIB}/samba/tests/smbd_base.py ${PYSITELIB}/samba/tests/smbd_fuzztest.py @@ -791,6 +803,7 @@ lib/samba/private/libsmbd-shim-samba4.so ${PLIST.ldap}lib/samba/private/libsmbldaphelper-samba4.so lib/samba/private/libsmbpasswdparser-samba4.so lib/samba/private/libsocket-blocking-samba4.so +lib/samba/private/libstable-sort-samba4.so lib/samba/private/libsys-rw-samba4.so lib/samba/private/libtalloc-report-printf-samba4.so lib/samba/private/libtalloc-report-samba4.so @@ -999,7 +1012,10 @@ share/examples/samba/deluser.sh @pkgdir share/examples/samba/pam_smbpass share/examples/samba/samba.schema share/examples/samba/smb.conf.default +${PLIST.ads}share/samba/samba/admx/GNOME_Settings.admx +${PLIST.ads}share/samba/samba/admx/en-US/GNOME_Settings.adml ${PLIST.ads}share/samba/samba/admx/en-US/samba.adml +${PLIST.ads}share/samba/samba/admx/ru-RU/GNOME_Settings.adml ${PLIST.ads}share/samba/samba/admx/samba.admx ${PLIST.ads}share/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf ${PLIST.ads}share/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf Index: pkgsrc/net/samba4/distinfo diff -u pkgsrc/net/samba4/distinfo:1.91 pkgsrc/net/samba4/distinfo:1.92 --- pkgsrc/net/samba4/distinfo:1.91 Sat Apr 1 08:49:05 2023 +++ pkgsrc/net/samba4/distinfo Sat Apr 29 08:01:06 2023 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.91 2023/04/01 08:49:05 taca Exp $ +$NetBSD: distinfo,v 1.92 2023/04/29 08:01:06 wiz Exp $ -BLAKE2s (samba-4.17.7.tar.gz) = 80304d23cf0add5af1790379c533f0226a88fa81615528bc658289790fb493ec -SHA512 (samba-4.17.7.tar.gz) = ab6c4fedb1769447f028e4fa1ae91b2a80ad9cb809e6a78562350c90d7ef493793e876d19057854b2f87553655a8b766306deeda6e78a062e9d5daea49994fe4 -Size (samba-4.17.7.tar.gz) = 30862665 bytes +BLAKE2s (samba-4.18.2.tar.gz) = 2c6e47de5b9f6e52f65c4d60e273cd56309904e3ea1ebecff23aca54bc63cd0e +SHA512 (samba-4.18.2.tar.gz) = e13f1313ae23c65580f3d9eec8ba556f77327d4876f09387a1701dc62df5c7c18955ed42a50250c0ebd53d90afcfdea2743dc6776b63c900c47239afacfa4aba +Size (samba-4.18.2.tar.gz) = 41285033 bytes SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7 @@ -12,7 +12,7 @@ SHA1 (patch-dynconfig_wscript) = 1858e5f SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18 SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d -SHA1 (patch-lib_replace_wscript) = 4250bdfd8ee82fcdb43315f24a124b7ae8d7e36f +SHA1 (patch-lib_replace_wscript) = f75dff520034ed976c15134c950eebf78598a60b SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983 SHA1 (patch-lib_tevent_tevent.c) = 109e7a516dc291372e982b9f21c6ce8c0e5d3ca4 SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4 Index: pkgsrc/net/samba4/hacks.mk diff -u pkgsrc/net/samba4/hacks.mk:1.3 pkgsrc/net/samba4/hacks.mk:1.4 --- pkgsrc/net/samba4/hacks.mk:1.3 Mon Jun 27 20:59:40 2022 +++ pkgsrc/net/samba4/hacks.mk Sat Apr 29 08:01:06 2023 @@ -1,8 +1,8 @@ -# $NetBSD: hacks.mk,v 1.3 2022/06/27 20:59:40 rin Exp $ +# $NetBSD: hacks.mk,v 1.4 2023/04/29 08:01:06 wiz Exp $ # Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT # relocations' error under NetBSD/powerpc < 9.0. -.if !empty(MACHINE_PLATFORM:MNetBSD-[1-8].*-powerpc) +.if ${MACHINE_PLATFORM:MNetBSD-[1-8].*-powerpc} PKG_HACKS+= pie CONFIGURE_ARGS+= --without-pie .endif Index: pkgsrc/net/samba4/options.mk diff -u pkgsrc/net/samba4/options.mk:1.18 pkgsrc/net/samba4/options.mk:1.19 --- pkgsrc/net/samba4/options.mk:1.18 Tue Jan 3 15:27:23 2023 +++ pkgsrc/net/samba4/options.mk Sat Apr 29 08:01:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.18 2023/01/03 15:27:23 wiz Exp $ +# $NetBSD: options.mk,v 1.19 2023/04/29 08:01:06 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.samba4 PKG_SUPPORTED_OPTIONS= ads avahi ldap pam winbind cups # cups option is broken for me. @@ -11,7 +11,7 @@ SAMBA_ACL_OPSYS= AIX Darwin FreeBSD HPUX PKG_SUPPORTED_OPTIONS+= acl .endif -.if empty(MACHINE_PLATFORM:MDarwin-1[1-9].*) +.if !${MACHINE_PLATFORM:MDarwin-1[1-9].*} PKG_SUGGESTED_OPTIONS+= ads .endif Index: pkgsrc/net/samba4/patches/patch-lib_replace_wscript diff -u pkgsrc/net/samba4/patches/patch-lib_replace_wscript:1.3 pkgsrc/net/samba4/patches/patch-lib_replace_wscript:1.4 --- pkgsrc/net/samba4/patches/patch-lib_replace_wscript:1.3 Mon Mar 7 21:40:38 2022 +++ pkgsrc/net/samba4/patches/patch-lib_replace_wscript Sat Apr 29 08:01:06 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-lib_replace_wscript,v 1.3 2022/03/07 21:40:38 thor Exp $ +$NetBSD: patch-lib_replace_wscript,v 1.4 2023/04/29 08:01:06 wiz Exp $ Skip epoll tests on SunOS, implementation is Linux-specific. ---- lib/replace/wscript.orig 2021-08-26 09:01:35.530309000 +0000 +--- lib/replace/wscript.orig 2023-02-15 15:14:32.440958000 +0000 +++ lib/replace/wscript -@@ -451,7 +451,9 @@ def configure(conf): +@@ -480,7 +480,9 @@ def configure(conf): conf.CHECK_FUNCS('gai_strerror get_current_dir_name') conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups syscall setsid') conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist getpagesize') @@ -12,6 +12,6 @@ Skip epoll tests on SunOS, implementatio + conf.CHECK_FUNCS('getpwent_r getpwnam_r getpwuid_r') + if not sys.platform.startswith('sunos'): + conf.CHECK_FUNCS('epoll_create') - conf.CHECK_FUNCS('port_create') conf.CHECK_FUNCS('getprogname') if not conf.CHECK_FUNCS('copy_file_range'): + conf.CHECK_CODE(''' --_----------=_1682755266173280--