Wed Jan 10 08:39:30 2024 UTC (138d)
samba4: updated to 4.19.4

Changes since 4.19.3
* BUG 13577: net changesecretpw cannot set the machine account password if
  secrets.tdb is empty.
* BUG 15540: For generating doc, take, if defined, env XML_CATALOG_FILES.
* BUG 15541: Trivial C typo in nsswitch/winbind_nss_netbsd.c.
* BUG 15542: vfs_linux_xfs is incorrectly named.
* BUG 15377: systemd stumbled over copyright-message at smbd startup.
* BUG 15505: Following intermediate abolute share-local symlinks is broken.
* BUG 15523: ctdb RELEASE_IP causes a crash in release_ip if a connection to
  a non-public address disconnects first.
* BUG 15544: shadow_copy2 broken when current fileset's directories are
  removed.
* BUG 15377: systemd stumbled over copyright-message at smbd startup.
* BUG 15523: ctdb RELEASE_IP causes a crash in release_ip if a connection to
  a non-public address disconnects first.
* BUG 15534: smbd does not detect ctdb public ipv6 addresses for multichannel
  exclusion.
* BUG 15469: 'force user = localunixuser' doesn't work if 'allow trusted
  domains = no' is set.
* BUG 15525: smbget debug logging doesn't work.
* BUG 15532: smget: username in the smburl and interactive password entry
  doesn't work.
* BUG 15538: smbget auth function doesn't set values for password prompt
  correctly.
* BUG 15523: ctdb RELEASE_IP causes a crash in release_ip if a connection to
  a non-public address disconnects first.
* BUG 15440: Unable to copy and write files from clients to Ceph cluster via
  SMB Linux gateway with Ceph VFS module.
* BUG 15547: Multichannel refresh network information.


