From 733640bba3948b6aba4fb209425830c23a7dc92f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 6 Aug 2024 16:33:47 +0200
Subject: [PATCH] main/heimdal: fix build with gcc 14

---
 main/heimdal/APKBUILD         |  4 +++-
 main/heimdal/getpwnam_r.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 main/heimdal/getpwnam_r.patch

diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index 1e440480cd1..9d98f626eb1 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=heimdal
 pkgver=7.8.0
 _ver=${pkgver/_rc/rc}
-pkgrel=3
+pkgrel=4
 pkgdesc="Implementation of Kerberos 5"
 arch="all"
 url="https://github.com/heimdal/"
@@ -24,6 +24,7 @@ source="https://github.com/heimdal/heimdal/releases/download/heimdal-$pkgver/hei
 	CVE-2018-16860.patch
 	CVE-2022-45142.patch
 	silence-include-headers-redirect-warnings.patch
+	getpwnam_r.patch
 	"
 
 # secfixes:
@@ -143,4 +144,5 @@ e89efdc942c512363aac1d9797c6bf622324e9200e282bc5ed680300b9e1b39a4ea20f059cdac8f2
 36738795eb3478b55790bf1927f85a421b13b6b47dcc273daeb6630c39a4e1c1258148fa0e9f004ae59a9ac89caf54cb25efedb417e852e42a2c32d02e43fd56  CVE-2018-16860.patch
 3205ce659c755b1a9e3bca3a3088cf241550fb2343fe46bee4370623b1ea2845395bcf7682a8c472d067067fbf8b3a8ea8809e8d3e6d5f62e05dcd680ba7230b  CVE-2022-45142.patch
 5d507a4312bbc59f2b67cb441d0880eaa060e3fdd166b7b8cf9b967d404722a1672e10cc8daedc46a786b8cbbb78de0bc2585d1d4d5b985da16c18f60c87d54f  silence-include-headers-redirect-warnings.patch
+852312f8f74c96ff876398a2abcee8eec369f36d5729ffc13480760c52b57d632c0623176953c2f0caba38b1e6c8e2a28ba4b8c6ff59cbfae973139a28ceaca6  getpwnam_r.patch
 "
diff --git a/main/heimdal/getpwnam_r.patch b/main/heimdal/getpwnam_r.patch
new file mode 100644
index 00000000000..e835ef803ef
--- /dev/null
+++ b/main/heimdal/getpwnam_r.patch
@@ -0,0 +1,13 @@
+diff --git a/cf/check-getpwnam_r-posix.m4 b/cf/check-getpwnam_r-posix.m4
+index aab9eaf..bd51b93 100644
+--- a/cf/check-getpwnam_r-posix.m4
++++ b/cf/check-getpwnam_r-posix.m4
+@@ -3,7 +3,7 @@ dnl
+ dnl check for getpwnam_r, and if it's posix or not
+ 
+ AC_DEFUN([AC_CHECK_GETPWNAM_R_POSIX],[
+-AC_FIND_FUNC_NO_LIBS(getpwnam_r,c_r)
++AC_FIND_FUNC_NO_LIBS(getpwnam_r,c_r,[#include <pwd.h>],[0, 0, 0, 0, 0])
+ if test "$ac_cv_func_getpwnam_r" = yes; then
+ 	AC_CACHE_CHECK(if getpwnam_r is posix,ac_cv_func_getpwnam_r_posix,
+ 	ac_libs="$LIBS"