[gentoo-commits] repo/gentoo:master commit in: mail-mta/exim/

[Fabian Groffen]

commit:     55e61781cbd303dd196719217da6b0b1a9623ac9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 07:28:24 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 07:30:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e61781

mail-mta/exim-4.96: version bump

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-mta/exim/Manifest                             |  4 ++--
 .../exim/{exim-4.95-r1.ebuild => exim-4.96.ebuild} | 26 +++++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index b87cdd7fa6a5..254aa57e04a2 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,5 @@
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
-DIST exim-4.95.tar.xz 1865172 BLAKE2B 
0dc8dbc394c1bf4c6075e6ae1c1609b3f41841b2bb4c210d7353e4ad28ab38f905b6c245539bfa772512e2a9baf2dcc855e31d6ccb14ab49077f8da4fe6f1d0b
 SHA512 
93d09c20d99f27da5edbe3e6dc7d25aa4548faa2b67ca26f2cc0b4aeaf58398dd468e0263714fcf0df97531f05d16fcd3f1f0e9d0656ead7858a66b248a44a65
+DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
-DIST exim-pdf-4.95.tar.xz 2117384 BLAKE2B 
ac310ec7741110a067f2df135b6397a8219e48a1e8989c66118f6c62820467e6f7b1c391799ff9b7ddef7896e1340208c4bed21f126014fa94c24d338f681f94
 SHA512 
47f30f3c82fe2cb5b0836594b325da1d255c53d2514af90e720d4bf6c74cff43d4a6b1ab5fb7b148253e5330da74e8ebb80e29b3a08fbe1faed2f004476c9d6a
+DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.95-r1.ebuild b/mail-mta/exim/exim-4.96.ebuild
similarity index 97%
rename from mail-mta/exim/exim-4.95-r1.ebuild
rename to mail-mta/exim/exim-4.96.ebuild
index 79d8f53f3470..58282c3fd043 100644
--- a/mail-mta/exim/exim-4.95-r1.ebuild
+++ b/mail-mta/exim/exim-4.96.ebuild
@@ -126,6 +126,13 @@ src_prepare() {
        eapply     "${FILESDIR}"/exim-4.69-r1.27021.patch
        eapply     "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
 
+       # oddity, they disable berkdb as hack, and then throw an error when
+       # berkdb isn't enabled
+       sed -i \
+               -e 's/_DB_/_DONTMESS_/' \
+               -e 's/define DB void/define DONTMESS void/' \
+               src/auths/call_radius.c || die
+
        # for this reason we have a := dep on opendmarc, they changed their
        # API in a minor release
        if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
@@ -192,7 +199,14 @@ src_configure() {
                EOC
                sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
                sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
-       elif use berkdb ; then
+       elif use gdbm ; then
+               cat >> Makefile <<- EOC
+                       USE_GDBM=yes
+                       DBMLIB = -lgdbm
+               EOC
+               sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+               sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+       else # must be berkdb via required_use
                # use the "native" interfaces to the DBM and CDB libraries, 
support
                # passwd and directory lookups by default
                local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
@@ -204,13 +218,6 @@ src_configure() {
                EOC
                sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
                sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
-       else # must be gdbm via required_use
-               cat >> Makefile <<- EOC
-                       USE_GDBM=yes
-                       DBMLIB = -lgdbm
-               EOC
-               sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
-               sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
        fi
 
        # if we use libiconv, now is the time to tell so
@@ -635,6 +642,9 @@ pkg_postinst() {
                einfo "Please create ${EROOT}/etc/exim/exim.conf from"
                einfo "  ${EROOT}/etc/exim/exim.conf.dist."
        fi
+       if use berkdb && ( use gdbm || use tdb ) ; then
+               ewarn "USE=berkdb is ignored because USE=gdbm or USE=tdb is 
enabled!"
+       fi
        if use dmarc ; then
                einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
                einfo "you can populate this file with the contents downloaded 
from"