(adam)
diff -r1.177 -r1.178 pkgsrc/net/samba4/Makefile
diff -r1.100 -r1.101 pkgsrc/net/samba4/distinfo
diff -r1.2 -r1.3 pkgsrc/net/samba4/patches/patch-nsswitch_winbind__nss__netbsd.c
diff -r1.1 -r1.2 pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c
cvs diff -r1.177 -r1.178 pkgsrc/net/samba4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba4/Makefile 2023/11/27 17:08:25 1.177
+++ pkgsrc/net/samba4/Makefile 2024/01/10 08:39:30 1.178
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.177 2023/11/27 17:08:25 adam Exp $ 1# $NetBSD: Makefile,v 1.178 2024/01/10 08:39:30 adam Exp $
2 2
3DISTNAME= samba-4.19.3 3DISTNAME= samba-4.19.4
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= https://download.samba.org/pub/samba/stable/ 5MASTER_SITES= https://download.samba.org/pub/samba/stable/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.samba.org/ 8HOMEPAGE= https://www.samba.org/
9COMMENT= SMB/CIFS protocol server suite 9COMMENT= SMB/CIFS protocol server suite
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12CONFLICTS+= ja-samba-[0-9]* winbind-[0-9]* 12CONFLICTS+= ja-samba-[0-9]* winbind-[0-9]*
13 13
14PYTHON_VERSIONS_INCOMPATIBLE= 27 14PYTHON_VERSIONS_INCOMPATIBLE= 27
15 15
16GCC_REQD+= 4.4 16GCC_REQD+= 4.4
cvs diff -r1.100 -r1.101 pkgsrc/net/samba4/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba4/distinfo 2023/11/27 17:08:25 1.100
+++ pkgsrc/net/samba4/distinfo 2024/01/10 08:39:30 1.101
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: distinfo,v 1.100 2023/11/27 17:08:25 adam Exp $ 1$NetBSD: distinfo,v 1.101 2024/01/10 08:39:30 adam Exp $
2 2
3BLAKE2s (samba-4.19.3.tar.gz) = a23d3f9698807486c7a68fd3e374b633406995fa6d28c08b9f436c1a5be25dc5 3BLAKE2s (samba-4.19.4.tar.gz) = c82f3664fa70e6d718b7765c735326b84b4d271cf1efbefb6fe16ba3af1e0558
4SHA512 (samba-4.19.3.tar.gz) = 1eacc6be2866ecc7cbb13c5d17a32ad14cc8148e811db9c730a11065ac3ed84a82e406e750dc97fbc884377346c4538a38d8031e63db6b09acd78fbd2c02d702 4SHA512 (samba-4.19.4.tar.gz) = 9a66f685cb1b5b89c59c75ccb67292b3f792b40b30ca76dfc483e805f5bb680bac027117a28a117f42713452fca41c439bed1724ba7d436fe0b0cb30a34f5b45
5Size (samba-4.19.3.tar.gz) = 41829749 bytes 5Size (samba-4.19.4.tar.gz) = 41839810 bytes
6SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926 6SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
7SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d 7SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
8SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7 8SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
9SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2 9SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
10SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758 10SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758
11SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4 11SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4
12SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18 12SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
13SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c 13SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c
14SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d 14SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d
15SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983 15SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983
16SHA1 (patch-lib_tevent_tevent.c) = 109e7a516dc291372e982b9f21c6ce8c0e5d3ca4 16SHA1 (patch-lib_tevent_tevent.c) = 109e7a516dc291372e982b9f21c6ce8c0e5d3ca4
17SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4 17SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4
18SHA1 (patch-lib_tsocket_tsocket__bsd.c) = 0ac414e02ee3a326d3dd34515bfffce6e8da5e46 18SHA1 (patch-lib_tsocket_tsocket__bsd.c) = 0ac414e02ee3a326d3dd34515bfffce6e8da5e46
19SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26 19SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26
20SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea 20SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea
21SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec 21SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec
22SHA1 (patch-lib_util_time.h) = 5048614e301cf6922ff7fa6693fa58bfe17ff10e 22SHA1 (patch-lib_util_time.h) = 5048614e301cf6922ff7fa6693fa58bfe17ff10e
23SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89 23SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
24SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2 24SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
25SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe 25SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 1214bfbd7714b64f3ff3eb97b6f24e3d2629370f
26SHA1 (patch-nsswitch_wscript__build) = 5be3e07f8a34ae3e2f68126eb6f05f8b65f5be2f 26SHA1 (patch-nsswitch_wscript__build) = 5be3e07f8a34ae3e2f68126eb6f05f8b65f5be2f
27SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f 27SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
28SHA1 (patch-source3_modules_vfs__solarisacl.c) = 1a56006393d08d9977c60e75fddfcf501e2233f7 28SHA1 (patch-source3_modules_vfs__solarisacl.c) = 1a56006393d08d9977c60e75fddfcf501e2233f7
29SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a77b7b634f 29SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a77b7b634f
30SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76 30SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76
31SHA1 (patch-source3_smbd_quotas.c) = 7f959964fac3ee435c57a115c8f5b6407e57b777 31SHA1 (patch-source3_smbd_quotas.c) = 7f959964fac3ee435c57a115c8f5b6407e57b777
32SHA1 (patch-source3_smbd_smb1__process.c) = ff59b9b4f4bdfff2761613ff84fbd669899ea540 32SHA1 (patch-source3_smbd_smb1__process.c) = ff59b9b4f4bdfff2761613ff84fbd669899ea540
33SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77 33SHA1 (patch-source3_utils_net__offlinejoin.c) = defb3ad930ba88ec040bda8899efd24e2a95f294
34SHA1 (patch-source4_auth_gensec_wscript__build) = 01f3cdf787833e05f2e0b49ff0af7c8bbad2c161 34SHA1 (patch-source4_auth_gensec_wscript__build) = 01f3cdf787833e05f2e0b49ff0af7c8bbad2c161
35SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898 35SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
36SHA1 (patch-source4_scripting_wscript__build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159 36SHA1 (patch-source4_scripting_wscript__build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159
37SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402 37SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402
38SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276 38SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276
39SHA1 (patch-third__party_heimdal_lib_hcrypto_evp.c) = 8e8e23198ef4afdc24a6930bd57aa5a898f1826f 39SHA1 (patch-third__party_heimdal_lib_hcrypto_evp.c) = 8e8e23198ef4afdc24a6930bd57aa5a898f1826f
40SHA1 (patch-third__party_heimdal_lib_roken_getauxval.h) = 23c9cf574d9f042c9f6dd1b0377c91045e755b5b 40SHA1 (patch-third__party_heimdal_lib_roken_getauxval.h) = 23c9cf574d9f042c9f6dd1b0377c91045e755b5b
cvs diff -r1.2 -r1.3 pkgsrc/net/samba4/patches/patch-nsswitch_winbind__nss__netbsd.c (expand / switch to unified diff)

--- pkgsrc/net/samba4/patches/patch-nsswitch_winbind__nss__netbsd.c 2020/07/21 18:42:25 1.2
+++ pkgsrc/net/samba4/patches/patch-nsswitch_winbind__nss__netbsd.c 2024/01/10 08:39:30 1.3
@@ -1,34 +1,28 @@ @@ -1,34 +1,28 @@
1$NetBSD: patch-nsswitch_winbind__nss__netbsd.c,v 1.2 2020/07/21 18:42:25 christos Exp $ 1$NetBSD: patch-nsswitch_winbind__nss__netbsd.c,v 1.3 2024/01/10 08:39:30 adam Exp $
2 2
3Syntax error fix. 
4Add primary group support 3Add primary group support
5 4
6--- nsswitch/winbind_nss_netbsd.c.orig 2020-01-31 05:25:36.000000000 -0500 5--- nsswitch/winbind_nss_netbsd.c.orig 2024-01-08 14:34:28.213466000 +0000
7+++ nsswitch/winbind_nss_netbsd.c 2020-07-21 10:24:19.651265315 -0400 6+++ nsswitch/winbind_nss_netbsd.c
8@@ -176,6 +176,7 @@ 7@@ -176,6 +176,7 @@ netbsdwinbind_getgroupmembership(void *n
9 { 8 {
10 int *result = va_arg(ap, int *); 9 int *result = va_arg(ap, int *);
11 const char *uname = va_arg(ap, const char *); 10 const char *uname = va_arg(ap, const char *);
12+ gid_t agroup = va_arg(ap, gid_t); 11+ gid_t agroup = va_arg(ap, gid_t);
13 gid_t *groups = va_arg(ap, gid_t *); 12 gid_t *groups = va_arg(ap, gid_t *);
14 int maxgrp = va_arg(ap, int); 13 int maxgrp = va_arg(ap, int);
15 int *groupc = va_arg(ap, int *); 14 int *groupc = va_arg(ap, int *);
16@@ -185,10 +186,17 @@ 15@@ -189,6 +190,13 @@ netbsdwinbind_getgroupmembership(void *n
17 }; 
18 struct winbindd_response response = { 
19 .length = 0, 
20- } 
21+ }; 
22 gid_t *wblistv; 16 gid_t *wblistv;
23 int wblistc, i, isdup, dupc; 17 int wblistc, i, isdup, dupc;
24  18
25+ /* add the primary group */ 19+ /* add the primary group */
26+ if (*groupc < maxgrp) 20+ if (*groupc < maxgrp)
27+ groups[*groupc] = agroup; 21+ groups[*groupc] = agroup;
28+ else 22+ else
29+ *result = -1; 23+ *result = -1;
30+ (*groupc)++; 24+ (*groupc)++;
31+ 25+
32 strncpy(request.data.username, uname, 26 strncpy(request.data.username, uname,
33 sizeof(request.data.username) - 1); 27 sizeof(request.data.username) - 1);
34 i = winbindd_request_response(NULL, WINBINDD_GETGROUPS, 28 i = winbindd_request_response(NULL, WINBINDD_GETGROUPS,
cvs diff -r1.1 -r1.2 pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c (expand / switch to unified diff)

--- pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c 2022/03/07 21:40:38 1.1
+++ pkgsrc/net/samba4/patches/patch-source3_utils_net__offlinejoin.c 2024/01/10 08:39:30 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-source3_utils_net__offlinejoin.c,v 1.1 2022/03/07 21:40:38 thor Exp $ 1$NetBSD: patch-source3_utils_net__offlinejoin.c,v 1.2 2024/01/10 08:39:30 adam Exp $
2 2
3Fix netapi header usage to follow othertools, preferring local paths. 3Fix netapi header usage to follow othertools, preferring local paths.
4Otherwise, <netapi.h> can be easily resolved to an instance from an 4Otherwise, <netapi.h> can be easily resolved to an instance from an
5old samba install in the system. 5old samba install in the system.
6 6
7--- source3/utils/net_offlinejoin.c.orig 2022-01-28 16:10:18.562082156 +0000 7--- source3/utils/net_offlinejoin.c.orig 2024-01-08 14:34:28.241466000 +0000
8+++ source3/utils/net_offlinejoin.c 8+++ source3/utils/net_offlinejoin.c
9@@ -19,8 +19,8 @@ 9@@ -19,8 +19,8 @@
10  10
11 #include "includes.h" 11 #include "includes.h"
12 #include "utils/net.h" 12 #include "utils/net.h"
13-#include <netapi.h> 13-#include <netapi.h>
14-#include "netapi/netapi_net.h" 14-#include "netapi/netapi_net.h"
15+#include "lib/netapi/netapi.h" 15+#include "lib/netapi/netapi.h"
16+#include "lib/netapi/netapi_net.h" 16+#include "lib/netapi/netapi_net.h"
17 #include "libcli/registry/util_reg.h" 17 #include "libcli/registry/util_reg.h"
18  18 #include "libcli/security/dom_sid.h"
19 int net_offlinejoin_usage(struct net_context *c, int argc, const char **argv) 19 #include "lib/cmdline/cmdline.h"