diff options
Diffstat (limited to 'net-mail')
101 files changed, 844 insertions, 2806 deletions
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest index 44094c53ca9..e51474a8f5d 100644 --- a/net-mail/amavis-logwatch/Manifest +++ b/net-mail/amavis-logwatch/Manifest @@ -1,2 +1 @@ -DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5 DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f SHA512 aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild deleted file mode 100644 index 17b9ad2d5af..00000000000 --- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A log analyzer for amavisd-new" -HOMEPAGE="http://logreporters.sourceforge.net/" -SRC_URI="mirror://sourceforge/logreporters/${P}.tgz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="dev-lang/perl" - -PATCHES=( - "${FILESDIR}/unescaped-left-brace.patch" - "${FILESDIR}/redundant-argument-to-sprintf.patch" - "${FILESDIR}/ignore-amavis-startup-notifications.patch" - "${FILESDIR}/ignore-utf8smtp-lines.patch" - "${FILESDIR}/unchecked-encrypted.patch" - "${FILESDIR}/file-libmagic-errors.patch" - "${FILESDIR}/ignore-all-sd_notify-lines.patch" - "${FILESDIR}/no-pid_file-configured.patch" - "${FILESDIR}/will-bind-to-lines.patch" - "${FILESDIR}/SANITIZED-NULL-bytes-messages.patch" - "${FILESDIR}/handle-clamd-select-failed.patch" -) - -src_prepare() { - default - # Replace the default config file location with ours. - local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf' - local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf'; - sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \ - || die 'failed to update the default config location' -} - -src_compile() { - # The default make target just outputs instructions. We don't want - # the user to see these, so we avoid the default emake. - : -} - -src_install() { - dodoc Bugs Changes README - doman ${PN}.1 - dobin ${PN} - insinto /etc - doins ${PN}.conf -} diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild index 3369b162db4..fcb4e13709c 100644 --- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild +++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="dev-lang/perl" diff --git a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch deleted file mode 100644 index 0cc27f0bd22..00000000000 --- a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6d985d29d8be2b70ee7e4048a7ae95e2b4013f17 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Fri, 28 Dec 2018 10:01:56 -0500 -Subject: [PATCH 4/4] Ignore "SANITIZED ... NULL byte(s)" messages. - -Newer versions of the amavisd daemon sanitize NULL bytes within the -body of a message for the benefit of Cyrus IMAP. When it does this, -the number of bytes sanitized is logged. This is an informational -message only as far as I can tell, so it's been added to the list of -messages to ignore. ---- - amavis-logwatch | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 250a6ba..044c94d 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2052,6 +2052,12 @@ sub create_ignore_list() { - # describe what is being sent to the systemd notification socket, - # if one exists. - push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/; -+ -+ # In amavisd-new-2.11.0-rc1 and later, amavis will replace any null -+ # bytes that it finds in the body of a message with a "modified -+ # UTF-8" encoded null. The number of times it does this is then -+ # logged with the following message. -+ push @ignore_list_final, qr/^smtp forwarding: SANITIZED (\d+) NULL byte\(s\)/; - } - - # Notes: --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/file-libmagic-errors.patch b/net-mail/amavis-logwatch/files/file-libmagic-errors.patch deleted file mode 100644 index 2a28c4ee623..00000000000 --- a/net-mail/amavis-logwatch/files/file-libmagic-errors.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 63421f1c92403149be838c64ebb731778c148dde Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 7 Sep 2017 07:36:39 -0400 -Subject: [PATCH 1/1] Ignore errors from the File::LibMagic describe_filename - function. - -Newer versions of amavisd-new can make use of the File::LibMagic -library (as opposed to the "file" executable) to get information about -attachments. Using the library should be faster, but when it fails, it -does so in a novel way: - - (02859-21) File::LibMagic::describe_filename failed on p003: libmagic - JPEG image data, Exif standard: [TIFF image data, big-endian,... - -This commit adds such lines to the global ignore list, since they -don't provide us with any useful information. ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 448de3a..ac93cbc 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2033,6 +2033,7 @@ sub create_ignore_list() { - - push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /; - push @ignore_list_final, qr/^Decoding of .* failed, leaving it unpacked: /; -+ push @ignore_list_final, qr/^File::LibMagic::describe_filename failed on p\d+: /; - - # various forms of "Using ..." - # more specific, interesting variants already captured: search "Using" --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch b/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch deleted file mode 100644 index 83dad161e18..00000000000 --- a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 869fa9d8b2113f50c3a97ef9f4a1f95171702be4 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Wed, 13 Feb 2019 11:25:33 -0500 -Subject: [PATCH 1/1] Catch "Select failed: Interrupted system call" entries - from clamd. - -When a select() call in clamd is interrupted, amavis logs the -following warning: - - ClamAV-clamd: Select failed: Interrupted system call at /usr/sbin/amavisd - line 8472, <GEN16> line 296., retrying (1) - -These are harmless in and of themselves, but we would like to classify -them as warnings. Currently they are unmatched. This commit adds a -pattern for them, moving them from the "Unmatched Entries" heading to -"Miscellaneous warnings" instead. Afterwards, the report looks like, - - 24 Miscellaneous warnings -------------------------------- - 2 ClamAV-clamd: Select failed: Interrupted system call ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 044c94d..4c9b59f 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2817,6 +2817,7 @@ while (<>) { - ($p1 =~ /^TROUBLE/) or - ($p1 =~ /Can't (?:connect to UNIX|send to) socket/) or - ($p1 =~ /: Empty result from /) or -+ ($p1 =~ /: Select failed: Interrupted system call/) or - ($p1 =~ /: Error reading from socket: Connection reset by peer/) or - ($p1 =~ /open\(.*\): Permission denied/) or - ($p1 =~ /^_?WARN: /) or --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch b/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch deleted file mode 100644 index f3ce1d1091a..00000000000 --- a/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 653f988ba163c74f3ebdb6e53f57db9d8e569b1f Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Fri, 28 Dec 2018 09:23:52 -0500 -Subject: [PATCH 1/4] Ignore all "sd_notify" lines. - -Lines beginning with either "sd_notify:" or "sd_notify (no socket):" -contain information about what is being sent to the systemd -notification socket, if one exists. One such line was already being -ignored, but we don't want any of them. So, the existing -@ignore_list_final entry was expanded to encompass all such messages. ---- - amavis-logwatch | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index ac93cbc..ffb502b 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2047,7 +2047,10 @@ sub create_ignore_list() { - push @ignore_list_final, qr/\bRUSAGE\b/; - push @ignore_list_final, qr/: Sending .* to UNIX socket/; - -- push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./ -+ # Lines beginning with "sd_notify:" or "sd_notify (no socket):" -+ # describe what is being sent to the systemd notification socket, -+ # if one exists. -+ push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/; - } - - # Notes: --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch b/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch deleted file mode 100644 index 4dd019186e4..00000000000 --- a/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 15bf4096ea496a28210e2f4c1f34ab28b413566a Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 24 Aug 2017 08:52:18 -0400 -Subject: [PATCH 3/4] Ignore amavisd-new "starting child processes" - notifications. - -Newer versions of amavisd-new log the following constantly: - - sd_notify (no socket): STATUS=Starting child process(es), ready for work. - -It's of no use to us, so add it to the global "ignore" list. ---- - amavis-logwatch | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 1aab787..06b60c8 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2044,6 +2044,8 @@ sub create_ignore_list() { - # unanchored - push @ignore_list_final, qr/\bRUSAGE\b/; - push @ignore_list_final, qr/: Sending .* to UNIX socket/; -+ -+ push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./ - } - - # Notes: --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch b/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch deleted file mode 100644 index 83fd4cb80a4..00000000000 --- a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a8dac25fe398e42abdb89b85b1435d52386827b4 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 24 Aug 2017 09:05:04 -0400 -Subject: [PATCH 4/4] Ignore UTF8SMTP lines. - -Lines that look like, - - UTF8SMTP :10024 /var/...: <sender@example.net> -> <rcpt@example.com> - BODY=8BITMIME SMTPUTF8 Received: from mx.example.com ([127.0.0.1]) by... - -were previously unmatched because of the relatively-new "UTF8SMTP". -Similar lines that have "ESMTP" instead of "UTF8SMTP" are already -ignored, so it makes sense to ignore the "UTF8SMTP" lines too. ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 06b60c8..deb9146 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2132,6 +2132,7 @@ while (<>) { - or ($p1 =~ /^SpamControl/) - or ($p1 =~ /^Perl/) - or ($p1 =~ /^ESMTP/) -+ or ($p1 =~ /^UTF8SMTP/) - or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:FWD|SEND) from /) # log level 4 - or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:ESMTP|FWD|SEND) via /) # log level 4 - or ($p1 =~ /^tempdir being removed/) --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/no-pid_file-configured.patch b/net-mail/amavis-logwatch/files/no-pid_file-configured.patch deleted file mode 100644 index 5f23955366e..00000000000 --- a/net-mail/amavis-logwatch/files/no-pid_file-configured.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a93ee5d433308d2cac76ac9502e34c953ff96337 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Fri, 28 Dec 2018 09:33:07 -0500 -Subject: [PATCH 2/4] Ignore "no $pid_file configured, not checking it" lines. - -When no PID file is configured (for example, when amavisd is running -in the foreground), this message is logged. We already ignore the -other types of PID file notifications, so ignore this one too. ---- - amavis-logwatch | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/amavis-logwatch b/amavis-logwatch -index ffb502b..6d06793 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -1958,6 +1958,7 @@ sub create_ignore_list() { - push @ignore_list_final, qr/^fish_out_ip_from_received: /; - push @ignore_list_final, qr/^Waiting for the process \S+ to terminate/; - push @ignore_list_final, qr/^Valid PID file \(younger than sys uptime/; -+ push @ignore_list_final, qr/^no \$pid_file configured, not checking it/; - push @ignore_list_final, qr/^Sending SIG\S+ to amavisd/; - push @ignore_list_final, qr/^Can't send SIG\S+ to process/; - push @ignore_list_final, qr/^killing process/; --- -2.19.2 - diff --git a/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch b/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch deleted file mode 100644 index 91f456afdd1..00000000000 --- a/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 02cf771776d2f1ad9d7872f3959e41a548adfab9 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 24 Aug 2017 08:20:59 -0400 -Subject: [PATCH 2/4] Fix redundant argument to sprintf warning. - -Perl 5.22 now warns about redundant (i.e. extra) arguments to the -sprintf function. If your format string only has two place-holders but -you pass three place-fillers, you get warned: - - Redundant argument in sprintf at ./amavis-logwatch line 1338... - -The issue there was that the format string passed to sprintf was -constructed dynamically; sometimes it would contain two place-holders, -and sometimes three. Three place-fillers were always passed, so when -only two place-holders were used, the warning would be thrown. This was -fixed by testing whether or not there are two or three place-holders, -and passing the appropriate number of place-fillers. ---- - amavis-logwatch | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 8972497..1aab787 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -1334,8 +1334,17 @@ sub print_summary_report (\@) { - $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor; - } - else { -- push @{$lines[$cur_level]}, -- sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname}); -+ my $new_line; -+ if ($extra eq '') { -+ $new_line = sprintf("$fmt %-23s \n", $total, $desc); -+ } -+ else { -+ $new_line = sprintf("$fmt %-23s $extra\n", -+ $total, -+ $desc, -+ commify ($Totals{$keyname})); -+ } -+ push @{$lines[$cur_level]}, $new_line - } - } - } --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/unchecked-encrypted.patch b/net-mail/amavis-logwatch/files/unchecked-encrypted.patch deleted file mode 100644 index 33c2214a2d0..00000000000 --- a/net-mail/amavis-logwatch/files/unchecked-encrypted.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e9f83dde1b241ce449264db7a517124bb115dd99 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Wed, 6 Sep 2017 09:19:42 -0400 -Subject: [PATCH 1/1] Catch mail that is passed UNCHECKED-ENCRYPTED. - -Some encrypted mail can pass through the system with a log line like, - - (01495-17) Passed UNCHECKED-ENCRYPTED {RelayedTaggedInbound}, ... - -These were unmatched, because the "-ENCRYPTED" suffix is new. One -regular expression and a dictionary have been updated to catch those -lines and dump them into the "unchecked" bin with the rest of the -UNCHECKED lines. ---- - amavis-logwatch | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index deb9146..448de3a 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -1799,6 +1799,7 @@ my %ccatmajor_to_sectkey = ( - 'INFECTED' => 'malware', - 'BANNED' => 'bannedname', - 'UNCHECKED' => 'unchecked', -+ 'UNCHECKED-ENCRYPTED' => 'unchecked', - 'SPAM' => 'spam', - 'SPAMMY' => 'spammy', - 'BAD-HEADER' => 'badheader', -@@ -2295,7 +2296,7 @@ while (<>) { - #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o )) - - # the first IP is the envelope sender. -- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { -+ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|UNCHECKED-ENCRYPTED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { - inc_unmatched('passblock'); - next; - } --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/unescaped-left-brace.patch b/net-mail/amavis-logwatch/files/unescaped-left-brace.patch deleted file mode 100644 index 2cb293b89e8..00000000000 --- a/net-mail/amavis-logwatch/files/unescaped-left-brace.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 79f37650aa72fe3feeed682ee2b79686ee2b6547 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 24 Aug 2017 08:16:05 -0400 -Subject: [PATCH 1/4] Fix unescaped left brace warning in monster regex. - -New versions of Perl are starting to complain about unescaped braces -in regular expressions, and supposedly the warning will become a fatal -error in Perl 5.30. This particular warning is, - - Unescaped left brace in regex is deprecated, passed through in regex; - marked by <-- HERE in m/^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\) - |BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: - { <-- HERE [^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), - (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/ at - /usr/bin/amavis-logwatch line 2286. - -and it was fixed by going to line 2286 and putting a backslash before -the left brace. ---- - amavis-logwatch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 4ad07f6..8972497 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2283,7 +2283,7 @@ while (<>) { - #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o )) - - # the first IP is the envelope sender. -- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: {[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { -+ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { - inc_unmatched('passblock'); - next; - } --- -2.13.0 - diff --git a/net-mail/amavis-logwatch/files/will-bind-to-lines.patch b/net-mail/amavis-logwatch/files/will-bind-to-lines.patch deleted file mode 100644 index 464a85b1c56..00000000000 --- a/net-mail/amavis-logwatch/files/will-bind-to-lines.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e53948a6909e98b63c63c97749c7d0eb534fa274 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Fri, 28 Dec 2018 09:40:36 -0500 -Subject: [PATCH 3/4] Ignore "will bind to" lines in addition to "bind to" - lines. - -In amavisd-new-2.11.0-rc1, the informational "bind to..." messages -were changed to say "will bind to..." instead. This commit updates the -@ignore_list_final regular expression to match both forms. ---- - amavis-logwatch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amavis-logwatch b/amavis-logwatch -index 6d06793..250a6ba 100644 ---- a/amavis-logwatch -+++ b/amavis-logwatch -@@ -2029,7 +2029,7 @@ sub create_ignore_list() { - push @ignore_list_final, qr/^address modified \(/; - push @ignore_list_final, qr/^Request: AM\.PDP /; - push @ignore_list_final, qr/^DSPAM result: /; -- push @ignore_list_final, qr/^bind to \//; -+ push @ignore_list_final, qr/^(will )?bind to \//; - push @ignore_list_final, qr/^ZMQ enabled: /; - - push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /; --- -2.19.2 - diff --git a/net-mail/automx2/automx2-2022.0.ebuild b/net-mail/automx2/automx2-2022.0.ebuild index 10bb53d7dc0..20fbebce7c0 100644 --- a/net-mail/automx2/automx2-2022.0.ebuild +++ b/net-mail/automx2/automx2-2022.0.ebuild @@ -35,8 +35,8 @@ python_test() { } python_install_all() { - local DOCS=( ${S}/docs/*.adoc ${S}/contrib/*sample.conf ) - local HTML_DOCS=( ${S}/docs/*.{html,svg} ) + local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf ) + local HTML_DOCS=( "${S}"/docs/*.{html,svg} ) newconfd "${FILESDIR}/confd" "${PN}" newinitd "${FILESDIR}/init-r1" "${PN}" insinto /etc diff --git a/net-mail/automx2/automx2-2022.1.ebuild b/net-mail/automx2/automx2-2022.1.ebuild index 58a4985460d..43acbf69502 100644 --- a/net-mail/automx2/automx2-2022.1.ebuild +++ b/net-mail/automx2/automx2-2022.1.ebuild @@ -36,8 +36,8 @@ python_test() { } python_install_all() { - local DOCS=( ${S}/docs/*.adoc ${S}/contrib/*sample.conf ) - local HTML_DOCS=( ${S}/docs/*.{html,svg} ) + local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf ) + local HTML_DOCS=( "${S}"/docs/*.{html,svg} ) newconfd "${FILESDIR}/confd" "${PN}" newinitd "${FILESDIR}/init-r1" "${PN}" insinto /etc diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index ea0166b1d39..414e0a4c708 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -2,3 +2,4 @@ DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6 DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276 +DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2 diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild new file mode 100644 index 00000000000..fd888906a05 --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html! +inherit autotools flag-o-matic pam ssl-cert + +DESCRIPTION="The Cyrus IMAP Server" +HOMEPAGE="https://www.cyrusimap.org/" +SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" + +LICENSE="BSD-with-attribution GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="afs backup calalarm caps clamav http kerberos ldap \ + mysql nntp pam perl postgres replication +server sieve \ + sqlite ssl static-libs tcpd test xapian" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/libpcre:3 + >=dev-libs/cyrus-sasl-2.1.13:2 + dev-libs/jansson:= + dev-libs/icu:= + sys-apps/util-linux + sys-fs/e2fsprogs:= + sys-libs/zlib:= + afs? ( net-fs/openafs ) + calalarm? ( dev-libs/libical:= ) + caps? ( sys-libs/libcap ) + clamav? ( app-antivirus/clamav ) + http? ( + app-arch/brotli:= + app-arch/zstd:= + dev-libs/libxml2 + dev-libs/libical:= + net-libs/nghttp2:= + sci-libs/shapelib:= + ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) + nntp? ( !net-nntp/leafnode ) + pam? ( + >=net-mail/mailbase-1 + sys-libs/pam + ) + perl? ( + dev-lang/perl:= + virtual/perl-Term-ReadLine + ) + postgres? ( dev-db/postgresql:* ) + ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] ) + sqlite? ( dev-db/sqlite:3 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xapian? ( >=dev-libs/xapian-1.4.0:= )" +# all blockers really needed? +# file collision with app-arch/dump - bug 619584 +RDEPEND="${DEPEND} + acct-group/mail + acct-user/cyrus + !mail-mta/courier + !net-mail/bincimap + !net-mail/courier-imap + !net-mail/uw-imap + !app-arch/dump" +DEPEND+=" test? ( dev-util/cunit )" +BDEPEND="sys-devel/flex + virtual/pkgconfig + virtual/yacc" + +REQUIRED_USE="afs? ( kerberos ) + backup? ( sqlite ) + calalarm? ( http ) + http? ( sqlite )" + +# https://bugs.gentoo.org/678754 +# TODO: check underlinking for other libraries +#PATCHES=( +# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" +#) + +src_prepare() { + default + + # Fix master(8)->cyrusmaster(8) manpage. + for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do + sed -i -e 's:master\.8:cyrusmaster.8:g' \ + -e 's:master(8):cyrusmaster(8):g' \ + "${i}" || die "sed failed" || die "sed failed" + done + mv man/master.8 man/cyrusmaster.8 || die "mv failed" + sed -i -e "s:MASTER:CYRUSMASTER:g" \ + -e "s:Master:Cyrusmaster:g" \ + -e "s:master:cyrusmaster:g" \ + man/cyrusmaster.8 || die "sed failed" + + # lock.h to afs/lock.h + sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ + ptclient/afskrb.c || die + + eautoreconf +} + +src_configure() { + local myconf + + # bug #604466 + append-ldflags $(no-as-needed) + + # Workaround runtime crash + # bug #834573 + append-flags -fno-toplevel-reorder + + if use afs ; then + myconf+=" --with-afs-libdir=/usr/$(get_libdir)" + myconf+=" --with-afs-incdir=/usr/include/afs" + fi + + # TODO: + # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine) + # - post-emerge message re lmdb removal? + econf \ + --enable-murder \ + --enable-idled \ + --enable-autocreate \ + --enable-pcre \ + --with-com_err \ + --with-cyrus-user=cyrus \ + --with-sasl \ + --with-sphinx-build=no \ + --without-krb \ + --without-krbdes \ + --enable-squat \ + --with-zlib \ + --without-wslay \ + --without-chardet \ + --without-cld2 \ + --disable-srs \ + $(use_enable afs) \ + $(use_enable afs krb5afspts) \ + $(use_enable backup) \ + $(use_enable calalarm calalarmd) \ + $(use_with caps libcap) \ + $(use_with clamav) \ + $(use_enable nntp) \ + $(use_enable http) \ + $(use_with http nghttp2) \ + $(use_enable replication) \ + $(use_enable kerberos gssapi) \ + $(use_with ldap) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with perl) \ + $(use_with sqlite) \ + $(use_with ssl openssl) \ + $(use_enable server) \ + $(use_enable sieve) \ + $(use_enable static-libs static) \ + $(use_with tcpd libwrap) \ + $(use_enable xapian) \ + $(use_enable test unit-tests) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" INSTALLDIRS=vendor install + + dodoc README* + dodoc -r doc + + cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die + rm -f doc/text/Makefile* || die + + mv "${ED}"/usr/libexec/{master,cyrusmaster} || die + + insinto /etc + newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf + newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf + + sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ + -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ + -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ + "${ED}"/etc/imapd.conf || die + + sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ + -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ + "${ED}"/etc/cyrus.conf || die + + # turn off sieve if not installed + if ! use sieve; then + sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die + fi + + # same thing for http(s) as well + if ! use http; then + sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die + fi + + newinitd "${FILESDIR}"/cyrus.rc8 cyrus + newconfd "${FILESDIR}"/cyrus.confd cyrus + newpamd "${FILESDIR}"/cyrus.pam-include sieve + + for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do + keepdir "/var/${subdir}" + fowners cyrus:mail "/var/${subdir}" + fperms 0750 "/var/${subdir}" + done + + for subdir in imap/{user,quota,sieve} spool/imap ; do + for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do + keepdir "/var/${subdir}/${i}" + fowners cyrus:mail "/var/${subdir}/${i}" + fperms 0750 "/var/${subdir}/${i}" + done + done +} + +pkg_preinst() { + if ! has_version ${CATEGORY}/${PN} ; then + elog "For correct logging add the following to /etc/syslog.conf:" + elog " local6.* /var/log/imapd.log" + elog " auth.debug /var/log/auth.log" + echo + + elog "You have to add user cyrus to the sasldb2. Do this with:" + elog " saslpasswd2 cyrus" + fi +} + +pkg_postinst() { + # do not install server.{key,pem) if they exist + if use ssl ; then + if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then + install_cert /etc/ssl/cyrus/server + chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem} + fi + fi + + einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" + einfo "for upgrade instructions." +} diff --git a/net-mail/dbmail/dbmail-3.2.3-r5.ebuild b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild index edabceb3764..50a1edf5ed0 100644 --- a/net-mail/dbmail/dbmail-3.2.3-r5.ebuild +++ b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild @@ -31,7 +31,8 @@ RDEPEND=" ssl? ( dev-libs/openssl:= )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone )" BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) diff --git a/net-mail/dbmail/dbmail-3.2.5-r2.ebuild b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild index 17e33e79a6f..0c48f3c6305 100644 --- a/net-mail/dbmail/dbmail-3.2.5-r2.ebuild +++ b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild @@ -18,6 +18,7 @@ DEPEND="dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33:= ) jemalloc? ( dev-libs/jemalloc:= ) + elibc_musl? ( sys-libs/queue-standalone ) app-text/asciidoc app-text/xmlto app-crypt/mhash @@ -32,6 +33,7 @@ DEPEND="dev-db/libzdb RDEPEND="${DEPEND} acct-group/dbmail acct-user/dbmail" +DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )" DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING ) README_GENTOO_SUFFIX="" diff --git a/net-mail/django-mailman3/Manifest b/net-mail/django-mailman3/Manifest deleted file mode 100644 index 4a5ba61edc4..00000000000 --- a/net-mail/django-mailman3/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST django-mailman3-1.3.4.tar.gz 390310 BLAKE2B 0f28e5191ddfec8196824362ffb6b406f8bbcc64e85f93ded37317502673140693c48c60a34713a90cd6651839edaa788f9f73ec8a1836a1597854316ffd3481 SHA512 0b28636caec452efeda2b1b44f1d5ad44740ab0c3ea7b03d7d2e6bf420b1a788d5858e5c827824ef6baf2a463232ec53f404d3de0c22cf6ee17065236f7fcd91 -DIST django-mailman3-1.3.7.tar.gz 404133 BLAKE2B cabaabd9514b28caf571af56b966b37893d582b3fc61b945096dd4b898635b321b239d88082c496f9b972a42bd773354e081e397418bc07c219596e7f9e0edda SHA512 923ca67cc813f59ee9e84b639c4a0b2cfe5b39b63a1a19c5b28c7727540a0ca1f1ee9ecfa12d91a314ee3d7cdb3535c939b9a240281ba277b9af276f18be28e8 diff --git a/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild b/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild deleted file mode 100644 index 42fef691910..00000000000 --- a/net-mail/django-mailman3/django-mailman3-1.3.4.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="Django-based interfaces interacting with Mailman 3" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/django[${PYTHON_USEDEP}] - net-mail/mailmanclient[${PYTHON_USEDEP}] - dev-python/django-allauth[${PYTHON_USEDEP}] - dev-python/django-gravatar2[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] -" - -DOCS=( README.rst ) diff --git a/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild b/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild deleted file mode 100644 index f241f724a95..00000000000 --- a/net-mail/django-mailman3/django-mailman3-1.3.7.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit distutils-r1 - -DESCRIPTION="Django-based interfaces interacting with Mailman 3" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="dev-python/django[${PYTHON_USEDEP}] - net-mail/mailmanclient[${PYTHON_USEDEP}] - dev-python/django-allauth[${PYTHON_USEDEP}] - dev-python/django-gravatar2[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] -" - -DOCS=( README.rst ) - -python_test() { - local -x DJANGO_SETTINGS_MODULE=django_mailman3.tests.settings_test - local -x PYTHONPATH="${S}" - django-admin test -v 2 || die -} diff --git a/net-mail/django-mailman3/metadata.xml b/net-mail/django-mailman3/metadata.xml deleted file mode 100644 index 8aed0b944d8..00000000000 --- a/net-mail/django-mailman3/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">django-mailman3</remote-id> - <remote-id type="gitlab">mailman/django-mailman3</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index a96fbb9db9f..eb64874e282 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,4 +1,2 @@ -DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 478da07a2f507a3322c6b6035f8cb74a720c030cc9413496f90a793d165178617207e26b0b57f710a9b9c7671be3fffdbaccaacb8747198abf82943dcb4a24df SHA512 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f31c5ea3c04a1971b1a5621b56be1c79a8575aceb4f7e7fef62e7d0a3d980dcb5b8e1a8eeec543adcf0b016b65eb34ca4a26e8d2fe23 SHA512 5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a -DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233 -DIST dovecot-2.3.19.tar.gz 7790661 BLAKE2B 060364dc83a5fcb7ee7a5a77467aedb79de13e65c5abfb1a9c1e76c7fac4b5b1ad07157917d095631ea72b194efdde38829d4c7274ced65dca7b457c0cc4bb13 SHA512 a61ce88b53c4f24faddf4951f16cb75dfe52aa7057d072c727566a7c9a683cc487d26cea9a83ad8aca161a053949d2f2196ba6a58015e3d33be897094aabf887 +DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071 SHA512 ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150 diff --git a/net-mail/dovecot/dovecot-2.3.18-r1.ebuild b/net-mail/dovecot/dovecot-2.3.18-r1.ebuild deleted file mode 100644 index 1017a340f6a..00000000000 --- a/net-mail/dovecot/dovecot-2.3.18-r1.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 lua5-3 ) -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.5.18" -if [[ ${PV} == *_rc* ]]; then - rc_dir="rc/" -else - rc_dir="" -fi -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz - ) " -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/" - -SLOT="0" -LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" - -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="lz4 zstd" -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc - selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-libs/icu:= - dev-libs/openssl:0= - sys-libs/zlib:= - virtual/libiconv - argon2? ( dev-libs/libsodium:= ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam:= ) - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) - rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) - selinux? ( sec-policy/selinux-dovecot ) - solr? ( net-misc/curl dev-libs/expat ) - sqlite? ( dev-db/sqlite:* ) - stemmer? ( dev-libs/snowball-stemmer:= ) - suid? ( acct-group/mail ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - unwind? ( sys-libs/libunwind:= ) - zstd? ( app-arch/zstd:= ) - virtual/libcrypt:= - " - -RDEPEND=" - ${DEPEND} - acct-group/dovecot - acct-group/dovenull - acct-user/dovecot - acct-user/dovenull - net-mail/mailbase - " - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch - "${FILESDIR}/${PN}"-socket-name-too-long.patch -) - -pkg_setup() { - use lua && lua-single_pkg_setup - if use managesieve && ! use sieve; then - ewarn "managesieve USE flag selected but sieve USE flag unselected" - ewarn "sieve USE flag will be turned on" - fi -} - -src_prepare() { - default - # bug 657108 - #elibtoolize - eautoreconf - - # Bug #727244 - append-cflags -fasynchronous-unwind-tables -} - -src_configure() { - local conf="" - - if use postgres || use mysql || use sqlite; then - conf="${conf} --with-sql" - fi - - # turn valgrind tests off. Bug #340791 - VALGRIND=no \ - LUAPC="${ELUA}" \ - systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - econf \ - --with-rundir="${EPREFIX}/run/dovecot" \ - --with-statedir="${EPREFIX}/var/lib/dovecot" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --disable-rpath \ - --with-bzlib \ - --without-libbsd \ - --with-lzma \ - --with-icu \ - --with-ssl \ - --with-zlib \ - $( use_with argon2 sodium ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with lucene ) \ - $( use_with lz4 ) \ - $( use_with mysql ) \ - $( use_with pam ) \ - $( use_with postgres pgsql ) \ - $( use_with sqlite ) \ - $( use_with solr ) \ - $( use_with stemmer ) \ - $( use_with systemd ) \ - $( use_with tcpd libwrap ) \ - $( use_with textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zstd ) \ - $( use_enable static-libs static ) \ - ${conf} - - if use sieve || use managesieve; then - # The sieve plugin needs this file to be build to determine the plugin - # directory and the list of libraries to link to. - emake dovecot-config - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX}/var" \ - --enable-shared \ - --with-dovecot="${S}" \ - $( use_with ldap ) \ - $( use_with managesieve ) - fi -} - -src_compile() { - default - if use sieve || use managesieve; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - fi -} - -src_test() { - default - if use sieve || use managesieve; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - default - fi -} - -src_install() { - default - - # insecure: - # use suid && fperms u+s /usr/libexec/dovecot/deliver - # better: - if use suid; then - einfo "Changing perms to allow deliver to be suided" - fowners root:mail "/usr/libexec/dovecot/dovecot-lda" - fperms 4750 "/usr/libexec/dovecot/dovecot-lda" - fi - - newinitd "${FILESDIR}"/dovecot.init-r6 dovecot - - rm -rf "${ED}"/usr/share/doc/dovecot - - dodoc AUTHORS NEWS README TODO - dodoc doc/*.{txt,cnf,xml,sh} - docinto example-config - dodoc doc/example-config/*.{conf,ext} - docinto example-config/conf.d - dodoc doc/example-config/conf.d/*.{conf,ext} - docinto wiki - dodoc doc/wiki/* - doman doc/man/*.{1,7} - - # Create the dovecot.conf file from the dovecot-example.conf file that - # the dovecot folks nicely left for us.... - local conf="${ED}/etc/dovecot/dovecot.conf" - local confd="${ED}/etc/dovecot/conf.d" - - insinto /etc/dovecot - doins doc/example-config/*.{conf,ext} - insinto /etc/dovecot/conf.d - doins doc/example-config/conf.d/*.{conf,ext} - fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext - rm -f "${confd}/../README" - - # .maildir is the Gentoo default - local mail_location="maildir:~/.maildir" - sed -i -e \ - "s|#mail_location =|mail_location = ${mail_location}|" \ - "${confd}/10-mail.conf" \ - || die "failed to update mail location settings in 10-mail.conf" - - # We're using pam files (imap and pop3) provided by mailbase - if use pam; then - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ - "${confd}/auth-system.conf.ext" \ - || die "failed to update PAM settings in auth-system.conf.ext" - # mailbase does not provide a sieve pam file - use managesieve && dosym imap /etc/pam.d/sieve - sed -i -e \ - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update PAM settings in 10-auth.conf" - fi - - # Disable ipv6 if necessary - if ! use ipv6; then - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ - || die "failed to update listen settings in dovecot.conf" - fi - - # Update ssl cert locations - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ - || die "ssl conf failed" - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" - - # Install SQL configuration - if use mysql || use postgres; then - sed -i -e \ - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ - "${confd}/10-auth.conf" || die "failed to update SQL settings in \ - 10-auth.conf" - fi - - # Install LDAP configuration - if use ldap; then - sed -i -e \ - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update ldap settings in 10-auth.conf" - fi - - if use sieve || use managesieve; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - emake DESTDIR="${ED}" install - sed -i -e \ - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ - || die "failed to update sieve settings in 15-lda.conf" - rm -rf "${ED}"/usr/share/doc/dovecot - docinto example-config/conf.d - dodoc doc/example-config/conf.d/*.conf - insinto /etc/dovecot/conf.d - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf - docinto sieve/rfc - dodoc doc/rfc/*.txt - docinto sieve/devel - dodoc doc/devel/DESIGN - docinto plugins - dodoc doc/plugins/*.txt - docinto extensions - dodoc doc/extensions/*.txt - docinto locations - dodoc doc/locations/*.txt - doman doc/man/*.{1,7} - fi - - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete -} - -pkg_postinst() { - # Let's not make a new certificate if we already have one - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then - einfo "Creating SSL certificate" - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" - install_cert /etc/ssl/dovecot/server - fi - - elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.18-r2.ebuild b/net-mail/dovecot/dovecot-2.3.18-r2.ebuild deleted file mode 100644 index a0a7853cfdc..00000000000 --- a/net-mail/dovecot/dovecot-2.3.18-r2.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 lua5-3 ) -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.5.18" -if [[ ${PV} == *_rc* ]]; then - rc_dir="rc/" -else - rc_dir="" -fi -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz - ) " -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/" - -SLOT="0" -LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" -IUSE_DOVECOT_COMPRESS="lz4 zstd" -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc - selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-libs/icu:= - dev-libs/openssl:0= - sys-libs/zlib:= - virtual/libiconv - argon2? ( dev-libs/libsodium:= ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam:= ) - postgres? ( dev-db/postgresql:* ) - rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) - selinux? ( sec-policy/selinux-dovecot ) - solr? ( net-misc/curl dev-libs/expat ) - sqlite? ( dev-db/sqlite:* ) - stemmer? ( dev-libs/snowball-stemmer:= ) - suid? ( acct-group/mail ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - unwind? ( sys-libs/libunwind:= ) - zstd? ( app-arch/zstd:= ) - virtual/libcrypt:= - " - -RDEPEND=" - ${DEPEND} - acct-group/dovecot - acct-group/dovenull - acct-user/dovecot - acct-user/dovenull - net-mail/mailbase - " - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch - "${FILESDIR}/${PN}"-socket-name-too-long.patch -) - -pkg_setup() { - use lua && lua-single_pkg_setup - if use managesieve && ! use sieve; then - ewarn "managesieve USE flag selected but sieve USE flag unselected" - ewarn "sieve USE flag will be turned on" - fi -} - -src_prepare() { - default - # bug 657108 - #elibtoolize - eautoreconf - - # Bug #727244 - append-cflags -fasynchronous-unwind-tables -} - -src_configure() { - local conf="" - - if use postgres || use mysql || use sqlite; then - conf="${conf} --with-sql" - fi - - # turn valgrind tests off. Bug #340791 - VALGRIND=no \ - LUAPC="${ELUA}" \ - systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - econf \ - --with-rundir="${EPREFIX}/run/dovecot" \ - --with-statedir="${EPREFIX}/var/lib/dovecot" \ - --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ - --disable-rpath \ - --with-bzlib \ - --without-libbsd \ - --with-lzma \ - --with-icu \ - --with-ssl \ - --with-zlib \ - $( use_with argon2 sodium ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with lucene ) \ - $( use_with lz4 ) \ - $( use_with mysql ) \ - $( use_with pam ) \ - $( use_with postgres pgsql ) \ - $( use_with sqlite ) \ - $( use_with solr ) \ - $( use_with stemmer ) \ - $( use_with systemd ) \ - $( use_with tcpd libwrap ) \ - $( use_with textcat ) \ - $( use_with unwind libunwind ) \ - $( use_with zstd ) \ - $( use_enable static-libs static ) \ - ${conf} - - if use sieve || use managesieve; then - # The sieve plugin needs this file to be build to determine the plugin - # directory and the list of libraries to link to. - emake dovecot-config - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX}/var" \ - --enable-shared \ - --with-dovecot="${S}" \ - $( use_with ldap ) \ - $( use_with managesieve ) - fi -} - -src_compile() { - default - if use sieve || use managesieve; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - fi -} - -src_test() { - default - if use sieve || use managesieve; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - default - fi -} - -src_install() { - default - - # insecure: - # use suid && fperms u+s /usr/libexec/dovecot/deliver - # better: - if use suid; then - einfo "Changing perms to allow deliver to be suided" - fowners root:mail "/usr/libexec/dovecot/dovecot-lda" - fperms 4750 "/usr/libexec/dovecot/dovecot-lda" - fi - - newinitd "${FILESDIR}"/dovecot.init-r6 dovecot - - rm -rf "${ED}"/usr/share/doc/dovecot - - dodoc AUTHORS NEWS README TODO - dodoc doc/*.{txt,cnf,xml,sh} - docinto example-config - dodoc doc/example-config/*.{conf,ext} - docinto example-config/conf.d - dodoc doc/example-config/conf.d/*.{conf,ext} - docinto wiki - dodoc doc/wiki/* - doman doc/man/*.{1,7} - - # Create the dovecot.conf file from the dovecot-example.conf file that - # the dovecot folks nicely left for us.... - local conf="${ED}/etc/dovecot/dovecot.conf" - local confd="${ED}/etc/dovecot/conf.d" - - insinto /etc/dovecot - doins doc/example-config/*.{conf,ext} - insinto /etc/dovecot/conf.d - doins doc/example-config/conf.d/*.{conf,ext} - fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext - rm -f "${confd}/../README" - - # .maildir is the Gentoo default - local mail_location="maildir:~/.maildir" - sed -i -e \ - "s|#mail_location =|mail_location = ${mail_location}|" \ - "${confd}/10-mail.conf" \ - || die "failed to update mail location settings in 10-mail.conf" - - # We're using pam files (imap and pop3) provided by mailbase - if use pam; then - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ - "${confd}/auth-system.conf.ext" \ - || die "failed to update PAM settings in auth-system.conf.ext" - # mailbase does not provide a sieve pam file - use managesieve && dosym imap /etc/pam.d/sieve - sed -i -e \ - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update PAM settings in 10-auth.conf" - fi - - # Disable ipv6 if necessary - if ! use ipv6; then - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ - || die "failed to update listen settings in dovecot.conf" - fi - - # Update ssl cert locations - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ - || die "ssl conf failed" - sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ - -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ - "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" - - # Install SQL configuration - if use mysql || use postgres; then - sed -i -e \ - 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ - "${confd}/10-auth.conf" || die "failed to update SQL settings in \ - 10-auth.conf" - fi - - # Install LDAP configuration - if use ldap; then - sed -i -e \ - 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update ldap settings in 10-auth.conf" - fi - - if use sieve || use managesieve; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - emake DESTDIR="${ED}" install - sed -i -e \ - 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ - || die "failed to update sieve settings in 15-lda.conf" - rm -rf "${ED}"/usr/share/doc/dovecot - docinto example-config/conf.d - dodoc doc/example-config/conf.d/*.conf - insinto /etc/dovecot/conf.d - doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf - use managesieve && doins doc/example-config/conf.d/20-managesieve.conf - docinto sieve/rfc - dodoc doc/rfc/*.txt - docinto sieve/devel - dodoc doc/devel/DESIGN - docinto plugins - dodoc doc/plugins/*.txt - docinto extensions - dodoc doc/extensions/*.txt - docinto locations - dodoc doc/locations/*.txt - doman doc/man/*.{1,7} - fi - - use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete -} - -pkg_postinst() { - # Let's not make a new certificate if we already have one - if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ - -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then - einfo "Creating SSL certificate" - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" - install_cert /etc/ssl/dovecot/server - fi - - elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes." -} diff --git a/net-mail/dovecot/dovecot-2.3.19.ebuild b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild index 1fa7a3cfb45..9d580a135e1 100644 --- a/net-mail/dovecot/dovecot-2.3.19.ebuild +++ b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild @@ -29,7 +29,7 @@ HOMEPAGE="https://www.dovecot.org/" SLOT="0" LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" IUSE_DOVECOT_COMPRESS="lz4 zstd" @@ -85,6 +85,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch "${FILESDIR}/${PN}"-socket-name-too-long.patch + "${FILESDIR}"/CVE-2022-30550.patch ) pkg_setup() { diff --git a/net-mail/dovecot/files/CVE-2022-30550.patch b/net-mail/dovecot/files/CVE-2022-30550.patch new file mode 100644 index 00000000000..d7da1316f76 --- /dev/null +++ b/net-mail/dovecot/files/CVE-2022-30550.patch @@ -0,0 +1,155 @@ +From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen <timo.sirainen@open-xchange.com> +Date: Mon, 9 May 2022 15:23:33 +0300 +Subject: [PATCH 1/2] auth: Fix handling passdbs with identical driver/args but + different mechanisms/username_filter + +The passdb was wrongly deduplicated in this situation, causing wrong +mechanisms or username_filter setting to be used. This would be a rather +unlikely configuration though. + +Fixed by moving mechanisms and username_filter from struct passdb_module +to struct auth_passdb, which is where they should have been in the first +place. +--- + src/auth/auth-request.c | 6 +++--- + src/auth/auth.c | 18 ++++++++++++++++++ + src/auth/auth.h | 5 +++++ + src/auth/passdb.c | 15 ++------------- + src/auth/passdb.h | 4 ---- + 5 files changed, 28 insertions(+), 20 deletions(-) + +diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c +index cd08b1fa02..0ca29f3674 100644 +--- a/src/auth/auth-request.c ++++ b/src/auth/auth-request.c +@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request, + struct auth_passdb *passdb) + { + /* if mechanism is not supported, skip */ +- const char *const *mechs = passdb->passdb->mechanisms; +- const char *const *username_filter = passdb->passdb->username_filter; ++ const char *const *mechs = passdb->mechanisms; ++ const char *const *username_filter = passdb->username_filter; + const char *username; + + username = request->fields.user; +@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request, + return TRUE; + } + +- if (passdb->passdb->username_filter != NULL && ++ if (passdb->username_filter != NULL && + !auth_request_username_accepted(username_filter, username)) { + auth_request_log_debug(request, + request->mech != NULL ? AUTH_SUBSYS_MECH +diff --git a/src/auth/auth.c b/src/auth/auth.c +index f2f3fda20c..9f6c4ba60c 100644 +--- a/src/auth/auth.c ++++ b/src/auth/auth.c +@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set, + auth_passdb->override_fields_tmpl = + passdb_template_build(auth->pool, set->override_fields); + ++ if (*set->mechanisms == '\0') { ++ auth_passdb->mechanisms = NULL; ++ } else if (strcasecmp(set->mechanisms, "none") == 0) { ++ auth_passdb->mechanisms = (const char *const[]){ NULL }; ++ } else { ++ auth_passdb->mechanisms = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->mechanisms, " ,"); ++ } ++ ++ if (*set->username_filter == '\0') { ++ auth_passdb->username_filter = NULL; ++ } else { ++ auth_passdb->username_filter = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->username_filter, " ,"); ++ } ++ + /* for backwards compatibility: */ + if (set->pass) + auth_passdb->result_success = AUTH_DB_RULE_CONTINUE; +diff --git a/src/auth/auth.h b/src/auth/auth.h +index f700e29d5c..460a179765 100644 +--- a/src/auth/auth.h ++++ b/src/auth/auth.h +@@ -41,6 +41,11 @@ struct auth_passdb { + struct passdb_template *default_fields_tmpl; + struct passdb_template *override_fields_tmpl; + ++ /* Supported authentication mechanisms, NULL is all, {NULL} is none */ ++ const char *const *mechanisms; ++ /* Username filter, NULL is no filter */ ++ const char *const *username_filter; ++ + enum auth_passdb_skip skip; + enum auth_db_rule result_success; + enum auth_db_rule result_failure; +diff --git a/src/auth/passdb.c b/src/auth/passdb.c +index eb4ac8ae82..f5eed1af4f 100644 +--- a/src/auth/passdb.c ++++ b/src/auth/passdb.c +@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set) + passdb->id = ++auth_passdb_id; + passdb->iface = *iface; + passdb->args = p_strdup(pool, set->args); +- if (*set->mechanisms == '\0') { +- passdb->mechanisms = NULL; +- } else if (strcasecmp(set->mechanisms, "none") == 0) { +- passdb->mechanisms = (const char *const[]){NULL}; +- } else { +- passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,"); +- } +- +- if (*set->username_filter == '\0') { +- passdb->username_filter = NULL; +- } else { +- passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,"); +- } ++ /* NOTE: if anything else than driver & args are added here, ++ passdb_find() also needs to be updated. */ + array_push_back(&passdb_modules, &passdb); + return passdb; + } +diff --git a/src/auth/passdb.h b/src/auth/passdb.h +index 2e95328e5c..e466a9fdb6 100644 +--- a/src/auth/passdb.h ++++ b/src/auth/passdb.h +@@ -63,10 +63,6 @@ struct passdb_module { + /* Default password scheme for this module. + If default_cache_key is set, must not be NULL. */ + const char *default_pass_scheme; +- /* Supported authentication mechanisms, NULL is all, [NULL] is none*/ +- const char *const *mechanisms; +- /* Username filter, NULL is no filter */ +- const char *const *username_filter; + + /* If blocking is set to TRUE, use child processes to access + this passdb. */ + +From a1022072e2ce36f853873d910287f466165b184b Mon Sep 17 00:00:00 2001 +From: Timo Sirainen <timo.sirainen@open-xchange.com> +Date: Mon, 16 May 2022 14:58:45 +0200 +Subject: [PATCH 2/2] auth: Add a comment about updating userdb_find() + +--- + src/auth/userdb.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/auth/userdb.c b/src/auth/userdb.c +index 0849659102..830bc2dd64 100644 +--- a/src/auth/userdb.c ++++ b/src/auth/userdb.c +@@ -158,7 +158,8 @@ userdb_preinit(pool_t pool, const struct auth_userdb_settings *set) + userdb->id = ++auth_userdb_id; + userdb->iface = iface; + userdb->args = p_strdup(pool, set->args); +- ++ /* NOTE: if anything else than driver & args are added here, ++ userdb_find() also needs to be updated. */ + array_push_back(&userdb_modules, &userdb); + return userdb; + } diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml index 510eca85431..ba8487bd7a7 100644 --- a/net-mail/dovecot/metadata.xml +++ b/net-mail/dovecot/metadata.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>eras@gentoo.org</email> - <name>Eray Aslan</name> - </maintainer> - <use> - <flag name="argon2">Add support for ARGON2 password schemes</flag> - <flag name="managesieve">Add managesieve protocol support</flag> - <flag name="sieve">Add sieve support</flag> - <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag> - <flag name="rpc">Add support for NFS quotas</flag> - <flag name="solr">Add solr full text search (FTS) support</flag> - <flag name="stemmer">Add libstemmer support (for FTS)</flag> - <flag name="textcat">Add libtextcat language guessing support for full text search (FTS)</flag> - <flag name="zstd">Add support for zstd (de)compression</flag> - </use> - <upstream> - <remote-id type="github">dovecot/core</remote-id> - </upstream> + <maintainer type="person"> + <email>eras@gentoo.org</email> + <name>Eray Aslan</name> + </maintainer> + <use> + <flag name="argon2">Add support for ARGON2 password schemes</flag> + <flag name="managesieve">Add managesieve protocol support</flag> + <flag name="sieve">Add sieve support</flag> + <flag name="lucene">Add lucene full text search (FTS) support using <pkg>dev-cpp/clucene</pkg></flag> + <flag name="rpc">Add support for NFS quotas</flag> + <flag name="solr">Add solr full text search (FTS) support</flag> + <flag name="stemmer">Add libstemmer support (for FTS)</flag> + <flag name="textcat">Add libtextcat language guessing support for full text search (FTS)</flag> + <flag name="zstd">Add support for zstd (de)compression</flag> + </use> + <upstream> + <remote-id type="github">dovecot/core</remote-id> + </upstream> </pkgmetadata> diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest index 7b14d1c5cfe..ccc5ffc692f 100644 --- a/net-mail/fetchmail/Manifest +++ b/net-mail/fetchmail/Manifest @@ -1,4 +1,3 @@ -DIST fetchmail-6.4.21.tar.xz 1318996 BLAKE2B 4c2befad2b7dfa6957889e029572c259be7a20e4b54b864e2cca827540d745a57ad227f8e1fce1336e8f3a1005c780d8fa7c1b10b9ee05ce68dbcfac75afa179 SHA512 c9300f63c0e4073f199a9a7d9061774a7f88aad496b696cad96c0ee85107cae506461f0cd083903c60104b1e7654461213f3f759c1cdaffaf1c85fb1956faa67 -DIST fetchmail-6.4.22.tar.xz 1330176 BLAKE2B 7086f8a3df263f68ae2034321f63c40fcf4759517f46c67ba4b5d3b33ba07d3bb4f512d749a67a2d76991b46847b6dd9df0795a7a28e8166842454001497cfc9 SHA512 ff6db2705b6e3806e22c326da8a0f6bdc0909965cd283b50f9d55bd3a18a52fc4b2f4b4afece1e81aa25b6f1037450cb2b579c4d2cfe4705d34b31d4c1a47e00 DIST fetchmail-6.4.27.tar.xz 1326668 BLAKE2B fb349f8e4b17929d8ab5ec144e2d6e4227b56143112eb3745830c339f8dfdaa80fb47060ad3671258563198ed1283a903fcd5a82564b7320a829ceb4c5826642 SHA512 75650c2a8bcfa6f4364dacd6964f00848a23e1bc96eed10f7fcfd9c8c6f6b6fe60eee2730c57c8a5263c11f01b3031cbef7d6b2bffa730de63e7ec262448af2f DIST fetchmail-6.4.30.tar.xz 1333524 BLAKE2B 67e6aff00b1678ad68a4539c40147c79fbb22970248a97fd16340dbc64e90339a476ea322afde7345858b7041a00364e181af37dc96a09dcdca2e096f62922ea SHA512 0ec540c4102267e6e72fefa5e76aa76f45d25a0e68ec40f1fd834719f2a4b5f3f78c587b050fc33d97dd8fc6f674950949e5c23f960ebcd3046d5cc2e06db1d0 +DIST fetchmail-6.4.31.tar.xz 1332264 BLAKE2B b92e098b6799b9af480f00a99eb229c584230adaea1c6c86c5a4c4ef333403f4892087fbcc4c79e4835bed0ab63912656cb544c58c47bb9e3ebc3b406b4d58f6 SHA512 08aa8dc2c09d59aad5815479e3b6d449a0e65a1d3e8f62fe0cc30d15d9ac94d780b8e88074f43941a7e442b536808260794ac39d6257e24dea4f16ac0627d539 diff --git a/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild b/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild deleted file mode 100644 index ee54777b53a..00000000000 --- a/net-mail/fetchmail/fetchmail-6.4.21-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -PYTHON_REQ_USE="tk" - -inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs - -DESCRIPTION="the legendary remote-mail retrieval and forwarding utility" -HOMEPAGE="https://www.fetchmail.info/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="ssl nls kerberos tk socks" -REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="acct-user/fetchmail - ssl? ( - >=dev-libs/openssl-1.1.1:= - ) - kerberos? ( - virtual/krb5 - >=dev-libs/openssl-1.0.2:= - ) - nls? ( virtual/libintl ) - !elibc_glibc? ( sys-fs/e2fsprogs ) - socks? ( net-proxy/dante ) - tk? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - )" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/flex - nls? ( sys-devel/gettext )" - -DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO" -HTML_DOCS="*.html" -PATCHES=( - "${FILESDIR}"/${PN}-6.3.26-python-optional.patch -) -S=${WORKDIR}/${P/_/.} - -pkg_setup() { - use tk && python-single-r1_pkg_setup -} - -src_prepare() { - default - # don't compile during src_install - use tk && : > "${S}"/py-compile - eautoreconf -} - -src_configure() { - use tk || export PYTHON=: - - econf \ - --enable-RPA \ - --enable-NTLM \ - --enable-SDPS \ - $(use_enable nls) \ - $(use_with ssl ssl "${EPREFIX}/usr") \ - $(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \ - $(use_with kerberos gssapi) \ - $(use_with kerberos kerberos5) \ - --without-hesiod \ - $(use_with socks) -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - - newinitd "${FILESDIR}"/fetchmail.initd fetchmail - newconfd "${FILESDIR}"/fetchmail.confd fetchmail - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service" - dotmpfiles "${FILESDIR}"/${PN}.conf - - docinto contrib - local f - for f in contrib/* ; do - [ -f "${f}" ] && dodoc "${f}" - done - - use tk && python_optimize -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please see /etc/conf.d/fetchmail if you want to adjust" - elog "the polling delay used by the fetchmail init script." - fi -} diff --git a/net-mail/fetchmail/fetchmail-6.4.22.ebuild b/net-mail/fetchmail/fetchmail-6.4.31.ebuild index 9d676c85c58..98b1ae2dae8 100644 --- a/net-mail/fetchmail/fetchmail-6.4.22.ebuild +++ b/net-mail/fetchmail/fetchmail-6.4.31.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="tk" inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" LICENSE="GPL-2 public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="ssl nls kerberos tk socks" REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" diff --git a/net-mail/getmail/getmail-6.18.9.ebuild b/net-mail/getmail/getmail-6.18.9.ebuild index 473959e43c5..734f390f84c 100644 --- a/net-mail/getmail/getmail-6.18.9.ebuild +++ b/net-mail/getmail/getmail-6.18.9.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/getmail6-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" python_prepare_all() { # Use gentoo version number (including revision) for doc dir and remove COPYING file diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml index 405e10a7016..82095fa4ac1 100644 --- a/net-mail/getmail/metadata.xml +++ b/net-mail/getmail/metadata.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>r+gentoo@r78.nl</email> - <name>Remco Rijnders</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <maintainer status="active"> - <name>Roland Puntaier</name> - </maintainer> - <bugs-to>https://github.com/getmail6/getmail6/issues</bugs-to> - <remote-id type="github">getmail6/getmail6</remote-id> - <remote-id type="pypi">getmail</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>zoltan@sinustrom.info</email> + <name>Zoltan Puskas</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <maintainer status="active"> + <name>Roland Puntaier</name> + </maintainer> + <bugs-to>https://github.com/getmail6/getmail6/issues</bugs-to> + <remote-id type="github">getmail6/getmail6</remote-id> + <remote-id type="pypi">getmail</remote-id> + </upstream> </pkgmetadata> diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest index d2fa605992b..452947fda8d 100644 --- a/net-mail/grepmail/Manifest +++ b/net-mail/grepmail/Manifest @@ -1,2 +1 @@ -DIST grepmail-5.3033.tar.gz 536791 BLAKE2B 400cc3c30a291f6075d343522a4f506997e3328c2adda2cfa7d4449052ce5bd6112fc06a44f8359def6358c716422b5c33353c7247dd6b5cf6c5a0502a2c34d6 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f DIST grepmail-5.3111.tar.gz 560547 BLAKE2B 88c9e841aed419ae428c45dd9a1bfb294076d73a3635e06b50a1f5b3bb3d2d447a8c586054b80ad793ccd6b2b2cb16394486d044f988c5760c04f9fe2da0e73e SHA512 50df6585ecebb838a2b60c048e66588d7a161a88256ffce2c7313e61d32751739b3c30a64deb43dcd2a5933970cacc812fbb2dbd9f91a8ac34012e0581cd2962 diff --git a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch b/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch deleted file mode 100644 index cdab28bb635..00000000000 --- a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Fix FTBFS with libmail-mbox-messageparser-perl 1.5002 - From 1.5002, it does not return "No data on standard input" anymore. -Author: Vincent Legout <vincent@legout.info> -Last-Update: 2010-04-28 -Bug-Debian: http://bugs.debian.org/549782 -Bug-Gentoo: https://bugs.gentoo.org/296657 - ---- grepmail/t/nonexistent_mailbox.t -+++ grepmail/t/nonexistent_mailbox.t -@@ -13,21 +13,15 @@ - => ['none','no_such_file'], - "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . - " | grepmail pattern" -- => ['none','no_data'], -+ => ['none','none'], - "grepmail -E $single_quote\$email =~ /pattern/$single_quote no_such_file" - => ['none','no_such_file'], - "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . - " | grepmail -E $single_quote\$email =~ /pattern/$single_quote" -- => ['none','no_data'], -+ => ['none','none'], - ); - - my %expected_errors = ( --"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . -- " | grepmail pattern" -- => 1, --"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . -- " | grepmail -E $single_quote\$email =~ /pattern/$single_quote" -- => 1, - ); - - my %localization = ( diff --git a/net-mail/grepmail/files/5.30.33-midnight.patch b/net-mail/grepmail/files/5.30.33-midnight.patch deleted file mode 100644 index d861774df81..00000000000 --- a/net-mail/grepmail/files/5.30.33-midnight.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix bug with midnight -Author: Manuel Prinz <manuel@debian.org> -Last-Update: 2010-02-22 -Bug-Debian: http://bugs.debian.org/559588 -Bug-Gentoo: https://bugs.gentoo.org/355067 - ---- grepmail/grepmail -+++ grepmail/grepmail -@@ -397,7 +397,7 @@ - if (eval 'require Date::Manip') - { - my ($version_number) = $Date::Manip::VERSION =~ /^(\d+\.\d+)/; -- Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43; -+ Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43 and $version_number < 6; - } - } - diff --git a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild deleted file mode 100644 index c02c6360e13..00000000000 --- a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator perl-module - -MY_P="${PN}-$(delete_version_separator 2)" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates" -HOMEPAGE="https://github.com/coppit/grepmail" -SRC_URI="mirror://sourceforge/grepmail/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-perl/Inline - dev-perl/TimeDate - dev-perl/Date-Manip - virtual/perl-Digest-MD5 - >=dev-perl/Mail-Mbox-MessageParser-1.40.01 -" -DEPEND="${RDEPEND} -" -# test? ( dev-perl/Mail-Mbox-MessageParser ) - -# 100% failure on running -DIST_TEST="skip" - -PATCHES=( - "${FILESDIR}"/5.30.33-fix_nonexistent_mailbox_test.patch - "${FILESDIR}"/5.30.33-midnight.patch -) - -src_prepare() { - sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL || - die "Can't patch Makefile.PL for 5.26 dot-in-inc" - perl-module_src_prepare -} diff --git a/net-mail/hyperkitty/Manifest b/net-mail/hyperkitty/Manifest deleted file mode 100644 index 90e71719921..00000000000 --- a/net-mail/hyperkitty/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST HyperKitty-1.3.3.tar.gz 1936346 BLAKE2B 8014b62a44989faeb0467779fb53a9e5a0c381bae44fae8102b211a6d3c7dfa63cb76b6cc25ae29bb1b260fdc4bafd9d2c61c39103cc29d76a229263fe704c40 SHA512 4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76 diff --git a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild deleted file mode 100644 index bf751073a21..00000000000 --- a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="A web interface to access GNU Mailman v3 archives" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/H/HyperKitty/HyperKitty-${PV}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/django[${PYTHON_USEDEP}] - net-mail/django-mailman3[${PYTHON_USEDEP}] - dev-python/django-gravatar2[${PYTHON_USEDEP}] - dev-python/djangorestframework[${PYTHON_USEDEP}] - dev-python/robot-detection[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/django-compressor[${PYTHON_USEDEP}] - net-mail/mailmanclient[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/django-haystack[${PYTHON_USEDEP}] - dev-python/django-extensions[${PYTHON_USEDEP}] - dev-python/flufl-lock[${PYTHON_USEDEP}] - dev-python/django-q[${PYTHON_USEDEP}] - dev-python/whoosh[${PYTHON_USEDEP}] - dev-lang/sassc" - -BDEPEND="dev-python/isort[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/django-debug-toolbar[${PYTHON_USEDEP}] - )" - -DOCS=( README.rst ) -S="${WORKDIR}/HyperKitty-${PV}" diff --git a/net-mail/hyperkitty/metadata.xml b/net-mail/hyperkitty/metadata.xml deleted file mode 100644 index 26ffc33ff76..00000000000 --- a/net-mail/hyperkitty/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="pypi">hyperkitty</remote-id> - <remote-id type="gitlab">mailman/hyperkitty</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-mail/mailman-meta/mailman-meta-3.ebuild b/net-mail/mailman-meta/mailman-meta-3.ebuild deleted file mode 100644 index e5399bc8b02..00000000000 --- a/net-mail/mailman-meta/mailman-meta-3.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Meta ebuild for GNU Mailman 3" -HOMEPAGE="https://list.org/" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=">=net-mail/mailman-3.0 - net-mail/postorius - net-mail/hyperkitty" diff --git a/net-mail/mailman-meta/metadata.xml b/net-mail/mailman-meta/metadata.xml deleted file mode 100644 index 115e9d64a66..00000000000 --- a/net-mail/mailman-meta/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest deleted file mode 100644 index 0772b97b920..00000000000 --- a/net-mail/mailman/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29 -DIST mailman-3.3.4.tar.gz 1578084 BLAKE2B d0c8ba6dd0df481915397b55521c9a524b44bbdb7c4efe789c6fe92c1383950b6107a76db43337b7a310a7d97eb3931a4289566271ac5b6360645ec8d316230a SHA512 52d7e8355744730f608605b05bc9c977c3e4daf22a78267b1ea6cd3922b2826d3f70dd61a591f13633fc7cbcc536b6d56a2076c00752a6590964cbd4e1aec3cc diff --git a/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch b/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch deleted file mode 100644 index c5f5d774fda..00000000000 --- a/net-mail/mailman/files/mailman-3.3.4-fix-click-8.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5d27492403f80c4b4ea1820b3d6f821bd8401ca8 Mon Sep 17 00:00:00 2001 -From: Mark Sapiro <mark@msapiro.net> -Date: Tue, 11 May 2021 18:14:59 -0700 -Subject: [PATCH] Require click >=8.0.0 and fix the tests it breaks. - ---- a/src/mailman/commands/docs/import.rst -+++ b/src/mailman/commands/docs/import.rst -@@ -58,5 +58,6 @@ import, the mailing list's "real name" will change. - Import - - >>> command('mailman import21 import@example.com ' + pickle_file) -+ Importing ... - >>> print(mlist.display_name) - Test ---- a/src/mailman/commands/tests/test_cli_addmembers.py -+++ b/src/mailman/commands/tests/test_cli_addmembers.py -@@ -57,8 +57,8 @@ class TestCLIAddMembers(unittest.TestCase): - result.output, - 'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n' - 'Try \'addmembers --help\' for help.\n\n' -- 'Error: Invalid value for \'FILENAME\': Could not open ' -- 'file: bad: No such file or directory\n') -+ 'Error: Invalid value for \'FILENAME\': ' -+ '\'bad\': No such file or directory\n') - - def test_already_subscribed_with_display_name(self): - subscribe(self._mlist, 'Anne') -@@ -265,8 +265,8 @@ class TestCLIAddMembers(unittest.TestCase): - 'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n' - 'Try \'addmembers --help\' for help.\n\n' - 'Error: Invalid value for \'--delivery\' / \'-d\': ' -- 'invalid choice: bogus. (choose from regular, mime, ' -- 'plain, summary, disabled)\n') -+ '\'bogus\' is not one of \'regular\', \'mime\', ' -+ '\'plain\', \'summary\', \'disabled\'.\n') - - def test_invite_member(self): - with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp: ---- a/src/mailman/commands/tests/test_cli_delmembers.py -+++ b/src/mailman/commands/tests/test_cli_delmembers.py -@@ -56,8 +56,8 @@ class TestCLIDelMembers(unittest.TestCase): - result.output, - 'Usage: delmembers [OPTIONS]\n' - 'Try \'delmembers --help\' for help.\n\n' -- 'Error: Invalid value for \'--file\' / \'-f\': Could not open ' -- 'file: bad: No such file or directory\n') -+ 'Error: Invalid value for \'--file\' / \'-f\': ' -+ '\'bad\': No such file or directory\n') - - def test_not_subscribed_without_display_name(self): - with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp: ---- a/src/mailman/commands/tests/test_cli_syncmembers.py -+++ b/src/mailman/commands/tests/test_cli_syncmembers.py -@@ -58,8 +58,8 @@ class TestCLISyncMembers(unittest.TestCase): - result.output, - 'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n' - 'Try \'syncmembers --help\' for help.\n\n' -- 'Error: Invalid value for \'FILENAME\': Could not open ' -- 'file: bad: No such file or directory\n') -+ 'Error: Invalid value for \'FILENAME\': ' -+ '\'bad\': No such file or directory\n') - - def test_sync_invalid_email(self): - with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp: -@@ -374,8 +374,8 @@ class TestCLISyncMembers(unittest.TestCase): - 'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n' - 'Try \'syncmembers --help\' for help.\n\n' - 'Error: Invalid value for \'--delivery\' / \'-d\': ' -- 'invalid choice: bogus. (choose from regular, mime, ' -- 'plain, summary, disabled)\n') -+ '\'bogus\' is not one of \'regular\', \'mime\', ' -+ '\'plain\', \'summary\', \'disabled\'.\n') - - def test_override_no_welcome(self): - self._mlist.send_welcome_message = False diff --git a/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch b/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch deleted file mode 100644 index f8771678b3e..00000000000 --- a/net-mail/mailman/files/mailman-3.3.4-py3.9-importlib.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0eced2d273535577645493340c7319ebf27a559c Mon Sep 17 00:00:00 2001 -From: Neal Gompa <ngompa13@gmail.com> -Date: Fri, 16 Oct 2020 03:47:38 -0400 -Subject: [PATCH] Use importlib.resources for Python 3.9+ and - importlib_resources otherwise - -This makes it possible to use Mailman 3 in environments where importlib_resources -is not available. - -Signed-off-by: Neal Gompa <ngompa13@gmail.com> ---- - setup.py | 2 +- - src/mailman/__init__.py | 5 +++++ - src/mailman/testing/__init__.py | 23 +++++++++++++++++++++++ - 3 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index cd3645611..6d871fbfd 100644 ---- a/setup.py -+++ b/setup.py -@@ -121,7 +121,7 @@ case second 'm'. Any other spelling is incorrect.""", - 'flufl.bounce', - 'flufl.i18n>=2.0', - 'flufl.lock>=3.1', -- 'importlib_resources>=1.1.0', -+ 'importlib_resources>=1.1.0 ; python_version<"3.9"', - 'gunicorn', - 'lazr.config', - 'python-dateutil>=2.0', -diff --git a/src/mailman/__init__.py b/src/mailman/__init__.py -index 2d94288e0..1c760008d 100644 ---- a/src/mailman/__init__.py -+++ b/src/mailman/__init__.py -@@ -37,3 +37,8 @@ if 'build_sphinx' not in sys.argv: # pragma: nocover - else: - from mailman.core.i18n import initialize - initialize() -+ -+# Switch over to the internal importlib.resources module on Python 3.9+ -+if sys.version_info >= (3, 9, 0): -+ import importlib.resources -+ sys.modules['importlib_resources'] = importlib.resources -diff --git a/src/mailman/testing/__init__.py b/src/mailman/testing/__init__.py -index e69de29bb..2b2ed536a 100644 ---- a/src/mailman/testing/__init__.py -+++ b/src/mailman/testing/__init__.py -@@ -0,0 +1,23 @@ -+# Copyright (C) 2009-2020 by the Free Software Foundation, Inc. -+# -+# This file is part of GNU Mailman. -+# -+# GNU Mailman is free software: you can redistribute it and/or modify it under -+# the terms of the GNU General Public License as published by the Free -+# Software Foundation, either version 3 of the License, or (at your option) -+# any later version. -+# -+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+# more details. -+# -+# You should have received a copy of the GNU General Public License along with -+# GNU Mailman. If not, see <https://www.gnu.org/licenses/>. -+ -+import sys -+ -+# Switch over to the internal importlib.resources module on Python 3.9+ -+if sys.version_info >= (3, 9, 0): -+ import importlib.resources -+ sys.modules['importlib_resources'] = importlib.resources --- -GitLab - diff --git a/net-mail/mailman/mailman-3.3.2.ebuild b/net-mail/mailman/mailman-3.3.2.ebuild deleted file mode 100644 index 825b5d0deff..00000000000 --- a/net-mail/mailman/mailman-3.3.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Mailman -- the GNU mailing list manager" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="3" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}] - dev-python/alembic[${PYTHON_USEDEP}] - dev-python/atpublic[${PYTHON_USEDEP}] - >=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}] - >=dev-python/authres-1.0.1[${PYTHON_USEDEP}] - >=dev-python/click-7.0[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}] - >=dev-python/falcon-2.0.0[${PYTHON_USEDEP}] - dev-python/flufl-bounce[${PYTHON_USEDEP}] - >=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}] - >=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}] - >=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}] - www-servers/gunicorn[${PYTHON_USEDEP}] - dev-python/lazr-config[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-configuration[${PYTHON_USEDEP}] - dev-python/zope-event[${PYTHON_USEDEP}] - >=dev-python/zope-interface-5.0[${PYTHON_USEDEP}] -" diff --git a/net-mail/mailman/mailman-3.3.4.ebuild b/net-mail/mailman/mailman-3.3.4.ebuild deleted file mode 100644 index d6f428c545b..00000000000 --- a/net-mail/mailman/mailman-3.3.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -inherit distutils-r1 - -DESCRIPTION="Mailman -- the GNU mailing list manager" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="3" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/aiosmtpd-1.4.1[${PYTHON_USEDEP}] - dev-python/alembic[${PYTHON_USEDEP}] - dev-python/atpublic[${PYTHON_USEDEP}] - >=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}] - >=dev-python/authres-1.0.1[${PYTHON_USEDEP}] - >=dev-python/click-8.0[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}] - >=dev-python/falcon-2.0.0[${PYTHON_USEDEP}] - dev-python/flufl-bounce[${PYTHON_USEDEP}] - >=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}] - >=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/importlib_resources[${PYTHON_USEDEP}] - ' python3_8) - www-servers/gunicorn[${PYTHON_USEDEP}] - dev-python/lazr-config[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-configuration[${PYTHON_USEDEP}] - dev-python/zope-event[${PYTHON_USEDEP}] - >=dev-python/zope-interface-5.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/flufl-testing[${PYTHON_USEDEP}] - virtual/python-greenlet[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/${P}-py3.9-importlib.patch" - "${FILESDIR}/${P}-fix-click-8.patch" -) - -python_test() { - distutils_install_for_testing --via-venv - "${EPYTHON}" -m nose2 -vv || die "Tests failed with ${EPYTHON}" -} diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml deleted file mode 100644 index 09728cc8863..00000000000 --- a/net-mail/mailman/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">mailman</remote-id> - <remote-id type="gitlab">mailman/mailman</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-mail/mailmanclient/Manifest b/net-mail/mailmanclient/Manifest deleted file mode 100644 index 26154d03b0e..00000000000 --- a/net-mail/mailmanclient/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mailmanclient-3.3.1.tar.gz 78807 BLAKE2B 04542069b3a7a4b0069363f09c21ce321350fe25e57a86e5ac9ac9ec5329777acfdd1ccf62354d9df86f615f37328a8c9700811e05823ec39a648c4477b9321e SHA512 bb23d47b4c5c9f4881298330f530624c7af243e9e583f8c20cac2de77fc4a789dae729e8daa96b6a6bbe775ac549d0fc118773697b7a156fb74e4365a18683b7 -DIST mailmanclient-3.3.3.tar.gz 90137 BLAKE2B d354123fb7735d8b670422461f3d5697a30ac83d1b2f9c7f642583423ab383f58b0d0604f18be23175fcdabe42721ee02102e764211fd0723c9146f8c39581fd SHA512 a4d18a7fc6084dfb20a7028cc085c31e696b8c2db4eec674852929b1d3a221a065b8e33d8047d018d4a0edf1afb3bcb55e76906808c0f6b3715abb8a81437b9e diff --git a/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild b/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild deleted file mode 100644 index 7ada696e8dc..00000000000 --- a/net-mail/mailmanclient/mailmanclient-3.3.1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="Python bindings for the GNU Mailman 3 REST API" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" - -DOCS=( README.rst ) diff --git a/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild b/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild deleted file mode 100644 index 00d0bcb61d8..00000000000 --- a/net-mail/mailmanclient/mailmanclient-3.3.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit distutils-r1 - -DESCRIPTION="Python bindings for the GNU Mailman 3 REST API" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/httpx[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-services[${PYTHON_USEDEP}] - net-mail/mailman[${PYTHON_USEDEP}] - ) -" - -DOCS=( README.rst ) - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # Needs network - src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_user_page - src/mailmanclient/tests/test_client.py::TestFindUsers::test_find_users -) - -src_prepare() { - sed -e '/addopts/d' -i pytest.ini || die - distutils-r1_src_prepare -} diff --git a/net-mail/mailmanclient/metadata.xml b/net-mail/mailmanclient/metadata.xml deleted file mode 100644 index e498aa8e9df..00000000000 --- a/net-mail/mailmanclient/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">mailmanclient</remote-id> - <remote-id type="gitlab">mailman/mailmanclient</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-mail/mailshears/Manifest b/net-mail/mailshears/Manifest index 0c4d870e0d8..5dd79e70ce1 100644 --- a/net-mail/mailshears/Manifest +++ b/net-mail/mailshears/Manifest @@ -1 +1 @@ -DIST mailshears-0.0.4.gem 68608 BLAKE2B 8adca0b902145f9ed97f9154db927f0ba9aa4696c37485c6ee9c3001f728f6f0554d0d8330b6173d7b636712f123107aa71cd818dba91aa8abf956df016775e1 SHA512 6c808ae2d1f2393c19fcad2a0c9c437a7a79354f779dfbbe8ec1662c39a534b1318ee30355593db9027d8b9eb418b4f99f4b87d06441668a3c15c0987ea8cf57 +DIST mailshears-0.0.5.gem 68608 BLAKE2B bee5c44121e9a5fb746af0ba525e749ae6f0a772a37cff00325ee8e2d3d5f6bf39a20e90bffcf8b9d863525beeb93cf757469412a5dd4b23d566215aaabe134d SHA512 873e906ba5332b5589feb0aa24a7c9e5372971bc821ad290b536412d826fc0b103ed62cff73a33d80ada7e862d66c43808d73c46c46c49b319104022a04f3026 diff --git a/net-mail/mailshears/mailshears-0.0.4-r1.ebuild b/net-mail/mailshears/mailshears-0.0.5.ebuild index 9c6e50724d6..06a584f9a77 100644 --- a/net-mail/mailshears/mailshears-0.0.4-r1.ebuild +++ b/net-mail/mailshears/mailshears-0.0.5.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -USE_RUBY="ruby24 ruby25 ruby26" +# ruby31 is ok too +USE_RUBY="ruby26 ruby27 ruby30" # The tests are dangerous and shouldn't be run by anyone! # They mess with your local postgres databases. diff --git a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch index d67c63e4b95..7f1f894882d 100644 --- a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch +++ b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch @@ -1,6 +1,5 @@ -diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl ---- a/lib/mhamain.pl 2006-06-10 02:42:58.000000000 +0000 -+++ b/lib/mhamain.pl 2008-01-27 14:12:48.000000000 +0000 +--- a/lib/mhamain.pl ++++ b/lib/mhamain.pl @@ -73,6 +73,8 @@ TERM TRAP USR1 USR2 VTALRM XCPU XFSZ ); @@ -10,7 +9,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl ############################################################################### ## Public routines ############################################################################### -@@ -934,6 +936,16 @@ +@@ -936,6 +938,16 @@ } else { $ctype = 'text/plain'; } @@ -26,8 +25,8 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl + } ## Insure uniqueness of index - $index .= $X . sprintf('%d',(defined($msgnum)?$msgnum:($LastMsgNum+1))); -@@ -955,6 +967,7 @@ + my $t = $index; +@@ -961,6 +973,7 @@ $Subject{$index} = $sub; $MsgHead{$index} = htmlize_header($fields); $ContentType{$index} = $ctype; @@ -35,7 +34,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl if ($msgid) { $MsgId{$msgid} = $index; $NewMsgId{$msgid} = $index; # Track new message-ids -@@ -966,6 +979,7 @@ +@@ -972,6 +985,7 @@ } else { $IndexNum{$index} = getNewMsgNum(); } @@ -43,7 +42,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl $Refs{$index} = [ @refs ] if (@refs); -@@ -1102,7 +1116,7 @@ +@@ -1121,7 +1135,7 @@ my $adding = ($ADD && !$force && !$SINGLE); my $i_p0 = fmt_msgnum($msgnum); @@ -52,7 +51,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl my $filepathname = join($DIRSEP, $OUTDIR, $filename); my $tmppathname; -@@ -1160,7 +1174,9 @@ +@@ -1179,7 +1193,9 @@ "<!--X-Message-Id: ", commentize($Index2MsgId{$index}), " -->\n", "<!--X-Content-Type: ", @@ -63,7 +62,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl if (defined($Refs{$index})) { foreach (@{$Refs{$index}}) { -@@ -1456,8 +1472,9 @@ +@@ -1475,8 +1491,9 @@ #&defineIndex2MsgId(); my $msgnum = $IndexNum{$key}; return (undef, undef) if ($msgnum eq ''); @@ -74,9 +73,8 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl delete $ContentType{$key}; delete $Date{$key}; delete $From{$key}; -diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl ---- a/lib/mhdb.pl 2005-12-20 21:28:15.000000000 +0000 -+++ b/lib/mhdb.pl 2008-01-27 13:25:52.000000000 +0000 +--- a/lib/mhdb.pl ++++ b/lib/mhdb.pl @@ -61,6 +61,7 @@ ## Meta-data @@ -85,10 +83,9 @@ diff -Nuar a/lib/mhdb.pl b/lib/mhdb.pl print_var($db,'Date', \%Date); print_var($db,'Derived', \%Derived); print_var($db,'FollowOld', \%Follow); -diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl ---- a/lib/mhinit.pl 2005-07-08 06:34:03.000000000 +0000 -+++ b/lib/mhinit.pl 2008-01-27 13:25:52.000000000 +0000 -@@ -247,6 +247,7 @@ +--- a/lib/mhinit.pl ++++ b/lib/mhinit.pl +@@ -248,6 +248,7 @@ %Follow = (); # Index key to follow-ups %FolCnt = (); # Index key to number of follow-ups %ContentType = (); # Index key to base content-type of message @@ -96,9 +93,8 @@ diff -Nuar a/lib/mhinit.pl b/lib/mhinit.pl %Icons = (); # Index key to icon URL for content-type %AddIndex = (); # Flags for messages that must be written -diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl ---- a/lib/mhmsgfile.pl 2001-09-17 16:10:28.000000000 +0000 -+++ b/lib/mhmsgfile.pl 2008-01-27 14:12:16.000000000 +0000 +--- a/lib/mhmsgfile.pl ++++ b/lib/mhmsgfile.pl @@ -123,6 +123,10 @@ if (defined($href->{'derived'})) { $Derived{$index} = $href->{'derived'}; @@ -110,10 +106,9 @@ diff -Nuar a/lib/mhmsgfile.pl b/lib/mhmsgfile.pl $IndexNum{$index} = int($msgnum); -diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl ---- a/lib/mhopt.pl 2005-07-08 06:34:03.000000000 +0000 -+++ b/lib/mhopt.pl 2008-01-27 13:25:52.000000000 +0000 -@@ -764,6 +764,7 @@ +--- a/lib/mhopt.pl ++++ b/lib/mhopt.pl +@@ -798,6 +798,7 @@ delete($MsgId{''}); delete($FollowOld{''}); delete($ContentType{''}); @@ -121,10 +116,9 @@ diff -Nuar a/lib/mhopt.pl b/lib/mhopt.pl delete($Refs{''}); # update DOCURL if default old value -diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl ---- a/lib/mhrcvars.pl 2005-07-08 05:27:52.000000000 +0000 -+++ b/lib/mhrcvars.pl 2008-01-27 14:11:19.000000000 +0000 -@@ -195,7 +195,7 @@ +--- a/lib/mhrcvars.pl ++++ b/lib/mhrcvars.pl +@@ -225,7 +225,7 @@ } if ($var eq 'MSG') { ## Filename of message page ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg); @@ -133,7 +127,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl last REPLACESW; } if ($var eq 'MSGHFIELD') { ## Message header field -@@ -417,7 +417,7 @@ +@@ -447,7 +447,7 @@ if (!defined($key)) { $tmp = ""; last REPLACESW; } $tmp = qq/name="/ . &fmt_msgnum($IndexNum{$key}) . qq/" href="/ . @@ -142,7 +136,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl qq/"/; last REPLACESW; } -@@ -432,7 +432,7 @@ +@@ -462,7 +462,7 @@ $isurl = 0; ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg); if (!defined($key)) { $tmp = ""; last REPLACESW; } @@ -151,7 +145,7 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl last REPLACESW; } if ($var eq 'IDXFNAME') { ## Filename of index page -@@ -730,7 +730,7 @@ +@@ -760,7 +760,7 @@ $ret = qq|<a name="| . &fmt_msgnum($IndexNum{$index}) . qq|" href="| . @@ -160,9 +154,8 @@ diff -Nuar a/lib/mhrcvars.pl b/lib/mhrcvars.pl qq|">$ret</a>| if $var eq 'SUBJECT' && $arg eq "" && !$mailto; -diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl ---- a/lib/mhutil.pl 2005-07-08 05:27:53.000000000 +0000 -+++ b/lib/mhutil.pl 2008-01-27 14:11:50.000000000 +0000 +--- a/lib/mhutil.pl ++++ b/lib/mhutil.pl @@ -28,6 +28,7 @@ package mhonarc; @@ -171,7 +164,7 @@ diff -Nuar a/lib/mhutil.pl b/lib/mhutil.pl ## RFC 2369 header fields to check for URLs %HFieldsList = ( -@@ -304,16 +305,20 @@ +@@ -313,16 +314,20 @@ ## Routine to get filename of a message number. ## sub msgnum_filename { diff --git a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild index 333911aff1b..544922d5947 100644 --- a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild +++ b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit perl-module +MY_P="${P/mhonarc-gentoo/MHonArc}" + DESCRIPTION="Perl Mail-to-HTML Converter, Gentoo fork" HOMEPAGE="https://www.mhonarc.org/" -LICENSE="GPL-2" SRC_URI="https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2" +S="${WORKDIR}/${MY_P}" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="!net-mail/mhonarc" -MY_P="${P/mhonarc-gentoo/MHonArc}" -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${P}-archives-gentoo.patch" ) +PATCHES=( "${FILESDIR}"/${P}-archives-gentoo.patch ) src_install() { - sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}' -prefix '${D}'|g" -i Makefile || die "sed on Makefile failed" + sed -e "s|-prefix |-docpath '${ED}/usr/share/doc/${PF}' -prefix '${ED}'|g" -i Makefile || die "sed on Makefile failed" sed -e "s|installsitelib|installvendorlib|g" -i install.me || die "sed on install.me failed" perl-module_src_install diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest deleted file mode 100644 index 03c910abe15..00000000000 --- a/net-mail/mpack/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mpack-1.6.tar.gz 179850 BLAKE2B d6b79e8514633fd0bfd1c04b167ba1d1a030cf5407dae30ba2a45e3d30157b66955808aed40a5163737c0242349d05f53c27ada920676cf3d7b81a00e7bd5059 SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714 diff --git a/net-mail/mpack/files/mpack-1.6-clang.patch b/net-mail/mpack/files/mpack-1.6-clang.patch deleted file mode 100644 index fc21d170af5..00000000000 --- a/net-mail/mpack/files/mpack-1.6-clang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- umpack-1.6/udecode.c 2003-07-21 20:46:37.000000000 +0000 -+++ mpack-1.6/uudecode.c 2014-04-19 10:04:19.000000000 +0000 -@@ -845,7 +845,7 @@ - } - line += 4; - } -- return; -+ return 0; - } - - diff --git a/net-mail/mpack/files/mpack-1.6-compile.patch b/net-mail/mpack/files/mpack-1.6-compile.patch deleted file mode 100644 index 570319cabe5..00000000000 --- a/net-mail/mpack/files/mpack-1.6-compile.patch +++ /dev/null @@ -1,129 +0,0 @@ -From a01468c1734129595355af0815d4577af4e265cc Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 7 Dec 2011 23:22:55 +0100 -Subject: [PATCH] Add missing includes, remove conflicting prototypes - ---- - decode.c | 1 + - encode.c | 1 + - magic.c | 1 + - part.c | 1 + - unixos.c | 5 +---- - unixpk.c | 2 ++ - unixpk.o | Bin 12000 -> 12016 bytes - unixunpk.c | 1 + - xmalloc.c | 2 +- - 9 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/decode.c b/decode.c -index c96918f..8b8df56 100644 ---- a/decode.c -+++ b/decode.c -@@ -28,6 +28,7 @@ - #include <stdio.h> - #include <string.h> - #include <ctype.h> -+#include <stdlib.h> - #include "xmalloc.h" - #include "common.h" - #include "part.h" -diff --git a/encode.c b/encode.c -index 0ba3934..1377cf8 100644 ---- a/encode.c -+++ b/encode.c -@@ -24,6 +24,7 @@ - */ - #include <stdio.h> - #include <string.h> -+#include <stdlib.h> - - extern char *magic_look(FILE *infile); - extern char *os_genid(void); -diff --git a/magic.c b/magic.c -index e08c6f8..a452a43 100644 ---- a/magic.c -+++ b/magic.c -@@ -23,6 +23,7 @@ - * SOFTWARE. - */ - #include <stdio.h> -+#include <string.h> - - /* Description of the various file formats and their magic numbers */ - struct magic { -diff --git a/part.c b/part.c -index 1d4efe6..15fd724 100644 ---- a/part.c -+++ b/part.c -@@ -28,6 +28,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <stdlib.h> - - #include "part.h" - #include "xmalloc.h" -diff --git a/unixos.c b/unixos.c -index 3f5c4c0..fa6d0a7 100644 ---- a/unixos.c -+++ b/unixos.c -@@ -30,6 +30,7 @@ - #include <sys/param.h> - #include <netdb.h> - #include <fcntl.h> -+#include <stdlib.h> - #include "xmalloc.h" - #include "common.h" - #include "part.h" -@@ -38,10 +39,6 @@ - #define MAXHOSTNAMELEN 64 - #endif - --extern int errno; --extern char *malloc(); --extern char *getenv(); -- - int overwrite_files = 0; - int didchat; - -diff --git a/unixpk.c b/unixpk.c -index c2aaa56..1f81ea9 100644 ---- a/unixpk.c -+++ b/unixpk.c -@@ -25,6 +25,8 @@ - #include <stdio.h> - #include <string.h> - #include <errno.h> -+#include <stdlib.h> -+#include <unistd.h> - #include "common.h" - #include "version.h" - #include "xmalloc.h" -diff --git a/unixunpk.c b/unixunpk.c -index a1f065b..0f5fa85 100644 ---- a/unixunpk.c -+++ b/unixunpk.c -@@ -23,6 +23,7 @@ - * SOFTWARE. - */ - #include <stdio.h> -+#include <stdlib.h> - #include "version.h" - #include "part.h" - -diff --git a/xmalloc.c b/xmalloc.c -index 7c74360..46dbbd1 100644 ---- a/xmalloc.c -+++ b/xmalloc.c -@@ -24,7 +24,7 @@ - */ - #include <stdio.h> - #include <string.h> --extern char *malloc(), *realloc(); -+#include <stdlib.h> - - char *xmalloc (int size) - { --- -1.7.8 - diff --git a/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch b/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch deleted file mode 100644 index 62a04faa793..00000000000 --- a/net-mail/mpack/files/mpack-1.6-cve-2011-4919.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0c87201f64491575350b18d04c62ec142e119d1f Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sat, 31 Dec 2011 20:17:20 +0100 -Subject: [PATCH] Fix permissions - ---- - unixos.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/unixos.c b/unixos.c -index fa6d0a7..0e2f469 100644 ---- a/unixos.c -+++ b/unixos.c -@@ -134,9 +134,9 @@ FILE *os_createnewfile(char *fname) - FILE *ret; - - #ifdef O_EXCL -- fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0644); -+ fd=open(fname, O_RDWR|O_CREAT|O_EXCL, 0600); - #else -- fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0644); -+ fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600); - #endif - - if (fd == -1) --- -1.7.8.1 - diff --git a/net-mail/mpack/files/mpack-1.6-filenames.patch b/net-mail/mpack/files/mpack-1.6-filenames.patch deleted file mode 100644 index 6a1fc225a79..00000000000 --- a/net-mail/mpack/files/mpack-1.6-filenames.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 10aad11d7baf7044328fff616b9c6f1859bd2cbd Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 8 Jan 2012 17:36:20 +0100 -Subject: [PATCH 1/2] Use actual filenames for unpacking (rather than - "part[0-9]+") - -Example: -# curl http://pbot.rmdir.de/b224d87617c5d76d6cd938bd4410fabf | ./munpack ---- - decode.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/decode.c b/decode.c -index 8b8df56..7349abd 100644 ---- a/decode.c -+++ b/decode.c -@@ -546,8 +546,8 @@ getDispositionFilename(char *disposition) - SkipWhitespace(&disposition); - if (!disposition) return 0; - -- /* If we're looking at a ";", we found what we're looking for */ -- if (*disposition++ == ';') break; -+ /* If we're looking at a "=", we found what we're looking for */ -+ if (*disposition++ == '=') break; - } - - SkipWhitespace(&disposition); --- -1.7.8.3 - diff --git a/net-mail/mpack/files/mpack-1.6-gentoo.patch b/net-mail/mpack/files/mpack-1.6-gentoo.patch deleted file mode 100644 index faf72eb67e7..00000000000 --- a/net-mail/mpack/files/mpack-1.6-gentoo.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -bur mpack-1.6-orig/unixos.c mpack-1.6/unixos.c ---- mpack-1.6-orig/unixos.c 2007-03-11 02:02:02.000000000 +0100 -+++ mpack-1.6/unixos.c 2007-03-11 02:04:48.000000000 +0100 -@@ -39,7 +39,7 @@ - #endif - - extern int errno; --extern char *malloc(); -+extern void *malloc(); - extern char *getenv(); - - int overwrite_files = 0; -@@ -90,7 +90,7 @@ - strcpy(buf, getenv("TMPDIR")); - } - else { -- strcpy(buf, "/usr/tmp"); -+ strcpy(buf, "/var/tmp"); - } - strcat(buf, "/m-prts-"); - p = getenv("USER"); -diff -bur mpack-1.6-orig/unixpk.c mpack-1.6/unixpk.c ---- mpack-1.6-orig/unixpk.c 2007-03-11 02:02:02.000000000 +0100 -+++ mpack-1.6/unixpk.c 2007-03-11 02:14:02.000000000 +0100 -@@ -167,7 +167,7 @@ - strcpy(fnamebuf, "/usr/tmp"); - } - strcat(fnamebuf, "/mpackXXXXXX"); -- mktemp(fnamebuf); -+ mkstemp(fnamebuf); - outfname = strsave(fnamebuf); - } - -diff -bur mpack-1.6-orig/unixpk.man mpack-1.6/unixpk.man ---- mpack-1.6-orig/unixpk.man 2007-03-11 02:02:02.000000000 +0100 -+++ mpack-1.6/unixpk.man 2007-03-11 02:14:13.000000000 +0100 -@@ -136,7 +136,7 @@ - .SH ENVIRONMENT - .TP - .B TMPDIR --Directory to store temporary files. Default is /usr/tmp. -+Directory to store temporary files. Default is /var/tmp. - .TP - .B SPLITSIZE - Default value of the -m switch. -diff -bur mpack-1.6-orig/unixunpk.man mpack-1.6/unixunpk.man ---- mpack-1.6-orig/unixunpk.man 2007-03-11 02:02:02.000000000 +0100 -+++ mpack-1.6/unixunpk.man 2007-03-11 02:03:14.000000000 +0100 -@@ -107,7 +107,7 @@ - .SH ENVIRONMENT - .TP - .B TMPDIR --Directory to store temporary files. Default is /usr/tmp. -+Directory to store temporary files. Default is /var/tmp. - .SH FILES - .TP - .B $TMPDIR/m-prts-$USER/ -diff -bur mpack-1.6-orig/xmalloc.c mpack-1.6/xmalloc.c ---- mpack-1.6-orig/xmalloc.c 2007-03-11 02:02:02.000000000 +0100 -+++ mpack-1.6/xmalloc.c 2007-03-11 02:04:29.000000000 +0100 -@@ -24,7 +24,7 @@ - */ - #include <stdio.h> - #include <string.h> --extern char *malloc(), *realloc(); -+extern void *malloc(), *realloc(); - - char *xmalloc (int size) - { diff --git a/net-mail/mpack/files/mpack-1.6-munpack.patch b/net-mail/mpack/files/mpack-1.6-munpack.patch deleted file mode 100644 index 9d5c8af6e81..00000000000 --- a/net-mail/mpack/files/mpack-1.6-munpack.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a4ececa89969adfa53c30878b21178e1427cb6c5 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 18 Jan 2012 05:22:25 +0100 -Subject: [PATCH] Fix unpacking of multiple parts - -The problem was reported by Dirk Meyer of FreeBSD. - -He shared these commands to reproduce: -$ ./mpack -s Subject -m 1700 -o zparts md5c.c -$ ./munpack zparts.* ---- - decode.c | 2 +- - unixos.c | 13 +++++++++++++ - 2 files changed, 14 insertions(+), 1 deletions(-) - -diff --git a/decode.c b/decode.c -index 7349abd..e8e8d56 100644 ---- a/decode.c -+++ b/decode.c -@@ -633,7 +633,7 @@ int handlePartial(struct part *inpart, char *headers, params contentParams, int - } - /* Store number of parts in reassembly directory */ - sprintf(buf, "%sCT", dir); -- partfile = os_createnewfile(buf); -+ partfile = os_resetfile(buf); - if (!partfile) { - os_perror(buf); - goto ignore; -diff --git a/unixos.c b/unixos.c -index 0e2f469..1650594 100644 ---- a/unixos.c -+++ b/unixos.c -@@ -146,6 +146,19 @@ FILE *os_createnewfile(char *fname) - return ret; - } - -+FILE *os_resetfile(char *fname) -+{ -+ int fd; -+ FILE *ret; -+ -+ fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600); -+ if (fd == -1) -+ return NULL; -+ -+ ret=fdopen(fd, "w"); -+ return ret; -+} -+ - - /* - * Create a new file, with suggested filename "fname". --- -1.7.8.3 - diff --git a/net-mail/mpack/files/mpack-1.6-paths.patch b/net-mail/mpack/files/mpack-1.6-paths.patch deleted file mode 100644 index 0dc2de8b212..00000000000 --- a/net-mail/mpack/files/mpack-1.6-paths.patch +++ /dev/null @@ -1,95 +0,0 @@ -From b857da37ec211e4472070c9e870aa5a0b827563b Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Thu, 8 Dec 2011 00:09:03 +0100 -Subject: [PATCH] Use /var/tmp rather than /usr/tmp - ---- - README.unix | 2 +- - mkreadme.pl | 2 +- - unixos.c | 2 +- - unixpk.c | 2 +- - unixpk.man | 2 +- - unixunpk.man | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/README.unix b/README.unix -index d7a762c..c26b7c8 100644 ---- a/README.unix -+++ b/README.unix -@@ -188,7 +188,7 @@ The environment variables which control munpack's behavior are: - - TMPDIR - Root of directory to store partial messages awaiting -- reassembly. Default is "/usr/tmp". Partial messages -+ reassembly. Default is "/var/tmp". Partial messages - are stored in subdirectories of $TMPDIR/m-prts-$USER/ - - -diff --git a/mkreadme.pl b/mkreadme.pl -index a45117b..22e4e81 100755 ---- a/mkreadme.pl -+++ b/mkreadme.pl -@@ -413,7 +413,7 @@ The environment variables which control munpack's behavior are: - =unix - TMPDIR - Root of directory to store partial messages awaiting -- reassembly. Default is "/usr/tmp". Partial messages -+ reassembly. Default is "/var/tmp". Partial messages - are stored in subdirectories of $TMPDIR/m-prts-$USER/ - - =pc os2 -diff --git a/unixos.c b/unixos.c -index 2243d12..fa6d0a7 100644 ---- a/unixos.c -+++ b/unixos.c -@@ -87,7 +87,7 @@ char *os_idtodir(char *id) - strcpy(buf, getenv("TMPDIR")); - } - else { -- strcpy(buf, "/usr/tmp"); -+ strcpy(buf, "/var/tmp"); - } - strcat(buf, "/m-prts-"); - p = getenv("USER"); -diff --git a/unixpk.c b/unixpk.c -index 3605dd1..0bae849 100644 ---- a/unixpk.c -+++ b/unixpk.c -@@ -166,7 +166,7 @@ int main(int argc, char **argv) - strcpy(fnamebuf, getenv("TMPDIR")); - } - else { -- strcpy(fnamebuf, "/usr/tmp"); -+ strcpy(fnamebuf, "/var/tmp"); - } - strcat(fnamebuf, "/mpackXXXXXX"); - mktemp(fnamebuf); -diff --git a/unixpk.man b/unixpk.man -index de251ee..c4c9313 100644 ---- a/unixpk.man -+++ b/unixpk.man -@@ -136,7 +136,7 @@ Mail the generated messages to the specified addresses. - .SH ENVIRONMENT - .TP - .B TMPDIR --Directory to store temporary files. Default is /usr/tmp. -+Directory to store temporary files. Default is /var/tmp. - .TP - .B SPLITSIZE - Default value of the -m switch. -diff --git a/unixunpk.man b/unixunpk.man -index da384b1..8c9ab7e 100644 ---- a/unixunpk.man -+++ b/unixunpk.man -@@ -107,7 +107,7 @@ see the section "OPTIONS" above. - .SH ENVIRONMENT - .TP - .B TMPDIR --Directory to store temporary files. Default is /usr/tmp. -+Directory to store temporary files. Default is /var/tmp. - .SH FILES - .TP - .B $TMPDIR/m-prts-$USER/ --- -1.7.8 - diff --git a/net-mail/mpack/files/mpack-1.6-usage.patch b/net-mail/mpack/files/mpack-1.6-usage.patch deleted file mode 100644 index f4f07e530ee..00000000000 --- a/net-mail/mpack/files/mpack-1.6-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 74fd172db4961ab07f134a60cd88955fb170f11d Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 8 Jan 2012 17:39:51 +0100 -Subject: [PATCH 2/2] Mention parameter -t in usage output - ---- - unixunpk.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/unixunpk.c b/unixunpk.c -index 0f5fa85..1320b70 100644 ---- a/unixunpk.c -+++ b/unixunpk.c -@@ -101,7 +101,7 @@ int main(int argc, char **argv) - - void usage(void) { - fprintf(stderr, "munpack version %s\n", MPACK_VERSION); -- fprintf(stderr, "usage: munpack [-f] [-q] [-C directory] [files...]\n"); -+ fprintf(stderr, "usage: munpack [-f] [-q] [-t] [-C directory] [files...]\n"); - exit(1); - } - --- -1.7.8.3 - diff --git a/net-mail/mpack/metadata.xml b/net-mail/mpack/metadata.xml deleted file mode 100644 index 85e4ed814fa..00000000000 --- a/net-mail/mpack/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-mail/mpack/mpack-1.6-r4.ebuild b/net-mail/mpack/mpack-1.6-r4.ebuild deleted file mode 100644 index cdc76aa564c..00000000000 --- a/net-mail/mpack/mpack-1.6-r4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -AT_M4DIR=cmulocal - -inherit autotools - -DESCRIPTION="Command-line MIME encoding and decoding utilities" -HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/" -SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz" - -SLOT="0" -LICENSE="HPND" -KEYWORDS="amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -PATCHES=( "${FILESDIR}"/${P}-filenames.patch - "${FILESDIR}"/${P}-usage.patch - "${FILESDIR}"/${P}-munpack.patch - # NOTE: These three patches replace <mpack-1.6-gentoo.patch> - "${FILESDIR}"/${P}-compile.patch - "${FILESDIR}"/${P}-paths.patch - "${FILESDIR}"/${P}-cve-2011-4919.patch - - "${FILESDIR}"/${P}-clang.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README.* Changes -} diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 9f778db017a..1c72228c0d8 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,2 +1,4 @@ -DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887 -DIST mu-1.7.23.tar.xz 2136016 BLAKE2B 9b0a27fc07072e52c06d8d4b807a77491d314d4c531799a83b1281ce935b79f5eab3510dc94be98ee0effe86c69379331172cfea3db330b8302d03582f7bf364 SHA512 412789146e4962f670c356576906e5eabc5783dd0fc7d04440146f064877f53b4e948713ed557e97b114a96d7a41b3087a8e3c528b48bb363e68fd0eabfe42fc +DIST mu-1.8.5.tar.xz 539368 BLAKE2B 6efc12f82aab2beee86475ee49492ce59cb70e8b4fa63f2099a6071ec3275e7f0f308a868133ab3be4646d2280f720a4f6bb5673563a4437d2135e149b1cdfac SHA512 f43afb9484937077f32a38f347352b1ec8fb74c85be74f3afdd53ff75b965f42ab88daa58433fd9292a10c69ed2f2daf3ddbaf3d8d5d5595b0b29b81629a846f +DIST mu-1.8.6.tar.xz 539684 BLAKE2B ea220a1a6f1fafab54574aa79638232aac4108d32c1e84cb3a1bc910dabbc0dcd1092b18ab62bc5dc57eef4118e023b729d279f9cb84b1fa061d72d60bfa5a91 SHA512 09ac9732e9c18ccdf85b2e2ed64f21f8b87d1484b773ae5ce6edea37f46711ec8709ccceb76f500f8ac02ad5cb54c2bbbc86f75185682ef73bd05a9b467c254c +DIST mu-1.8.7.tar.xz 539664 BLAKE2B 2f0081f350c0d6da4b7920c0380a02aab42eda12062011bd03a46ceb925c179089b794b501df53b4fc84daa38e6e977a3510801685aa7c91c1c0be58c9c78929 SHA512 04c2027acec80c7569f055c8324f947862721aa36b093dba07ac80b9051229a51225e5371af7cd48fae71c9d5148bd3dc2081f591b9f733bccb5650b4853df67 +DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99da253d7ffc87df2e36b5fef6d19dd8831002d040c5d6ed13a53e9df69d18d7c002a05a64fb22fe32f5f5 SHA512 deb48ef7d12d76575f14e5313e9c94a40a04dc916943fa45d4281aa637b6549cbcee3cc0879b9daab51e0409cdfdc619acae12bf2ff3edaeb84fb77c3bee8982 diff --git a/net-mail/mu/files/mu-1.7.12-gcc12.patch b/net-mail/mu/files/mu-1.7.12-gcc12.patch deleted file mode 100644 index f360351e17f..00000000000 --- a/net-mail/mu/files/mu-1.7.12-gcc12.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/djcb/mu/pull/2224 (rebased) -https://bugs.gentoo.org/839918 ---- a/lib/utils/mu-utils.cc -+++ b/lib/utils/mu-utils.cc -@@ -32,6 +32,7 @@ - #include <string.h> - #include <iostream> - #include <algorithm> -+#include <functional> - #include <numeric> - - #include <glib.h> diff --git a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch deleted file mode 100644 index 0f14bf3249e..00000000000 --- a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 41e262b51968359074faac21fa80d2f1237c57cf Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matthew@gentoo.org> -Date: Sat, 2 Apr 2022 10:06:21 +0100 -Subject: [PATCH] build: add emacs option - -Without this option, mu4e will always be installed when Emacs is -installed. ---- - meson.build | 2 +- - meson_options.txt | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 58ac9002..5f71d766 100644 ---- a/meson.build -+++ b/meson.build -@@ -174,7 +174,7 @@ subdir('lib') - subdir('mu') - subdir('man') - --if emacs.found() -+if get_option('emacs').enabled() and emacs.found() - subdir('mu4e') - endif - -diff --git a/meson_options.txt b/meson_options.txt -index 0c70826e..34cb0c02 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -29,3 +29,8 @@ option('readline', - type: 'feature', - value: 'auto', - description: 'enable readline support for the mu4e repl') -+ -+option('emacs', -+ type : 'feature', -+ value: 'disabled', -+ description: 'build mu4e') --- -2.35.1 - diff --git a/net-mail/mu/mu-1.6.10.ebuild b/net-mail/mu/mu-1.6.10.ebuild deleted file mode 100644 index 7900e138420..00000000000 --- a/net-mail/mu/mu-1.6.10.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common - -DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" -HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" -SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 arm arm64 x86 ~x64-macos" -IUSE="emacs guile readline" - -DEPEND=" - dev-libs/glib:2 - dev-libs/gmime:3.0 - >=dev-libs/xapian-1.4:= - emacs? ( >=app-editors/emacs-25.3:* ) - guile? ( >=dev-scheme/guile-2.2:* ) - readline? ( sys-libs/readline:= )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -SITEFILE="70mu-gentoo-autoload.el" - -src_configure() { - local myeconfargs=( - $(use_enable emacs mu4e) - $(use_enable guile) - $(use_enable readline) - --disable-gtk - --disable-webkit - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # On some systems make -n errors out so the default src_test - # implementation does not call the tests. Bug #836782 - emake test -} - -src_install() { - default - find "${ED}" -name '*.la' -type f -delete || die -} - -pkg_preinst() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - elog "After upgrading from an old major version, you should" - elog "rebuild your mail index." - fi -} - -pkg_postinst() { - if use emacs; then - einfo "To use mu4e you need to configure it in your .emacs file" - einfo "See the manual for more information:" - einfo "https://www.djcbsoftware.nl/code/mu/mu4e/" - - elisp-site-regen - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-mail/mu/mu-1.8.5.ebuild b/net-mail/mu/mu-1.8.5.ebuild new file mode 100644 index 00000000000..702126efea4 --- /dev/null +++ b/net-mail/mu/mu-1.8.5.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common meson + +DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" +HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" +SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 arm arm64 x86 ~x64-macos" +IUSE="emacs readline" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gmime:3.0 + >=dev-libs/xapian-1.4:= + emacs? ( >=app-editors/emacs-25.3:* ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig +" + +SITEFILE="70mu-gentoo-autoload.el" + +src_prepare() { + default + + # Don't install NEWS.org into /usr/share/doc. + sed -i '/NEWS.org/,+1 d' meson.build || die + sed -i '/mu4e-about.org/d' mu4e/meson.build || die + + # Don't compress the info file. + sed -i '/gzip/d' build-aux/meson-install-info.sh || die + + # Instead, put it in /usr/share/doc/${PF}. + sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_feature readline) + -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" + # NOTE: Guile interface is deprecated to be removed shortly. + -Dguile=disabled + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Since meson no longer installs NEWS.org, install it with dodoc. + # Also, it must be uncompressed so that it can be viewed with + # mu4e-info. + docompress -x /usr/share/doc/${PF}/NEWS.org + dodoc NEWS.org + + # Same as above. + docompress -x /usr/share/doc/${PF}/mu4e-about.org + dodoc mu4e/mu4e-about.org +} + +pkg_preinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog "After upgrading from an old major version, you should" + elog "rebuild your mail index." + fi +} + +pkg_postinst() { + if use emacs; then + einfo "To use mu4e you need to configure it in your .emacs file" + einfo "See the manual for more information:" + einfo "https://www.djcbsoftware.nl/code/mu/mu4e/" + + elisp-site-regen + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/net-mail/mu/mu-1.7.23.ebuild b/net-mail/mu/mu-1.8.6.ebuild index 39d5cb8ad14..af673005c01 100644 --- a/net-mail/mu/mu-1.7.23.ebuild +++ b/net-mail/mu/mu-1.8.6.ebuild @@ -7,7 +7,7 @@ inherit elisp-common meson DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" -SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz" +SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" @@ -26,11 +26,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch - "${FILESDIR}"/${PN}-1.7.12-gcc12.patch -) - SITEFILE="70mu-gentoo-autoload.el" src_prepare() { @@ -40,14 +35,17 @@ src_prepare() { sed -i '/NEWS.org/,+1 d' meson.build || die sed -i '/mu4e-about.org/d' mu4e/meson.build || die + # Don't compress the info file. + sed -i '/gzip/d' build-aux/meson-install-info.sh || die + # Instead, put it in /usr/share/doc/${PF}. sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die } src_configure() { local emesonargs=( - $(meson_feature emacs) $(meson_feature readline) + -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" # NOTE: Guile interface is deprecated to be removed shortly. -Dguile=disabled ) diff --git a/net-mail/mu/mu-1.8.7.ebuild b/net-mail/mu/mu-1.8.7.ebuild new file mode 100644 index 00000000000..2e8ad733ced --- /dev/null +++ b/net-mail/mu/mu-1.8.7.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common meson + +DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" +HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" +SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" +IUSE="emacs readline" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gmime:3.0 + >=dev-libs/xapian-1.4:= + emacs? ( >=app-editors/emacs-25.3:* ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig +" + +SITEFILE="70mu-gentoo-autoload.el" + +src_prepare() { + default + + # Don't install NEWS.org into /usr/share/doc. + sed -i '/NEWS.org/,+1 d' meson.build || die + sed -i '/mu4e-about.org/d' mu4e/meson.build || die + + # Don't compress the info file. + sed -i '/gzip/d' build-aux/meson-install-info.sh || die + + # Instead, put it in /usr/share/doc/${PF}. + sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_feature readline) + -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" + # NOTE: Guile interface is deprecated to be removed shortly. + -Dguile=disabled + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Since meson no longer installs NEWS.org, install it with dodoc. + # Also, it must be uncompressed so that it can be viewed with + # mu4e-info. + docompress -x /usr/share/doc/${PF}/NEWS.org + dodoc NEWS.org + + # Same as above. + docompress -x /usr/share/doc/${PF}/mu4e-about.org + dodoc mu4e/mu4e-about.org +} + +pkg_preinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog "After upgrading from an old major version, you should" + elog "rebuild your mail index." + fi +} + +pkg_postinst() { + if use emacs; then + einfo "To use mu4e you need to configure it in your .emacs file" + einfo "See the manual for more information:" + einfo "https://www.djcbsoftware.nl/code/mu/mu4e/" + + elisp-site-regen + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/net-mail/mu/mu-1.8.8.ebuild b/net-mail/mu/mu-1.8.8.ebuild new file mode 100644 index 00000000000..2e8ad733ced --- /dev/null +++ b/net-mail/mu/mu-1.8.8.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common meson + +DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" +HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu" +SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" +IUSE="emacs readline" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gmime:3.0 + >=dev-libs/xapian-1.4:= + emacs? ( >=app-editors/emacs-25.3:* ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig +" + +SITEFILE="70mu-gentoo-autoload.el" + +src_prepare() { + default + + # Don't install NEWS.org into /usr/share/doc. + sed -i '/NEWS.org/,+1 d' meson.build || die + sed -i '/mu4e-about.org/d' mu4e/meson.build || die + + # Don't compress the info file. + sed -i '/gzip/d' build-aux/meson-install-info.sh || die + + # Instead, put it in /usr/share/doc/${PF}. + sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_feature readline) + -Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)" + # NOTE: Guile interface is deprecated to be removed shortly. + -Dguile=disabled + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Since meson no longer installs NEWS.org, install it with dodoc. + # Also, it must be uncompressed so that it can be viewed with + # mu4e-info. + docompress -x /usr/share/doc/${PF}/NEWS.org + dodoc NEWS.org + + # Same as above. + docompress -x /usr/share/doc/${PF}/mu4e-about.org + dodoc mu4e/mu4e-about.org +} + +pkg_preinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog "After upgrading from an old major version, you should" + elog "rebuild your mail index." + fi +} + +pkg_postinst() { + if use emacs; then + einfo "To use mu4e you need to configure it in your .emacs file" + einfo "See the manual for more information:" + einfo "https://www.djcbsoftware.nl/code/mu/mu4e/" + + elisp-site-regen + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest index d7d14eaf174..51c32dfc4ba 100644 --- a/net-mail/postfix-logwatch/Manifest +++ b/net-mail/postfix-logwatch/Manifest @@ -1,2 +1,2 @@ -DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341 DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b +DIST postfix-logwatch-1.40.05.tar.xz 79504 BLAKE2B 5d45a43ef2206b77092a90cd463a1718fada286fdd499df4416739aea7246c79b0670503585e7e057174ac715986767e3a72974d9790f33a2cd251221d883687 SHA512 15ba438701be110ce75c59bb6803cbb308bd53876428b01a457f42b3fb12e565c9b0c2d4559d71451475ec4986fccfc9f06854760035b4653c72508b968d5a0d diff --git a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch b/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch deleted file mode 100644 index dd5ae5869eb..00000000000 --- a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7b3930a9d44f91a63f0edbe765c75dc8f6128b7c Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Wed, 26 Dec 2018 12:54:15 -0500 -Subject: [PATCH 1/1] Match postscreen "all server ports busy" lines. - -Lines that look like - - NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy - -were not being matched. There were two similar matches, one for a -specific "too many connections" error - - NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections - -and another for a more general form intended to match "all screening -ports busy" errors from postscreen: - - reject: connect from [192.168.0.1]:21225: all screening ports busy - -The general form is preferable in my opinion, but the "screening -ports" message is a bit of a black sheep. As a result, even the more -general regular expression didn't match the other two errors due to -their beginning with "NOQUEUE" and using an uppercase "CONNECT". - -To fix this, the general regular expression was made even more -general. Now, a leading "NOQUEUE: " is optional, and the "CONNECT" can -be capitalized. Thus, one regular expression now catches all three -messages. ---- - postfix-logwatch | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/postfix-logwatch b/postfix-logwatch -index 827dfe0..648ba7a 100644 ---- a/postfix-logwatch -+++ b/postfix-logwatch -@@ -4399,14 +4399,11 @@ sub postfix_postscreen { - } - } - -- elsif ($line =~ /^NOQUEUE: reject: CONNECT from \[([^]]+)\](?::\d+)?: too many connections/) { -- # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections -- $Counts{'postscreen'}{'reject'}{'Too many connections'}{$1}{$END_KEY}++ if $Collecting{'postscreen'}; -- } -- -- elsif ($line =~ /^reject: connect from \[([^]]+)\](?::\d+)?: (.+)$/) { -- # reject: connect from [192.168.0.1]:21225: all screening ports busy -- $Counts{'postscreen'}{'reject'}{"\u$2"}{$1}{$END_KEY}++ if $Collecting{'postscreen'}; -+ elsif ($line =~ /^(NOQUEUE: )?reject: (connect|CONNECT) from \[([^]]+)\](?::\d+)?: (.+)$/) { -+ # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections -+ # NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy -+ # reject: connect from [192.168.0.1]:21225: all screening ports busy -+ $Counts{'postscreen'}{'reject'}{"\u$4"}{$3}{$END_KEY}++ if $Collecting{'postscreen'}; - } - - elsif ($line =~ /^(?:WHITELIST VETO) \[([^]]+)\](?::\d+)?$/) { --- -2.19.2 - diff --git a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch deleted file mode 100644 index 4c743a21c17..00000000000 --- a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 891b5ce1780e10cd94d230efacf6e8b5cb33a931 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Wed, 15 Apr 2020 08:04:02 -0400 -Subject: [PATCH 1/1] Ignore postscreen "BDAT/DATA without valid RCPT" lines. - -Postscreen now emits a notice when clients send BDAT or DATA -prematurely (after postscreen rejects the recipient): - - DATA without valid RCPT from [192.168.0.1]:48580 - -These are merely informational, since the connection was rejected for -some other reason, so this commit ignores them. ---- - postfix-logwatch | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/postfix-logwatch b/postfix-logwatch -index 648ba7a..1b89ad6 100644 ---- a/postfix-logwatch -+++ b/postfix-logwatch -@@ -4359,7 +4359,8 @@ sub postfix_postscreen { - $line =~ /discarding EHLO keywords: / or - $line =~ /: discard_mask / or - $line =~ /: sq=\d+ cq=\d+ event/ or -- $line =~ /: replacing command "/ -+ $line =~ /: replacing command "/ or -+ $line =~ /^(DATA|BDAT) without valid RCPT/ - ); - - --- -2.24.1 - diff --git a/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch b/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch deleted file mode 100644 index f07ab22813c..00000000000 --- a/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ced6e6fcbf1a025419e8ee9f940e5022ed440532 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Tue, 5 Sep 2017 09:19:44 -0400 -Subject: [PATCH 1/1] Allow multi-digit numbers in enhanced SMTP status codes. - -The re_DSN regular expression is intended to match a response like -"550 1.2.3", where "1.2.3" is an enhanced status code. However, the -regular expression was only expecting single-digit numbers between the -dots; thus it was missing codes like "550 5.7.23". The expression has -been updated to accept any number of digits between the dots. - -This fixes unmatched rejection lines that begin with, - - 550 5.7.23 <user@example.com>: Recipient address rejected... - -Such lines appear with newer versions of the python SPF policy daemon. ---- - postfix-logwatch | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/postfix-logwatch b/postfix-logwatch -index 92ed621..827dfe0 100644 ---- a/postfix-logwatch -+++ b/postfix-logwatch -@@ -66,7 +66,9 @@ my $re_QID_s = qr/[A-Z\d]+/; - my $re_QID_l = qr/(?:NOQUEUE|[bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ\d]+)/; - our $re_QID; - --our $re_DSN = qr/(?:(?:\d{3})?(?: ?\d\.\d\.\d)?)/; -+# The enhanced status codes can contain two-digit (or more) numbers; -+# for example, "550 5.7.23". -+our $re_DSN = qr/(?:(?:\d{3})?(?: ?\d+\.\d+\.\d+)?)/; - our $re_DDD = qr/(?:(?:conn_use=\d+ )?delay=-?[\d.]+(?:, delays=[\d\/.]+)?(?:, dsn=[\d.]+)?)/; - - #MODULE: ../Logreporters/Utils.pm --- -2.13.0 - diff --git a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch b/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch deleted file mode 100644 index ee0e79bd41d..00000000000 --- a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6afb8e258a5a2a0e7c72c4c25927dde9d1e2ad89 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 24 Aug 2017 07:34:36 -0400 -Subject: [PATCH 2/2] Fix redundant argument to sprintf warning. - -Perl 5.22 now warns about redundant (i.e. extra) arguments to the -sprintf function. If your format string only has two place-holders but -you pass three place-fillers, you get warned: - - Redundant argument in sprintf at ./postfix-logwatch line 1382... - -The issue there was that the format string passed to sprintf was -constructed dynamically; sometimes it would contain two place-holders, -and sometimes three. Three place-fillers were always passed, so when -only two place-holders were used, the warning would be thrown. This was -fixed by testing whether or not there are two or three place-holders, -and passing the appropriate number of place-fillers. ---- - postfix-logwatch | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/postfix-logwatch b/postfix-logwatch -index 1e58a95..92ed621 100644 ---- a/postfix-logwatch -+++ b/postfix-logwatch -@@ -1378,8 +1378,17 @@ sub print_summary_report (\@) { - $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor; - } - else { -- push @{$lines[$cur_level]}, -- sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname}); -+ my $new_line; -+ if ($extra eq '') { -+ $new_line = sprintf("$fmt %-23s \n", $total, $desc); -+ } -+ else { -+ $new_line = sprintf("$fmt %-23s $extra\n", -+ $total, -+ $desc, -+ commify ($Totals{$keyname})); -+ } -+ push @{$lines[$cur_level]}, $new_line - } - } - } --- -2.13.0 - diff --git a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch b/net-mail/postfix-logwatch/files/unescaped-left-brace.patch deleted file mode 100644 index 65139a3aff1..00000000000 --- a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 84f9fb47783e63757f27e5990ee606ff01e079a9 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 24 Aug 2017 07:09:28 -0400 -Subject: [PATCH 1/2] Fix unescaped left brace warning for "Config: {". - -New versions of Perl are starting to complain about unescaped braces -in regular expressions, and supposedly the warning will become a fatal -error in Perl 5.30. This particular warning is, - - Unescaped left brace in regex is deprecated, passed through in regex; - marked by <-- HERE in m/^Config: { <-- HERE / at ./postfix-logwatch - line 1850. - -and it was fixed by going to line 1850 and putting a backslash before -the left brace. - -Bug: https://sourceforge.net/p/logreporters/bugs/4/ ---- - postfix-logwatch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/postfix-logwatch b/postfix-logwatch -index 3e4a673..1e58a95 100644 ---- a/postfix-logwatch -+++ b/postfix-logwatch -@@ -1847,7 +1847,7 @@ sub postfix_policy_spf($) { - # KeyboardInterrupt - $line =~ /^Read line: "/ or - $line =~ /^Found the end of entry$/ or -- $line =~ /^Config: {/ or -+ $line =~ /^Config: \{/ or - $line =~ /^spfcheck: pyspf result/ or - $line =~ /^Starting$/ or - $line =~ /^Normal exit$/ or --- -2.13.0 - diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild index bab89768c04..43edbac6465 100644 --- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild +++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="dev-lang/perl" diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild index 9bf2ef83569..dc661eb713a 100644 --- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild +++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild @@ -1,26 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="A log analyzer for postfix" -HOMEPAGE="http://logreporters.sourceforge.net/" -SRC_URI="mirror://sourceforge/logreporters/${P}.tgz" +HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml" +SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RDEPEND="dev-lang/perl" -PATCHES=( - "${FILESDIR}/unescaped-left-brace.patch" - "${FILESDIR}/redundant-argument-to-sprintf.patch" - "${FILESDIR}/multi-digit-enhanced-status.patch" - "${FILESDIR}/all-server-ports-busy-lines.patch" - "${FILESDIR}/data-without-valid-rcpt.patch" -) - src_prepare() { default # Replace the default config file location with ours. @@ -30,12 +22,6 @@ src_prepare() { || die 'failed to update the default config location' } -src_compile() { - # The default make target just outputs instructions. We don't want - # the user to see these, so we avoid the default emake. - : -} - src_install() { dodoc Bugs Changes README ${PN}.conf-topn doman ${PN}.1 diff --git a/net-mail/postorius/Manifest b/net-mail/postorius/Manifest deleted file mode 100644 index 71f92d61e3d..00000000000 --- a/net-mail/postorius/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST postorius-1.3.5.tar.gz 2775722 BLAKE2B 85f3408b7205ce4f89c36906280ff7ccecca0752ae611f4631e16d43972d0b52321be0f533fdabe6bf7d503120ab7a3794ef25f64a72369dec782b60347e33bb SHA512 f5f90ade87ae028fe665918b0aef69ac6c79f8d45ee4d105825ed9113661f084f3a82db9ac6ee850fa0feb5fd5afe7b66e49040d22c2e0599a95c3aa8ad56a31 diff --git a/net-mail/postorius/metadata.xml b/net-mail/postorius/metadata.xml deleted file mode 100644 index 17b555894f9..00000000000 --- a/net-mail/postorius/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">postorius</remote-id> - <remote-id type="gitlab">mailman/postorius</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-mail/postorius/postorius-1.3.5.ebuild b/net-mail/postorius/postorius-1.3.5.ebuild deleted file mode 100644 index 18b4965e46d..00000000000 --- a/net-mail/postorius/postorius-1.3.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit distutils-r1 - -DESCRIPTION="A web user interface for GNU Mailman 3" -HOMEPAGE="https://www.list.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/django[${PYTHON_USEDEP}] - dev-python/readme_renderer[${PYTHON_USEDEP}] - net-mail/django-mailman3[${PYTHON_USEDEP}] - net-mail/mailmanclient[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/vcrpy[${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/pytest-django[${PYTHON_USEDEP}] - dev-python/isort[${PYTHON_USEDEP}] - net-mail/mailman[${PYTHON_USEDEP}] - ) -" - -DOCS=( README.rst ) - -distutils_enable_tests pytest - -src_prepare() { - sed -e 's/test_list_info/_&/' -i src/postorius/tests/mailman_api_tests/test_list_summary.py || die - distutils-r1_src_prepare -} - -python_test() { - local -x PYTHONPATH="${S}/src" - cd example_project || die - epytest ../src -} diff --git a/net-mail/public-inbox/Manifest b/net-mail/public-inbox/Manifest index 7bd7af9913a..3d256ef2a4f 100644 --- a/net-mail/public-inbox/Manifest +++ b/net-mail/public-inbox/Manifest @@ -1 +1,2 @@ DIST public-inbox-1.7.0.tar.gz 805628 BLAKE2B 4403cd11a2c4f793b136aff07ccc06ea60011c21484196e497921ca36599870eecdf7b93f550ef44e876bca814a3b03e1d8d4b484113506ee809098124cfd1b2 SHA512 cb03d2ec3e28f1fc75bdbff2b8ea5b417898ddb2895d27b105624cab35f0dcab99269d86bfc158bdf42faecb7b7a5734363a81d2202970e8d079bf05fa359250 +DIST public-inbox-1.8.0.tar.gz 808979 BLAKE2B 1b68121429f9d9b56008951c0fef8eca4082a71969c907d0e2ba1db434774a451e4080e88c7d0fe80960dba906e0981e19bfcacd63042acfe3c6e16f36aba675 SHA512 878c60d6e6bfdcac3218d71b8aa5cab766c622ff1a81c8ebb04399a48da7ef1ab86cae67f8f05e8486f92451f90b9c068ab67ba35dfb74179163598fb5860229 diff --git a/net-mail/public-inbox/public-inbox-1.8.0.ebuild b/net-mail/public-inbox/public-inbox-1.8.0.ebuild new file mode 100644 index 00000000000..6d7bfd810fc --- /dev/null +++ b/net-mail/public-inbox/public-inbox-1.8.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-module + +HOMEPAGE="https://public-inbox.org" +SRC_URI="https://public-inbox.org/public-inbox.git/snapshot/${P}.tar.gz" +DESCRIPTION="An archives-first approach to mailing lists" +LICENSE="AGPL-3+" + +SLOT="0" + +KEYWORDS="~amd64" + +# in order of mention in INSTALL.html, going more for feature completeness +# than for minimal footprint +RDEPEND=" + dev-vcs/git + dev-perl/DBD-SQLite + virtual/mta + dev-perl/URI + dev-perl/Plack + dev-perl/TimeDate + dev-perl/Inline-C + dev-perl/Email-Address-XS + dev-perl/Search-Xapian + dev-perl/Parse-RecDescent + dev-perl/Mail-IMAPClient + dev-perl/BSD-Resource + net-misc/curl + dev-perl/Linux-Inotify2 + dev-perl/Net-Server +" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" diff --git a/net-mail/qprint/metadata.xml b/net-mail/qprint/metadata.xml index 0cfab183010..9ca7a1bd593 100644 --- a/net-mail/qprint/metadata.xml +++ b/net-mail/qprint/metadata.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription> + <!-- maintainer-needed --> + <longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription> </pkgmetadata> diff --git a/net-mail/qprint/qprint-1.1.ebuild b/net-mail/qprint/qprint-1.1-r1.ebuild index abe9228eea6..bf12e9111a4 100644 --- a/net-mail/qprint/qprint-1.1.ebuild +++ b/net-mail/qprint/qprint-1.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="MIME quoted-printable data encoding and decoding utility" HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/" @@ -10,7 +10,6 @@ SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz" LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ppc x86 ~ppc-macos" -IUSE="" src_install() { dodir /usr/bin diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild index dcad85db8ec..523f7eff7e3 100644 --- a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild +++ b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit python-single-r1 diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild index 9a9a53077df..4810f8c70cd 100644 --- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild +++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,6 +34,9 @@ src_configure() { local myCC="$(tc-getCC)" echo "${myCC} ${CFLAGS}" > conf-cc || die echo "${myCC} ${LDFLAGS}" > conf-ld || die + sed -i \ + -e "s:'ar :'$(tc-getAR) :" \ + -e "s:'ranlib :'$(tc-getRANLIB) :" Makefile || die } src_install() { @@ -52,9 +55,9 @@ src_install() { # tell it our storage dir echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \ - > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die + > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die # default to 30 minutes - echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die + echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die dodir /etc/cron.hourly echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \ diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild index 9e71696f848..a53cf4be26c 100644 --- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild +++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,6 +35,9 @@ src_configure() { local myCC="$(tc-getCC)" echo "${myCC} ${CFLAGS}" > conf-cc || die echo "${myCC} ${LDFLAGS}" > conf-ld || die + sed -i \ + -e "s:'ar :'$(tc-getAR) :" \ + -e "s:'ranlib :'$(tc-getRANLIB) :" Makefile || die } src_install() { @@ -54,12 +57,12 @@ src_install() { # tell it our storage dir echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \ - > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die + > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die # default to 30 minutes - echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die + echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die dodir /etc/cron.hourly - echo "#!/bin/sh" > ${D}/etc/cron.hourly/relay-ctrl-age + echo "#!/bin/sh" > "${D}"/etc/cron.hourly/relay-ctrl-age echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \ >> "${D}"/etc/cron.hourly/relay-ctrl-age fperms 755 /etc/cron.hourly/relay-ctrl-age diff --git a/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild index 2c858db5f65..7c10bdf9bb3 100644 --- a/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild +++ b/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,9 @@ src_configure() { local myCC="$(tc-getCC)" echo "${myCC} ${CFLAGS}" > conf-cc || die echo "${myCC} ${LDFLAGS}" > conf-ld || die + sed -i \ + -e "s:'ar :'$(tc-getAR) :" \ + -e "s:'ranlib :'$(tc-getRANLIB) :" Makefile || die } src_install() { @@ -55,12 +58,12 @@ src_install() { # tell it our storage dir echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \ - > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die + > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die # default to 30 minutes - echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die + echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die dodir /etc/cron.hourly - echo "#!/bin/sh" > ${D}/etc/cron.hourly/relay-ctrl-age + echo "#!/bin/sh" > "${D}"/etc/cron.hourly/relay-ctrl-age echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \ >> "${D}"/etc/cron.hourly/relay-ctrl-age fperms 755 /etc/cron.hourly/relay-ctrl-age diff --git a/net-mail/swaks/swaks-20201014.0.ebuild b/net-mail/swaks/swaks-20201014.0.ebuild index 775eba5c923..488f56a7a9e 100644 --- a/net-mail/swaks/swaks-20201014.0.ebuild +++ b/net-mail/swaks/swaks-20201014.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit optfeature perl-functions +inherit optfeature DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH" HOMEPAGE="https://www.jetmore.org/john/code/swaks/ diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest index 130fa7b1c34..2ee1c6d6f98 100644 --- a/net-mail/ytnef/Manifest +++ b/net-mail/ytnef/Manifest @@ -1,2 +1 @@ -DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543 DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6 diff --git a/net-mail/ytnef/metadata.xml b/net-mail/ytnef/metadata.xml index 95c76211f82..b90a43458ee 100644 --- a/net-mail/ytnef/metadata.xml +++ b/net-mail/ytnef/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> <upstream> <remote-id type="github">Yeraze/ytnef</remote-id> diff --git a/net-mail/ytnef/ytnef-1.9.3.ebuild b/net-mail/ytnef/ytnef-1.9.3.ebuild deleted file mode 100644 index 232bf9cb8f1..00000000000 --- a/net-mail/ytnef/ytnef-1.9.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Yeraze's TNEF Stream Reader - for winmail.dat files" -HOMEPAGE="https://github.com/Yeraze/ytnef" -SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -IUSE="static-libs" - -DEPEND="sys-devel/libtool" -RDEPEND="dev-perl/MIME-tools" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name "*.la" -delete || die -} diff --git a/net-mail/ytnef/ytnef-2.0.ebuild b/net-mail/ytnef/ytnef-2.0.ebuild index 102dea01756..f5e3f0bbd2d 100644 --- a/net-mail/ytnef/ytnef-2.0.ebuild +++ b/net-mail/ytnef/ytnef-2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,6 +10,7 @@ HOMEPAGE="https://github.com/Yeraze/ytnef" SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" +QA_PKGCONFIG_VERSION="${PV}.0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" IUSE="static-libs" |