CVS commit: pkgsrc/security/mhash

["Hubert Feyrer" <hubertf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hubertf
Date:           Mon Aug 17 12:10:06 UTC 2026

Modified Files:
        pkgsrc/security/mhash: Makefile distinfo
Added Files:
        pkgsrc/security/mhash/patches: patch-lib_mhash__int.h

Log Message:
Fix building on macOS:

In C23 an empty parameter list means "(void)" rather than "unspecified
arguments", so the unprototyped declarations below conflict with the
definitions in keygen.c. Use the full prototypes (only!) in the C23 case.

Bump version to nb15.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/security/mhash/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/mhash/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/mhash/patches/patch-lib_mhash__int.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/mhash/Makefile
diff -u pkgsrc/security/mhash/Makefile:1.42 pkgsrc/security/mhash/Makefile:1.43
--- pkgsrc/security/mhash/Makefile:1.42 Mon Aug  3 13:12:31 2026
+++ pkgsrc/security/mhash/Makefile      Mon Aug 17 12:10:06 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2026/08/03 13:12:31 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2026/08/17 12:10:06 hubertf Exp $
 
 DISTNAME=      mhash-0.9.9
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    security devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mhash/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/security/mhash/distinfo
diff -u pkgsrc/security/mhash/distinfo:1.15 pkgsrc/security/mhash/distinfo:1.16
--- pkgsrc/security/mhash/distinfo:1.15 Tue Aug  6 16:07:06 2024
+++ pkgsrc/security/mhash/distinfo      Mon Aug 17 12:10:06 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2024/08/06 16:07:06 tnn Exp $
+$NetBSD: distinfo,v 1.16 2026/08/17 12:10:06 hubertf Exp $
 
 BLAKE2s (mhash-0.9.9.tar.bz2) = 130b13eb3202c4f1249689abb5fabeabfb4f68c82a41e8b293b139d9ce9f672f
 SHA512 (mhash-0.9.9.tar.bz2) = 96e780858d6693ed253f98dff7d56df906bdfb66da463d53289c4495e4fa7432294be64e57cf9cdac35e5b85b3b134638534cc4e596ec2e3555a68f5445b1ff0
@@ -10,4 +10,5 @@ SHA1 (patch-aa) = b65814b689abfa823d0245
 SHA1 (patch-ab) = 39d26134ebbc935a6bbbc0876fdc23bc52a8a29f
 SHA1 (patch-ac) = aea5b22ffd9cb13513f4262e401a8ac17f05cf7b
 SHA1 (patch-include_mutils_mutils.h) = f4480583fc5e45c79c27a697442676357327dcbf
+SHA1 (patch-lib_mhash__int.h) = 54ec9ace7983580df6fa660707286172c59def24
 SHA1 (patch-lib_stdfns.c) = f98611e91ea92a9c088523e5a6fad89b12507ee5

Added files:

Index: pkgsrc/security/mhash/patches/patch-lib_mhash__int.h
diff -u /dev/null pkgsrc/security/mhash/patches/patch-lib_mhash__int.h:1.1
--- /dev/null   Mon Aug 17 12:10:06 2026
+++ pkgsrc/security/mhash/patches/patch-lib_mhash__int.h        Mon Aug 17 12:10:06 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-lib_mhash__int.h,v 1.1 2026/08/17 12:10:06 hubertf Exp $
+
+Do not use unprototyped declarations for the keygen functions when
+compiling as C23.
+
+In C23 an empty parameter list means "(void)" rather than "unspecified
+arguments", so these declarations conflict with the definitions in
+keygen.c and the build fails with compilers defaulting to C23 (e.g.
+clang on macOS).  The full prototypes are already present in the #else
+branch.  Older language modes keep the previous behaviour.
+
+--- lib/mhash_int.h~   2015-06-18 06:08:36.000000000 +0000
++++ lib/mhash_int.h
+@@ -36,7 +36,14 @@
+ 
+ /* Key generation functions */
+ 
++/*
++ * In C23 an empty parameter list means "(void)" rather than "unspecified
++ * arguments", so the unprototyped declarations below conflict with the
++ * definitions in keygen.c.  Use the full prototypes in that case.
++ */
++#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L
+ #define EMPTY_PROTOTYPES 1
++#endif
+ 
+ #if defined(EMPTY_PROTOTYPES)
+