CVS commit: pkgsrc/net/samba4

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Thu Jul 24 15:12:51 UTC 2025

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

Log Message:
samba4: fix random coredump on NetBSD/i386 10.1.

Taken from FreeBSD ports:
 https://bugs.freebsd.org/275597


To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/samba4/patches/patch-source3_modules_vfs__cap.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.204 pkgsrc/net/samba4/Makefile:1.205
--- pkgsrc/net/samba4/Makefile:1.204    Thu Jul 10 15:24:28 2025
+++ pkgsrc/net/samba4/Makefile  Thu Jul 24 15:12:51 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.204 2025/07/10 15:24:28 taca Exp $
+# $NetBSD: Makefile,v 1.205 2025/07/24 15:12:51 tsutsui Exp $
 
 DISTNAME=      samba-4.21.7
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.115 pkgsrc/net/samba4/distinfo:1.116
--- pkgsrc/net/samba4/distinfo:1.115    Thu Jul 10 15:24:28 2025
+++ pkgsrc/net/samba4/distinfo  Thu Jul 24 15:12:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.115 2025/07/10 15:24:28 taca Exp $
+$NetBSD: distinfo,v 1.116 2025/07/24 15:12:51 tsutsui Exp $
 
 BLAKE2s (samba-4.21.7.tar.gz) = 4cee4b3035ff21c547049e348ca7dac48cadfb5a653277bf06f4f9d8595a4fa9
 SHA512 (samba-4.21.7.tar.gz) = f44a0dc880b2a5694f9c46ff11c808ae263f68c91cc9b0e32869bb44f84c1fdcc49370a396f38e0f452133c29357d8ad80a689af67bd85f648b2121e7792b555
@@ -29,6 +29,7 @@ SHA1 (patch-nsswitch_wscript__build) = 5
 SHA1 (patch-python_pyglue.c) = ba8b0f7d471f16e603a050f735d4a92a95e0b886
 SHA1 (patch-source3_lib_sysquotas__4A.c) = da4e557485b95dbd780b3345613c506ef18d7923
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
+SHA1 (patch-source3_modules_vfs__cap.c) = 7299d9b83c3ec08a22f317bbbdbed9721defd086
 SHA1 (patch-source3_modules_vfs__solarisacl.c) = 1a56006393d08d9977c60e75fddfcf501e2233f7
 SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a77b7b634f
 SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76

Added files:

Index: pkgsrc/net/samba4/patches/patch-source3_modules_vfs__cap.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source3_modules_vfs__cap.c:1.1
--- /dev/null   Thu Jul 24 15:12:51 2025
+++ pkgsrc/net/samba4/patches/patch-source3_modules_vfs__cap.c  Thu Jul 24 15:12:51 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-source3_modules_vfs__cap.c,v 1.1 2025/07/24 15:12:51 tsutsui Exp $
+
+- Fix random coredump on NetBSD/i386 10.1. From FreeBSD ports:
+ https://bugs.freebsd.org/275597
+
+--- source3/modules/vfs_cap.c.orig     2025-07-24 02:19:13.963781176 +0000
++++ source3/modules/vfs_cap.c
+@@ -110,7 +110,7 @@ cap_readdir(vfs_handle_struct *handle, s
+               return NULL;
+       }
+       talloc_set_name_const(newdirent, "struct dirent");
+-      memcpy(newdirent, result, sizeof(struct dirent));
++      memcpy(newdirent, result, result->d_reclen);
+       memcpy(&newdirent->d_name, newname, newnamelen);
+       return newdirent;
+ }