From c56bfb9f4f4b728f0d9e47f1aac0be355ad5e1b3 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 18 Mar 2023 21:54:02 +0000
Subject: net-mail/fdm: fix configure w/ clang 16, fix strlcpy check

Closes: https://bugs.gentoo.org/731262
Thanks-to: Markus Peloquin <markus@cs.wisc.edu>
Signed-off-by: Sam James <sam@gentoo.org>
---
 net-mail/fdm/fdm-2.2-r1.ebuild                     | 54 ++++++++++++++++++++++
 net-mail/fdm/fdm-2.2.ebuild                        | 46 ------------------
 net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch | 20 ++++++++
 3 files changed, 74 insertions(+), 46 deletions(-)
 create mode 100644 net-mail/fdm/fdm-2.2-r1.ebuild
 delete mode 100644 net-mail/fdm/fdm-2.2.ebuild
 create mode 100644 net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch

diff --git a/net-mail/fdm/fdm-2.2-r1.ebuild b/net-mail/fdm/fdm-2.2-r1.ebuild
new file mode 100644
index 000000000000..cac36667dc18
--- /dev/null
+++ b/net-mail/fdm/fdm-2.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Fetch, filter and deliver mail"
+HOMEPAGE="https://github.com/nicm/fdm"
+SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="examples pcre"
+
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/tdb
+	pcre? ( dev-libs/libpcre2 )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/fdm
+	acct-user/fdm
+"
+
+DOCS=( CHANGES README TODO MANUAL )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-configure-strlcpy.patch
+)
+
+src_prepare() {
+	default
+
+	# Change user '_fdm' to 'fdm'
+	sed -e 's/_fdm/fdm/g' -i fdm.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable pcre pcre2)
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/net-mail/fdm/fdm-2.2.ebuild b/net-mail/fdm/fdm-2.2.ebuild
deleted file mode 100644
index 895dd72d1b2c..000000000000
--- a/net-mail/fdm/fdm-2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Fetch, filter and deliver mail"
-HOMEPAGE="https://github.com/nicm/fdm"
-SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples pcre"
-
-DEPEND="
-	dev-libs/openssl:=
-	sys-libs/tdb
-	pcre? ( dev-libs/libpcre2 )
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/fdm
-	acct-user/fdm
-"
-
-DOCS=( CHANGES README TODO MANUAL )
-
-src_prepare() {
-	default
-
-	# Change user '_fdm' to 'fdm'
-	sed -e 's/_fdm/fdm/g' -i fdm.h || die
-}
-
-src_configure() {
-	econf $(use_enable pcre pcre2)
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch b/net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch
new file mode 100644
index 000000000000..443a7240c40a
--- /dev/null
+++ b/net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index e356e9c..d91ae66 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -124,13 +124,13 @@ if test "x$found_libssl" = xno; then
+ 	AC_MSG_ERROR("libssl not found")
+ fi
+ 
+-AC_CHECK_DECL(strlcpy, found_strlcpy=yes, found_strlcpy=no)
++AC_CHECK_FUNC(strlcpy, found_strlcpy=yes, found_strlcpy=no)
+ if test "x$found_strlcpy" = xyes; then
+ 	AC_DEFINE(HAVE_STRLCPY)
+ fi
+ AM_CONDITIONAL(NO_STRLCPY, [test "x$found_strlcpy" = xno])
+ 
+-AC_CHECK_DECL(strlcat, found_strlcat=yes, found_strlcat=no)
++AC_CHECK_FUNC(strlcat, found_strlcat=yes, found_strlcat=no)
+ if test "x$found_strlcat" = xyes; then
+ 	AC_DEFINE(HAVE_STRLCAT)
+ fi
-- 
cgit v1.2.3-18-g5258