CVS commit: pkgsrc/net/samba4

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jun 19 02:08:47 UTC 2025

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

Log Message:
samba4: build fix for, e.g., older NetBSD releases

Account for platforms that don't define ENOTRECOVERABLE, like NetBSD
before 10.0.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/samba4/patches/patch-python_pyglue.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.113 pkgsrc/net/samba4/distinfo:1.114
--- pkgsrc/net/samba4/distinfo:1.113    Wed Jun  4 14:43:09 2025
+++ pkgsrc/net/samba4/distinfo  Thu Jun 19 02:08:47 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2025/06/04 14:43:09 taca Exp $
+$NetBSD: distinfo,v 1.114 2025/06/19 02:08:47 gutteridge Exp $
 
 BLAKE2s (samba-4.21.6.tar.gz) = 6d763bf813f948662e2783e407916c3214a9c31294e4d3b0236836ccac49b7c9
 SHA512 (samba-4.21.6.tar.gz) = 58e6d6d44f551e4271bbaade81ea9f5488ce9c811cea1228eb55199a7852dd0a7eaf368287dc691fa47ff86132bc20633926504348c749fbba58337c3385c6ab
@@ -21,11 +21,12 @@ 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-lib_util_util__crypt.c) = cb76f52dd3b0bf98b1ebe7be6bfa36c3c644955d
 SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
 SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 1214bfbd7714b64f3ff3eb97b6f24e3d2629370f
 SHA1 (patch-nsswitch_wscript__build) = 5be3e07f8a34ae3e2f68126eb6f05f8b65f5be2f
+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__solarisacl.c) = 1a56006393d08d9977c60e75fddfcf501e2233f7

Index: pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c
diff -u pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c:1.1 pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c:1.2
--- pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c:1.1  Wed Jun  4 14:43:09 2025
+++ pkgsrc/net/samba4/patches/patch-lib_util_util__crypt.c      Thu Jun 19 02:08:47 2025
@@ -1,8 +1,11 @@
-$NetBSD: patch-lib_util_util__crypt.c,v 1.1 2025/06/04 14:43:09 taca Exp $
+$NetBSD: patch-lib_util_util__crypt.c,v 1.2 2025/06/19 02:08:47 gutteridge Exp $
 
 Do not include <crypt.h> unconditionally.
 
---- lib/util/util_crypt.c.orig 2025-06-04 00:59:55.724394893 +0000
+Account for platforms that don't define ENOTRECOVERABLE, like NetBSD
+before 10.0.
+
+--- lib/util/util_crypt.c.orig 2025-02-17 15:48:20.606155400 +0000
 +++ lib/util/util_crypt.c
 @@ -2,7 +2,9 @@
  #include "data_blob.h"
@@ -14,3 +17,27 @@ Do not include <crypt.h> unconditionally
  #include "util_crypt.h"
  
  
+@@ -62,7 +64,11 @@ static int crypt_as_best_we_can(TALLOC_C
+       if (hash == NULL || hash[0] == '*') {
+               if (ret == 0) {
+                       /* this is annoying */
++#ifdef ENOTRECOVERABLE
+                       ret = ENOTRECOVERABLE;
++#else
++                      ret = ENOSYS;
++#endif
+               }
+       }
+       if (ret != 0) {
+@@ -107,7 +113,11 @@ char *talloc_crypt_errstring(TALLOC_CTX 
+                       mem_ctx,
+                       "Password exceeds maximum length allowed for crypt() hashing");
+       }
++#ifdef ENOTRECOVERABLE
+       if (error == ENOTRECOVERABLE) {
++#else
++      if (error == ENOSYS) {
++#endif
+               /* probably weird RHEL7 crypt, see crypt_as_best_we_can() */
+               goto unknown;
+       }

Added files:

Index: pkgsrc/net/samba4/patches/patch-python_pyglue.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-python_pyglue.c:1.1
--- /dev/null   Thu Jun 19 02:08:47 2025
+++ pkgsrc/net/samba4/patches/patch-python_pyglue.c     Thu Jun 19 02:08:47 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-python_pyglue.c,v 1.1 2025/06/19 02:08:47 gutteridge Exp $
+
+Account for platforms that don't define ENOTRECOVERABLE, like NetBSD
+before 10.0.
+
+--- python/pyglue.c.orig       2025-02-17 15:48:20.614155500 +0000
++++ python/pyglue.c
+@@ -538,7 +538,11 @@ static PyObject *py_crypt(PyObject *self
+       ret = talloc_crypt_blob(frame, phrase, setting, &hash);
+       if (ret != 0) {
+               const char *errstr = talloc_crypt_errstring(frame, ret);
++#ifdef ENOTRECOVERABLE
+               if (ret == EINVAL || ret == ERANGE || ret == ENOTRECOVERABLE) {
++#else
++              if (ret == EINVAL || ret == ERANGE || ret == ENOSYS) {
++#endif
+                       PyErr_Format(PyExc_ValueError,
+                                    "could not crypt(): %s",
+                                    errstr);