From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- mail-filter/spamassassin/Manifest | 12 +- .../files/spamassassin-3.4.2-bug_7623_p1.patch | 13 - .../files/spamassassin-3.4.2-bug_7623_p2.patch | 15 -- .../files/spamassassin-3.4.2-bug_7631.patch | 61 ----- .../files/spamassassin-3.4.2-bug_7632.patch | 20 -- .../files/update-spamassassin-rules.cron | 38 --- .../spamassassin/spamassassin-3.4.2-r2.ebuild | 247 ------------------ .../spamassassin/spamassassin-3.4.2-r6.ebuild | 287 --------------------- mail-filter/spamassassin/spamassassin-3.4.3.ebuild | 284 -------------------- mail-filter/spamassassin/spamassassin-3.4.4.ebuild | 2 +- 10 files changed, 2 insertions(+), 977 deletions(-) delete mode 100644 mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch delete mode 100644 mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch delete mode 100644 mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch delete mode 100644 mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch delete mode 100644 mail-filter/spamassassin/files/update-spamassassin-rules.cron delete mode 100644 mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild delete mode 100644 mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild delete mode 100644 mail-filter/spamassassin/spamassassin-3.4.3.ebuild (limited to 'mail-filter/spamassassin') diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 960793614a0f..367ffa1b849e 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,19 +1,9 @@ AUX 3.4.1-spamd.conf-r1 1257 BLAKE2B bbdeeda731965dcd863c2a9bc615295b7d48e0110994dac66bfccb4ee1d84c9c50e6c2fd6649b09b7206e16120ed7e55b387ba76afdf0fe7e629bc767d87a80c SHA512 b2233d9330fa06d13dc8d222fa16198a1f81dcb9c87ca93961db54d9f2514cdabd824d0f25c0cca678495f271f48f601ee14363c2a2f833100facae307226beb AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a72a933b3819f35dfe9f9085f13f73be95b1169e04d3a09bc4cec6284e87963059ac047d5908df3458fb2b SHA512 2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02 AUX secrets.cf 664 BLAKE2B a501fb93369743e3c9139cc780f166168313613c840857bc0e72def5b3e168f235afc16a1dc34afa0e839ffa9da6c0c360c9a93a126d9dd711b4473e0a19ebcc SHA512 bb6992098a44e16147be46b75b70e3fb81672285dd71a30719606e2cab556720fc9dd318c7a80832ceaf2e6d9c98c2dd7434f48242feede1922c3e1073559edb -AUX spamassassin-3.4.2-bug_7623_p1.patch 599 BLAKE2B 620cd321761d0c87aa4e064b4576f2e1909c3cc9835861e351f35997f0fc0543ecbb0d8509ab5d61ff4901a5ec0f3068d7089dec8800dfa6d25e54be4b81bc9e SHA512 4bf3d4fcfe50ee5a4c1b7357bc6f014cfe46c419a30a5c3ebe26415b700260f5f82f89ce39044b32f799c7b8614a5baaf5db54de5599e14fcc64e45c5c75d2a8 -AUX spamassassin-3.4.2-bug_7623_p2.patch 742 BLAKE2B c3011fc1edd2b399b4cc9a4cfb518b197aa96ee0e58a6605934a88aa5e56c669791d591db365673ecf820e943e6728abab9734492f6fb3abb6cff194786c6fe9 SHA512 b17df1f5b332895976ab00553d6b1c85b8576fb688f20fd3485531ab897263e31d4adcb47afa5f1f2bf5b7aca91d70de6097bac740ddd8c56b2b0d6777c3d0f4 -AUX spamassassin-3.4.2-bug_7631.patch 2022 BLAKE2B 33b67b585fdb2ce82b6e64856463714e014f8e6ae69671a70f0a8c0952450c888e9e42cd4cebe0d57cf6552d30ae50214757c0192f61601294b4e11c39537832 SHA512 f23c7f9d821ef9d24f716f56016ce3bb1b29fabd177ad7ce3f8b6728601fcfb22d2c8aad82f36b978f3343bc18a514e1e85ce7c5b207ffd732c2921cf4909353 -AUX spamassassin-3.4.2-bug_7632.patch 673 BLAKE2B a819b0817efb745f1dc9d971fa476d9da355b72df41ffc58a7a505a5a2c1588ecee3e1dbe79c3a0d03ba04a6fc2e63bc018b49240da1417bb2a967925ed85e84 SHA512 adf9f78a60a95d16cf918e048c178986ec5543fb80a350d9419800b2bcc8fbcc8669967b77d9a85dfce7b67528fe9d816f5ca9a435444197f9ac1aa83d92fec3 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe -AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5 -DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885 -DIST Mail-SpamAssassin-3.4.3.tar.bz2 2739618 BLAKE2B cd77fc99cbec17f10c04f211e773fe2df9dd9c2efb54c9cc169f1fbfed884e74b77c96d8eee333af4bcefb05dee4519408b2e53e0c519734d582f95bad6030d6 SHA512 4d50b30a42d318c3a4c868b4940d1f56c329cc501270df12e1a369dd7de670c30f328a5fbc37dbd3b0d06538b9500085e920939c62de80ad6d8740bc47162cb0 DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f -EBUILD spamassassin-3.4.2-r2.ebuild 7630 BLAKE2B 709d3a9791377bbfefd971b8ddbe34b4c17a74444ebf28ed92db795239b05537db81cd58b02aa7f7a2deb284955d2368eaca1ee02cd4cdda4b83334e66afb5ce SHA512 b897fd165baffde6bebc6b17865c7f1df394bcb4523e60f95c4b6b1477ad7ed10f69e3b0812cea9f2851b6adadc1dc7a2c55f9c3ad96a2bb344e51aa35daf102 -EBUILD spamassassin-3.4.2-r6.ebuild 8712 BLAKE2B 9b427dcec7df513b30a06466f35e4f1c423766e441e0c52fd73058ddbedc6613b144334117a15c167b4a0775ca1f58dd18681f62d5820fef00f4dc336ec3f794 SHA512 63177d560a6d25782978a9ac0134641f58b0fd9d26a2697f719afac44f44e70bc8662b92b2534698f0b8e1a81b7f39ed3f86046263f803e9958c56d8a4a248c1 -EBUILD spamassassin-3.4.3.ebuild 8504 BLAKE2B 7bce952a83a094ad9749637fcf2d5f2b9838b4da66a5f8c73d7a1676d46d3cbe8bdb71f847ef7746a497fda1a916aed30a0b89d2be554105bb0d3b3cae27756e SHA512 129c4056efb704db05bcd43a8790e1e9e830e6be7cad392b50e8419602aaf73a7bffec8c430914837e592ddcfa4e5b4cd6d6c1ded064c9376289b3319b05a108 -EBUILD spamassassin-3.4.4.ebuild 8503 BLAKE2B 565a07f4276cbecc51356b2e502381802a5810c8b1db92c7f801d0d8bd31098e33966c47739d90972a9c65cdf7c03986f883b29bf3b122c155ce0d5913a1538c SHA512 f4052269362234cd002895e70fa1347d04288fef9fab774e0822a3b1fc8f9db9e3e0d849398acadb7bc529cd9f06d99c36d195a1ebdac817e8bf1790875cfde3 +EBUILD spamassassin-3.4.4.ebuild 8499 BLAKE2B 592546b060b152316a579e6f6d201590d4081c7eb1bea2ba8957f954fbda514051f14fc51bba7ffa2a6359a4551d806634b0219daba7ce98356b080192b20027 SHA512 ac9c0eb2934a33df010046706267ad58c4e12a3c8c07d6d43e51aa013f9c8031ccf9160e82f6bde5fef895430dec22016eb61daa8ce2c149ad426e3d3e6bc9e3 MISC metadata.xml 693 BLAKE2B 57b8a079ed95858b27fb567e1c3b77389e8141315fcf69e34e2b80dab13e5b0f88c9f50f2387f7537cedd5a3cd56adcb611932a641e31a7f875914bb847708d3 SHA512 991a54ec305b6b4c4e9fd27ba77abf2ad7e72647776e0acc0e29a058566d0045e31df8ceebee6e320f758f10fb12973239d1650e469e910ac77a887656fcff3e diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch deleted file mode 100644 index d0fe21bf9ef9..000000000000 --- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch +++ /dev/null @@ -1,13 +0,0 @@ -Bug: https://bugs.gentoo.org/677250 -Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623 - ---- a/sa-update.raw 2018/09/29 09:33:52 1842302 -+++ b/sa-update.raw 2018/09/29 09:41:24 1842303 -@@ -1659,6 +1659,7 @@ - my($a_rr, $aaaa_rr); - # RFC 3986: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) - $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si; # strip scheme like http:// -+ $mirror =~ s{[:/].*}{}s; # strip all starting from :port or /path - return 1 if $have_inet4 && do_dns_query($mirror, "A"); - return 1 if $have_inet6 && do_dns_query($mirror, "AAAA"); - return 0; diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch deleted file mode 100644 index 26d921a6e676..000000000000 --- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Bug: https://bugs.gentoo.org/677250 -Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623 - ---- a/sa-update.raw 2018/09/29 10:16:29 1842320 -+++ b/sa-update.raw 2018/09/29 10:20:26 1842321 -@@ -1659,6 +1659,9 @@ - my($a_rr, $aaaa_rr); - # RFC 3986: scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) - $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si; # strip scheme like http:// -+ # No DNS check needed for IPv4 or IPv6 address literal -+ return 1 if $mirror =~ m{^\d+\.\d+\.\d+\.\d+(?:[:/]|$)}; -+ return 1 if $mirror =~ m{^\[}; - $mirror =~ s{[:/].*}{}s; # strip all starting from :port or /path - return 1 if $have_inet4 && do_dns_query($mirror, "A"); - return 1 if $have_inet6 && do_dns_query($mirror, "AAAA"); diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch deleted file mode 100644 index 3c4bf403dc2c..000000000000 --- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch +++ /dev/null @@ -1,61 +0,0 @@ -This upstream doc changes addresses 3.4.2 adding new rows to awl SQL -tables. - -Upstream's UPGRADE diff is slightly different. Their version is -applied to the 3.4.3 release notes (not yet released), ours applies -to 3.4.2. - -Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7631 -Bug: https://bugs.gentoo.org/666576 - ---- a/UPGRADE 2018-10-28 15:43:45.744850026 -0400 -+++ b/UPGRADE 2018-10-28 15:47:52.805028626 -0400 -@@ -8,6 +8,13 @@ - - See https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7614 - -+- Added last_hit timestamp to Awl SQL schema. -+ You should upgrade your sql database running the following command: -+ MySQL: -+ "ALTER TABLE `awl` ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;" -+ PostgreSQL: -+ "ALTER TABLE awl ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP;" -+ - New plugins - ----------- - ---- a/sql/awl_mysql.sql 2018/10/21 12:10:09 1844484 -+++ b/sql/awl_mysql.sql 2018/10/21 12:10:40 1844485 -@@ -5,5 +5,6 @@ - msgcount int(11) NOT NULL default '0', - totscore float NOT NULL default '0', - signedby varchar(255) NOT NULL default '', -+ last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (username,email,signedby,ip) - ) ENGINE=InnoDB; ---- a/sql/awl_pg.sql 2018/10/21 12:10:09 1844484 -+++ b/sql/awl_pg.sql 2018/10/21 12:10:40 1844485 -@@ -5,8 +5,22 @@ - msgcount bigint NOT NULL default '0', - totscore float NOT NULL default '0', - signedby varchar(255) NOT NULL default '', -+ last_hit timestamp NOT NULL default CURRENT_TIMESTAMP, - PRIMARY KEY (username,email,signedby,ip) - ); - --ALTER TABLE awl SET (fillfactor=95); -+create index awl_last_hit on awl (last_hit); -+ -+create OR REPLACE function update_awl_last_hit() -+RETURNS TRIGGER AS $$ -+BEGIN -+ NEW.last_hit = CURRENT_TIMESTAMP; -+ RETURN NEW; -+END; -+$$ language 'plpgsql'; - -+create TRIGGER update_awl_update_last_hit BEFORE UPDATE -+ON awl FOR EACH ROW EXECUTE PROCEDURE -+update_awl_last_hit(); -+ -+ALTER TABLE awl SET (fillfactor=95); diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch deleted file mode 100644 index a9a065abd817..000000000000 --- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch +++ /dev/null @@ -1,20 +0,0 @@ -This upstream fix changes the informational message, - - dns: new_dns_packet: domain is utf8 flagged... - -to a debug one. This should prevent it from being spammed in your logs -a million times a day. - -Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7632 - ---- a/lib/Mail/SpamAssassin/DnsResolver.pm 2018/10/12 06:14:11 1843622 -+++ b/lib/Mail/SpamAssassin/DnsResolver.pm 2018/10/12 06:38:56 1843623 -@@ -547,7 +547,7 @@ - eval { - - if (utf8::is_utf8($domain)) { # since Perl 5.8.1 -- info("dns: new_dns_packet: domain is utf8 flagged: %s", $domain); -+ dbg("dns: new_dns_packet: domain is utf8 flagged: %s", $domain); - } - - $domain =~ s/\.*\z/./s; diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules.cron b/mail-filter/spamassassin/files/update-spamassassin-rules.cron deleted file mode 100644 index 1b36af0548db..000000000000 --- a/mail-filter/spamassassin/files/update-spamassassin-rules.cron +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# Update SpamAssassin rules and reload daemons that use them. -# - -# First, redirect stdout to /dev/null. -exec 1>/dev/null - -# Try to update the rules. -sa-update - -# Exit code 0: all new updates were installed. -# Exit code 1: we were already up-to-date. -# Exit code 3: some updates were installed, but some weren't. -# Any other exit code indicates failure. -if (( $? == 0 || $? == 3 )); then - # Compilation spits out its progress onto stderr. - sa-compile 2>/dev/null - - # Do you run spamd or amavisd? Both daemons need to be reloaded - # in order to pick up the newly-updated rules. - if command -v rc-service 2>/dev/null; then - # OpenRC is installed. These "status" checks should succeed - # only when the daemon is running under OpenRC. We redirect - # stderr to hide the lecture that OpenRC gives you if you - # try this on a system running systemd. - rc-service spamd status 2>/dev/null && rc-service spamd reload - rc-service amavisd status 2>/dev/null && rc-service amavisd reload - fi - - if command -v systemctl 2>/dev/null; then - # The systemctl (systemd) executable is installed, so try to - # use it to restart spamd and amavisd. These are safe to run - # if systemd is installed but not in use. - systemctl try-restart spamassassin - systemctl try-restart amavisd - fi -fi diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild deleted file mode 100644 index a68f39a6a865..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-functions systemd toolchain-funcs user - -MY_P="Mail-SpamAssassin-${PV//_/-}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="An extensible mail filter which can identify and tag spam" -HOMEPAGE="https://spamassassin.apache.org/" -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" -RESTRICT="!test? ( test )" - -# The Makefile.PL script checks for dependencies, but only fails if a -# required (i.e. not optional) dependency is missing. We therefore -# require most of the optional modules only at runtime. -REQDEPEND="dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Archive-Tar - virtual/perl-Digest-SHA - virtual/perl-IO-Zlib - virtual/perl-Time-HiRes - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" - -# SpamAssassin doesn't use libwww-perl except as a fallback for when -# curl/wget are missing, so we depend on one of those instead. Some -# mirrors use https, so we need those utilities to support SSL. -# -# re2c is needed to compile the rules (sa-compile). -# -# We still need the old Digest-SHA1 because razor2 has not been ported -# to Digest-SHA. -OPTDEPEND="app-crypt/gnupg - dev-perl/Digest-SHA1 - dev-perl/Encode-Detect - dev-perl/Geo-IP - dev-perl/HTTP-Date - dev-perl/Mail-DKIM - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-CIDR-Lite - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - virtual/perl-Pod-Parser - berkdb? ( virtual/perl-DB_File ) - ipv6? ( dev-perl/IO-Socket-INET6 ) - ldap? ( dev-perl/perl-ldap ) - mysql? ( - dev-perl/DBI - dev-perl/DBD-mysql - ) - postgres? ( - dev-perl/DBI - dev-perl/DBD-Pg - ) - sqlite? ( - dev-perl/DBI - dev-perl/DBD-SQLite - ) - ssl? ( dev-perl/IO-Socket-SSL )" - -DEPEND="${REQDEPEND} - test? ( - ${OPTDEPEND} - virtual/perl-Test-Harness - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" - -PATCHES=( "${FILESDIR}/spamassassin-3.4.2-bug_7632.patch" ) - -src_prepare() { - default - - # The sa_compile test does some weird stuff like hopping around in - # the directory tree and calling "make" to create a dist tarball - # from ${S}. It fails, and is more trouble than it's worth... - perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test' - - # The spamc tests (which need the networked spamd daemon) fail for - # irrelevant reasons. It's too hard to disable them (unlike the - # spamd tests themselves -- see src_test), so use a crude - # workaround. - perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests' - - # Upstream bug 7622: this thing needs network access but doesn't - # respect the 'run_net_tests' setting. - perl_rm_files t/urilocalbl_geoip.t \ - || die 'failed to remove urilocalbl_geoip tests' -} - -src_configure() { - # This is how and where the perl-module eclass disables the - # MakeMaker interactive prompt. - export PERL_MM_USE_DEFAULT=1 - - # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again - # (just to be sure, nobody knows how it could happen in the first place). - # - # We also set the path to the perl executable explictly. This will be - # used to create the initial shebang line in the scripts (bug 62276). - perl Makefile.PL \ - PREFIX="${EPREFIX}/usr" \ - INSTALLDIRS=vendor \ - SYSCONFDIR="${EPREFIX}/etc" \ - DATADIR="${EPREFIX}/usr/share/spamassassin" \ - PERL_BIN="${EPREFIX}/usr/bin/perl" \ - ENABLE_SSL="$(usex ssl)" \ - DESTDIR="${D}" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install() { - emake install - einstalldocs - - # Create the stub dir used by sa-update and friends - keepdir /var/lib/spamassassin - - # Move spamd to sbin where it belongs. - dodir /usr/sbin - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" - - if use qmail; then - dobin spamc/qmail-spamc - fi - - dosym mail/spamassassin /etc/spamassassin - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "${ED}/etc/mail/spamassassin/init.pre" \ - || die "failed to disable plugins by default" - - # Add the init and config scripts. - newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd - newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd - - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ - "${PN}.service" - - use postgres && dodoc sql/*_pg.sql - use mysql && dodoc sql/*_mysql.sql - - dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \ - sql/README.awl procmailrc.example sample-nonspam.txt \ - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \ - spamd-apache2/README.apache - - # Rename some files so that they don't clash with others. - newdoc spamd/README README.spamd - newdoc sql/README README.sql - newdoc ldap/README README.ldap - - if use qmail; then - dodoc spamc/README.qmail - fi - - insinto /etc/mail/spamassassin/ - insopts -m0400 - newins "${FILESDIR}"/secrets.cf secrets.cf.example - - # Create the directory where sa-update stores its GPG key (if you - # choose to import one). If this directory does not exist, the - # import will fail. This is bug 396307. We expect that the import - # will be performed as root, and making the directory accessible - # only to root prevents a warning on the command-line. - diropts -m0700 - dodir /etc/mail/spamassassin/sa-update-keys - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/cron.daily - newexe "${FILESDIR}/update-spamassassin-rules.cron" \ - update-spamassassin-rules - fi - - # Remove perllocal.pod to avoid file collisions (bug #603338). - perl_delete_localpod || die "failed to remove perllocal.pod" - - # The perl-module eclass calls three other functions to clean - # up in src_install. The first fixes references to ${D} in the - # packlist, and is useful to us, too. The other two functions, - # perl_delete_emptybsdir and perl_remove_temppath, don't seem - # to be needed: there are no empty directories, *.bs files, or - # ${D} paths remaining in our installed image. - perl_fix_packlist || die "failed to fix paths in packlist" -} - -src_test() { - # Trick the test suite into skipping the spamd tests. Setting - # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be - # set in SATest.pm. - export SPAMD_HOST=disabled - default -} - -pkg_preinst() { - # The spamd daemon runs as this user. Use a real home directory so - # that it can hold SA configuration. - enewuser spamd -1 -1 /home/spamd -} - -pkg_postinst() { - elog - elog 'No rules are installed by default. You will need to run sa-update' - elog 'at least once, and most likely configure SpamAssassin before it' - elog 'will work.' - - if ! use cron; then - elog - elog 'You should consider a cron job for sa-update. One is provided' - elog 'for daily updates if you enable the "cron" USE flag.' - fi - elog - elog 'Configuration and update help can be found on the wiki:' - elog - elog ' https://wiki.gentoo.org/wiki/SpamAssassin' - elog - - ewarn 'If this version of SpamAssassin causes permissions issues' - ewarn 'with your user configurations or bayes databases, then you' - ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' - ewarn 'configuration file, or remove the --username and --groupname' - ewarn 'flags from the SPAMD_OPTS variable in your systemd service' - ewarn 'configuration file.' -} diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild deleted file mode 100644 index 07de81c0dbe3..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.2-r6.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-functions systemd toolchain-funcs user eapi7-ver - -MY_P="Mail-SpamAssassin-${PV//_/-}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="An extensible mail filter which can identify and tag spam" -HOMEPAGE="https://spamassassin.apache.org/" -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" -RESTRICT="!test? ( test )" - -# The Makefile.PL script checks for dependencies, but only fails if a -# required (i.e. not optional) dependency is missing. We therefore -# require most of the optional modules only at runtime. -REQDEPEND="dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Archive-Tar - virtual/perl-Digest-SHA - virtual/perl-IO-Zlib - virtual/perl-Time-HiRes - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" - -# SpamAssassin doesn't use libwww-perl except as a fallback for when -# curl/wget are missing, so we depend on one of those instead. Some -# mirrors use https, so we need those utilities to support SSL. -# -# re2c is needed to compile the rules (sa-compile). -# -# We still need the old Digest-SHA1 because razor2 has not been ported -# to Digest-SHA. -OPTDEPEND="app-crypt/gnupg - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Encode-Detect - dev-perl/Geo-IP - dev-perl/HTTP-Date - dev-perl/Mail-DKIM - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-CIDR-Lite - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - virtual/perl-Pod-Parser - berkdb? ( virtual/perl-DB_File ) - ipv6? ( dev-perl/IO-Socket-INET6 ) - ldap? ( dev-perl/perl-ldap ) - mysql? ( - dev-perl/DBI - dev-perl/DBD-mysql - ) - postgres? ( - dev-perl/DBI - dev-perl/DBD-Pg - ) - sqlite? ( - dev-perl/DBI - dev-perl/DBD-SQLite - ) - ssl? ( dev-perl/IO-Socket-SSL )" - -DEPEND="${REQDEPEND} - test? ( - ${OPTDEPEND} - virtual/perl-Test-Harness - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" - -PATCHES=( - "${FILESDIR}/spamassassin-3.4.2-bug_7631.patch" - "${FILESDIR}/spamassassin-3.4.2-bug_7632.patch" - "${FILESDIR}/spamassassin-3.4.2-bug_7623_p1.patch" - "${FILESDIR}/spamassassin-3.4.2-bug_7623_p2.patch" -) - -src_prepare() { - default - - # The sa_compile test does some weird stuff like hopping around in - # the directory tree and calling "make" to create a dist tarball - # from ${S}. It fails, and is more trouble than it's worth... - perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test' - - # The spamc tests (which need the networked spamd daemon) fail for - # irrelevant reasons. It's too hard to disable them (unlike the - # spamd tests themselves -- see src_test), so use a crude - # workaround. - perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests' - - # Upstream bug 7622: this thing needs network access but doesn't - # respect the 'run_net_tests' setting. - perl_rm_files t/urilocalbl_geoip.t \ - || die 'failed to remove urilocalbl_geoip tests' -} - -src_configure() { - # This is how and where the perl-module eclass disables the - # MakeMaker interactive prompt. - export PERL_MM_USE_DEFAULT=1 - - # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again - # (just to be sure, nobody knows how it could happen in the first place). - # - # We also set the path to the perl executable explictly. This will be - # used to create the initial shebang line in the scripts (bug 62276). - perl Makefile.PL \ - PREFIX="${EPREFIX}/usr" \ - INSTALLDIRS=vendor \ - SYSCONFDIR="${EPREFIX}/etc" \ - DATADIR="${EPREFIX}/usr/share/spamassassin" \ - PERL_BIN="${EPREFIX}/usr/bin/perl" \ - ENABLE_SSL="$(usex ssl)" \ - DESTDIR="${D}" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install() { - emake install - einstalldocs - - # Create the stub dir used by sa-update and friends - keepdir /var/lib/spamassassin - - # Move spamd to sbin where it belongs. - dodir /usr/sbin - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" - - if use qmail; then - dobin spamc/qmail-spamc - fi - - dosym mail/spamassassin /etc/spamassassin - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "${ED}/etc/mail/spamassassin/init.pre" \ - || die "failed to disable plugins by default" - - # Add the init and config scripts. - newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd - newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd - - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ - "${PN}.service" - - use postgres && dodoc sql/*_pg.sql - use mysql && dodoc sql/*_mysql.sql - - dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \ - sql/README.awl procmailrc.example sample-nonspam.txt \ - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \ - spamd-apache2/README.apache - - # Rename some files so that they don't clash with others. - newdoc spamd/README README.spamd - newdoc sql/README README.sql - newdoc ldap/README README.ldap - - if use qmail; then - dodoc spamc/README.qmail - fi - - insinto /etc/mail/spamassassin/ - insopts -m0400 - newins "${FILESDIR}"/secrets.cf secrets.cf.example - - # Create the directory where sa-update stores its GPG key (if you - # choose to import one). If this directory does not exist, the - # import will fail. This is bug 396307. We expect that the import - # will be performed as root, and making the directory accessible - # only to root prevents a warning on the command-line. - diropts -m0700 - dodir /etc/mail/spamassassin/sa-update-keys - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/cron.daily - newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \ - update-spamassassin-rules - fi - - # Remove perllocal.pod to avoid file collisions (bug #603338). - perl_delete_localpod || die "failed to remove perllocal.pod" - - # The perl-module eclass calls three other functions to clean - # up in src_install. The first fixes references to ${D} in the - # packlist, and is useful to us, too. The other two functions, - # perl_delete_emptybsdir and perl_remove_temppath, don't seem - # to be needed: there are no empty directories, *.bs files, or - # ${D} paths remaining in our installed image. - perl_fix_packlist || die "failed to fix paths in packlist" -} - -src_test() { - # Trick the test suite into skipping the spamd tests. Setting - # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be - # set in SATest.pm. - export SPAMD_HOST=disabled - default -} - -pkg_preinst() { - # The spamd daemon runs as this user. Use a real home directory so - # that it can hold SA configuration. - enewuser spamd -1 -1 /home/spamd - - if use mysql || use postgres ; then - local _awlwarn=0 - local _v - for _v in ${REPLACING_VERSIONS}; do - if ! ver_test "${_v}" -gt "3.4.2-r3"; then - _awlwarn=1 - fi - done - if [[ ${_awlwarn} == 1 ]] ; then - ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - fi - fi -} - -pkg_postinst() { - elog - elog 'No rules are installed by default. You will need to run sa-update' - elog 'at least once, and most likely configure SpamAssassin before it' - elog 'will work.' - - if ! use cron; then - elog - elog 'You should consider a cron job for sa-update. One is provided' - elog 'for daily updates if you enable the "cron" USE flag.' - fi - elog - elog 'Configuration and update help can be found on the wiki:' - elog - elog ' https://wiki.gentoo.org/wiki/SpamAssassin' - elog - - if use mysql || use postgres ; then - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.2-r3"; then - ewarn - ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - - # show this only once - break - fi - done - fi - - ewarn 'If this version of SpamAssassin causes permissions issues' - ewarn 'with your user configurations or bayes databases, then you' - ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' - ewarn 'configuration file, or remove the --username and --groupname' - ewarn 'flags from the SPAMD_OPTS variable in your systemd service' - ewarn 'configuration file.' -} diff --git a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild deleted file mode 100644 index da1c0754b715..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-functions systemd toolchain-funcs user eapi7-ver - -MY_P="Mail-SpamAssassin-${PV//_/-}" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="An extensible mail filter which can identify and tag spam" -HOMEPAGE="https://spamassassin.apache.org/" -SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" -RESTRICT="!test? ( test )" - -# The Makefile.PL script checks for dependencies, but only fails if a -# required (i.e. not optional) dependency is missing. We therefore -# require most of the optional modules only at runtime. -REQDEPEND="dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Archive-Tar - virtual/perl-Digest-SHA - virtual/perl-IO-Zlib - virtual/perl-Time-HiRes - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" - -# SpamAssassin doesn't use libwww-perl except as a fallback for when -# curl/wget are missing, so we depend on one of those instead. Some -# mirrors use https, so we need those utilities to support SSL. -# -# re2c is needed to compile the rules (sa-compile). -# -# We still need the old Digest-SHA1 because razor2 has not been ported -# to Digest-SHA. -OPTDEPEND="app-crypt/gnupg - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Encode-Detect - dev-perl/Geo-IP - dev-perl/HTTP-Date - dev-perl/Mail-DKIM - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-CIDR-Lite - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - virtual/perl-Pod-Parser - berkdb? ( virtual/perl-DB_File ) - ipv6? ( dev-perl/IO-Socket-INET6 ) - ldap? ( dev-perl/perl-ldap ) - mysql? ( - dev-perl/DBI - dev-perl/DBD-mysql - ) - postgres? ( - dev-perl/DBI - dev-perl/DBD-Pg - ) - sqlite? ( - dev-perl/DBI - dev-perl/DBD-SQLite - ) - ssl? ( dev-perl/IO-Socket-SSL )" - -DEPEND="${REQDEPEND} - test? ( - ${OPTDEPEND} - virtual/perl-Test-Harness - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" - -PATCHES=( -) - -src_prepare() { - default - - # The sa_compile test does some weird stuff like hopping around in - # the directory tree and calling "make" to create a dist tarball - # from ${S}. It fails, and is more trouble than it's worth... - perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test' - - # The spamc tests (which need the networked spamd daemon) fail for - # irrelevant reasons. It's too hard to disable them (unlike the - # spamd tests themselves -- see src_test), so use a crude - # workaround. - perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests' - - # Upstream bug 7622: this thing needs network access but doesn't - # respect the 'run_net_tests' setting. - perl_rm_files t/urilocalbl_geoip.t \ - || die 'failed to remove urilocalbl_geoip tests' -} - -src_configure() { - # This is how and where the perl-module eclass disables the - # MakeMaker interactive prompt. - export PERL_MM_USE_DEFAULT=1 - - # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again - # (just to be sure, nobody knows how it could happen in the first place). - # - # We also set the path to the perl executable explictly. This will be - # used to create the initial shebang line in the scripts (bug 62276). - perl Makefile.PL \ - PREFIX="${EPREFIX}/usr" \ - INSTALLDIRS=vendor \ - SYSCONFDIR="${EPREFIX}/etc" \ - DATADIR="${EPREFIX}/usr/share/spamassassin" \ - PERL_BIN="${EPREFIX}/usr/bin/perl" \ - ENABLE_SSL="$(usex ssl)" \ - DESTDIR="${D}" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install() { - emake install - einstalldocs - - # Create the stub dir used by sa-update and friends - keepdir /var/lib/spamassassin - - # Move spamd to sbin where it belongs. - dodir /usr/sbin - mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed" - - if use qmail; then - dobin spamc/qmail-spamc - fi - - dosym mail/spamassassin /etc/spamassassin - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "${ED}/etc/mail/spamassassin/init.pre" \ - || die "failed to disable plugins by default" - - # Add the init and config scripts. - newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd - newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd - - systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service" - systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \ - "${PN}.service" - - use postgres && dodoc sql/*_pg.sql - use mysql && dodoc sql/*_mysql.sql - - dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \ - sql/README.awl procmailrc.example sample-nonspam.txt \ - sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \ - spamd-apache2/README.apache - - # Rename some files so that they don't clash with others. - newdoc spamd/README README.spamd - newdoc sql/README README.sql - newdoc ldap/README README.ldap - - if use qmail; then - dodoc spamc/README.qmail - fi - - insinto /etc/mail/spamassassin/ - insopts -m0400 - newins "${FILESDIR}"/secrets.cf secrets.cf.example - - # Create the directory where sa-update stores its GPG key (if you - # choose to import one). If this directory does not exist, the - # import will fail. This is bug 396307. We expect that the import - # will be performed as root, and making the directory accessible - # only to root prevents a warning on the command-line. - diropts -m0700 - dodir /etc/mail/spamassassin/sa-update-keys - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/cron.daily - newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \ - update-spamassassin-rules - fi - - # Remove perllocal.pod to avoid file collisions (bug #603338). - perl_delete_localpod || die "failed to remove perllocal.pod" - - # The perl-module eclass calls three other functions to clean - # up in src_install. The first fixes references to ${D} in the - # packlist, and is useful to us, too. The other two functions, - # perl_delete_emptybsdir and perl_remove_temppath, don't seem - # to be needed: there are no empty directories, *.bs files, or - # ${D} paths remaining in our installed image. - perl_fix_packlist || die "failed to fix paths in packlist" -} - -src_test() { - # Trick the test suite into skipping the spamd tests. Setting - # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be - # set in SATest.pm. - export SPAMD_HOST=disabled - default -} - -pkg_preinst() { - # The spamd daemon runs as this user. Use a real home directory so - # that it can hold SA configuration. - enewuser spamd -1 -1 /home/spamd - - if use mysql || use postgres ; then - local _awlwarn=0 - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - _awlwarn=1 - break - fi - done - if [[ ${_awlwarn} == 1 ]] ; then - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - fi - fi -} - -pkg_postinst() { - elog - elog 'No rules are installed by default. You will need to run sa-update' - elog 'at least once, and most likely configure SpamAssassin before it' - elog 'will work.' - - if ! use cron; then - elog - elog 'You should consider a cron job for sa-update. One is provided' - elog 'for daily updates if you enable the "cron" USE flag.' - fi - elog - elog 'Configuration and update help can be found on the wiki:' - elog - elog ' https://wiki.gentoo.org/wiki/SpamAssassin' - elog - - if use mysql || use postgres ; then - local _v - for _v in ${REPLACING_VERSIONS}; do - if ver_test "${_v}" -lt "3.4.3"; then - ewarn - ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.' - ewarn 'You will need to manually ALTER your tables for them to' - ewarn 'continue working. See the UPGRADE documentation for' - ewarn 'details.' - ewarn - - # show this only once - break - fi - done - fi - - ewarn 'If this version of SpamAssassin causes permissions issues' - ewarn 'with your user configurations or bayes databases, then you' - ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service' - ewarn 'configuration file, or remove the --username and --groupname' - ewarn 'flags from the SPAMD_OPTS variable in your systemd service' - ewarn 'configuration file.' -} diff --git a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild index 55de18339926..7e04843441b6 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.4.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" -- cgit v1.2.3