| 1 |
commit: 8178c3c1238395b7112fca6c6b70311cdac19247 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 2 07:32:47 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 2 07:32:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8178c3c1 |
| 7 |
|
| 8 |
mail-mta/exim-4.96-r1: drop srs-alt/srs-native flags |
| 9 |
|
| 10 |
Only the native implementation is available in 4.96 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/855608 |
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
mail-mta/exim/exim-4.96-r1.ebuild | 39 ++++++++++----------------------------- |
| 16 |
1 file changed, 10 insertions(+), 29 deletions(-) |
| 17 |
|
| 18 |
diff --git a/mail-mta/exim/exim-4.96-r1.ebuild b/mail-mta/exim/exim-4.96-r1.ebuild |
| 19 |
index 1d04cbc97f35..719ead900410 100644 |
| 20 |
--- a/mail-mta/exim/exim-4.96-r1.ebuild |
| 21 |
+++ b/mail-mta/exim/exim-4.96-r1.ebuild |
| 22 |
@@ -8,7 +8,7 @@ inherit db-use toolchain-funcs multilib pam systemd |
| 23 |
IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl |
| 24 |
dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx |
| 25 |
mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux |
| 26 |
-socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X" |
| 27 |
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X" |
| 28 |
REQUIRED_USE=" |
| 29 |
arc? ( dkim spf ) |
| 30 |
dane? ( ssl !gnutls ) |
| 31 |
@@ -17,10 +17,7 @@ REQUIRED_USE=" |
| 32 |
gnutls? ( ssl ) |
| 33 |
pkcs11? ( ssl ) |
| 34 |
spf? ( exiscan-acl ) |
| 35 |
- srs? ( |
| 36 |
- exiscan-acl |
| 37 |
- ^^ ( srs-alt srs-native ) |
| 38 |
- ) |
| 39 |
+ srs? ( exiscan-acl ) |
| 40 |
|| ( berkdb gdbm tdb ) |
| 41 |
" |
| 42 |
# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked |
| 43 |
@@ -79,7 +76,6 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5 |
| 44 |
redis? ( dev-libs/hiredis:= ) |
| 45 |
spf? ( >=mail-filter/libspf2-1.2.5-r1 ) |
| 46 |
dmarc? ( mail-filter/opendmarc:= ) |
| 47 |
- srs? ( srs-alt? ( mail-filter/libsrs_alt ) ) |
| 48 |
X? ( |
| 49 |
x11-libs/libX11 |
| 50 |
x11-libs/libXmu |
| 51 |
@@ -491,22 +487,11 @@ src_configure() { |
| 52 |
|
| 53 |
# Sender Rewriting Scheme |
| 54 |
if use srs; then |
| 55 |
- # NOTE: we currently USE-default to srs-alt, because this is |
| 56 |
- # what USE=srs used to be. Eventually we want to rid ourselves |
| 57 |
- # of this external implementation. |
| 58 |
- if use srs-alt; then |
| 59 |
- # historical default, until 4.95 |
| 60 |
- cat >> Makefile <<- EOC |
| 61 |
- EXPERIMENTAL_SRS_ALT=yes |
| 62 |
- EXTRALIBS_EXIM += -lsrs_alt |
| 63 |
- EOC |
| 64 |
- fi |
| 65 |
- if use srs-native; then |
| 66 |
- # this one is the default/supported variant since 4.95 |
| 67 |
- cat >> Makefile <<- EOC |
| 68 |
- SUPPORT_SRS=yes |
| 69 |
- EOC |
| 70 |
- fi |
| 71 |
+ # this one is the default/supported variant since 4.95, and the |
| 72 |
+ # only variant available since 4.96 |
| 73 |
+ cat >> Makefile <<- EOC |
| 74 |
+ SUPPORT_SRS=yes |
| 75 |
+ EOC |
| 76 |
fi |
| 77 |
|
| 78 |
# Delivery Sender Notifications extra information in fail message |
| 79 |
@@ -655,13 +640,9 @@ pkg_postinst() { |
| 80 |
einfo "documentation at the bottom of this prerelease message:" |
| 81 |
einfo " http://article.gmane.org/gmane.mail.exim.devel/3579" |
| 82 |
fi |
| 83 |
- if use srs-alt; then |
| 84 |
- einfo "SRS support using libsrs_alt is experimental in this" |
| 85 |
- einfo "release of Exim" |
| 86 |
- elog "You are using libsrs_alt to implement SRS support." |
| 87 |
- elog "The native SRS implementation (USE=srs-native) is the" |
| 88 |
- elog "default implementation, which means libsrs_alt may go" |
| 89 |
- elog "away in a future release." |
| 90 |
+ if use srs; then |
| 91 |
+ einfo "SRS support using libsrs_alt was dropped in this" |
| 92 |
+ einfo "release of Exim, you are now using the native SRS implementation" |
| 93 |
fi |
| 94 |
use dsn && einfo "extra information in fail DSN message is experimental" |
| 95 |
einfo |
Archives