gentoo resync : 13.09.2019

3 files changed, 2 insertions, 187 deletions

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 0e7c9821d973..c4303672c81e 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -15,6 +15,5 @@ DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r2.ebuild 3955 BLAKE2B 80a549c28b008ca7a9bbd9c514b1239487be72f2c2381231cc92fa3ff345b5c700ceab4a1f95d8585e3be61a17f6b4b0fed93621f910e2493c9f1291289844e2 SHA512 4da917138b1e48d4a4926f12a9d25f2b3b89f2c08c02c02c2728195c3ee44ebcdecbde43675ec369677083981f23c51acc1b74be9ef5be5d77ee7e5bea1ce814
 EBUILD netqmail-1.06-r4.ebuild 4168 BLAKE2B 4e8f5cbdbf4d3dad977814856d8b757cf73b1851bf79cafe8ec46975872241770281827e5e1a061d08be41edd79c9f55770681bb5dd3ce477efeda4f98c99978 SHA512 2a79163fe009405f4bb77f725fc520ff6503005377c9a949611002a99e124e1baf266f8d48d9a17cced99d3ef3f09d9a588f319fcf6eccd2e40c611c89b91fc8
-EBUILD netqmail-1.06-r5.ebuild 4317 BLAKE2B ff4d410a11f3360e34976fd1f32ee6127d58c6c46c89f5661c0f1cbec06e0fb6c7e92b5d55b9c8580bb2600e4c43a35e77866c94839cb339daa24e49408d4adf SHA512 ea7ac067e5931596c2ccc60a558ffb13e75d73281a7472f0a9bf3883e782e62efdd5cf822b9abd1329284a9c3b6019a8841f9c3e68e915e218a47d9ba2cb5ba4
-EBUILD netqmail-1.06-r6.ebuild 4340 BLAKE2B 377c258e39fca2e6efa2295724367ddf8605db0ed6b7d5f3be98153a0039fa8e0f74221cf0a632f7c4c5325a72a2c5cf70e0dd1f31f458b9909fdfb3ccb23bc7 SHA512 cb2db3c701b76d80c71ac163170909e008a806cd3b8b1ab696881519800336eb9a2f98bc020fc133ea33789efe3e2a797e4ed13e63709f3ba2ba88bc77b8ef10
+EBUILD netqmail-1.06-r6.ebuild 4346 BLAKE2B 6947e256e37c6d7645269d42546312b44c2793a3db994a82053da41a094126e41b22f30ec4f7f9d628faaa3ba84c5055d2653843de0b516acc335505bedc744b SHA512 2c318c4241f19cef9ab3778e4e783982957582764189dad1f7b5914d0ba2b5090fdcc6a6e58d7b0c45b0086aa0bd75dcd45e5b1e59e9470003d2ccef4f0204c9
 MISC metadata.xml 478 BLAKE2B d947af2777a19a9c422bf722a2755c00302885909dfcf3877624c3c3baf2f5bc13befdbd8865a9de246e3ea3ab446a0bb42d5f26febb5bc585393e66b76d214e SHA512 13a8e6e9fb1bb277d98625b6e87d03aea279802263806476ebb8057248e787eb6abbca5fc9b5f4855750f47b8281adefadc87fec7ef61cb2a1e74b0d8a0f346e
diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
deleted file mode 100644
index f6f4cfb3deec..000000000000
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20070417
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-QMAIL_SMTPUTF8='qmail-smtputf8.patch'
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
-HOMEPAGE="
-	http://netqmail.org
-	https://cr.yp.to/qmail.html
-	http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-	http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
-	!vanilla? (
-		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-		ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
-REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
-RESTRICT="test"
-
-DEPEND="
-	!mail-mta/qmail
-	net-mail/queue-repair
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sys-apps/gentoo-functions
-	sys-apps/groff
-	net-dns/libidn2
-"
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	>=sys-apps/ucspi-tcp-0.88-r17
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	virtual/daemontools
-	>=net-mail/dot-forward-0.71-r3
-	virtual/checkpassword
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	${DEPEND}
-"
-
-pkg_setup() {
-	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-		eerror
-		eerror "The QMAIL_PATCH_DIR variable for custom patches"
-		eerror "has been removed from ${PN}. If you need custom patches"
-		eerror "you should create a copy of this ebuild in an overlay."
-		eerror
-		die "QMAIL_PATCH_DIR is not supported anymore"
-	fi
-
-	qmail_create_users
-}
-
-src_unpack() {
-	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
-
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-exit.patch
-	epatch "${FILESDIR}"/${PV}-readwrite.patch
-	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
-	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
-
-	ht_fix_file Makefile*
-
-	if ! use vanilla; then
-		if use ssl; then
-			# This patch contains relative paths and needs to be cleaned up.
-			sed 's~^--- ../../~--- ~g' \
-				< "${DISTDIR}"/${QMAIL_TLS_F} \
-				> "${T}"/${QMAIL_TLS_F} || die
-			epatch "${T}"/${QMAIL_TLS_F}
-			epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
-		fi
-		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
-
-		if use qmail-spp; then
-			if use ssl; then
-				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
-			else
-				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
-			fi
-			cd "${WORKDIR}" || die
-			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
-			cd - || die
-		fi
-	fi
-
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-	use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch
-	cd - || die
-
-	qmail_src_postunpack
-
-	# Fix bug #33818 but for netqmail (Bug 137015)
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
-}
-
-src_compile() {
-	qmail_src_compile
-	use qmail-spp && qmail_spp_src_compile
-}
-
-src_install() {
-	qmail_src_install
-}
-
-pkg_postinst() {
-	qmail_queue_setup
-	qmail_rootmail_fixup
-	qmail_tcprules_build
-
-	qmail_config_notice
-	qmail_supervise_config_notice
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
-	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-	elog "http://www.lifewithqmail.com/"
-	elog "  -- Life with qmail"
-	elog
-}
-
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
-pkg_config() {
-	# avoid some weird locale problems
-	export LC_ALL=C
-
-	qmail_config_fast
-	qmail_tcprules_config
-	qmail_tcprules_build
-
-	use ssl && qmail_ssl_generate
-}
diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index f78baf94aacb..f58a3c0abad7 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
+		!libressl? ( >=dev-libs/openssl-1.1:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
 	sys-apps/gentoo-functions