commit: fac2c92f7f70eda398a843171fd6c56c330d1c69 Author: Philippe Chaintreuil <gentoo_bugs_2_peep <AT> parallaxshift <DOT> com> AuthorDate: Sat Jan 3 19:10:14 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 10 05:15:14 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac2c92f
mail-filter/spamassassin: drop 4.0.0-r4, 4.0.0-r5, 4.0.1 - Keep 4.0.1-r1 & 4.0.2. - Clean up unused patch files. Closes: https://github.com/gentoo/gentoo/pull/45240 Signed-off-by: Philippe Chaintreuil <gentoo_bugs_2_peep <AT> parallaxshift.com> Part-of: https://github.com/gentoo/gentoo/pull/45240 Signed-off-by: Sam James <sam <AT> gentoo.org> mail-filter/spamassassin/Manifest | 2 - .../files/4.0.0-DnsResolver-udpsize.patch | 16 - .../files/4.0.0-sa-update-rdatastr.patch | 12 - .../4.0.0-tests-dnsbl_subtests.t_002_no-net.patch | 12 - .../spamassassin/files/4.0.0-tests-strip2.t.patch | 20 -- .../spamassassin/spamassassin-4.0.0-r4.ebuild | 340 --------------------- .../spamassassin/spamassassin-4.0.0-r5.ebuild | 339 -------------------- mail-filter/spamassassin/spamassassin-4.0.1.ebuild | 337 -------------------- 8 files changed, 1078 deletions(-) diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index b2bb4cc8bf58..3aba99ceb1f4 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,5 +1,3 @@ -DIST Mail-SpamAssassin-4.0.0.tar.bz2 6371055 BLAKE2B 86f2167f6250a10a6bf871cc291f63ee9ee2d853b4183a637b4267e6979209196155be1b26e5e5b1093cf63841f9819a249de65e7002414a7e790ee1b67e5206 SHA512 a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f -DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf4080807ad3c3fd9eff9f2eadadadbfde828e542bc57b5cdcfb062c7f210be4d721bdf9cf85aec9b1fb491076165453b000b47990f0d SHA512 b87a80d2b0b802f52df75e485878c53cc4fad52935ca2b14b1b06e46d334b52c673e66d61cc2155b5e812fa6a486f8e61f6a87794be2524acea1fd8ac42e7d6a DIST Mail-SpamAssassin-4.0.1.tar.bz2 6379932 BLAKE2B 303c54d8731cf0ccb622e3e78efbc6be983fc87c7a71107ea700daa54e7ffb85dbb59696188d8ac666067499b1bc7477e31edb36f6e99c9749288a8f921a36b1 SHA512 66183e356b07d1049cf5598fc1e563e4aab580dfca04bf8ec37781dfb57ef568d33c6f6455076f54f940947f5a5dfefa7a08d233833deea5fe5ea18b669cd790 DIST Mail-SpamAssassin-4.0.1.tar.bz2.asc 833 BLAKE2B 9a7dd3a3a59b6a85139fe6db461da9a4a23ed9d1b3110aba70df60145252c3307c526bb5b5c129e2c4ee74427b2b59e421b80bc8d6ca71b89a0c6f608ca02ab9 SHA512 b180080c1692684014680a6873f42ed07d1640c40a6e3e330cfb43235bb3e3008f5e21018fbc0e9cba67ab6d9ba5b87cc2d98c3bed15c9503164dacdfdaef9df DIST Mail-SpamAssassin-4.0.2.tar.bz2 6496450 BLAKE2B 1abda06e9729b5e1a9a242c1b4cc3a8ae9d46fb8380bb7b5823638ff8eaa796c55cf8ee4c07a6fd2c0d2e11e8a92293c485e7d8cd2ff4597047b57f8741e894c SHA512 05917f1a897e22569ab9e5130d4f91cb546db2e28fceed7bd904ea211f2684d863cf30960db750e2c99f2ea4f3119b61353714760257a3f57e898f0d11ce6cdb diff --git a/mail-filter/spamassassin/files/4.0.0-DnsResolver-udpsize.patch b/mail-filter/spamassassin/files/4.0.0-DnsResolver-udpsize.patch deleted file mode 100644 index a9462c21433e..000000000000 --- a/mail-filter/spamassassin/files/4.0.0-DnsResolver-udpsize.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?r1=1909910&r2=1909909&pathrev=1909910 ---- a/lib/Mail/SpamAssassin/DnsResolver.pm -+++ b/lib/Mail/SpamAssassin/DnsResolver.pm -@@ -599,7 +599,11 @@ - my $udp_payload_size = $self->{conf}->{dns_options}->{edns}; - if ($udp_payload_size && $udp_payload_size > 512) { - # dbg("dns: adding EDNS ext, UDP payload size %d", $udp_payload_size); -- $packet->edns->size($udp_payload_size); -+ if ($packet->edns->can('udpsize')) { # since Net::DNS 1.38 -+ $packet->edns->udpsize($udp_payload_size); -+ } else { -+ $packet->edns->size($udp_payload_size); -+ } - } - } - diff --git a/mail-filter/spamassassin/files/4.0.0-sa-update-rdatastr.patch b/mail-filter/spamassassin/files/4.0.0-sa-update-rdatastr.patch deleted file mode 100644 index 415bc187865d..000000000000 --- a/mail-filter/spamassassin/files/4.0.0-sa-update-rdatastr.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?r1=1910601&r2=1910600&pathrev=1910601 ---- a/sa-update.raw -+++ b/sa-update.raw -@@ -1458,7 +1458,7 @@ - next if !$rr; # no answer records, only rcode - next if $rr->type ne $rr_type; - # scalar context! -- my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdatastr; -+ my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdstring; - push(@result,$text) if defined $text && $text ne ''; - } - printf("DNS %s query: %s -> %s\n", $rr_type, $query, join(", ",@result)) diff --git a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch deleted file mode 100644 index 47bfea21b617..000000000000 --- a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/apache/spamassassin/commit/20c6a5a78e31877b3d4fa379d6a011d6112aabb9 ---- a/t/dnsbl_subtests.t -+++ b/t/dnsbl_subtests.t -@@ -14,6 +14,8 @@ use Test::More; - - use Errno qw(EADDRINUSE EACCES); - -+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests'); -+ - use constant HAS_NET_DNS_NAMESERVER => eval { require Net::DNS::Nameserver; }; - plan skip_all => "Net::DNS::Nameserver in unavailable on this system" unless (HAS_NET_DNS_NAMESERVER); - plan tests => 46; diff --git a/mail-filter/spamassassin/files/4.0.0-tests-strip2.t.patch b/mail-filter/spamassassin/files/4.0.0-tests-strip2.t.patch deleted file mode 100644 index 94e1059259b5..000000000000 --- a/mail-filter/spamassassin/files/4.0.0-tests-strip2.t.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8096 ---- a/t/strip2.t -+++ b/t/strip2.t -@@ -4,14 +4,15 @@ - use SATest; sa_t_init("strip2"); - - use Test::More; -+use constant HAS_TEXTDIFF => eval { require Text::Diff; }; - plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests'); -+plan skip_all => 'Need Text::Diff' unless HAS_TEXTDIFF; - plan tests => 98; - - # --------------------------------------------------------------------------- - - use File::Copy; - use File::Compare qw(compare_text); --use Text::Diff; - - my @files = qw( - data/nice/crlf-endings diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild deleted file mode 100644 index ab0fd9fa1f6f..000000000000 --- a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit perl-functions systemd toolchain-funcs verify-sig autotools - -MY_P="Mail-SpamAssassin-${PV//_/-}" -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 - verify-sig? ( - https://downloads.apache.org/spamassassin/source/${MY_P}.tar.bz2.asc - ) -" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="berkdb cron ipv6 ldap 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="acct-user/spamd - acct-group/spamd - dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Digest-SHA - ssl? ( - dev-libs/openssl:0= - )" - -# 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/Archive-Zip - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Email-Address-XS - dev-perl/Encode-Detect - || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) - dev-perl/IO-String - dev-perl/Mail-DKIM - dev-perl/Mail-DMARC - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-LibIDN2 - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - dev-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} - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" -BDEPEND="${RDEPEND} - verify-sig? ( sec-keys/openpgp-keys-spamassassin )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc - -PATCHES=( - "${FILESDIR}/mention-geoip.cf-in-init.pre.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch" - "${FILESDIR}/4.0.0-tests-strip2.t.patch" - "${FILESDIR}/4.0.0-DnsResolver-udpsize.patch" - "${FILESDIR}/4.0.0-sa-update-rdatastr.patch" -) - -# There are a few renames and use-dependent ones in src_install as well. -DOCS=( - 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 -) - -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 - - # 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 - - # Some tests need extra dependencies - # e.g. t/sql_based_whitelist.t needs DBD - # This is kinder than REQUIRED_USE for tests which hurts automation - if ! use mysql && ! use postgres && ! use sqlite ; then - perl_rm_files t/sql_based_whitelist.t - fi - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "rules/init.pre" \ - || die "failed to disable plugins by default" -} - -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. - - # Run autoreconf to avoid some issues caused by a standard test in the - # current autoconf. Expected to be fixed in next autoconf release, so - # these next 3 lines might not be needed for long. See bug #899782. - pushd spamc >/dev/null - eautoreconf - popd >/dev/null - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install () { - default - - # 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 - - # 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 - use qmail && dodoc spamc/README.qmail - - # 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 - - insinto /etc/mail/spamassassin/ - newins "${FILESDIR}"/geoip-4.0.0.cf geoip.cf - 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 - - # 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 -} - -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() { - 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.' - - if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog "The acct-user/spamd package should have relocated it for you," - elog "but may have failed because your spamd daemon was running." - elog - elog "To fix this:" - elog " - Stop your spamd daemon" - elog " - emerge -1 acct-user/spamd" - elog " - Restart your spamd daemon" - elog " - Remove the old home folder if you want" - elog " rm -rf \"${ROOT}/home/spamd\"" - fi - if [[ -e "${ROOT}/home/spamd" ]] ; then - ewarn - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog " Old Home: ${ROOT}/home/spamd" - elog " New Home: ${ROOT}/var/lib/spamd" - elog - elog "You may wish to migrate your data to the new location:" - elog " - Stop your spamd daemon" - elog " - Re-emerge acct-user/spamd to ensure the home folder has been" - elog " updated to the new location, now that the daemon isn't running:" - elog " # emerge -1 acct-user/spamd" - elog " # echo ~spamd" - elog " - Migrate the contents from the old location to the new home" - elog " For example:" - elog " # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\"" - elog " - Remove the old home folder" - elog " # rm -rf \"${ROOT}/home/spamd\"" - elog " - Restart your spamd daemon" - elog - elog "If you do not wish to migrate data, you should remove the old" - elog "home folder from your system as it is not used." - fi -} diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild deleted file mode 100644 index eb204a8d426e..000000000000 --- a/mail-filter/spamassassin/spamassassin-4.0.0-r5.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit perl-functions systemd toolchain-funcs verify-sig autotools - -MY_P="Mail-SpamAssassin-${PV//_/-}" -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 - verify-sig? ( - https://downloads.apache.org/spamassassin/source/${MY_P}.tar.bz2.asc - ) -" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="berkdb cron ipv6 ldap 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="acct-user/spamd - acct-group/spamd - dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Digest-SHA - ssl? ( - dev-libs/openssl:0= - )" - -# 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/Archive-Zip - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Email-Address-XS - dev-perl/Encode-Detect - || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) - dev-perl/IO-String - dev-perl/Mail-DKIM - dev-perl/Mail-DMARC - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-LibIDN2 - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - dev-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} - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" -BDEPEND="${RDEPEND} - verify-sig? ( sec-keys/openpgp-keys-spamassassin )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc - -PATCHES=( - "${FILESDIR}/mention-geoip.cf-in-init.pre.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch" - "${FILESDIR}/4.0.0-tests-strip2.t.patch" - "${FILESDIR}/4.0.0-DnsResolver-udpsize.patch" - "${FILESDIR}/4.0.0-sa-update-rdatastr.patch" -) - -# There are a few renames and use-dependent ones in src_install as well. -DOCS=( - 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 -) - -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 - - # 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 - - # Some tests need extra dependencies - # e.g. t/sql_based_whitelist.t needs DBD - # This is kinder than REQUIRED_USE for tests which hurts automation - if ! use mysql && ! use postgres && ! use sqlite ; then - perl_rm_files t/sql_based_whitelist.t - fi - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "rules/init.pre" \ - || die "failed to disable plugins by default" -} - -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)" \ - || die 'failed to create a Makefile using Makefile.PL' - - # Now configure spamc. - - # Run autoreconf to avoid some issues caused by a standard test in the - # current autoconf. Expected to be fixed in next autoconf release, so - # these next 3 lines might not be needed for long. See bug #899782. - pushd spamc >/dev/null - eautoreconf - popd >/dev/null - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install () { - default - - # 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 - - # 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 - use qmail && dodoc spamc/README.qmail - - # 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 - - insinto /etc/mail/spamassassin/ - newins "${FILESDIR}"/geoip-4.0.0.cf geoip.cf - 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 - - # 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 -} - -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() { - 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.' - - if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog "The acct-user/spamd package should have relocated it for you," - elog "but may have failed because your spamd daemon was running." - elog - elog "To fix this:" - elog " - Stop your spamd daemon" - elog " - emerge -1 acct-user/spamd" - elog " - Restart your spamd daemon" - elog " - Remove the old home folder if you want" - elog " rm -rf \"${ROOT}/home/spamd\"" - fi - if [[ -e "${ROOT}/home/spamd" ]] ; then - ewarn - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog " Old Home: ${ROOT}/home/spamd" - elog " New Home: ${ROOT}/var/lib/spamd" - elog - elog "You may wish to migrate your data to the new location:" - elog " - Stop your spamd daemon" - elog " - Re-emerge acct-user/spamd to ensure the home folder has been" - elog " updated to the new location, now that the daemon isn't running:" - elog " # emerge -1 acct-user/spamd" - elog " # echo ~spamd" - elog " - Migrate the contents from the old location to the new home" - elog " For example:" - elog " # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\"" - elog " - Remove the old home folder" - elog " # rm -rf \"${ROOT}/home/spamd\"" - elog " - Restart your spamd daemon" - elog - elog "If you do not wish to migrate data, you should remove the old" - elog "home folder from your system as it is not used." - fi -} diff --git a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild deleted file mode 100644 index 5eb16d7d42b1..000000000000 --- a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild +++ /dev/null @@ -1,337 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit perl-functions systemd toolchain-funcs verify-sig autotools - -MY_P="Mail-SpamAssassin-${PV//_/-}" -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 - verify-sig? ( - https://downloads.apache.org/spamassassin/source/${MY_P}.tar.bz2.asc - ) -" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="berkdb cron ipv6 ldap 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="acct-user/spamd - acct-group/spamd - dev-lang/perl:= - dev-perl/HTML-Parser - dev-perl/Net-DNS - dev-perl/NetAddr-IP - virtual/perl-Digest-SHA - ssl? ( - dev-libs/openssl:0= - )" - -# 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/Archive-Zip - dev-perl/BSD-Resource - dev-perl/Digest-SHA1 - dev-perl/Email-Address-XS - dev-perl/Encode-Detect - || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) - dev-perl/IO-String - dev-perl/Mail-DKIM - dev-perl/Mail-DMARC - dev-perl/Mail-SPF - dev-perl/Net-Patricia - dev-perl/Net-LibIDN2 - dev-util/re2c - || ( net-misc/wget[ssl] net-misc/curl[ssl] ) - virtual/perl-MIME-Base64 - dev-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} - )" -RDEPEND="${REQDEPEND} ${OPTDEPEND}" -BDEPEND="${RDEPEND} - verify-sig? ( sec-keys/openpgp-keys-spamassassin )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc - -PATCHES=( - "${FILESDIR}/mention-geoip.cf-in-init.pre.patch" - "${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch" - "${FILESDIR}/4.0.1-tests-sa_txrep.t-no-dbm.patch" -) - -# There are a few renames and use-dependent ones in src_install as well. -DOCS=( - 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 -) - -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 - - # 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 - - # Some tests need extra dependencies - # e.g. t/sql_based_whitelist.t needs DBD - # This is kinder than REQUIRED_USE for tests which hurts automation - if ! use mysql && ! use postgres && ! use sqlite ; then - perl_rm_files t/sql_based_whitelist.t - fi - - # Disable plugin by default - sed -i -e 's/^loadplugin/\#loadplugin/g' \ - "rules/init.pre" \ - || die "failed to disable plugins by default" -} - -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. - - # Run autoreconf to avoid some issues caused by a standard test in the - # current autoconf. Expected to be fixed in next autoconf release, so - # these next 3 lines might not be needed for long. See bug #899782. - pushd spamc >/dev/null - eautoreconf - popd >/dev/null - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile -} - -src_compile() { - emake - use qmail && emake spamc/qmail-spamc -} - -src_install () { - default - - # 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 - - # 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 - use qmail && dodoc spamc/README.qmail - - # 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 - - insinto /etc/mail/spamassassin/ - newins "${FILESDIR}"/geoip-4.0.0.cf geoip.cf - 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 - - # 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 -} - -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() { - 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.' - - if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog "The acct-user/spamd package should have relocated it for you," - elog "but may have failed because your spamd daemon was running." - elog - elog "To fix this:" - elog " - Stop your spamd daemon" - elog " - emerge -1 acct-user/spamd" - elog " - Restart your spamd daemon" - elog " - Remove the old home folder if you want" - elog " rm -rf \"${ROOT}/home/spamd\"" - fi - if [[ -e "${ROOT}/home/spamd" ]] ; then - ewarn - ewarn "The spamd user's home folder has been moved to a new location." - elog - elog " Old Home: ${ROOT}/home/spamd" - elog " New Home: ${ROOT}/var/lib/spamd" - elog - elog "You may wish to migrate your data to the new location:" - elog " - Stop your spamd daemon" - elog " - Re-emerge acct-user/spamd to ensure the home folder has been" - elog " updated to the new location, now that the daemon isn't running:" - elog " # emerge -1 acct-user/spamd" - elog " # echo ~spamd" - elog " - Migrate the contents from the old location to the new home" - elog " For example:" - elog " # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\"" - elog " - Remove the old home folder" - elog " # rm -rf \"${ROOT}/home/spamd\"" - elog " - Restart your spamd daemon" - elog - elog "If you do not wish to migrate data, you should remove the old" - elog "home folder from your system as it is not used." - fi -}
