diff options
Diffstat (limited to 'net-mail/fdm')
| -rw-r--r-- | net-mail/fdm/Manifest | 7 | ||||
| -rw-r--r-- | net-mail/fdm/fdm-2.2-r1.ebuild | 54 | ||||
| -rw-r--r-- | net-mail/fdm/fdm-2.2-r2.ebuild | 57 | ||||
| -rw-r--r-- | net-mail/fdm/fdm-2.2-r3.ebuild | 7 | ||||
| -rw-r--r-- | net-mail/fdm/files/fdm-2.2-pop3-utf8.patch | 50 | ||||
| -rw-r--r-- | net-mail/fdm/metadata.xml | 1 |
6 files changed, 8 insertions, 168 deletions
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest index fb5bfd8a0d47..f598b7d5b38c 100644 --- a/net-mail/fdm/Manifest +++ b/net-mail/fdm/Manifest @@ -1,9 +1,6 @@ AUX fdm-2.2-configure-strlcpy.patch 655 BLAKE2B 2057b5866603a6ca6d5b9b5618e7c3e238accf5b061e341b23c9f22096a6e65aa7affd06694a37ccc114be1089495b6efa1fc851c2999e63b5ff71e53420e00d SHA512 937bb22f0cf4ae44972b9373cc5bfc4beced41afc20322993286594246c02a1ccdda5e3208c78c0ec7af3b1bc5e758e9d1d0a0ce8cbdf8467695587727015896 AUX fdm-2.2-pcre2.patch 2210 BLAKE2B a8083ccffe594e4973773eb6339700eeb6cf2d349e409b1b72d93bda68e2c33c5c62b5eecdd8584b93f8d0c5e617d21b30c50fc2ee31dbbf1efbfdf881d14cff SHA512 9371601e8dd8e4357f62af735ac91e61023ceb5532671d42f4011bb24e51eb39d37888f69a09c69c35897edd2454936bc5a1e3a20b2bffd33685489cd29a415d -AUX fdm-2.2-pop3-utf8.patch 1643 BLAKE2B dd06d048b36cb239f56794ac82b4bf976239e108b77b2e73aa7dc71e907dfb03c2340e9986c227d7a5ef4e62260d49a9071a6de209190fca61fadc3cedd35891 SHA512 178f9ce11f15301943efd1787421cf9a0ae4abbc76244b6a749d8a89c418356650f4a63ede4809c1719b9b5986aff7ff4818e652c516c8bc7ff0d4a819e427f2 AUX fdm-2.2-uaf.patch 757 BLAKE2B d87814d5e578af6d89cc5de7b6e48d7492cd961c0a7ca46187167b5f3beed29d65918ceb009ff606cebeb6c8382c5963d96a2baa6cdead89c64a3d2eea4e4439 SHA512 1c0f7a5119f6a6770289bc2862a60fbdf40090a7001a26357611edabfa88eac83050005341f609f86f79324f61ca866380233bc9e49969467f30ba8194935552 DIST fdm-2.2.tar.gz 319140 BLAKE2B dde9126aaf3183444123bb3b546f8997a5a25f5dc58bb7fc08818e491e2193543f4f06e758b479e61da7feaf752e3d3ddfd8103c616a49f0d65c41972bae7e12 SHA512 13efa0f272c5f6146b90e094602e8a9b52016af79ae0b6cd80dc9f36b2ba37f64cadae7313bd8db90bcb007dd07206a3614987f11bb82c3535e04f0511c9fc6d -EBUILD fdm-2.2-r1.ebuild 852 BLAKE2B 9dad05555f02b521939150012dc81c819f1c12217a10e563ab28e27084c0918462d88974f27e6d733a994aa7baecd3edfe17b1c8f20605ffb18086ed506bec80 SHA512 af9df3fff6ff5f36c9dbffbe8cfd24590d6c150f5675ac660bde40b645e1eadb4ee6c0f03e2e5ae08811ecb98239aafea4ab20f8281781d33625e86a2a89654e -EBUILD fdm-2.2-r2.ebuild 950 BLAKE2B eeb5c7e911f8e195affc0efb5fd7cfa70e2c3ef0ad51074818a7dca33ece6e7ad695353a721be2c680546d6d1301b3d1e4a2db38ea84eeb1d126972679506fdf SHA512 20f9f4e81c2771fc56db6f5d5c0e9e15b79c2413362fca164fd856ba7ff970aba41b8f0c10a998f554ae9a4ef34777281a2e0aa45452be19168f533cf772ee09 -EBUILD fdm-2.2-r3.ebuild 914 BLAKE2B 2fc19214fc59130412f506c5bc610126cabf6ad494928cababd955fe7a84765ee59a7900d0cd968b224a5e61a3e247a95b2a98067afd41f30c812d6948baae4b SHA512 9a3e901e6b8454edd4bccdb275837a627b6ecef886a7727acb1645d46ba691607831305fb6748cf7eb9590fe8928c85cabe9a6122c170684c78746018db5f2c8 -MISC metadata.xml 296 BLAKE2B 340645d0a215d131e992a64b54a2e45091542b92c60c29df762b2e75a7d3e081a83cf529959f2ce0e171f6c1b6412a83ab597c55c094aa9c08c93eaa53365934 SHA512 dc241981c679d9b7a57ebd104f4ebc54daaa8d7eb10e5b558bd7f8ff85512e8104a89cbcd876c13d1e6a1a3919186769ee103fd127e4cfe1afa89c5a1fea86fc +EBUILD fdm-2.2-r3.ebuild 1007 BLAKE2B f74ab78b67e4400f37e4f18b2b94b60dc3fd614940507d997ee9383e38fa4002268fa848ee7ece9b9181b606047f464a84b2b0892c175d36972a9c07c61a1e14 SHA512 40f91e932a09fea9fbeea84c29f8279397338c3a24ee6e4bbd1b982b0163d8dfe5d98ab622161e59360c4c4cbb56b1c8331738e3d780d14f6951e6aee877fa3f +MISC metadata.xml 246 BLAKE2B b5a0ae9b0514754e4101179944f7c5befbd65ea3111994d177070ef698014367e7f5f09b3edd4f72d4c86c28cccbbb4a6df4858804ac5db0b84ac58580d5e4c5 SHA512 5f536810ef1329ec33e54e21e7823be636730071e3133c43480cf0a2f0eae2b292b917e6e23b70fc4f7fcf257919aa1d9215d870a9f2712127eb669883af7df5 diff --git a/net-mail/fdm/fdm-2.2-r1.ebuild b/net-mail/fdm/fdm-2.2-r1.ebuild deleted file mode 100644 index cac36667dc18..000000000000 --- a/net-mail/fdm/fdm-2.2-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# 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-r2.ebuild b/net-mail/fdm/fdm-2.2-r2.ebuild deleted file mode 100644 index d916992998f7..000000000000 --- a/net-mail/fdm/fdm-2.2-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 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 - "${FILESDIR}"/${P}-pcre2.patch - "${FILESDIR}"/${P}-uaf.patch - "${FILESDIR}"/${P}-pop3-utf8.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-r3.ebuild b/net-mail/fdm/fdm-2.2-r3.ebuild index 404b0182e72b..ee77b6292d2d 100644 --- a/net-mail/fdm/fdm-2.2-r3.ebuild +++ b/net-mail/fdm/fdm-2.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,6 +25,11 @@ RDEPEND=" acct-user/fdm " +QA_CONFIG_IMPL_DECL_SKIP=( + # missing on musl, fdm has fallback implememntation + b64_ntop +) + DOCS=( CHANGES README TODO MANUAL ) PATCHES=( diff --git a/net-mail/fdm/files/fdm-2.2-pop3-utf8.patch b/net-mail/fdm/files/fdm-2.2-pop3-utf8.patch deleted file mode 100644 index 71cc08197ad7..000000000000 --- a/net-mail/fdm/files/fdm-2.2-pop3-utf8.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/nicm/fdm/commit/0918b78a82a789d63cebe44b7662f0a8dc603000 - -From 0918b78a82a789d63cebe44b7662f0a8dc603000 Mon Sep 17 00:00:00 2001 -From: Nicholas Marriott <nicholas.marriott@gmail.com> -Date: Mon, 4 Sep 2023 09:03:47 +0100 -Subject: [PATCH] Send UTF8 command to POP3 server (ignore the response), - because some servers don't like UTF-8 without it. - ---- - pop3-common.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/pop3-common.c b/pop3-common.c -index 0724887..e038172 100644 ---- a/pop3-common.c -+++ b/pop3-common.c -@@ -54,6 +54,7 @@ int pop3_invalid(struct account *, const char *); - int pop3_state_connect(struct account *, struct fetch_ctx *); - int pop3_state_starttls(struct account *, struct fetch_ctx *); - int pop3_state_connected(struct account *, struct fetch_ctx *); -+int pop3_state_utf8(struct account *, struct fetch_ctx *); - int pop3_state_user(struct account *, struct fetch_ctx *); - int pop3_state_cache1(struct account *, struct fetch_ctx *); - int pop3_state_cache2(struct account *, struct fetch_ctx *); -@@ -436,6 +437,24 @@ pop3_state_connected(struct account *a, struct fetch_ctx *fctx) - } - } - -+ if (pop3_putln(a, "UTF8") != 0) -+ return (FETCH_ERROR); -+ fctx->state = pop3_state_utf8; -+ return (FETCH_BLOCK); -+} -+ -+/* UTF8 state. */ -+int -+pop3_state_utf8(struct account *a, struct fetch_ctx *fctx) -+{ -+ struct fetch_pop3_data *data = a->data; -+ char *line; -+ -+ if (pop3_getln(a, fctx, &line) != 0) -+ return (FETCH_ERROR); -+ if (line == NULL) -+ return (FETCH_BLOCK); -+ - if (pop3_putln(a, "USER %s", data->user) != 0) - return (FETCH_ERROR); - fctx->state = pop3_state_user; - diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml index f4f8580b129e..e107065d0209 100644 --- a/net-mail/fdm/metadata.xml +++ b/net-mail/fdm/metadata.xml @@ -3,7 +3,6 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="sourceforge">fdm</remote-id> <remote-id type="github">nicm/fdm</remote-id> </upstream> </pkgmetadata> |