gentoo auto-resync : 19:03:2023 - 00:32:54

5 files changed, 30 insertions, 97 deletions

diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index b48cf8dd63ff..cf84cb0b460f 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,7 +1,4 @@
-DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
-DIST fdm-2.1.tar.gz 318803 BLAKE2B 2bb693177c69665d2354c382ab663a3283c5edae2cdf6f3bf2fe4133309de9d43e0e8ad3830eeee4eb002fe202eb20f982cdc892fb0b0d1698b13aa79f22be0a SHA512 6a864048e1f25eedbb6af86451b258678b91e3c225b3b065a1aeb043f125405dfa109a0fbd77363394e14050053c7d81093d5b9d6a2dd155fb00dc98455028b4
+AUX fdm-2.2-configure-strlcpy.patch 655 BLAKE2B 2057b5866603a6ca6d5b9b5618e7c3e238accf5b061e341b23c9f22096a6e65aa7affd06694a37ccc114be1089495b6efa1fc851c2999e63b5ff71e53420e00d SHA512 937bb22f0cf4ae44972b9373cc5bfc4beced41afc20322993286594246c02a1ccdda5e3208c78c0ec7af3b1bc5e758e9d1d0a0ce8cbdf8467695587727015896
 DIST fdm-2.2.tar.gz 319140 BLAKE2B dde9126aaf3183444123bb3b546f8997a5a25f5dc58bb7fc08818e491e2193543f4f06e758b479e61da7feaf752e3d3ddfd8103c616a49f0d65c41972bae7e12 SHA512 13efa0f272c5f6146b90e094602e8a9b52016af79ae0b6cd80dc9f36b2ba37f64cadae7313bd8db90bcb007dd07206a3614987f11bb82c3535e04f0511c9fc6d
-EBUILD fdm-2.0-r1.ebuild 751 BLAKE2B 0d3e2cc3699d60c4d1d288ccab9a95e584d92f411b7f9c8303fbeaaed1b5fe4c6b6b7619a107d847f091a932da616552c70cad1fb4491cfa3077287594a3ac74 SHA512 138aca9c80a5fef3a4879e52c82b091e4750bc5578f7088c7b183806ab4edd6d014f394b2af5f61eb7dfd417887eeb9127d62790121173049cbea363fe1e8b2b
-EBUILD fdm-2.1.ebuild 753 BLAKE2B 14fce7155144f908b8258dcdabc56606c908383c537adb6125c9a1f8d70ffda721cc3661a49bcfa5665b1aa26b90f75b8b29e4d816f2523ea412d4847717d9ef SHA512 8232dd4a63836ed5230c2430915cf3bbab0f2af522b7c3e4eeefd9bb639e96b8db216fe4fc66fd08b6f5a031f3d5a5f973ae22f6fa8d2d0d4ab508071a5fee38
-EBUILD fdm-2.2.ebuild 757 BLAKE2B f625a7b1d8b78c418018cfb6f8ef8e0433c52416d1326df74841f5ead8dbe455f4b9c8d2d583ad72318c67c9a4f007a655cebde77cbea7ca4c71c9ed78c15351 SHA512 ce44e3ab8d40c76fab4d87186e2f27df5b1a22d24f440a2d94f82facbf3f8d9fccf3225a9d509a0a4c75539bf3f87e80314d00b20c4c6bf310dfd140661e39f0
+EBUILD fdm-2.2-r1.ebuild 852 BLAKE2B 9dad05555f02b521939150012dc81c819f1c12217a10e563ab28e27084c0918462d88974f27e6d733a994aa7baecd3edfe17b1c8f20605ffb18086ed506bec80 SHA512 af9df3fff6ff5f36c9dbffbe8cfd24590d6c150f5675ac660bde40b645e1eadb4ee6c0f03e2e5ae08811ecb98239aafea4ab20f8281781d33625e86a2a89654e
 MISC metadata.xml 296 BLAKE2B 340645d0a215d131e992a64b54a2e45091542b92c60c29df762b2e75a7d3e081a83cf529959f2ce0e171f6c1b6412a83ab597c55c094aa9c08c93eaa53365934 SHA512 dc241981c679d9b7a57ebd104f4ebc54daaa8d7eb10e5b558bd7f8ff85512e8104a89cbcd876c13d1e6a1a3919186769ee103fd127e4cfe1afa89c5a1fea86fc
diff --git a/net-mail/fdm/fdm-2.0-r1.ebuild b/net-mail/fdm/fdm-2.0-r1.ebuild
deleted file mode 100644
index a98298a350e4..000000000000
--- a/net-mail/fdm/fdm-2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:0=
-	sys-libs/tdb
-	pcre? ( dev-libs/libpcre )
-"
-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)
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/net-mail/fdm/fdm-2.1.ebuild b/net-mail/fdm/fdm-2.1.ebuild
deleted file mode 100644
index bf1b62354bb5..000000000000
--- a/net-mail/fdm/fdm-2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:0=
-	sys-libs/tdb
-	pcre? ( dev-libs/libpcre )
-"
-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)
-}
-
-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-r1.ebuild
index 895dd72d1b2c..cac36667dc18 100644
--- a/net-mail/fdm/fdm-2.2.ebuild
+++ b/net-mail/fdm/fdm-2.2-r1.ebuild
@@ -3,6 +3,8 @@
 
 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"
@@ -25,11 +27,17 @@ RDEPEND="
 
 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() {
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