From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- mail-filter/spamassassin/Manifest | 5 +- .../files/spamassassin-3.4.2-bug_7623_p1.patch | 13 + .../files/spamassassin-3.4.2-bug_7623_p2.patch | 15 ++ .../spamassassin/spamassassin-3.4.2-r3.ebuild | 283 -------------------- .../spamassassin/spamassassin-3.4.2-r4.ebuild | 284 -------------------- .../spamassassin/spamassassin-3.4.2-r5.ebuild | 286 +++++++++++++++++++++ 6 files changed, 317 insertions(+), 569 deletions(-) create mode 100644 mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch create mode 100644 mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch delete mode 100644 mail-filter/spamassassin/spamassassin-3.4.2-r3.ebuild delete mode 100644 mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild create mode 100644 mail-filter/spamassassin/spamassassin-3.4.2-r5.ebuild (limited to 'mail-filter/spamassassin') diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest index 499204821bca..34e5da0e7447 100644 --- a/mail-filter/spamassassin/Manifest +++ b/mail-filter/spamassassin/Manifest @@ -1,6 +1,8 @@ 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 @@ -8,6 +10,5 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885 EBUILD spamassassin-3.4.2-r2.ebuild 7607 BLAKE2B c1232716b004a956480f5bc87f4ff1266471424302f17836bb34922e81d2815a97c12e4a204c0444b89180c0254dcd9b7f8e8f093d366c55274da9bf2836c97b SHA512 2b3bbad6b186b9af4dc17a5c664120e6a413fbf885f6ed91530653c88b2a9b2046dc0563a5f3dbe81492abe3dab4b55235e9b5c7caee5eb201cfdfd9c0ed41ed -EBUILD spamassassin-3.4.2-r3.ebuild 8559 BLAKE2B 0657529ee4324147998e4b6ee935cebe63b20643abc3a7fdc321370ff9343a44b1d97e6d7073dc568e35fde983b0734d363f81599c423ac35546592b8b1be984 SHA512 b8ad6679c0928e174c8c0f446af91f2dbb8e40e5dd48fab6299aa3d68ef29d6e597d5656a50a7875b15cbc4c1029720950af994b0a0c1e98a4c2e46ed531d04a -EBUILD spamassassin-3.4.2-r4.ebuild 8582 BLAKE2B f9dc4a124e16259d75a304f181109891c55e715fcacf004d83f94907d54c5221f6444021c91f7c8e2754b5a87000fa0c732685c959a658f239ba57d6bb23b779 SHA512 4ca9334c68447aaede7a9946d5354989ea1dbbe1eacbc88ee9dd3ee0ddbd558baa588a77fdb4f900fbb5dca7977f4fef680e10576e31ce81e8f14f9f61637ff0 +EBUILD spamassassin-3.4.2-r5.ebuild 8686 BLAKE2B 64d562d875653d12b98267481c21487d6a8405cdad169c8f264f2595927512710c5d50faf282d97cf89360c4ee3cd45aad5f875932685b4bb05469c04e5319b5 SHA512 59c195e05533d8e6280e606d4f7a292739f8fccca33b7345ce3ac4c754d026cae25d63779d359da735b3dc10b75b4377098ee0be9b15e6c40ba1512ce1341809 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b 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 new file mode 100644 index 000000000000..d0fe21bf9ef9 --- /dev/null +++ b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000000..26d921a6e676 --- /dev/null +++ b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch @@ -0,0 +1,15 @@ +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/spamassassin-3.4.2-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r3.ebuild deleted file mode 100644 index e1fd17004951..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.2-r3.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 1999-2018 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl 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_7631.patch" - "${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 - - 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.2-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild deleted file mode 100644 index 46de7f1fb3fd..000000000000 --- a/mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2019 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl 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" -) - -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 - - 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.2-r5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r5.ebuild new file mode 100644 index 000000000000..2162b9ce2b61 --- /dev/null +++ b/mail-filter/spamassassin/spamassassin-3.4.2-r5.ebuild @@ -0,0 +1,286 @@ +# Copyright 1999-2019 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl 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.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.' +} -- cgit v1.2.3