Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/fdm/files/, net-mail/fdm/
Date: Sat, 18 Mar 2023 21:54:56
Message-Id: 1679176478.c56bfb9f4f4b728f0d9e47f1aac0be355ad5e1b3.sam@gentoo
1 commit: c56bfb9f4f4b728f0d9e47f1aac0be355ad5e1b3
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 18 21:54:02 2023 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 18 21:54:38 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56bfb9f
7
8 net-mail/fdm: fix configure w/ clang 16, fix strlcpy check
9
10 Closes: https://bugs.gentoo.org/731262
11 Thanks-to: Markus Peloquin <markus <AT> cs.wisc.edu>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-mail/fdm/{fdm-2.2.ebuild => fdm-2.2-r1.ebuild} | 8 ++++++++
15 net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch | 20 ++++++++++++++++++++
16 2 files changed, 28 insertions(+)
17
18 diff --git a/net-mail/fdm/fdm-2.2.ebuild b/net-mail/fdm/fdm-2.2-r1.ebuild
19 similarity index 88%
20 rename from net-mail/fdm/fdm-2.2.ebuild
21 rename to net-mail/fdm/fdm-2.2-r1.ebuild
22 index 895dd72d1b2c..cac36667dc18 100644
23 --- a/net-mail/fdm/fdm-2.2.ebuild
24 +++ b/net-mail/fdm/fdm-2.2-r1.ebuild
25 @@ -3,6 +3,8 @@
26
27 EAPI=8
28
29 +inherit autotools
30 +
31 DESCRIPTION="Fetch, filter and deliver mail"
32 HOMEPAGE="https://github.com/nicm/fdm"
33 SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
34 @@ -25,11 +27,17 @@ RDEPEND="
35
36 DOCS=( CHANGES README TODO MANUAL )
37
38 +PATCHES=(
39 + "${FILESDIR}"/${PN}-2.2-configure-strlcpy.patch
40 +)
41 +
42 src_prepare() {
43 default
44
45 # Change user '_fdm' to 'fdm'
46 sed -e 's/_fdm/fdm/g' -i fdm.h || die
47 +
48 + eautoreconf
49 }
50
51 src_configure() {
52
53 diff --git a/net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch b/net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch
54 new file mode 100644
55 index 000000000000..443a7240c40a
56 --- /dev/null
57 +++ b/net-mail/fdm/files/fdm-2.2-configure-strlcpy.patch
58 @@ -0,0 +1,20 @@
59 +diff --git a/configure.ac b/configure.ac
60 +index e356e9c..d91ae66 100644
61 +--- a/configure.ac
62 ++++ b/configure.ac
63 +@@ -124,13 +124,13 @@ if test "x$found_libssl" = xno; then
64 + AC_MSG_ERROR("libssl not found")
65 + fi
66 +
67 +-AC_CHECK_DECL(strlcpy, found_strlcpy=yes, found_strlcpy=no)
68 ++AC_CHECK_FUNC(strlcpy, found_strlcpy=yes, found_strlcpy=no)
69 + if test "x$found_strlcpy" = xyes; then
70 + AC_DEFINE(HAVE_STRLCPY)
71 + fi
72 + AM_CONDITIONAL(NO_STRLCPY, [test "x$found_strlcpy" = xno])
73 +
74 +-AC_CHECK_DECL(strlcat, found_strlcat=yes, found_strlcat=no)
75 ++AC_CHECK_FUNC(strlcat, found_strlcat=yes, found_strlcat=no)
76 + if test "x$found_strlcat" = xyes; then
77 + AC_DEFINE(HAVE_STRLCAT)
78 + fi