From d2b7cca519cd1aa575ebbc562c57071266ae63f1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Jun 2023 01:31:19 +0100 Subject: gentoo auto-resync : 26:06:2023 - 01:31:19 --- mail-filter/spamassassin/Manifest | 4 +- .../files/4.0.0-sa-update-rdatastr.patch | 12 + .../spamassassin/spamassassin-4.0.0-r3.ebuild | 2 +- .../spamassassin/spamassassin-4.0.0-r4.ebuild | 340 +++++++++++++++++++++ 4 files changed, 356 insertions(+), 2 deletions(-) create mode 100644 mail-filter/spamassassin/files/4.0.0-sa-update-rdatastr.patch create mode 100644 mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild (limited to 'mail-filter/spamassassin') diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index dcb96826b7b8..486f2edb486a 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -2,6 +2,7 @@ AUX 3.4.1-spamd.conf-r1 1257 BLAKE2B bbdeeda731965dcd863c2a9bc615295b7d48e011099 AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a72a933b3819f35dfe9f9085f13f73be95b1169e04d3a09bc4cec6284e87963059ac047d5908df3458fb2b SHA512 2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02 AUX 3.4.6-configure-clang16.patch 1452 BLAKE2B 72c9cf2b411e54c955c9bfbe10b234e43ba5969d4daef21d3a1aeb95ee32fe337c47cc91375dcca9922f65d0f09ab3eaeeb7b3113002f6036b9f1c260fe0d196 SHA512 0ec2a51263d5211cfca405bcff10a589bd616d1c652f5b07e669d34c3a7c22eff6921836161fa174884d324a6964c89036b0bf1a9d86bd130fcbadec70dac989 AUX 4.0.0-DnsResolver-udpsize.patch 685 BLAKE2B cea6e3b795bf1a43d975fe33a6b90e03355c1807d79f62b9e25254a88c297190313d0d5ea307f61d4b1e909f22a661389aa9a8a898a6dde8a9f75fd3a15130fc SHA512 a3194f268534984643bd1870de81eb0eba8df07fee5e0cd79954edd3b54e646bb985cd0d141bd272e8c3035348d0d4c8b5b896ac2ead07edd465175bb26b5bdc +AUX 4.0.0-sa-update-rdatastr.patch 588 BLAKE2B 2740ffdb0d3080259e7cd31362385176c7d5a65928192918fd89d6bd69d5f5ca60aee5ebaad5695301cf4446b778bde0ff553a929dbe15a1f88e50d46741864e SHA512 ce1064fa38ba4d849e3610c3122db12234bf6f04f27c2f74c9437f0fe53657138a8cbd37080df17be331e35006a73884d2b834f3edcb633b015261952cf47f05 AUX 4.0.0-tests-dnsbl_subtests.t.patch 376 BLAKE2B 8df7bf985504bb76461cdbbe402863c1d66f9179dc6974a1d269f062d84ff4b7361697b24b7bc81446abd13f4a99754e0f721692f6c8c1987bfd6e4df13fa2ec SHA512 7a3739f4286c15e15f91244311253d466ff7fb783fe10a12fc4c8f342ac028bb14b4f4e3c535ac8e678eab576876531d45590f4905d572ef962ac4c920769b5e AUX 4.0.0-tests-strip2.t.patch 579 BLAKE2B c874e1efebe9b6f2a80ff63b116facbfc55fd05abe0c9e02665764509991d26b029b4bd9e7c03a368a7a1f072ce7e843859a0570b807a7bdc18779bff75a0a2a SHA512 bd5206d77cfa67dcb870cbcdf586457fa287d20555a1972ff3dc89d52ffdca4a57eb5011e734a5c6ca4c0017cb8fc9116c9f8e468db599c91d5fa1ba8a510151 AUX geoip-4.0.0.cf 2608 BLAKE2B 903672505fb9c8b6a05b100b81b7c6786cd7242065c812c871df8bfe2080644fa53fd762c60587fca8aa8b4c79fe0641f27160bd1f14d16285c0eee5c24cc018 SHA512 f313ac34dd79a577ddec59e6623a27b3645401fcf3375c73f3634ca92f20658d6101a10554c8da1210da8e8116441624c01d2dc88c7dd61f1a2ed5fc8ab192e7 @@ -17,5 +18,6 @@ DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf408080 EBUILD spamassassin-3.4.6-r2.ebuild 9832 BLAKE2B aeae24c04e90169b1e87605b53c23e57d3a14a825c023c39dae7a316860fd4f2a9393c68a5963838e4b39bb231db9cf94f417bc0baf9ab0f6752f842424cb523 SHA512 7fb3fdcf03bb93b8e8534dab572408a895c519e6dfcf4fc9016471d539f5ec00220cd5a4246c738d288a553273db78769b2c3feba4ce91548777293604cc44d1 EBUILD spamassassin-4.0.0-r1.ebuild 10154 BLAKE2B 64bcdf5c45bf51eac04c1411fdf41536d01490501683ca93cc765998ee5112b4bf7cc615c7fcf9d4442b6d6d2b44a1fbeea60ed4e3c606a749049c461615e34b SHA512 65ff1abdfea21b57d79b18f7a180aeb892287667265d74d15690e6709ba8d944bf12e9db46084095f970ec3eefff5c1eb32f30813c80ccbc28a175f79288c178 EBUILD spamassassin-4.0.0-r2.ebuild 10433 BLAKE2B b5bbb6b7706cb2674d6035a68d5cf8d7c0cf654ae7a43a1945042abd29d47c6ef856e1b4f52a6125d39f849934b4dfb3e3a20f921b0648f2b287293740786ca3 SHA512 eb3185a325afc60898be772d8002d7f03c8c3d3149c4dd1f7d356193693148ee0ae849721eab5e8a8e210e1cc0cf306d177404961ee0931ab5efb24e1d5c4c8a -EBUILD spamassassin-4.0.0-r3.ebuild 10484 BLAKE2B 372d692cc59f2890a5247c1bc2e1bdc0a570927eefa4eed9480b03a9ef7211174d0c92a9dddd0a255ff200eefb9b711f9d207a363dad50dd2d848aef1df30d04 SHA512 ff1f03cf66cf61d4c6c279162ce8787342748b8f89e5c674443bb1d1719ad76a56d40c1d371e784495507187fd512c6057b0bc8c6cd37423caf683cbab8a50c2 +EBUILD spamassassin-4.0.0-r3.ebuild 10482 BLAKE2B 72e4f145a7260d6252d04bee31eae37e1b371d26137b71f3c2ad99c2413145d3020d15477f18acb852eda3b910ad1a7eed61d60ccdc8877b941adcaca94fd6ca SHA512 d8543d0ca1588c36165f4244bf9852dc64f0dfddbff3e5f77f4066bc9031d50ce6ef5f929488137168c1cd966c596490a0b9257cb94a9023d8f537053dd57a27 +EBUILD spamassassin-4.0.0-r4.ebuild 10533 BLAKE2B cddac1033cefe870d15f685fbf9c7a1a3d24b07c5e7637eca90ba767045fe6b14e7df25b2019668adafd1539242b9e8d6b3c6a81ef65293e38abfa4793557c12 SHA512 1f46b53d1ea4bba50eed48484a6d0af23aa39dec5655b92c6de42d0c653c28c84d8373d2c93b3f9eb8648b46b976229b1b96e2918024d3a7bbc02d018f40d72e MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515 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 new file mode 100644 index 000000000000..415bc187865d --- /dev/null +++ b/mail-filter/spamassassin/files/4.0.0-sa-update-rdatastr.patch @@ -0,0 +1,12 @@ +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/spamassassin-4.0.0-r3.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild index 40f5f55dc813..8092e98fd3f0 100644 --- a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild +++ b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild new file mode 100644 index 000000000000..ef2e2c316414 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild @@ -0,0 +1,340 @@ +# Copyright 1999-2023 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 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +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} + virtual/perl-Test-Harness + )" +RDEPEND="${REQDEPEND} ${OPTDEPEND}" +BDEPEND="${RDEPEND} + verify-sig? ( sec-keys/openpgp-keys-spamassassin )" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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.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 +} -- cgit v1.2.3