commit: 51094e6bcf42daf4ec7b2757457039b9ba21c84c Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Jun 5 18:36:50 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Jun 5 18:39:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51094e6b
mail-mta/exim-4.96-r4: revbump to fix compilation issue #907870 Enable exiscan patch by default for the regex_vars infra builds on it (via our patches). So simplify the world somewhat by making the feature non-optional. Closes: https://bugs.gentoo.org/907870 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> .../exim/{exim-4.96-r3.ebuild => exim-4.96-r4.ebuild} | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/mail-mta/exim/exim-4.96-r3.ebuild b/mail-mta/exim/exim-4.96-r4.ebuild similarity index 98% rename from mail-mta/exim/exim-4.96-r3.ebuild rename to mail-mta/exim/exim-4.96-r4.ebuild index b9f58258caa4..8a6457798562 100644 --- a/mail-mta/exim/exim-4.96-r3.ebuild +++ b/mail-mta/exim/exim-4.96-r4.ebuild @@ -6,7 +6,7 @@ EAPI="7" inherit db-use toolchain-funcs pam systemd IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl -dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx +dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X" REQUIRED_USE=" @@ -16,8 +16,6 @@ REQUIRED_USE=" dkim? ( ssl !gnutls ) gnutls? ( ssl ) pkcs11? ( ssl ) - spf? ( exiscan-acl ) - srs? ( exiscan-acl ) || ( berkdb gdbm tdb ) " # NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked @@ -196,6 +194,7 @@ src_configure() { PID_FILE_PATH=${EPREFIX}/run/exim.pid SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim HAVE_ICONV=yes + WITH_CONTENT_SCAN=yes EOC # configure db implementation, Exim always needs one for its hints @@ -356,13 +355,6 @@ src_configure() { # features # - # content scanning support - if use exiscan-acl; then - cat >> Makefile <<- EOC - WITH_CONTENT_SCAN=yes - EOC - fi - # DomainKeys Identified Mail, RFC4871 if ! use dkim; then # DKIM is enabled by default @@ -595,9 +587,6 @@ src_install() { # conf files insinto /etc/exim newins "${S}"/src/configure.default exim.conf.dist - if use exiscan-acl; then - newins "${S}"/src/configure.default exim.conf.exiscan-acl - fi doins "${WORKDIR}"/system_filter.exim doins "${FILESDIR}"/auth_conf.sub
