gentoo resync : 30.06.2019

4 files changed, 43 insertions, 26 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 32ef72018420..e89a788ccc4f 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -9,7 +9,7 @@ AUX exim-4.80-spool-mail-group.patch 946 BLAKE2B a3b6783b77823c5a8373623d16b85e2
 AUX exim-4.82-makefile-freebsd.patch 1252 BLAKE2B 29c58b487850e28e0b2dfd5bbaa7e8ac341ebc00093a46a9d6b44c8d1c508629f78f646ccd3d022b2acee20d0572320f79acc21c519727f007e11e08623f4fec SHA512 fb440ad3e46b90d4c2e4826841944f4006390ccebee08154a39e46f6854be15edd7d0b028333b41451a0511f886ad3a30cb4b86e7ba8be99f12616a137f09d56
 AUX exim-4.89-as-needed-ldflags.patch 6048 BLAKE2B 229dbc384c64a30f620c2965b030f6e6773efca5390ccd67a6a69b5565b0d2d536f0385d8095f92e43e1bc45ab43822efd10cb8aafe2d3cee7d21c0b330e08d1 SHA512 a0ac891c2708afdf8be339a15e6c74d27a19ac87ab63e97de71b5b5d4fab63b898018f7f0ad1dc2e22a86d71c05c1a1b250d598d7622e6172f187ac36e5c3adf
 AUX exim-4.92-fix-eval-expansion-32bit.patch 1792 BLAKE2B 81ac3cc505e62c95624b8f55771d7cdce39c882cbcdd553e9cd6263417f31fe7a800dec4386cc4534609fa9b20fc493d2ae6393c8de0d09dd3b3056f3b7da501 SHA512 108e782f1483dcb2d1a34ba226d1829da78fbfb18eddd68def8e693091cf05c8e448c1bcd197fe893dc51996c434f8d9168c131e5ca67125e6362491c5aeeb77
-AUX exim-4.92-localscan_dlopen.patch 9482 BLAKE2B c7aaf2f89f15ac0a98b18ec7f03afaf263491697ad10a38525ef1469683d826288e3b27de579d83c84865c3a6881288ddb50567e8c2d9247f68874a956f18e6a SHA512 47123c214ffb0a95b533beca1af7fc0fe375552a3e40d5e77de6de1196898f9280d7cc8f500ed443435dd88a0b53c571aae56de2b92edef02fa684b569bc377a
+AUX exim-4.92-localscan_dlopen.patch 9483 BLAKE2B 8fe480bbdccfa7388428fcb9aad876bcdcfc33220a529aebfca64e90c62f5a3b5ccf3477586349204f3c0be9ee3bb4d753e18cc24e759f26cf1a427d4f3e77da SHA512 7226ae2ef3d29537241f8c392dcc7522978861f8ad32ca280ec2da2f465f6dad0561ea3ad6a7606f8f6b2e7328704d464c892cd2ddaf0e132bc51f29f8003f4c
 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
 AUX exim-submission_at.service 360 BLAKE2B 9ebcac1ab0f01a8264141843a4e711d77f634bdd910406bd466a0c197fdad8a9ff4bc31b9b28ef73c810aaff3e549eb60c0a2546507910dfc800da154eb1da00 SHA512 dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f
 AUX exim.confd 141 BLAKE2B bc200e6121544d17e7feb0e162b5f6a5157647c3323492218da1556a19f3a2febf89a698e157a6dc657540d2f46088a9b1e34700655c715fbeaf0c201bc4aa9f SHA512 cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998
@@ -24,6 +24,6 @@ DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ec
 DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547 SHA512 3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.91-r2.ebuild 13173 BLAKE2B f7ee40c7dbab94fd499c9fae38e385b2a937805ec340ec511c57d0e00e74f5075b0ced2ed35700af35e40702042612127155360b42529f5377eaee09da7c8fdb SHA512 5bc34da80791d5f5a482f31bdb425299a0201fc6e0d13076c63e92be678569bedab1356618662d7b463e96810b8d34de6462243eecc7c637d43bf7a5f1b0b7a3
