CVS commit: pkgsrc/net/samba4

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul 29 17:22:49 UTC 2026

Modified Files:
        pkgsrc/net/samba4: distinfo
        pkgsrc/net/samba4/patches: patch-buildtools_wafsamba_wscript
Added Files:
        pkgsrc/net/samba4/patches: patch-source4_torture_local_nss__tests.c

Log Message:
samba4: Additional SunOS build fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_wscript
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.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.127 pkgsrc/net/samba4/distinfo:1.128
--- pkgsrc/net/samba4/distinfo:1.127    Wed Jul  1 07:27:25 2026
+++ pkgsrc/net/samba4/distinfo  Wed Jul 29 17:22:49 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.127 2026/07/01 07:27:25 adam Exp $
+$NetBSD: distinfo,v 1.128 2026/07/29 17:22:49 jperkin Exp $
 
 BLAKE2s (samba-4.24.4.tar.gz) = b3bba50ea3da90441f5fb733a7f1004c745be7ef5076d985c417991873183698
 SHA512 (samba-4.24.4.tar.gz) = 3f6b8a99491d82fcb90115288e547b330afd452f7ed15f288085644a0ea9ccbd45645c5a75f2d5db6d2d888ff280e87ec252b48e0c064a0ca33cac39f24f123d
@@ -7,7 +7,7 @@ SHA1 (patch-buildtools_wafsamba_samba__c
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = b9015694b80c0e6382d75c806fd6e0eb92e5f998
 SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
-SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758
+SHA1 (patch-buildtools_wafsamba_wscript) = e39a904e7bbb129e3ba497d61cea0b317ac907c3
 SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4
 SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
 SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c
@@ -40,6 +40,7 @@ SHA1 (patch-source3_utils_net__offlinejo
 SHA1 (patch-source4_auth_gensec_wscript__build) = 01f3cdf787833e05f2e0b49ff0af7c8bbad2c161
 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
 SHA1 (patch-source4_scripting_wscript__build) = aac6894d49f5c17a28d26cb627be8cef1902bb1e
+SHA1 (patch-source4_torture_local_nss__tests.c) = c68325fdd4f65532de60c1a40e9cbe4173ea1711
 SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402
 SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276
 SHA1 (patch-third__party_heimdal_lib_hcrypto_evp.c) = 8e8e23198ef4afdc24a6930bd57aa5a898f1826f

Index: pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_wscript
diff -u pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_wscript:1.3 pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_wscript:1.4
--- pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_wscript:1.3     Sun Nov 10 17:01:58 2019
+++ pkgsrc/net/samba4/patches/patch-buildtools_wafsamba_wscript Wed Jul 29 17:22:49 2026
@@ -1,16 +1,18 @@
-$NetBSD: patch-buildtools_wafsamba_wscript,v 1.3 2019/11/10 17:01:58 adam Exp $
+$NetBSD: patch-buildtools_wafsamba_wscript,v 1.4 2026/07/29 17:22:49 jperkin Exp $
 
 Define _POSIX_PTHREAD_SEMANTICS on SunOS to pick up re-entrant functions.
 
---- buildtools/wafsamba/wscript.orig   2019-07-09 10:08:41.000000000 +0000
+--- buildtools/wafsamba/wscript.orig   2026-01-20 15:42:53.850815000 +0000
 +++ buildtools/wafsamba/wscript
-@@ -458,6 +458,10 @@ def configure(conf):
+@@ -601,6 +601,12 @@ def configure(conf):
      if conf.CHECK_CFLAGS(['-D__STDC_WANT_LIB_EXT1__=1']):
          conf.ADD_CFLAGS('-D__STDC_WANT_LIB_EXT1__=1')
  
 +    # Use POSIX getpwnam_r and friends.
 +    if conf.env['SYSTEM_UNAME_SYSNAME'] == 'SunOS':
 +        conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1, add_to_cflags=True)
++        conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
++        conf.DEFINE('__EXTENSIONS__', 1, add_to_cflags=True)
 +
      # on Tru64 certain features are only available with _OSF_SOURCE set to 1
      # and _XOPEN_SOURCE set to 600

Added files:

Index: pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.c:1.3
--- /dev/null   Wed Jul 29 17:22:49 2026
+++ pkgsrc/net/samba4/patches/patch-source4_torture_local_nss__tests.c  Wed Jul 29 17:22:49 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-source4_torture_local_nss__tests.c,v 1.3 2026/07/29 17:22:49 jperkin Exp $
+
+Fix illumos getpwent_r/getgrent_r arguments.
+
+--- source4/torture/local/nss_tests.c.orig     2026-07-29 16:57:02.512027378 +0000
++++ source4/torture/local/nss_tests.c
+@@ -351,7 +351,8 @@ static bool test_enum_r_passwd(struct to
+               torture_comment(tctx, "Testing getpwent_r\n");
+ 
+ #ifdef SOLARIS_GETPWENT_R
+-              ret = getpwent_r(&pwd, buffer, sizeof(buffer));
++              pwdp = getpwent_r(&pwd, buffer, sizeof(buffer));
++              ret = (pwdp != NULL) ? 0 : errno;
+ #else /* SOLARIS_GETPWENT_R */
+               ret = getpwent_r(&pwd, buffer, sizeof(buffer), &pwdp);
+ #endif /* SOLARIS_GETPWENT_R */
+@@ -551,7 +552,8 @@ static bool test_enum_r_group(struct tor
+               torture_comment(tctx, "Testing getgrent_r\n");
+ 
+ #ifdef SOLARIS_GETGRENT_R
+-              ret = getgrent_r(&grp, buffer, sizeof(buffer));
++              grpp = getgrent_r(&grp, buffer, sizeof(buffer));
++              ret = (grpp != NULL) ? 0 : errno;
+ #else /* SOLARIS_GETGRENT_R */
+               ret = getgrent_r(&grp, buffer, sizeof(buffer), &grpp);
+ #endif /* SOLARIS_GETGRENT_R */