diff options
author | Fabian Groffen <grobian@gentoo.org> | 2021-09-29 08:31:54 +0200 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2021-09-29 08:31:54 +0200 |
commit | 78d56e74ed18bae2388545dd5d0fead806452786 (patch) | |
tree | 16a1b8b372b35cad3a111f5fb8ee3aded6605c64 /mail-mta/exim | |
parent | app-text/cmark: remove old version (diff) | |
download | gentoo-78d56e74ed18bae2388545dd5d0fead806452786.tar.gz gentoo-78d56e74ed18bae2388545dd5d0fead806452786.tar.bz2 gentoo-78d56e74ed18bae2388545dd5d0fead806452786.zip |
mail-mta/exim-4.95: version bump, change of srs default
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'mail-mta/exim')
-rw-r--r-- | mail-mta/exim/Manifest | 2 | ||||
-rw-r--r-- | mail-mta/exim/exim-4.95.ebuild (renamed from mail-mta/exim/exim-4.94.2-r5.ebuild) | 28 | ||||
-rw-r--r-- | mail-mta/exim/files/exim-4.95-localscan_dlopen.patch | 221 |
3 files changed, 236 insertions, 15 deletions
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest index 3a31f9eb19f9..b87cdd7fa6a5 100644 --- a/mail-mta/exim/Manifest +++ b/mail-mta/exim/Manifest @@ -1,3 +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-pdf-4.94.2.tar.xz 2092248 BLAKE2B 973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d SHA512 3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0 +DIST exim-pdf-4.95.tar.xz 2117384 BLAKE2B ac310ec7741110a067f2df135b6397a8219e48a1e8989c66118f6c62820467e6f7b1c391799ff9b7ddef7896e1340208c4bed21f126014fa94c24d338f681f94 SHA512 47f30f3c82fe2cb5b0836594b325da1d255c53d2514af90e720d4bf6c74cff43d4a6b1ab5fb7b148253e5330da74e8ebb80e29b3a08fbe1faed2f004476c9d6a DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 diff --git a/mail-mta/exim/exim-4.94.2-r5.ebuild b/mail-mta/exim/exim-4.95.ebuild index d664f4b1c8d1..43c4cb4797fe 100644 --- a/mail-mta/exim/exim-4.94.2-r5.ebuild +++ b/mail-mta/exim/exim-4.95.ebuild @@ -8,7 +8,7 @@ inherit db-use toolchain-funcs multilib pam systemd IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux -socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X" +socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X" REQUIRED_USE=" arc? ( dkim spf ) dane? ( ssl !gnutls ) @@ -124,7 +124,7 @@ src_prepare() { eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279 eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 eapply "${FILESDIR}"/exim-4.69-r1.27021.patch - eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch + eapply "${FILESDIR}"/exim-4.95-localscan_dlopen.patch # for this reason we have a := dep on opendmarc, they changed their # API in a minor release @@ -488,17 +488,16 @@ src_configure() { # what USE=srs used to be. Eventually we want to rid ourselves # of this external implementation. if use srs-alt; then - # historical default, from 4.95 this becomes - # EXPERIMENTAL_SRS_ALT + # historical default, until 4.95 cat >> Makefile <<- EOC - EXPERIMENTAL_SRS=yes + EXPERIMENTAL_SRS_ALT=yes EXTRALIBS_EXIM += -lsrs_alt EOC fi if use srs-native; then - # this one becomes SUPPORT_SRS in 4.95 + # this one is the default/supported variant since 4.95 cat >> Makefile <<- EOC - EXPERIMENTAL_SRS_NATIVE=yes + SUPPORT_SRS=yes EOC fi fi @@ -646,14 +645,13 @@ pkg_postinst() { einfo "documentation at the bottom of this prerelease message:" einfo " http://article.gmane.org/gmane.mail.exim.devel/3579" fi - if use srs ; then - einfo "SRS support is experimental in this release of Exim" - if use srs-alt; then - elog "You are using libsrs_alt to implement SRS support." - elog "In future release of Exim, the native SRS implementation" - elog "(USE=srs-native) will become the default. Please prepare" - elog "your package.use or switch to USE=srs-native now." - fi + if use srs-alt; then + einfo "SRS support using libsrs_alt is experimental in this" + einfo "release of Exim" + elog "You are using libsrs_alt to implement SRS support." + elog "The native SRS implementation (USE=srs-native) is the" + elog "default implementation, which means libsrs_alt may go" + elog "away in a future release." fi use dsn && einfo "extra information in fail DSN message is experimental" einfo diff --git a/mail-mta/exim/files/exim-4.95-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.95-localscan_dlopen.patch new file mode 100644 index 000000000000..320cc9936da9 --- /dev/null +++ b/mail-mta/exim/files/exim-4.95-localscan_dlopen.patch @@ -0,0 +1,221 @@ +Only in exim-4.95: dlopen.patch +diff -aur exim-4.95.orig/src/config.h.defaults exim-4.95/src/config.h.defaults +--- exim-4.95.orig/src/config.h.defaults 2021-09-28 10:24:46.000000000 +0200 ++++ exim-4.95/src/config.h.defaults 2021-09-29 08:20:03.677883649 +0200 +@@ -35,6 +35,8 @@ + + #define AUTH_VARS 4 + ++#define DLOPEN_LOCAL_SCAN ++ + #define BIN_DIRECTORY + + #define CONFIGURE_FILE +Only in exim-4.95/src: config.h.defaults.orig +diff -aur exim-4.95.orig/src/EDITME exim-4.95/src/EDITME +--- exim-4.95.orig/src/EDITME 2021-09-28 10:24:46.000000000 +0200 ++++ exim-4.95/src/EDITME 2021-09-29 08:20:03.678883649 +0200 +@@ -883,6 +883,24 @@ + + + #------------------------------------------------------------------------------ ++# On systems which support dynamic loading of shared libraries, Exim can ++# load a local_scan function specified in its config file instead of having ++# to be recompiled with the desired local_scan function. For a full ++# description of the API to this function, see the Exim specification. ++ ++#DLOPEN_LOCAL_SCAN=yes ++ ++# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the ++# linker flags. Without it, the loaded .so won't be able to access any ++# functions from exim. ++ ++LFLAGS = -rdynamic ++ifeq ($(OSTYPE),Linux) ++LFLAGS += -ldl ++endif ++ ++ ++#------------------------------------------------------------------------------ + # The default distribution of Exim contains only the plain text form of the + # documentation. Other forms are available separately. If you want to install + # the documentation in "info" format, first fetch the Texinfo documentation +Only in exim-4.95/src: EDITME.orig +diff -aur exim-4.95.orig/src/globals.c exim-4.95/src/globals.c +--- exim-4.95.orig/src/globals.c 2021-09-28 10:24:46.000000000 +0200 ++++ exim-4.95/src/globals.c 2021-09-29 08:20:03.679883649 +0200 +@@ -42,6 +42,10 @@ + + uschar *no_aliases = NULL; + ++#ifdef DLOPEN_LOCAL_SCAN ++uschar *local_scan_path = NULL; ++#endif ++ + + /* For comments on these variables, see globals.h. I'm too idle to + duplicate them here... */ +Only in exim-4.95/src: globals.c.orig +diff -aur exim-4.95.orig/src/globals.h exim-4.95/src/globals.h +--- exim-4.95.orig/src/globals.h 2021-09-28 10:24:46.000000000 +0200 ++++ exim-4.95/src/globals.h 2021-09-29 08:20:03.680883648 +0200 +@@ -170,6 +170,9 @@ + extern int (*receive_ferror)(void); + extern BOOL (*receive_smtp_buffered)(void); + ++#ifdef DLOPEN_LOCAL_SCAN ++extern uschar *local_scan_path; /* Path to local_scan() library */ ++#endif + + /* For clearing, saving, restoring address expansion variables. We have to have + the size of this vector set explicitly, because it is referenced from more than +Only in exim-4.95/src: globals.h.orig +diff -aur exim-4.95.orig/src/local_scan.c exim-4.95/src/local_scan.c +--- exim-4.95.orig/src/local_scan.c 2021-09-28 10:24:46.000000000 +0200 ++++ exim-4.95/src/local_scan.c 2021-09-29 08:23:33.756785663 +0200 +@@ -54,10 +54,130 @@ + is used in the rejection message. + */ + ++#ifdef DLOPEN_LOCAL_SCAN ++# include <stdlib.h> ++# include <dlfcn.h> ++static int (*local_scan_fn)(int fd, uschar **return_text) = NULL; ++static int load_local_scan_library(void); ++extern uschar *local_scan_path; /* Path to local_scan() library */ ++#endif ++ + int + local_scan(int fd, uschar **return_text) + { +-return LOCAL_SCAN_ACCEPT; ++#ifdef DLOPEN_LOCAL_SCAN ++/* local_scan_path is defined AND not the empty string */ ++if (local_scan_path && *local_scan_path) ++ { ++ if (!local_scan_fn) ++ { ++ if (!load_local_scan_library()) ++ { ++ char *base_msg , *error_msg , *final_msg ; ++ int final_length = -1 ; ++ ++ base_msg=US"Local configuration error - local_scan() library failure\n"; ++ error_msg = dlerror() ; ++ ++ final_length = strlen(base_msg) + strlen(error_msg) + 1 ; ++ final_msg = (char*)malloc( final_length*sizeof(char) ) ; ++ *final_msg = '\0' ; ++ ++ strcat( final_msg , base_msg ) ; ++ strcat( final_msg , error_msg ) ; ++ ++ *return_text = final_msg ; ++ return LOCAL_SCAN_TEMPREJECT; ++ } ++ } ++ return local_scan_fn(fd, return_text); ++ } ++else ++#endif ++ return LOCAL_SCAN_ACCEPT; ++} ++ ++#ifdef DLOPEN_LOCAL_SCAN ++ ++static int load_local_scan_library(void) ++{ ++/* No point in keeping local_scan_lib since we'll never dlclose() anyway */ ++void *local_scan_lib = NULL; ++int (*local_scan_version_fn)(void); ++int vers_maj; ++int vers_min; ++ ++local_scan_lib = dlopen(local_scan_path, RTLD_NOW); ++if (!local_scan_lib) ++ { ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - " ++ "message temporarily rejected"); ++ return FALSE; ++ } ++ ++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major"); ++if (!local_scan_version_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan_version_major() function - message temporarily rejected"); ++ return FALSE; ++ } ++ ++/* The major number is increased when the ABI is changed in a non ++ backward compatible way. */ ++vers_maj = local_scan_version_fn(); ++ ++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor"); ++if (!local_scan_version_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan_version_minor() function - message temporarily rejected"); ++ return FALSE; ++ } ++ ++/* The minor number is increased each time a new feature is added (in a ++ way that doesn't break backward compatibility) -- Marc */ ++vers_min = local_scan_version_fn(); ++ ++ ++if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR) ++ { ++ dlclose(local_scan_lib); ++ local_scan_lib = NULL; ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major" ++ "version number, you need to recompile your module for this version" ++ "of exim (The module was compiled for version %d.%d and this exim provides" ++ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, ++ LOCAL_SCAN_ABI_VERSION_MINOR); ++ return FALSE; ++ } ++else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR) ++ { ++ dlclose(local_scan_lib); ++ local_scan_lib = NULL; ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor" ++ "version number, you need to recompile your module for this version" ++ "of exim (The module was compiled for version %d.%d and this exim provides" ++ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, ++ LOCAL_SCAN_ABI_VERSION_MINOR); ++ return FALSE; ++ } ++ ++local_scan_fn = dlsym(local_scan_lib, "local_scan"); ++if (!local_scan_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan() function - message temporarily rejected"); ++ return FALSE; ++ } ++ ++return TRUE; + } + ++#endif /* DLOPEN_LOCAL_SCAN */ ++ ++ + /* End of local_scan.c */ +diff -aur exim-4.95.orig/src/readconf.c exim-4.95/src/readconf.c +--- exim-4.95.orig/src/readconf.c 2021-09-28 10:24:46.000000000 +0200 ++++ exim-4.95/src/readconf.c 2021-09-29 08:20:03.682883647 +0200 +@@ -215,6 +215,9 @@ + { "local_from_prefix", opt_stringptr, {&local_from_prefix} }, + { "local_from_suffix", opt_stringptr, {&local_from_suffix} }, + { "local_interfaces", opt_stringptr, {&local_interfaces} }, ++#ifdef DLOPEN_LOCAL_SCAN ++ { "local_scan_path", opt_stringptr, {&local_scan_path} }, ++#endif + #ifdef HAVE_LOCAL_SCAN + { "local_scan_timeout", opt_time, {&local_scan_timeout} }, + #endif +Only in exim-4.95/src: readconf.c.orig |