CVS commit: [pkgsrc-2025Q3] pkgsrc/net/samba4

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Oct 23 03:25:09 UTC 2025

Modified Files:
        pkgsrc/net/samba4 [pkgsrc-2025Q3]: Makefile distinfo
Added Files:
        pkgsrc/net/samba4/patches [pkgsrc-2025Q3]: patch-lib_util_access.c
            patch-source3_auth_user__util.c

Log Message:
Pullup ticket #7022 - requested by taca
net/smaba4: Security fix

Revisions pulled up:
- net/samba4/Makefile                                           1.207
- net/samba4/distinfo                                           1.117-1.120
- net/samba4/patches/patch-lib_util_access.c                    1.1-1.3
- net/samba4/patches/patch-source3_auth_user__util.c            1.1-1.3

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Tue Oct  7 19:06:24 UTC 2025

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

   Log Message:
   samba4: add missing headers to fix build with gcc 14

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Wed Oct  8 14:28:53 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: add upstream bug report URL

---
   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

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Thu Oct 16 04:25:21 UTC 2025

   Modified Files:
        pkgsrc/net/samba4: Makefile distinfo

   Log Message:
   net/samba4: update to 4.21.9

                      =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
                      Release Notes for Samba 4.21.9
                             October 15, 2025
                      =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

   This is a security release in order to address the following defects:

   o CVE-2025-9640:  Uninitialized memory disclosure via vfs_streams_xattr=
   .=

                     https://www.samba.org/samba/security/CVE-2025-9640.ht=
   ml

   o CVE-2025-10230: Command injection via WINS server hook script.
                     https://www.samba.org/samba/security/CVE-2025-10230.h=
   tml

   Changes since 4.21.8
   --------------------

   o  Douglas Bagnall <douglas.bagnall%catalyst.net.nz@localhost>
      * BUG 15903: CVE-2025-10230.

   o  Andrew Walker <andrew.walker%truenas.com@localhost>
      * BUG 15885: CVE-2025-9640.

   ----------------------------------------
                      =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
                      Release Notes for Samba 4.21.8
                            September 09, 2025
                      =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
   =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

   This is the latest stable release of the Samba 4.21 release series.

   Changes since 4.21.7
   --------------------

   o  Ralph Boehme <slow%samba.org@localhost>
      * BUG 14981: netr_LogonSamLogonEx returns NR_STATUS_ACCESS_DENIED wi=
   th
        SysvolReady=3D0.
      * BUG 15844: getpwuid does not shift to new DC when current DC is do=
   wn.
      * BUG 15876: Windows security hardening locks out schannel'ed netlog=
   on dc
        calls like netr_DsRGetDCName.

   o  G=FCnther Deschner <gd%samba.org@localhost>
      * BUG 15840: kinit command is failing with Missing cache Error.

   o  Pavel Filipensk=FD <pfilipensky%samba.org@localhost>
      * BUG 15891: Figuring out the DC name from IP address fails and brea=
   ks
        fork_domain_child().

   o  Volker Lendecke <vl%samba.org@localhost>
      * BUG 15892: Delayed leader broadcast can block ctdb forever.

   o  Stefan Metzmacher <metze%samba.org@localhost>
      * BUG 14981: netr_LogonSamLogonEx returns NR_STATUS_ACCESS_DENIED wi=
   th
        SysvolReady=3D0.

   o  MikeLiu <mikeliu%qnap.com@localhost>
      * BUG 15900: 'net ads group' failed to list domain groups.

   o  Rabinarayan Panigrahi <rapanigr%redhat.com@localhost>
      * BUG 15663: Apparently there is a conflict between shadow_copy2 mod=
   ule and
        virusfilter (action quarantine).

   o  Aleksandr Sharov <asharov%redhat.com@localhost>
      * BUG 15877: Fix handling of empty GPO link.

   o  Srinivas Rao V <Srinivas.Rao.V%ibm.com@localhost>
      * BUG 15880: SMB ACL inheritance doesn't work for files created.


To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.206.2.1 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.116 -r1.116.2.1 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r0 -r1.3.2.2 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/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.206 pkgsrc/net/samba4/Makefile:1.206.2.1
--- pkgsrc/net/samba4/Makefile:1.206    Sat Aug 30 22:46:05 2025
+++ pkgsrc/net/samba4/Makefile  Thu Oct 23 03:25:09 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.206 2025/08/30 22:46:05 wiz Exp $
+# $NetBSD: Makefile,v 1.206.2.1 2025/10/23 03:25:09 maya Exp $
 
-DISTNAME=      samba-4.21.7
-PKGREVISION=   2
+DISTNAME=      samba-4.21.9
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.116 pkgsrc/net/samba4/distinfo:1.116.2.1
--- pkgsrc/net/samba4/distinfo:1.116    Thu Jul 24 15:12:51 2025
+++ pkgsrc/net/samba4/distinfo  Thu Oct 23 03:25:09 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.116 2025/07/24 15:12:51 tsutsui Exp $
+$NetBSD: distinfo,v 1.116.2.1 2025/10/23 03:25:09 maya Exp $
 
-BLAKE2s (samba-4.21.7.tar.gz) = 4cee4b3035ff21c547049e348ca7dac48cadfb5a653277bf06f4f9d8595a4fa9
-SHA512 (samba-4.21.7.tar.gz) = f44a0dc880b2a5694f9c46ff11c808ae263f68c91cc9b0e32869bb44f84c1fdcc49370a396f38e0f452133c29357d8ad80a689af67bd85f648b2121e7792b555
-Size (samba-4.21.7.tar.gz) = 42689509 bytes
+BLAKE2s (samba-4.21.9.tar.gz) = baeb524bb0b8fa706a07af46d2818778bf8290a08a673a56e4cefc7174be0d19
+SHA512 (samba-4.21.9.tar.gz) = 465ccb912c443e3b187d9662f605141011626b12ebc979558e3c710487382cae8fe110e0bc5232f04c839cb5d13313f8f68f2edd2511ead31cefb9096ecdcf08
+Size (samba-4.21.9.tar.gz) = 42695134 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = b9015694b80c0e6382d75c806fd6e0eb92e5f998
@@ -17,6 +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) = 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
@@ -27,6 +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) = c7c1c48974ba9d484ddda657996741e0e5b2a9c4
 SHA1 (patch-source3_lib_sysquotas__4A.c) = da4e557485b95dbd780b3345613c506ef18d7923
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
 SHA1 (patch-source3_modules_vfs__cap.c) = 7299d9b83c3ec08a22f317bbbdbed9721defd086

Added files:

Index: pkgsrc/net/samba4/patches/patch-lib_util_access.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-lib_util_access.c:1.3.2.2
--- /dev/null   Thu Oct 23 03:25:09 2025
+++ pkgsrc/net/samba4/patches/patch-lib_util_access.c   Thu Oct 23 03:25:09 2025
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Add missing header.
+https://bugzilla.samba.org/show_bug.cgi?id=15932
+
+--- lib/util/access.c.orig     2024-07-29 09:03:15.058628300 +0000
++++ lib/util/access.c
+@@ -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 /dev/null pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c:1.3.2.2
--- /dev/null   Thu Oct 23 03:25:09 2025
+++ pkgsrc/net/samba4/patches/patch-source3_auth_user__util.c   Thu Oct 23 03:25:09 2025
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Add missing header.
+https://bugzilla.samba.org/show_bug.cgi?id=15932
+
+--- source3/auth/user_util.c.orig      2024-07-29 09:03:15.302630200 +0000
++++ source3/auth/user_util.c
+@@ -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
+  map. Note that this modifies the name in place.