CVS commit: pkgsrc/net/samba4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Oct  9 07:45:50 UTC 2025

Modified Files:
        pkgsrc/net/samba4: distinfo
        pkgsrc/net/samba4/patches: patch-lib_util_access.c
            patch-source3_auth_user__util.c

Log Message:
samba4: update patch after upstream feedback


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/samba4/patches/patch-lib_util_access.c \
    pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c

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/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.118 pkgsrc/net/samba4/distinfo:1.119
--- pkgsrc/net/samba4/distinfo:1.118    Wed Oct  8 14:28:52 2025
+++ pkgsrc/net/samba4/distinfo  Thu Oct  9 07:45:50 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.118 2025/10/08 14:28:52 wiz Exp $
+$NetBSD: distinfo,v 1.119 2025/10/09 07:45:50 wiz Exp $
 
 BLAKE2s (samba-4.21.7.tar.gz) = 4cee4b3035ff21c547049e348ca7dac48cadfb5a653277bf06f4f9d8595a4fa9
 SHA512 (samba-4.21.7.tar.gz) = f44a0dc880b2a5694f9c46ff11c808ae263f68c91cc9b0e32869bb44f84c1fdcc49370a396f38e0f452133c29357d8ad80a689af67bd85f648b2121e7792b555
@@ -17,7 +17,7 @@ SHA1 (patch-lib_tdb_common_mutex.c) = 74
 SHA1 (patch-lib_tevent_tevent.c) = 109e7a516dc291372e982b9f21c6ce8c0e5d3ca4
 SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4
 SHA1 (patch-lib_tsocket_tsocket__bsd.c) = 0ac414e02ee3a326d3dd34515bfffce6e8da5e46
-SHA1 (patch-lib_util_access.c) = f6c5dc485c7009d3cfc7c3fe541875b7912370e2
+SHA1 (patch-lib_util_access.c) = e629aac8b4b36514fc73cf0d31a07b4a912f87c6
 SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26
 SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea
 SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec
@@ -28,7 +28,7 @@ SHA1 (patch-nsswitch_stress-nss-libwbcli
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 1214bfbd7714b64f3ff3eb97b6f24e3d2629370f
 SHA1 (patch-nsswitch_wscript__build) = 5be3e07f8a34ae3e2f68126eb6f05f8b65f5be2f
 SHA1 (patch-python_pyglue.c) = ba8b0f7d471f16e603a050f735d4a92a95e0b886
-SHA1 (patch-source3_auth_user__util.c) = 9e0f1edfc0d5612fade143d90537f27c26a599d2
+SHA1 (patch-source3_auth_user__util.c) = c7c1c48974ba9d484ddda657996741e0e5b2a9c4
 SHA1 (patch-source3_lib_sysquotas__4A.c) = da4e557485b95dbd780b3345613c506ef18d7923
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
 SHA1 (patch-source3_modules_vfs__cap.c) = 7299d9b83c3ec08a22f317bbbdbed9721defd086

Index: pkgsrc/net/samba4/patches/patch-lib_util_access.c
diff -u pkgsrc/net/samba4/patches/patch-lib_util_access.c:1.2 pkgsrc/net/samba4/patches/patch-lib_util_access.c:1.3
--- pkgsrc/net/samba4/patches/patch-lib_util_access.c:1.2       Wed Oct  8 14:28:53 2025
+++ pkgsrc/net/samba4/patches/patch-lib_util_access.c   Thu Oct  9 07:45:50 2025
@@ -1,15 +1,17 @@
-$NetBSD: patch-lib_util_access.c,v 1.2 2025/10/08 14:28:53 wiz Exp $
+$NetBSD: patch-lib_util_access.c,v 1.3 2025/10/09 07:45:50 wiz Exp $
 
 Add missing header.
 https://bugzilla.samba.org/show_bug.cgi?id=15932
 
---- lib/util/access.c.orig     2025-10-07 19:00:15.593339882 +0000
+--- lib/util/access.c.orig     2024-07-29 09:03:15.058628300 +0000
 +++ lib/util/access.c
-@@ -23,6 +23,8 @@
+@@ -23,6 +23,10 @@
  #include "lib/util/unix_match.h"
  #include "lib/util/smb_strtox.h"
  
++#ifdef HAVE_NETGROUP_H
 +#include <netgroup.h>
++#endif
 +
  #define NAME_INDEX 0
  #define ADDR_INDEX 1
Index: pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c
diff -u pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c:1.2 pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c:1.3
--- pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c:1.2       Wed Oct  8 14:28:53 2025
+++ pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c   Thu Oct  9 07:45:50 2025
@@ -1,15 +1,17 @@
-$NetBSD: patch-source3_auth_user__util.c,v 1.2 2025/10/08 14:28:53 wiz Exp $
+$NetBSD: patch-source3_auth_user__util.c,v 1.3 2025/10/09 07:45:50 wiz Exp $
 
 Add missing header.
 https://bugzilla.samba.org/show_bug.cgi?id=15932
 
---- source3/auth/user_util.c.orig      2025-10-07 19:00:41.861180195 +0000
+--- source3/auth/user_util.c.orig      2024-07-29 09:03:15.302630200 +0000
 +++ source3/auth/user_util.c
-@@ -25,6 +25,8 @@
+@@ -25,6 +25,10 @@
  #include "auth.h"
  #include "lib/gencache.h"
  
++#ifdef HAVE_NETGROUP_H
 +#include <netgroup.h>
++#endif
 +
  /*******************************************************************
   Map a username from a dos name to a unix name by looking in the username