CVS commit: pkgsrc/net/samba4

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Jun  4 14:43:09 UTC 2025

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/samba4/patches: patch-lib_util_util__crypt.c

Log Message:
net/samba4: update to 4.21.6

Samba 4.21.6 (2025-06-03)

This is the latest stable release of the Samba 4.21 release series.
It contains the security-relevant bugfix CVE-2025-0620:

    smbd doesn't pick up group membership changes
    when re-authenticating an expired SMB session:
    https://www.samba.org/samba/security/CVE-2025-0620.html

For more detail and changes with 4.21.4 and 4.21.5 please refer:
<https://www.samba.org/samba/history/>.


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/net/samba4/PLIST
cvs rdiff -u -r1.112 -r1.113 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.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.202 pkgsrc/net/samba4/Makefile:1.203
--- pkgsrc/net/samba4/Makefile:1.202    Fri May  9 13:23:51 2025
+++ pkgsrc/net/samba4/Makefile  Wed Jun  4 14:43:09 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.202 2025/05/09 13:23:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.203 2025/06/04 14:43:09 taca Exp $
 
-DISTNAME=      samba-4.21.3
-PKGREVISION=   4
+DISTNAME=      samba-4.21.6
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.61 pkgsrc/net/samba4/PLIST:1.62
--- pkgsrc/net/samba4/PLIST:1.61        Tue May  6 12:07:35 2025
+++ pkgsrc/net/samba4/PLIST     Wed Jun  4 14:43:09 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.61 2025/05/06 12:07:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.62 2025/06/04 14:43:09 taca Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@@ -617,6 +617,7 @@ ${PYSITELIB}/samba/tests/lsa_string.py
 ${PYSITELIB}/samba/tests/messaging.py
 ${PYSITELIB}/samba/tests/ndr/gkdi.py
 ${PYSITELIB}/samba/tests/ndr/gmsa.py
+${PYSITELIB}/samba/tests/ndr/sd.py
 ${PYSITELIB}/samba/tests/ndr/wbint.py
 ${PYSITELIB}/samba/tests/net_join.py
 ${PYSITELIB}/samba/tests/net_join_no_spnego.py
@@ -949,6 +950,7 @@ lib/samba/private/libtdb-wrap-private-sa
 lib/samba/private/libtevent-util-private-samba.so
 lib/samba/private/libtime-basic-private-samba.so
 lib/samba/private/libtorture-private-samba.so
+lib/samba/private/libutil-crypt-private-samba.so
 lib/samba/private/libutil-reg-private-samba.so
 lib/samba/private/libutil-setid-private-samba.so
 lib/samba/private/libutil-tdb-private-samba.so

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.112 pkgsrc/net/samba4/distinfo:1.113
--- pkgsrc/net/samba4/distinfo:1.112    Tue Jan  7 11:33:06 2025
+++ pkgsrc/net/samba4/distinfo  Wed Jun  4 14:43:09 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.112 2025/01/07 11:33:06 adam Exp $
+$NetBSD: distinfo,v 1.113 2025/06/04 14:43:09 taca Exp $
 
-BLAKE2s (samba-4.21.3.tar.gz) = cefc7628c027e67d8986f9374f619e5578563a6c92f5d2f3cb03f498feabafed
-SHA512 (samba-4.21.3.tar.gz) = b030e4a9749742bfa31b6ef03a3327f1b77b8db388a2d1d591bc8cf26db365ac773c1aa1f2710e7c94585685cdba6c0769af7ba0e0175db33e9d2552c97601ae
-Size (samba-4.21.3.tar.gz) = 42654317 bytes
+BLAKE2s (samba-4.21.6.tar.gz) = 6d763bf813f948662e2783e407916c3214a9c31294e4d3b0236836ccac49b7c9
+SHA512 (samba-4.21.6.tar.gz) = 58e6d6d44f551e4271bbaade81ea9f5488ce9c811cea1228eb55199a7852dd0a7eaf368287dc691fa47ff86132bc20633926504348c749fbba58337c3385c6ab
+Size (samba-4.21.6.tar.gz) = 42682936 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
@@ -21,6 +21,7 @@ SHA1 (patch-lib_util_charset_charset__ma
 SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea
 SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec
 SHA1 (patch-lib_util_time.h) = 5048614e301cf6922ff7fa6693fa58bfe17ff10e
+SHA1 (patch-lib_util_util__crypt.c) = 0868616f9cc92388fe87b6318b8f4b7be9fe5b43
 SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
 SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 1214bfbd7714b64f3ff3eb97b6f24e3d2629370f

Added files:

Index: pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c:1.1
--- /dev/null   Wed Jun  4 14:43:09 2025
+++ pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c      Wed Jun  4 14:43:09 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_util_util__crypt.c,v 1.1 2025/06/04 14:43:09 taca Exp $
+
+Do not include <crypt.h> unconditionally.
+
+--- lib/util/util_crypt.c.orig 2025-06-04 00:59:55.724394893 +0000
++++ lib/util/util_crypt.c
+@@ -2,7 +2,9 @@
+ #include "data_blob.h"
+ #include "discard.h"
+ #include <talloc.h>
++#ifdef HAVE_CRYPT_H
+ #include <crypt.h>
++#endif
+ #include "util_crypt.h"
+ 
+