gentoo resync : 20.03.2022

3 files changed, 225 insertions, 7 deletions

diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 233d6e5f23ac..a90b1b521678 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -5,7 +5,9 @@ DIST notqmail-1.08-spp.patch 14304 BLAKE2B 61cb1cf48e0af93d4928906fa115fe71df888
 DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300eb89b367c239ae7a60256c417a2abfa583984e6273eae6df22d44b98dcefce4904f6db9625ff2a57f4b30a8fff8c629d374b SHA512 bdccdf98024f811802504872b8e3f3ac3010c1f218a0ec79bb12e635c35bfa15471c2b7e499c14e6bec9b5d3e48f1e584e26ba2ca01f1ce73a347a338de2a304
 DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce58425c3c6e1ebfaaaf29a222a532cfd246fec16f52997e85eb921ad376235eb69a8580ba8df493bf760f3d8237311411c0 SHA512 012cdc62c2361737fb984e750a28bd06f357aefd9fa8d909e2e380e65fc5ae3a2cbef3f592eb60455ad858385dbf8e8b50a2f6358a9ffa3f885aa76250a336a0
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
+DIST notqmail-1.08.tar.xz.sig 195 BLAKE2B 0edf3758d24c22e69139a57804b5b39da6c5868c178af511ff5105cd45bf105f5bb903d94093d400c54126e359a259f32d8c8b25c2fb87233efd74fdb05593c1 SHA512 2d5e68d1f3d7330b8b58f54235ec22a94adc0811e23f4863fac806c7a3e0110e6388920c3089c68fa3bb438398d64ea6e37240d002225b1cab20460797487604
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 EBUILD notqmail-1.08-r5.ebuild 4334 BLAKE2B 2b1b9369b3ce11e42b1c113b0bdd65c32fda0e2de2f61d3e4175ccef5967c0d87deb7642ae906b804c3d25cd353e61d1c3353f66225c283482419e1028c748f8 SHA512 a25241b37373d686665d9a5bbbd7344d314a0175831fa003d5ae096806199bd56c3c6c7a8a1ff9dc011c977fcf19da9a196ddabe207b62190c87829a7121f95d
-EBUILD notqmail-9999.ebuild 4189 BLAKE2B c89890211163bcbe67b471204090c5a54b1dac48fb10ea856f961929959e51014275fb8403cdc1b76f967105fea87c640e8690241998442e76c51319f392c7c8 SHA512 7c00ecc44a537d7d1799e77884231fbca25a6ba89b1b2fba991b318717c9ef164eb48b247bbd87fe9b94f90400e82bcf47921a8af7939d8db8e07e7696f0d583
+EBUILD notqmail-1.08-r6.ebuild 4728 BLAKE2B 3d14b08335dcb8ac56391a687d2f69266d9b5d2b3498e49524cbe3ed25feaf516121cf601edb2a853c42f8af7c11ba9a37c9f955fcb08249fbd3d0ba5434c93d SHA512 35bc54f23af995596597257d0d9de0efcb3640fbef809f8e9bc20250a04a30df8448e4dc55ed1028f88d1dd62b1a40665cf9cc41360a29341642018f7c3b6947
+EBUILD notqmail-9999.ebuild 4601 BLAKE2B 93a521ea72c4ea5155770a3e5193ee0fd1a631229165af9f3d7bdc8685c5343ffd2fc4df426efa4907f01250aafe81bbb6078ef13ddd82745190e83316d0aabf SHA512 8c6c79f4a98e993e4376c56e0804cfb8f0860df5e8154c4d2f38f49e32c849987780cdad30e0c7ce8f86ceb436527ddfb0643f74bcd3fe63842c4135c9cb44d9
 MISC metadata.xml 808 BLAKE2B cc8d44eab1a8ceb2d0c46fee94d29b3fa631497d833c2404951a47c01898d33484db1f2c05571b66ef40d0293fbe396d8eb95b3249e85fa5c1fb0e0b320157bb SHA512 33bad8403da1c2fc99bc3fb73f4209fa297645b6abbe323bd3aabfc8b8b5fa809281ebd325742344a9b2d252a1f6c68dd518f9cbe63086ecf6d0e340ba6a7ea8
diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
new file mode 100644
index 000000000000..f8fec34a0f00
--- /dev/null
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENQMAIL_PV=20200817
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20200107
+QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
+
+QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
+
+QMAIL_LARGE_DNS="qmail-103.patch"
+
+inherit qmail systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
+	inherit git-r3
+else
+	inherit verify-sig
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	SRC_URI="
+		https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz
+		verify-sig? (
+			https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz.sig
+		)
+	"
+fi
+
+DESCRIPTION="Collaborative open-source successor to qmail"
+HOMEPAGE="
+	https://notqmail.org
+	https://cr.yp.to/qmail.html
+	http://qmail.org
+"
+SRC_URI="${SRC_URI}
+	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+	!vanilla? (
+		highvolume? (
+			https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F}
+		)
+		qmail-spp? (
+			ssl? (
+				https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch
+				https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> ${PN}-1.08-tls-spp.patch
+			)
+			!ssl? (
+				https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> ${PN}-1.08-spp.patch
+			)
+		)
+		ssl? (
+			https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> ${QMAIL_TLS_F}
+		)
+		!ssl? (
+			https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch
+		)
+	)
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-notqmail )"
+fi
+DEPEND="
+	net-dns/libidn2
+	net-mail/queue-repair
+	sys-apps/gentoo-functions
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+	test? ( dev-libs/check )
+"
+RDEPEND="${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
+	sys-apps/ucspi-tcp
+	authcram? ( >=net-mail/cmd5checkpw-0.30 )
+	ssl? (
+		pop3? ( sys-apps/ucspi-ssl )
+	)
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/nullmailer
+	!mail-mta/opensmtpd
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/netqmail
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+"
+PDEPEND="
+	virtual/daemontools
+"
+
+src_unpack() {
+	genqmail_src_unpack
+
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack
+	if [[ ${PV} != "9999" ]]; then
+		default
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+		fi
+	fi
+}
+
+PATCHES=(
+	"${DISTDIR}/${QMAIL_LARGE_DNS}"
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		if use qmail-spp; then
+			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )
+		elif use ssl; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" )
+		else
+			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )
+		fi
+		use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
+
+		if use qmail-spp; then
+			if use ssl; then
+				PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" )
+			else
+				PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" )
+			fi
+		fi
+	fi
+
+	default
+
+	qmail_src_postunpack
+
+	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 NROFF=true
+	emake qmail-send.service
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+	systemd_dounit "${S}"/qmail-send.service
+}
+
+src_test() {
+	emake test
+}
+
+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_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/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index d622c556ab57..6ce036b2f82c 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,8 +17,14 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
+	inherit verify-sig
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	SRC_URI="
+		https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz
+		verify-sig? (
+			https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz.sig
+		)
+	"
 fi
 
 DESCRIPTION="Collaborative open-source successor to qmail"
@@ -51,12 +57,17 @@ SRC_URI="${SRC_URI}
 	)
 "
 
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
+
 LICENSE="public-domain"
 SLOT="0"
 IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-notqmail )"
+fi
 DEPEND="
 	net-dns/libidn2
 	net-mail/queue-repair
@@ -99,12 +110,15 @@ src_unpack() {
 	genqmail_src_unpack
 
 	[[ ${PV} == "9999" ]] && git-r3_src_unpack
-	[[ ${PV} != "9999" ]] && default
+	if [[ ${PV} != "9999" ]]; then
+		default
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+		fi
+	fi
 }
 
 src_prepare() {
-	PATCHES=()
-
 	if ! use vanilla; then
 		if use qmail-spp; then
 			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )