commit: 722ead6e024105daff6a166e4b3b8462641091d4 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Fri Jan 10 10:13:55 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Fri Jan 10 10:50:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722ead6e
net-mail/fdm: drop 2.2-r1, 2.2-r2 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> net-mail/fdm/fdm-2.2-r1.ebuild | 54 ---------------------------- net-mail/fdm/fdm-2.2-r2.ebuild | 57 ------------------------------ net-mail/fdm/files/fdm-2.2-pop3-utf8.patch | 50 -------------------------- 3 files changed, 161 deletions(-) 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/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 <[email protected]> -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; -
