gentoo resync : 03.11.2019

4 files changed, 15 insertions, 202 deletions

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 5b935b7a442b..c93c8fd9d1f1 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -3,6 +3,7 @@ AUX 1.06-fbsd-utmpx.patch 1902 BLAKE2B 8c2a278e10ed48db89b76c7005655f6e7707ee4e6
 AUX 1.06-readwrite.patch 237 BLAKE2B a8c9af939378bb423c68aebdafeeb3ecb53def9e7d050272e6f669c4d99d938a10a268420b1cf7e699146b3f71bb75c461e45f3f0905b9ccd3371572947aafca SHA512 4cfb7991f2b30740d007a655743e77f5271ebefb4ed31ceb44d10ee53168eec713bbe64ff3616c372851c5fe1f04e57601dc83a27f1ce9cccdd0e2fbc942b550
 AUX genqmail-20080406-ldflags.patch 455 BLAKE2B 9a820b3ed89ec74063076ac88933e14ee92776ed310b4e2e1f6ecb472fbf6ff6361c2cbe2cebcf2c8e2c9ca4a3d3a1611edcc601ab32bf2dcca8560e669678e9 SHA512 5579e6d60b4c71dca70163a832ef079a19abe815eeaa83b362edcccd4a2646c2cfb25d30cfab44c49b3b124c3b069c169b299d0f251495a15d0f785c3ef16e82
 AUX netqmail-1.06-ipme-multiple.patch 3694 BLAKE2B 53d1db0766a1720cf626210bd9272f2e5bbe310738c934ed8c3c0ffc7adb54ba8938af0d12771c77f59cada9d1c97f858cacfd86a4a0b0bcbb5c6c4e7d0d0d6e SHA512 08f26af9ecab24258956d20c8e7201bd4f3d55ce9f2793417ae3fa1ecae4e610eaa2fcfe01462ffa70f4974b5ee4969851c254ab051fe039dd2a8eb9fb8b8f5e
+AUX qmail-smtputf8-crlf-fix.patch 397 BLAKE2B 3ca4abcb9f1c1604828c31f358a6da3b3f9734a76d736b1dacada786e69ef010bdb0254d8106c82859ad66f21e1f81249db5f49984116ac84e7c719770999306 SHA512 b6e8060ef00464f429bc8b6d47d294c8e021ddef1991b7cf212a277f375872672d7f4ef799d93f1913fcb9260cb6d74049e6e9978aa43b59228e6c0c067cd87b
 AUX qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 AUX use-new-path-for-functions.sh.patch 404 BLAKE2B 2481a3bedfd3ea78fd75e482401e71c4ab6b3ac85605af07a530953a271322dcfc2e3b15819e0e0a75fb6215c4bbbbf43b2321763dfd690acfd6f3d10dd4351e SHA512 00b7a7a16ae7c9350b8f9c0f814f7d08ddc510e53a943a1f2fa4d87f39587953b5861e8a848b541fa3050e68144c9dc5a3f11498e4f05d29f91fe2976988aa79
 DIST big-todo.103.patch 5546 BLAKE2B 34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554 SHA512 fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
@@ -15,7 +16,6 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8
 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
+EBUILD netqmail-1.06-r10.ebuild 4489 BLAKE2B feae1e617f8f0f06399222765a925ea362551a7697fc7cf04102bc016e6d9df1496a24d7f75c13af88a06edeadbf515c0197877f1fdbbbe6409106d80725ef00 SHA512 ee170c48deda72ff0af60bce59f9aca37b30240b1772a0992d83370c49783105be28b3db491cfce095048d8b2a86c0298d3e78094bac38f88f545b7305178165
 EBUILD netqmail-1.06-r4.ebuild 4309 BLAKE2B 0a1edcdbecbd803b48cbaeb753a4070478113f7b4eb6692b011ab0fb2576eee3b1df2fdfdbdc1bc8ace192548a3dce835a3381cd4cbda8eb5ff6f9b097708a82 SHA512 5c22b73b75638133594bd8e2afe9cc818037aff84c241391e983b26bab24fb513b26a635e31e8cd9e3adca308d06c44587c512dd1e0feff751edf595a2b844ce
-EBUILD netqmail-1.06-r8.ebuild 4595 BLAKE2B a0c4177a597c3dd47cd0c8279a1fb435e9f201c633c1d79542080e56b3c08fd818a301517de8726bd0a48d11e272222d6db3db52ad62bcd2e0ff3427da2f59f4 SHA512 86d397e43560c4dbe9aeed89c7a2f006cc4af2a11c036dbabe15d805e37d3b8bfe4d870ef48d77c982425ef6a8e259b39e6c10694b37b830be4db21f165aa95b
-EBUILD netqmail-1.06-r9.ebuild 4441 BLAKE2B a817d9964ff8b9be454da9dee960546b0ed319d22e96b1b65eb3ddc6c2186d890fee1aaa5ab3f84c5aeb9f36ee298eae78924375be805c1d52b4a9a0fe1c698d SHA512 2a583aaba4463dbcafadb4278ad5607ddfa89ef7178bc8b4d1b1b5b40b050436fb43b8a0a34f94f5f199abc4bc77e3b6b59b5c69f52e0cfde93872627884c3e5
 MISC metadata.xml 673 BLAKE2B ed2a0e5538649aad627dfc0e7c28753f62445d27ea7c27e78fe453eecc0b2b75e902060a1616fadbae59beddb0ff0d24dd6a35e8cd16423df15a8f92a9da1bd4 SHA512 14b27384c8af56fe2d30d12af1d455ce8db52a21848ffc3cfa15e784a459d54c071fd6f93bf467e2e3e1786e41f7207fff0cd77751dfb153373d249c2cd4509e
diff --git a/mail-mta/netqmail/files/qmail-smtputf8-crlf-fix.patch b/mail-mta/netqmail/files/qmail-smtputf8-crlf-fix.patch
new file mode 100644
index 000000000000..cde34e0f9dd4
--- /dev/null
+++ b/mail-mta/netqmail/files/qmail-smtputf8-crlf-fix.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/611142
+
+--- a/qmail-remote.c	2019-10-29 22:46:27.076000000 +0100
++++ b/qmail-remote.c	2019-10-29 22:48:18.868000000 +0100
+@@ -556,6 +556,7 @@ void checkutf8message()
+     if (r == 0) break;
+     if (r == -1) temp_read();
+ 
++    if (ch == '\n' && !stralloc_cats(&firstpart,"\r")) temp_nomem();
+     if (!stralloc_append(&firstpart,&ch)) temp_nomem();
+ 
+     if (ch == '\r')
diff --git a/mail-mta/netqmail/netqmail-1.06-r9.ebuild b/mail-mta/netqmail/netqmail-1.06-r10.ebuild
index 755e1c04b03e..315e297526f0 100644
--- a/mail-mta/netqmail/netqmail-1.06-r9.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r10.ebuild
@@ -120,6 +120,7 @@ src_prepare() {
 			PATCHES+=( "${T}/${QMAIL_TLS_F}"
 				"${DISTDIR}/${QMAIL_TLS_CVE}"
 				"${FILESDIR}/qmail-smtputf8.patch"
+				"${FILESDIR}/qmail-smtputf8-crlf-fix.patch"
 			)
 		fi
 		if use highvolume; then
diff --git a/mail-mta/netqmail/netqmail-1.06-r8.ebuild b/mail-mta/netqmail/netqmail-1.06-r8.ebuild
deleted file mode 100644
index fd0fcf4bf94b..000000000000
--- a/mail-mta/netqmail/netqmail-1.06-r8.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20190114
-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 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}
-	!vanilla? (
-		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-		ssl? (
-			https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
-			http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-			https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
-		)
-	)
-"
-
-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="
-	acct-group/nofiles
-	acct-group/qmail
-	acct-user/alias
-	acct-user/qmaild
-	acct-user/qmaill
-	acct-user/qmailp
-	acct-user/qmailq
-	acct-user/qmailr
-	acct-user/qmails
-	net-dns/libidn2
-	net-mail/queue-repair
-	sys-apps/gentoo-functions
-	sys-apps/groff
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp
-	virtual/checkpassword
-	virtual/daemontools
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? ( sys-apps/ucspi-ssl )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nullmailer
-	!mail-mta/opensmtpd
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-"
-
-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 "see 'user patches' in the portage manual."
-		eerror
-		die "QMAIL_PATCH_DIR is not supported anymore"
-	fi
-}
-
-src_unpack() {
-	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
-
-	unpack ${P}.tar.gz
-}
-
-PATCHES=(
-	"${FILESDIR}/${PV}-exit.patch"
-	"${FILESDIR}/${PV}-readwrite.patch"
-	"${DISTDIR}/${QMAIL_LARGE_DNS}"
-	"${FILESDIR}/${PV}-fbsd-utmpx.patch"
-	"${FILESDIR}/${P}-ipme-multiple.patch"
-)
-
-src_prepare() {
-	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
-			PATCHES+=( "${T}/${QMAIL_TLS_F}"
-				"${DISTDIR}/${QMAIL_TLS_CVE}"
-				"${FILESDIR}/qmail-smtputf8.patch"
-			)
-		fi
-		if use highvolume; then
-			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-		fi
-
-		if use qmail-spp; then
-			if use ssl; then
-				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
-			else
-				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
-			fi
-			# make the patch work with "-p1"
-			sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ \([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
-
-			PATCHES+=( "${SPP_PATCH}" )
-		fi
-	fi
-
-	default
-
-	pushd "${WORKDIR}" >/dev/null || die
-	use qmail-spp && eapply "${FILESDIR}/genqmail-20080406-ldflags.patch"
-	eapply "${FILESDIR}"/use-new-path-for-functions.sh.patch
-	popd >/dev/null || 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
-
-	ht_fix_file Makefile*
-}
-
-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
-}