-EBUILD exim-4.92-r1.ebuild 13253 BLAKE2B 55a0f2a3c2343af757b9fe2251767efb7bd03dce9f09e9cfdc4a5ffcb6157963e88cf32e016967c256aea298e8d58160a8dad714f189973ce5df508608503787 SHA512 0fd5dc14950613d3e6cf3679951033db40f5b3fcc2f05bdbc334fea34c2a19f7d0c7089cba0f53f06c3e6ae58e67da339031c4203e104538dd4098dceed1a048
-EBUILD exim-4.92.ebuild 13173 BLAKE2B 7f02d58105608c8acb1e352cda7f6e11d67e9732f0649b720007f6185c20efa3c72c24b683d50fad531d1b12a2d19e6b742c8120f4affc973b307e17575eb29a SHA512 5c1348eb5cb722b05528eb4cdaef9f1deb6db25fd3dbeb9fb21d412527e14a9bfa3059d79987b44428d6be15b15741d066ce863d0ccf3613556dbb2347660c61
+EBUILD exim-4.92-r2.ebuild 13512 BLAKE2B cef2f349005a06f3613a0dc30b096b830e9e61fe9b81b66c93ed677f61299de29427ae66e17b761345c5cd0d8e575cfa4b7be841b326529ffd19751f67c620c5 SHA512 6c73b4fa438f271b7731b3c652ed545a4edf5c301c5c948b56a6226b5e74493d16702ee176f1bc117dc5d5d05dd85180fd1dc5579f61d011f6f6b9291810c213
+EBUILD exim-4.92.ebuild 13221 BLAKE2B 1f4ade06d4aee9795a0c1647796fb2976f35f8fd2c2f2c320b03c570cc46b41b09184f0dde19a4cec887a98b20a375f2b11472dee4bc08ee18e91d40b4a97e4d SHA512 b02c7dd557552755d9484fb892bccca708208cb99a6c5e534f1cfc0ec1c9a44230dfb4aeb0548c88171a4d72b67d72c1e26289096c627060b7b79dec0831cdb8
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.92-r1.ebuild b/mail-mta/exim/exim-4.92-r2.ebuild
index a0346ffb5790..3a5c9bf51b08 100644
--- a/mail-mta/exim/exim-4.92-r1.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -131,25 +131,27 @@ src_prepare() {
 src_configure() {
 	# general config and paths
 
-	sed -i.orig \
-		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-		"${S}"/src/configure.default || die
+	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/g' Makefile || 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=${MAILUSER}:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
+		-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
-
-	if use elibc_musl; then
-		sed -e 's/^LIBS = -lnsl/LIBS =/g' \
-		-i OS/Makefile-Linux
-	fi
+		src/EDITME > Local/Makefile || die
 
+	# work on Local/Makefile from now on
 	cd Local
 
 	cat >> Makefile <<- EOC
@@ -181,6 +183,7 @@ src_configure() {
 
 	#
 	# mail storage formats
+	#
 
 	# mailstore is Exim's traditional storage format
 	cat >> Makefile <<- EOC
@@ -218,14 +221,14 @@ src_configure() {
 
 	if ! use dnsdb; then
 		# DNSDB lookup is enabled by default
-		sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
+		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"${EROOT}"usr/include/ldap
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
 			LOOKUP_LIBS += -lldap -llber
 		EOC
 	fi
@@ -245,7 +248,7 @@ src_configure() {
 		EOC
 		if use elibc_glibc ; then
 			cat >> Makefile <<- EOC
-				CFLAGS += -I/usr/include/tirpc
+				CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
 			EOC
 		fi
 	fi
@@ -272,17 +275,17 @@ src_configure() {
 		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
 	else
-		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
+		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
 	fi
 
 	#
 	# features
+	#
 
 	# content scanning support
 	if use exiscan-acl; then
@@ -317,7 +320,10 @@ src_configure() {
 
 	# log to syslog
 	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
+		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
@@ -365,6 +371,8 @@ src_configure() {
 	if use dlfunc; then
 		cat >> Makefile <<- EOC
 			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
 		EOC
 	fi
 
@@ -392,6 +400,7 @@ src_configure() {
 
 	#
 	# experimental features
+	#
 
 	# Authenticated Receive Chain
 	if use arc; then
@@ -428,6 +437,7 @@ src_configure() {
 
 	#
 	# authentication (SMTP AUTH)
+	#
 
 	# standard bits
 	cat >> Makefile <<- EOC
@@ -531,9 +541,12 @@ src_install () {
 	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'
+	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}
@@ -542,8 +555,10 @@ src_install () {
 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 for using smtp auth."
-		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
+		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 dcc ; then
 		einfo "DCC support is experimental, you can find some limited"
diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index a68f1b942033..fe6cf5e40f1d 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -364,6 +364,8 @@ src_configure() {
 	if use dlfunc; then
 		cat >> Makefile <<- EOC
 			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
 		EOC
 	fi
 
diff --git a/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch
index b52d2ad7b9cf..57363e56d50e 100644
--- a/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch
+++ b/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch
@@ -23,7 +23,7 @@ diff -ur exim-4.92.orig/src/EDITME exim-4.92/src/EDITME
 +# 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
++#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