commit:     8a7059d941873a35822e577495cf71fdea4dcc08
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 10:34:01 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 10:42:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7059d9

mail-mta/exim-4.94.2: drop old

sparc how has exim-4.96.2 stable

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

 mail-mta/exim/exim-4.94.2-r7.ebuild                | 618 ---------------------
 .../exim/files/exim-4.94-localscan_dlopen.patch    | 269 ---------
 2 files changed, 887 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r7.ebuild 
b/mail-mta/exim/exim-4.94.2-r7.ebuild
deleted file mode 100644
index 8f5367aecfb8..000000000000
--- a/mail-mta/exim/exim-4.94.2-r7.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit db-use toolchain-funcs pam systemd
-
-IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr 
proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +ssl syslog 
tcpd +tpda X"
-REQUIRED_USE="
-       arc? ( dkim spf )
-       dane? ( ssl !gnutls )
-       dmarc? ( dkim spf )
-       dkim? ( ssl !gnutls )
-       gnutls? ( ssl )
-       pkcs11? ( ssl )
-       spf? ( exiscan-acl )
-       srs? (
-               exiscan-acl
-               ^^ ( srs-alt srs-native )
-       )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
-# incorrect, but b) is the only "correct" view from repoman.
-
-SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
-        [[ ${PV} == *.*.*.* ]] && echo /fixes)
-COMM_URI="https://downloads.exim.org/exim4${SDIR}";
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
-       mirror://gentoo/system_filter.exim.gz
-       doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
-HOMEPAGE="https://www.exim.org/";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="sparc"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-       ( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
-       dev-libs/libpcre
-       idn? ( net-dns/libidn:= net-dns/libidn2:= )
-       perl? ( dev-lang/perl:= )
-       pam? ( sys-libs/pam )
-       tcpd? ( sys-apps/tcp-wrappers )
-       ssl? (
-               gnutls? (
-                       net-libs/gnutls:0=[pkcs11?]
-                       dev-libs/libtasn1
-               )
-               !gnutls? (
-                       dev-libs/openssl:0=
-               )
-       )
-       ldap? ( >=net-nds/openldap-2.0.7:= )
-       nis? (
-               elibc_glibc? (
-                       net-libs/libtirpc:=
-                       >=net-libs/libnsl-1:=
-               )
-       )
-       mysql? ( dev-db/mysql-connector-c:= )
-       postgres? ( dev-db/postgresql:= )
-       sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-       redis? ( dev-libs/hiredis:= )
-       spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-       dmarc? ( mail-filter/opendmarc:= )
-       srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
-       X? (
-               x11-libs/libX11
-               x11-libs/libXmu
-               x11-libs/libXt
-               x11-libs/libXaw
-       )
-       sqlite? ( dev-db/sqlite )
-       radius? ( net-dialup/freeradius-client )
-       virtual/libcrypt:=
-       virtual/libiconv
-       elibc_glibc? ( net-libs/libnsl )
-       "
-       # added X check for #57206
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-       !mail-mta/courier
-       !mail-mta/esmtp
-       !mail-mta/msmtp[mta]
-       !mail-mta/netqmail
-       !mail-mta/nullmailer
-       !mail-mta/postfix
-       !mail-mta/sendmail
-       !mail-mta/opensmtpd
-       !mail-mta/ssmtp[mta]
-       >=net-mail/mailbase-0.00-r5
-       virtual/logger
-       dcc? ( mail-filter/dcc )
-       selinux? ( sec-policy/selinux-exim )
-       "
-
-S=${WORKDIR}/${P//_rc/-RC}
-
-src_prepare() {
-       # Legacy patches which need a respin for -p1
-       eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
-       eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-       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
-
-       # 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
-               eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
-       fi
-
-       if use maildir ; then
-               eapply "${FILESDIR}"/exim-4.94-maildir.patch
-       else
-               eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 
438606
-       fi
-
-       eapply_user
-
-       # user Exim believes it should be
-       MAILUSER=mail
-       MAILGROUP=mail
-       if use prefix && [[ ${EUID} != 0 ]] ; then
-               MAILUSER=$(id -un)
-               MAILGROUP=$(id -gn)
-       fi
-}
-
-src_configure() {
-       # general config and paths
-
-       local aliases="${EPREFIX}/etc/mail/aliases"
-       sed -i \
-               -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
-               src/configure.default || die
-
-       sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
-
-       if use elibc_musl; then
-               sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
-       fi
-
-       local conffile="${EPREFIX}/etc/exim/exim.conf"
-       sed -e "48i\CFLAGS=${CFLAGS}" \
-               -e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-               -e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
-               -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
-               -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-               -e 
"s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-               src/EDITME > Local/Makefile || die
-
-       # work on Local/Makefile from now on
-       cd Local
-
-       cat >> Makefile <<- EOC
-               INFO_DIRECTORY=${EPREFIX}/usr/share/info
-               PID_FILE_PATH=${EPREFIX}/run/exim.pid
-               SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-               HAVE_ICONV=yes
-       EOC
-
-       # if we use libiconv, now is the time to tell so
-       if use !elibc_glibc && use !elibc_musl ; then
-               cat >> Makefile <<- EOC
-                       EXTRALIBS_EXIM=-liconv
-               EOC
-       fi
-
-       # support for IPv6
-       if use ipv6; then
-               cat >> Makefile <<- EOC
-                       HAVE_IPV6=YES
-               EOC
-       fi
-
-       # support i18n/IDNA
-       if use idn; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_I18N=yes
-                       SUPPORT_I18N_2008=yes
-                       EXTRALIBS_EXIM += -lidn -lidn2
-               EOC
-       fi
-
-       #
-       # mail storage formats
-       #
-
-       # mailstore is Exim's traditional storage format
-       cat >> Makefile <<- EOC
-               SUPPORT_MAILSTORE=yes
-       EOC
-
-       # mbox
-       if use mbx; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MBX=yes
-               EOC
-       fi
-
-       # maildir
-       if use maildir; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_MAILDIR=yes
-               EOC
-       fi
-
-       #
-       # lookup methods
-
-       # 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"
-       cat >> Makefile <<- EOC
-               USE_DB=yes
-               LOOKUP_CDB=yes
-               LOOKUP_PASSWD=yes
-               LOOKUP_DSEARCH=yes
-               # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
-               CFLAGS += -I$(db_includedir ${DB_VERS})
-               DBMLIB = -l$(db_libname ${DB_VERS})
-       EOC
-
-       if ! use dnsdb; then
-               # DNSDB lookup is enabled by default
-               sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || 
die
-       fi
-
-       if use ldap; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_LDAP=yes
-                       LDAP_LIB_TYPE=OPENLDAP2
-                       LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
-                       LOOKUP_LIBS += -lldap -llber
-               EOC
-       fi
-
-       if use mysql; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_MYSQL=yes
-                       LOOKUP_INCLUDE += $(mysql_config --include)
-                       LOOKUP_LIBS += $(mysql_config --libs)
-               EOC
-       fi
-
-       if use nis; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_NIS=yes
-                       LOOKUP_NISPLUS=yes
-               EOC
-               if use elibc_glibc ; then
-                       cat >> Makefile <<- EOC
-                               LOOKUP_INCLUDE += 
-I"${EPREFIX}"/usr/include/tirpc
-                               LOOKUP_LIBS += -lnsl
-                       EOC
-               fi
-       fi
-
-       if use postgres; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_PGSQL=yes
-                       LOOKUP_INCLUDE += -I$(pg_config --includedir)
-                       LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-               EOC
-       fi
-
-       if use sqlite; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_SQLITE=yes
-                       LOOKUP_SQLITE_PC=sqlite3
-               EOC
-       fi
-
-       if use redis; then
-               cat >> Makefile <<- EOC
-                       LOOKUP_REDIS=yes
-                       LOOKUP_LIBS += -lhiredis
-               EOC
-       fi
-
-       # Exim monitor, enabled by default, controlled via X USE-flag,
-       # disable if not requested, bug #46778
-       if use X; then
-               cp ../exim_monitor/EDITME eximon.conf || die
-               cat >> Makefile <<- EOC
-                       EXIM_MONITOR=eximon.bin
-               EOC
-       fi
-
-       #
-       # 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
-               cat >> Makefile <<- EOC
-                       DISABLE_DKIM=yes
-               EOC
-       fi
-
-       # Per-Recipient-Data-Response
-       if ! use prdr; then
-               # PRDR is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_PRDR=yes
-               EOC
-       fi
-
-       # Transport post-delivery actions
-       if use !tpda && use !dane; then
-               # EVENT is enabled by default
-               cat >> Makefile <<- EOC
-                       DISABLE_EVENT=yes
-               EOC
-       fi
-
-       # log to syslog
-       if use syslog; then
-               local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
-               sed -i \
-                       -e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
-                       Makefile || die
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=syslog
-               EOC
-       else
-               cat >> Makefile <<- EOC
-                       LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-               EOC
-       fi
-
-       # starttls support (ssl)
-       if use ssl; then
-               if use gnutls; then
-                       echo "USE_GNUTLS=yes" >> Makefile
-                       echo "USE_GNUTLS_PC=gnutls $(use dane && echo 
gnutls-dane)" \
-                               >> Makefile
-                       use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-               else
-                       echo "USE_OPENSSL=yes" >> Makefile
-                       echo "USE_OPENSSL_PC=openssl" >> Makefile
-               fi
-       else
-               echo "DISABLE_TLS=yes" >> Makefile
-       fi
-
-       # TCP wrappers
-       if use tcpd; then
-               cat >> Makefile <<- EOC
-                       USE_TCP_WRAPPERS=yes
-                       EXTRALIBS_EXIM += -lwrap
-               EOC
-       fi
-
-       # Light Mail Transport Protocol
-       if use lmtp; then
-               cat >> Makefile <<- EOC
-                       TRANSPORT_LMTP=yes
-               EOC
-       fi
-
-       # embedded Perl
-       if use perl; then
-               cat >> Makefile <<- EOC
-                       EXIM_PERL=perl.o
-               EOC
-       fi
-
-       # dlfunc
-       if use dlfunc; then
-               cat >> Makefile <<- EOC
-                       EXPAND_DLFUNC=yes
-                       HAVE_LOCAL_SCAN=yes
-                       DLOPEN_LOCAL_SCAN=yes
-               EOC
-       fi
-
-       # Proxy Protocol
-       if use proxy; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_PROXY=yes
-               EOC
-       fi
-
-       # DANE
-       if use !dane; then
-               # DANE is enabled by default
-               sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || 
die
-       fi
-
-       # DMARC
-       if use dmarc; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_DMARC=yes
-                       EXTRALIBS_EXIM += -lopendmarc
-               EOC
-       fi
-
-       # Sender Policy Framework
-       if use spf; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_SPF=yes
-                       EXTRALIBS_EXIM += -lspf2
-               EOC
-       fi
-
-       #
-       # experimental features
-       #
-
-       # Authenticated Receive Chain
-       if use arc; then
-               echo "EXPERIMENTAL_ARC=yes">> Makefile
-       fi
-
-       # Distributed Checksum Clearinghouse
-       if use dcc; then
-               echo "EXPERIMENTAL_DCC=yes">> Makefile
-       fi
-
-       # Sender Rewriting Scheme
-       if use srs; then
-               # NOTE: we currently USE-default to srs-alt, because this is
-               # 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
-                       cat >> Makefile <<- EOC
-                               EXPERIMENTAL_SRS=yes
-                               EXTRALIBS_EXIM += -lsrs_alt
-                       EOC
-               fi
-               if use srs-native; then
-                       # this one becomes SUPPORT_SRS in 4.95
-                       cat >> Makefile <<- EOC
-                               EXPERIMENTAL_SRS_NATIVE=yes
-                       EOC
-               fi
-       fi
-
-       # Delivery Sender Notifications extra information in fail message
-       if use dsn; then
-               cat >> Makefile <<- EOC
-                       EXPERIMENTAL_DSN_INFO=yes
-               EOC
-       fi
-
-       #
-       # authentication (SMTP AUTH)
-       #
-
-       # standard bits
-       cat >> Makefile <<- EOC
-               AUTH_SPA=yes
-               AUTH_CRAM_MD5=yes
-               AUTH_PLAINTEXT=yes
-       EOC
-
-       # Cyrus SASL
-       if use sasl; then
-               cat >> Makefile <<- EOC
-                       CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-                       AUTH_CYRUS_SASL=yes
-                       AUTH_LIBS += -lsasl2
-               EOC
-       fi
-
-       # Dovecot
-       if use dovecot-sasl; then
-               cat >> Makefile <<- EOC
-                       AUTH_DOVECOT=yes
-               EOC
-       fi
-
-       # Pluggable Authentication Modules
-       if use pam; then
-               cat >> Makefile <<- EOC
-                       SUPPORT_PAM=yes
-                       AUTH_LIBS += -lpam
-               EOC
-       fi
-
-       # Radius
-       if use radius; then
-               cat >> Makefile <<- EOC
-                       
RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-                       RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-                       AUTH_LIBS += -lfreeradius-client
-               EOC
-       fi
-}
-
-src_compile() {
-       emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \
-               AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO=''
-}
-
-src_install() {
-       cd "${S}"/build-exim-gentoo || die
-       dosbin exim
-       if use X; then
-               dosbin eximon.bin
-               dosbin eximon
-       fi
-       fperms 4755 /usr/sbin/exim
-
-       dosym exim /usr/sbin/sendmail
-       dosym exim /usr/sbin/rsmtp
-       dosym exim /usr/sbin/rmail
-       dosym ../sbin/exim /usr/bin/mailq
-       dosym ../sbin/exim /usr/bin/newaliases
-       dosym ../sbin/sendmail /usr/lib/sendmail
-
-       for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-               exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep 
\
-               convert4r3 convert4r4 exipick
-       do
-               dosbin $i
-       done
-
-       dodoc -r "${S}"/doc/.
-       doman "${S}"/doc/exim.8
-       use dsn && dodoc "${S}"/README.DSN
-       use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
-
-       # 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
-
-       if use pam; then
-               pamd_mimic system-auth exim auth account
-       fi
-
-       # headers, #436406
-       if use dlfunc ; then
-               # fixup includes so they actually can be found when including
-               sed -i \
-                       -e '/#include 
"\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-                       local_scan.h || die
-               insinto /usr/include/exim
-               doins {config,local_scan}.h ../src/{mytypes,store}.h
-       fi
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/exim.logrotate" exim
-
-       newinitd "${FILESDIR}"/exim.rc10 exim
-       newconfd "${FILESDIR}"/exim.confd exim
-
-       systemd_dounit \
-               "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-       systemd_newunit \
-               "${FILESDIR}"/exim_at.service 'exim@.service'
-       systemd_newunit \
-               "${FILESDIR}"/exim-submission_at.service 
'exim-submission@.service'
-
-       diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
-       keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then
-               einfo "${EROOT}/etc/exim/system_filter.exim is a sample 
system_filter."
-               einfo "${EROOT}/etc/exim/auth_conf.sub contains the 
configuration sub"
-               einfo "for using smtp auth."
-               einfo "Please create ${EROOT}/etc/exim/exim.conf from"
-               einfo "  ${EROOT}/etc/exim/exim.conf.dist."
-       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"
-               einfo "  https://publicsuffix.org/list/public_suffix_list.dat";
-       fi
-       if use dcc ; then
-               einfo "DCC support is experimental, you can find some limited"
-               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
-       fi
-       use dsn && einfo "extra information in fail DSN message is experimental"
-       einfo
-       elog "Note that this release contains a tainted variable check that"
-       elog "is likely to break your configuration used with Exim 4.93 and 
before."
-       elog "Please check your transports for occurences of \$local_part, and"
-       elog "use a replacement like \$local_part_data where possible."
-}

diff --git a/mail-mta/exim/files/exim-4.94-localscan_dlopen.patch 
b/mail-mta/exim/files/exim-4.94-localscan_dlopen.patch
deleted file mode 100644
index 68ff48ac2a33..000000000000
--- a/mail-mta/exim/files/exim-4.94-localscan_dlopen.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -ur exim-4.92.orig/src/config.h.defaults exim-4.92/src/config.h.defaults
---- exim-4.92.orig/src/config.h.defaults       2019-01-30 14:59:52.000000000 
+0100
-+++ exim-4.92/src/config.h.defaults    2019-02-16 18:17:24.547216157 +0100
-@@ -32,6 +32,8 @@
- 
- #define AUTH_VARS                     3
- 
-+#define DLOPEN_LOCAL_SCAN
-+
- #define BIN_DIRECTORY
- 
- #define CONFIGURE_FILE
-Only in exim-4.92/src: config.h.defaults.orig
-diff -ur exim-4.92.orig/src/EDITME exim-4.92/src/EDITME
---- exim-4.92.orig/src/EDITME  2019-01-30 14:59:52.000000000 +0100
-+++ exim-4.92/src/EDITME       2019-02-16 18:17:24.547216157 +0100
-@@ -824,6 +824,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.92/src: EDITME.orig
-diff -ur exim-4.92.orig/src/globals.c exim-4.92/src/globals.c
---- exim-4.92.orig/src/globals.c       2019-01-30 14:59:52.000000000 +0100
-+++ exim-4.92/src/globals.c    2019-02-16 18:17:24.549216150 +0100
-@@ -41,6 +41,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.92/src: globals.c.orig
-diff -ur exim-4.92.orig/src/globals.h exim-4.92/src/globals.h
---- exim-4.92.orig/src/globals.h       2019-01-30 14:59:52.000000000 +0100
-+++ exim-4.92/src/globals.h    2019-02-16 18:17:24.549216150 +0100
-@@ -152,6 +152,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.92/src: globals.h.orig
-diff -ur exim-4.92.orig/src/local_scan.c exim-4.92/src/local_scan.c
---- exim-4.92.orig/src/local_scan.c    2019-01-30 14:59:52.000000000 +0100
-+++ exim-4.92/src/local_scan.c 2019-02-16 18:29:56.832732592 +0100
-@@ -5,61 +5,133 @@
- /* Copyright (c) University of Cambridge 1995 - 2009 */
- /* See the file NOTICE for conditions of use and distribution. */
- 
-+#include "local_scan.h"
- 
--/******************************************************************************
--This file contains a template local_scan() function that just returns ACCEPT.
--If you want to implement your own version, you should copy this file to, say
--Local/local_scan.c, and edit the copy. To use your version instead of the
--default, you must set
--
--HAVE_LOCAL_SCAN=yes
--LOCAL_SCAN_SOURCE=Local/local_scan.c
--
--in your Local/Makefile. This makes it easy to copy your version for use with
--subsequent Exim releases.
--
--For a full description of the API to this function, see the Exim 
specification.
--******************************************************************************/
--
--
--/* This is the only Exim header that you should include. The effect of
--including any other Exim header is not defined, and may change from release to
--release. Use only the documented interface! */
--
--#include "local_scan.h"
--
--
--/* This is a "do-nothing" version of a local_scan() function. The arguments
--are:
--
--  fd             The file descriptor of the open -D file, which contains the
--                   body of the message. The file is open for reading and
--                   writing, but modifying it is dangerous and not recommended.
--
--  return_text    A pointer to an unsigned char* variable which you can set in
--                   order to return a text string. It is initialized to NULL.
--
--The return values of this function are:
--
--  LOCAL_SCAN_ACCEPT
--                 The message is to be accepted. The return_text argument is
--                   saved in $local_scan_data.
--
--  LOCAL_SCAN_REJECT
--                 The message is to be rejected. The returned text is used
--                   in the rejection message.
--
--  LOCAL_SCAN_TEMPREJECT
--                 This specifies a temporary rejection. The returned text
--                   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)
- {
- fd = fd;                      /* Keep picky compilers happy */
- return_text = 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 -ur exim-4.92.orig/src/readconf.c exim-4.92/src/readconf.c
---- exim-4.92.orig/src/readconf.c      2019-01-30 14:59:52.000000000 +0100
-+++ exim-4.92/src/readconf.c   2019-02-16 18:18:46.013947455 +0100
-@@ -205,6 +205,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

Reply via email to