From bdbb8a0811b63fd89a870337ffca30615b94ebd0 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Thu, 9 Apr 2026 12:03:48 +0000 Subject: [PATCH] testing/libmhash: fix casing in license expression and fix build --- testing/libmhash/APKBUILD | 8 +++++--- testing/libmhash/libmhash-prototypes.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 testing/libmhash/libmhash-prototypes.patch diff --git a/testing/libmhash/APKBUILD b/testing/libmhash/APKBUILD index 6b0a2ac181e..8b63b35f8b7 100644 --- a/testing/libmhash/APKBUILD +++ b/testing/libmhash/APKBUILD @@ -2,25 +2,26 @@ # Maintainer: Francesco Colista pkgname=libmhash pkgver=0.9.9.9 -pkgrel=3 +pkgrel=4 pkgdesc="Library which provides a uniform interface to a large number of hash algorithms" url="https://mhash.sourceforge.net/" arch="all" -license="LGPL-2.0-only and LGPL-2.1-or-later" +license="LGPL-2.0-only AND LGPL-2.1-or-later" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://downloads.sourceforge.net/project/mhash/mhash/$pkgver/mhash-$pkgver.tar.gz musl-fix-bool-includes.patch + libmhash-prototypes.patch " builddir="$srcdir/mhash-$pkgver" prepare() { default_prepare - update_config_sub update_config_guess } build() { + export CFLAGS="$CFLAGS -UEMPTY_PROTOTYPES -Wno-pointer-to-int-cast" ./configure --prefix=/usr make } @@ -32,4 +33,5 @@ package() { sha512sums=" 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee libmhash-0.9.9.9.tar.gz 848c687be7da956884b287ecf57d445c974db9421d1e3a6648837aa18ebe86ace1366e0863ba62a898010b56c85ffd2f8294aaa7744ed31cfcec67b0021cc731 musl-fix-bool-includes.patch +8b54051cfdd79fa726d564a7e99ef1865b88edc33b7625587cdfbe18a7e1d95adbc578413c36170d13fafb726f07ca1d4d283553832a8d69233b1bcc846aa8e6 libmhash-prototypes.patch " diff --git a/testing/libmhash/libmhash-prototypes.patch b/testing/libmhash/libmhash-prototypes.patch new file mode 100644 index 00000000000..8f2934a4eed --- /dev/null +++ b/testing/libmhash/libmhash-prototypes.patch @@ -0,0 +1,13 @@ +diff --git a/lib/mhash_int.h b/lib/mhash_int.h +index c1ed1c9..6fe92a6 100644 +--- a/lib/mhash_int.h ++++ b/lib/mhash_int.h +@@ -36,7 +36,7 @@ void *hmac_mhash_end(MHASH thread); + + /* Key generation functions */ + +-#define EMPTY_PROTOTYPES 1 ++#undef EMPTY_PROTOTYPES + + #if defined(EMPTY_PROTOTYPES) +