CVS commit: pkgsrc/www/hiawatha

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Mar 13 21:09:18 UTC 2026

Modified Files:
        pkgsrc/www/hiawatha: distinfo
        pkgsrc/www/hiawatha/patches:
            patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c

Log Message:
Adopt NetBSD build fix from security/mbedtls4.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/hiawatha/patches/patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__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/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.17 pkgsrc/www/hiawatha/distinfo:1.18
--- pkgsrc/www/hiawatha/distinfo:1.17   Fri Mar 13 21:02:49 2026
+++ pkgsrc/www/hiawatha/distinfo        Fri Mar 13 21:09:18 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2026/03/13 21:02:49 hauke Exp $
+$NetBSD: distinfo,v 1.18 2026/03/13 21:09:18 hauke Exp $
 
 BLAKE2s (hiawatha-v12.0.tar.gz) = e079ecaedececeb87869ce5f5b8d02a935d594fc405498a52c2d320efe345ac8
 SHA512 (hiawatha-v12.0.tar.gz) = c33a1f3cbe5fedafcfdb2b91507f5bd1add58b1fc73bfcaf8a83885454b75e7d5ef0a37497aefc17c31a1b5992b1263a881c6efe0f3f06b556786f0f86bbf780
@@ -6,5 +6,5 @@ Size (hiawatha-v12.0.tar.gz) = 2334911 b
 SHA1 (patch-CMakeLists.txt) = a96e51545ab31e5ceb4a520bb4757787088c8174
 SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
 SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347
-SHA1 (patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c) = 28e3cf0b22344145d8699ac33641a912db6f6ed9
+SHA1 (patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c) = 07c2b982b89df1ff2b0673593b07e4c7f5c1d7d1
 SHA1 (patch-src_hiawatha.c) = 4302f7f959799fc79bda6eda63901fb5b0fc3993

Index: pkgsrc/www/hiawatha/patches/patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c
diff -u pkgsrc/www/hiawatha/patches/patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c:1.1 
pkgsrc/www/hiawatha/patches/patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c:1.2
--- pkgsrc/www/hiawatha/patches/patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c:1.1    Fri Mar 13 21:02:50 2026
+++ pkgsrc/www/hiawatha/patches/patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c        Fri Mar 13 21:09:18 2026
@@ -1,17 +1,15 @@
-$NetBSD: patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c,v 1.1 2026/03/13 21:02:50 hauke Exp $
+$NetBSD: patch-mbedtls_tf-psa-crypto_drivers_builtin_src_platform__util.c,v 1.2 2026/03/13 21:09:18 hauke Exp $
 
-Make devmajor_t and friends available on NetBSD for KERN_ARND support
+    Fix build on NetBSD (from security/mbedtls4)
 
 --- mbedtls/tf-psa-crypto/drivers/builtin/src/platform_util.c.orig     2026-03-12 19:02:22.000000000 +0000
 +++ mbedtls/tf-psa-crypto/drivers/builtin/src/platform_util.c
-@@ -20,6 +20,10 @@
- #define _GNU_SOURCE
+@@ -11,7 +11,7 @@
+  * mbedtls_config.h, which pulls in glibc's features.h. Harmless on other platforms
+  * except OpenBSD, where it stops us accessing explicit_bzero.
+  */
+-#if !defined(_POSIX_C_SOURCE) && !defined(__OpenBSD__)
++#if !defined(_POSIX_C_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #define _POSIX_C_SOURCE 200112L
  #endif
  
-+#if defined(__NetBSD__)
-+#define _NETBSD_SOURCE
-+#endif
-+
- #include "tf_psa_crypto_common.h"
- 
- #include "mbedtls/platform_util.h"