diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /mail-filter/spamassassin | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'mail-filter/spamassassin')
-rw-r--r-- | mail-filter/spamassassin/Manifest | 7 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild | 315 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.4.5.ebuild | 9 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.4.6.ebuild (renamed from mail-filter/spamassassin/spamassassin-3.4.4-r5.ebuild) | 31 |
4 files changed, 28 insertions, 334 deletions
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index de4cb4e0edf4..4efc7d11a7cb 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -6,9 +6,8 @@ AUX secrets.cf 664 BLAKE2B a501fb93369743e3c9139cc780f166168313613c840857bc0e72d 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 -DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f DIST Mail-SpamAssassin-3.4.5.tar.bz2 6167088 BLAKE2B d99c9e40f6735328b5300f010f248d35a8a8dcd3a3692a8db909234b8de3a5e432d004cf09f7ddb8b2ae82144525ce1ab25d89df92b621d8e119e2128e59cce6 SHA512 46096019ef3d2b6dadb7af0d076c22526786cccb669cd4bed131b64fa935863630ca9f3e78277bebba0ed75099be9fbce97a30a6478ed84093896a1ad3d8387a -EBUILD spamassassin-3.4.4-r4.ebuild 9597 BLAKE2B b6143545ad7d644a9b871beb76280cf91c4b7a1c4f027b86e732ee3b7e416c11723afa81cc59d850bbc20d00e7f2335b258e4e4b6cfc238b9a27998a829f492a SHA512 9dc6d93468aa16cbf118fe3c1871b7b112b65f8d5f6a53df4dbb273dcb8e50790f48ed60d5790f1bd55fb35b3d1b799ff1e011857826fb5a57953a3e2d9321b8 -EBUILD spamassassin-3.4.4-r5.ebuild 9639 BLAKE2B 64be74a95194f2d3bd33d182775fa3367ea0410744cf8786394de74b68ced727ca3f86914030864e3fd46e35c790253d0f1c78da1282f44ea3cb865b646acf69 SHA512 ec54561690656c8a7b7c5796e71945b8ca9693d56027a32021825924396ecbe7fb75454d77d84b720d640d8786a84d68760de7e1169c58329dab0f2173fc454f -EBUILD spamassassin-3.4.5.ebuild 9605 BLAKE2B 0ff9381d0730c50b2f439a6d5e0dcc55fc2a9caf5ed662a5be22b4a1985894970b90d359b8eef127da2b3ae79c8303eb8272b23a49a6d8f67dba41d6a2074eec SHA512 a78bffdd68bdc188adebe0fca80abd9b1a5f7542c2eeffad0c988d77026e0e47575fc91cae07a6ce19c9684bba85d16fea387763f1cbc0ce94aa61b1dc5189c4 +DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6da70c7b846737513bd4d6d2d410872c58ab7cbe7ade6a109a71bdbb6dbaf7aee8eb48520e7de929b27e83546401f3692aeb0c3 SHA512 bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593 +EBUILD spamassassin-3.4.5.ebuild 9849 BLAKE2B e2b647408448f49909bde4598302f90b822529fef9892eabfe7a1e9c6cbaead4a28b88918e7b58aeeb4c80442242adc0930d6ba750656e9b849c04b0db367a50 SHA512 f9263137075097325d173cfcc5aac3e6bdb174d7e6c04178a751503c682d55706819eebfa05e7f80c18b0c33be0d6bc36983f195bb95025323fd08a4fb37ecc0 +EBUILD spamassassin-3.4.6.ebuild 9856 BLAKE2B 131cd51392a558d7bc4dd53241f93a171e0301eec573ac00540468221feaad0ac4a45fb0a37709a667ca93924e8ff3691ee31e6b72534f0ce968d0f6f73195bc SHA512 c97246bf03dda5ac38836cdf693a8b7995e614fd1b3328ba6d09887e3ac2b81824ed18f729e929462e678c78bca850728e9c2022e4d6b64880b7707194e0723d MISC metadata.xml 609 BLAKE2B 81b169e5c10732a699a07de2aa6327aed5a0c1c8ef44eb6934bd7c37bfa5c80f2f433ade2998a3cd57da68c1b773229ed8aeb7b64c1ed2d58c7ab529d2649b72 SHA512 e0ad537ae894ca5ab2585d0b5dd20357325c409a4497fba096c6b6cbc88cd99fb937af1085c59e164d510a5d5033c6fa511fadc4ab77b1fa2a5bb6b2c514061d diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild deleted file mode 100644 index 5b15b0b3ad6b..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit perl-functions systemd toolchain-funcs - -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 sparc x86 ~amd64-linux ~x86-linux" -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="acct-user/spamd - acct-group/spamd - 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/GeoIP2 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}/mention-geoip.cf-in-init.pre.patch" -) - -# There are a few renames and use-dependent ones in src_istall 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 - - # 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. - 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/ - doins "${FILESDIR}"/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-3.4.5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild index 562694ddd4ca..41d4874d323d 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.5.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 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test" RESTRICT="!test? ( test )" @@ -107,6 +107,13 @@ src_prepare() { # 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" \ diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild index bb8b7a01744a..732579b87577 100644 --- a/mail-filter/spamassassin/spamassassin-3.4.4-r5.ebuild +++ b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild @@ -20,14 +20,20 @@ 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:= +REQDEPEND="acct-user/spamd + acct-group/spamd + 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" + 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 @@ -68,22 +74,12 @@ OPTDEPEND="app-crypt/gnupg ) ssl? ( dev-perl/IO-Socket-SSL )" -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - )" -BDEPEND="${REQDEPEND} - ${DEPEND} +DEPEND="${REQDEPEND} test? ( ${OPTDEPEND} virtual/perl-Test-Harness )" -RDEPEND="acct-user/spamd - acct-group/spamd - ${REQDEPEND} - ${DEPEND} - ${OPTDEPEND}" +RDEPEND="${REQDEPEND} ${OPTDEPEND}" PATCHES=( "${FILESDIR}/mention-geoip.cf-in-init.pre.patch" @@ -111,6 +107,13 @@ src_prepare() { # 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" \ |