public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-06-05 16:03 Michał Górny
  0 siblings, 0 replies; 27+ messages in thread
From: Michał Górny @ 2020-06-05 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d331eb76b161a27da553b85f6f6c8821d6065a0c
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu May 21 08:57:55 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 16:03:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d331eb76

mail-mta/notqmail: new package

"notqmail is a community-driven fork of qmail, beginning where netqmail left
off".

From everything we can tell there will be no new release of netqmail, so we
decided to do our own thing. Eventually this will replace the existing
mail-mta/netqmail ebuilds.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 mail-mta/notqmail/Manifest             |   7 ++
 mail-mta/notqmail/metadata.xml         |  23 ++++
 mail-mta/notqmail/notqmail-1.08.ebuild | 186 +++++++++++++++++++++++++++++++++
 mail-mta/notqmail/notqmail-9999.ebuild | 186 +++++++++++++++++++++++++++++++++
 4 files changed, 402 insertions(+)

diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
new file mode 100644
index 00000000000..57b6074b1bd
--- /dev/null
+++ b/mail-mta/notqmail/Manifest
@@ -0,0 +1,7 @@
+DIST genqmail-20191010.tar.bz2 10063 BLAKE2B bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718 SHA512 8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
+DIST notqmail-1.08-auth.patch 71183 BLAKE2B c980475ef7a2ad6e05d71f494293579e5082b63606fd0bbbd51fff5d067912b1548b4033f36de8030d60b195a684ff0845afe022d316ad835b1ad0b360cafbd6 SHA512 697b8b2a26a10c0029918193046dd2758bb3e84af97fb2e99f29bfb23efb0a9e0ee6ecca0431369e348d1414ef70bc5c446420b4f019ba427d16d0f07f23f6e3
+DIST notqmail-1.08-big-todo.patch 7179 BLAKE2B f7582d0193096f17316feb15e65c2b841545e274309351fc2921120ec3a4fb35b1998fbd8b8ca573c7dbd690ab7197f4b4f9105671f7d299687bf339b747deb2 SHA512 8444c8b4558410682d46e4954973721a1fb5e90585c9a3a4d7603448faf68cc0d07d2b5d51977ce72d35551b5c43b03014638251b542e48fe9cbef327cacc7c6
+DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300eb89b367c239ae7a60256c417a2abfa583984e6273eae6df22d44b98dcefce4904f6db9625ff2a57f4b30a8fff8c629d374b SHA512 bdccdf98024f811802504872b8e3f3ac3010c1f218a0ec79bb12e635c35bfa15471c2b7e499c14e6bec9b5d3e48f1e584e26ba2ca01f1ce73a347a338de2a304
+DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
+DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
+DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf

diff --git a/mail-mta/notqmail/metadata.xml b/mail-mta/notqmail/metadata.xml
new file mode 100644
index 00000000000..1547ff2797a
--- /dev/null
+++ b/mail-mta/notqmail/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>eike@sf-mail.de</email>
+		<name>Rolf Eike Beer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="authcram">Enable AUTHCRAM support</flag>
+		<flag name="gencertdaily">Generate SSL certificates daily instead of
+			hourly</flag>
+		<flag name="highvolume">Prepare notqmail for high volume servers</flag>
+		<flag name="pop3">Include POP3 server</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">notqmail/notqmail</remote-id>
+		<remote-id type="sourceforge">qmail-spp</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08.ebuild
new file mode 100644
index 00000000000..6332e8b46af
--- /dev/null
+++ b/mail-mta/notqmail/notqmail-1.08.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENQMAIL_PV=20191010
+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
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~sparc"
+	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
+fi
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+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? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch
+		ssl? (
+			https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F}
+		)
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	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:= )
+	)
+	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
+	virtual/checkpassword
+	virtual/daemontools
+	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]
+"
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack
+	[[ ${PV} != "9999" ]] && default
+}
+
+PATCHES=(
+	"${DISTDIR}/${QMAIL_LARGE_DNS}"
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		if use ssl; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" )
+		else
+			PATCHES+=( "${DISTDIR}/${P}-auth.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
+
+	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
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+}
+
+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_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/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
new file mode 100644
index 00000000000..6332e8b46af
--- /dev/null
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENQMAIL_PV=20191010
+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
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~sparc"
+	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
+fi
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+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? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+		https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch
+		ssl? (
+			https://github.com/notqmail/notqmail/commit/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F}
+		)
+	)
+"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	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:= )
+	)
+	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
+	virtual/checkpassword
+	virtual/daemontools
+	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]
+"
+
+src_unpack() {
+	genqmail_src_unpack
+	use qmail-spp && qmail_spp_src_unpack
+
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack
+	[[ ${PV} != "9999" ]] && default
+}
+
+PATCHES=(
+	"${DISTDIR}/${QMAIL_LARGE_DNS}"
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		if use ssl; then
+			PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" )
+		else
+			PATCHES+=( "${DISTDIR}/${P}-auth.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
+
+	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
+	use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+	qmail_src_install
+}
+
+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_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
+}


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-06-06 18:49 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2020-06-06 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     80db5fdc12e5a4315fec48dd890f653895269488
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 18:49:01 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 18:49:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80db5fdc

mail-mta/notqmail: keyworded 1.08 for ia64

keyworded wrt bug #727256

Package-Manager: Portage-2.3.100, Repoman-2.3.22
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08.ebuild
index 6332e8b46af..f0c38be6c75 100644
--- a/mail-mta/notqmail/notqmail-1.08.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~sparc"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~sparc"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-06-14 19:59 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2020-06-14 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     830615a418368dd56fe377f3a71fe5198eadc02b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 19:59:27 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 19:59:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=830615a4

mail-mta/notqmail: keyworded 1.08 for ppc

keyworded wrt bug #727256

Package-Manager: Portage-2.3.100, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08.ebuild
index f0c38be6c75..c53908f5710 100644
--- a/mail-mta/notqmail/notqmail-1.08.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~sparc"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-06-14 20:01 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2020-06-14 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     0e3b2cd4728e70cff904460424173922b39bf01e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 20:01:37 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 20:01:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e3b2cd4

mail-mta/notqmail: keyworded 1.08 for ppc64

keyworded wrt bug #727256

Package-Manager: Portage-2.3.100, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08.ebuild
index c53908f5710..a714f858628 100644
--- a/mail-mta/notqmail/notqmail-1.08.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-06-17 18:08 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2020-06-17 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     5ad43973db39bd8512284919ee8388efe2cb6f09
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Jun 17 15:35:10 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 18:08:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad43973

mail-mta/notqmail: remove unneeded dependency

groff was used to build cat-manpages, that were not installed anyway. Since the
1.08 release it is possible to fake their build for packagers that do not care,
so do it.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08.ebuild | 3 +--
 mail-mta/notqmail/notqmail-9999.ebuild | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08.ebuild
index a714f858628..b5ff5be5d0e 100644
--- a/mail-mta/notqmail/notqmail-1.08.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08.ebuild
@@ -54,7 +54,6 @@ DEPEND="
 	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:= )
@@ -142,7 +141,7 @@ src_prepare() {
 }
 
 src_compile() {
-	qmail_src_compile
+	qmail_src_compile NROFF=true
 	use qmail-spp && qmail_spp_src_compile
 }
 

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 6332e8b46af..b5ff5be5d0e 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~sparc"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 
@@ -54,7 +54,6 @@ DEPEND="
 	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:= )
@@ -142,7 +141,7 @@ src_prepare() {
 }
 
 src_compile() {
-	qmail_src_compile
+	qmail_src_compile NROFF=true
 	use qmail-spp && qmail_spp_src_compile
 }
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-06-20 14:49 Thomas Deutschmann
  0 siblings, 0 replies; 27+ messages in thread
From: Thomas Deutschmann @ 2020-06-20 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     77fab628735f9070d4943a302d9dd541df3111a0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 14:46:52 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 14:48:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fab628

mail-mta/notqmail: x86 keyworded (bug #727256)

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08.ebuild
index b5ff5be5d0e..7378c6d1a12 100644
--- a/mail-mta/notqmail/notqmail-1.08.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-06-27  7:28 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2020-06-27  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     7788930617aefdc9a102a9de9651bc257320688c
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Jun 27 07:07:11 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 07:28:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77889306

mail-mta/notqmail: install systemd unit file

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/{notqmail-1.08.ebuild => notqmail-1.08-r1.ebuild} | 4 +++-
 mail-mta/notqmail/notqmail-9999.ebuild                              | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08.ebuild b/mail-mta/notqmail/notqmail-1.08-r1.ebuild
similarity index 97%
rename from mail-mta/notqmail/notqmail-1.08.ebuild
rename to mail-mta/notqmail/notqmail-1.08-r1.ebuild
index 7378c6d1a12..eb09e7fa8d3 100644
--- a/mail-mta/notqmail/notqmail-1.08.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r1.ebuild
@@ -13,7 +13,7 @@ QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 
 QMAIL_LARGE_DNS="qmail-103.patch"
 
-inherit qmail
+inherit qmail systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
@@ -142,11 +142,13 @@ src_prepare() {
 
 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() {

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index b5ff5be5d0e..eb09e7fa8d3 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -13,13 +13,13 @@ QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 
 QMAIL_LARGE_DNS="qmail-103.patch"
 
-inherit qmail
+inherit qmail systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 
@@ -142,11 +142,13 @@ src_prepare() {
 
 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() {


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-07-25 19:56 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2020-07-25 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     760def5c66ed2dce2de868c977b885bba7f52b99
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 19:56:46 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 19:56:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=760def5c

mail-mta/notqmail: s390 keyworded (bug #727256)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r1.ebuild b/mail-mta/notqmail/notqmail-1.08-r1.ebuild
index eb09e7fa8d3..f025f8eddc5 100644
--- a/mail-mta/notqmail/notqmail-1.08-r1.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r1.ebuild
@@ -19,7 +19,7 @@ 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"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-07-26  8:01 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2020-07-26  8:01 UTC (permalink / raw
  To: gentoo-commits

commit:     88746d67250bc81b28f59c5f6845c00364e40158
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Jun  6 21:44:18 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 08:00:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88746d67

mail-mta/notqmail[qmail-spp]: fix build

The original patch version does not apply to notqmail anymore, so use a rebased
version instead.

While at it explicitely specify some USE flag dependencies.

Closes: https://bugs.gentoo.org/727322
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/16826
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/Manifest                         |  3 +-
 ...mail-1.08-r1.ebuild => notqmail-1.08-r2.ebuild} | 35 ++++++++++++----------
 mail-mta/notqmail/notqmail-9999.ebuild             | 35 ++++++++++++----------
 3 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 57b6074b1bd..01bd981c66e 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -1,7 +1,8 @@
 DIST genqmail-20191010.tar.bz2 10063 BLAKE2B bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718 SHA512 8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
 DIST notqmail-1.08-auth.patch 71183 BLAKE2B c980475ef7a2ad6e05d71f494293579e5082b63606fd0bbbd51fff5d067912b1548b4033f36de8030d60b195a684ff0845afe022d316ad835b1ad0b360cafbd6 SHA512 697b8b2a26a10c0029918193046dd2758bb3e84af97fb2e99f29bfb23efb0a9e0ee6ecca0431369e348d1414ef70bc5c446420b4f019ba427d16d0f07f23f6e3
 DIST notqmail-1.08-big-todo.patch 7179 BLAKE2B f7582d0193096f17316feb15e65c2b841545e274309351fc2921120ec3a4fb35b1998fbd8b8ca573c7dbd690ab7197f4b4f9105671f7d299687bf339b747deb2 SHA512 8444c8b4558410682d46e4954973721a1fb5e90585c9a3a4d7603448faf68cc0d07d2b5d51977ce72d35551b5c43b03014638251b542e48fe9cbef327cacc7c6
+DIST notqmail-1.08-spp.patch 14304 BLAKE2B 61cb1cf48e0af93d4928906fa115fe71df888d676d38bf4e2c23106900d7f66964a915f90cb0cc3b36130a9a9a2050f209471fdc9c03bb16a82cae2e35b94278 SHA512 b0671b6a370f4eda0721a655a140f24b0585ab752f46260f90aa3afbcf86d5ba2970985c7f88af95402c8e4e7c9e2fe54a75b9cf7a598f8fb1901dccc4960c8a
 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 qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
-DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf

diff --git a/mail-mta/notqmail/notqmail-1.08-r1.ebuild b/mail-mta/notqmail/notqmail-1.08-r2.ebuild
similarity index 76%
rename from mail-mta/notqmail/notqmail-1.08-r1.ebuild
rename to mail-mta/notqmail/notqmail-1.08-r2.ebuild
index f025f8eddc5..f6de8967357 100644
--- a/mail-mta/notqmail/notqmail-1.08-r1.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r2.ebuild
@@ -36,10 +36,20 @@ SRC_URI="${SRC_URI}
 		highvolume? (
 			https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F}
 		)
-		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-		https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch
+		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/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F}
+			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
 		)
 	)
 "
@@ -47,7 +57,7 @@ SRC_URI="${SRC_URI}
 LICENSE="public-domain"
 SLOT="0"
 IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -92,7 +102,6 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
 
 	[[ ${PV} == "9999" ]] && git-r3_src_unpack
 	[[ ${PV} != "9999" ]] && default
@@ -104,25 +113,21 @@ PATCHES=(
 
 src_prepare() {
 	if ! use vanilla; then
-		if use ssl; 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
-		if use highvolume; then
-			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-		fi
+		use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
 
 		if use qmail-spp; then
 			if use ssl; then
-				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
+				PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" )
 			else
-				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
+				PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" )
 			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
 

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index eb09e7fa8d3..393242d48ca 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -36,10 +36,20 @@ SRC_URI="${SRC_URI}
 		highvolume? (
 			https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F}
 		)
-		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-		https://github.com/notqmail/notqmail/commit/b224a3ceb63ff8ebc57648bf304e079d0bf55023.patch -> ${PN}-1.08-auth.patch
+		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/ed58c2eff21612037bbcc633f4b3a8e708f522a0.patch -> ${QMAIL_TLS_F}
+			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
 		)
 	)
 "
@@ -47,7 +57,7 @@ SRC_URI="${SRC_URI}
 LICENSE="public-domain"
 SLOT="0"
 IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -92,7 +102,6 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
 
 	[[ ${PV} == "9999" ]] && git-r3_src_unpack
 	[[ ${PV} != "9999" ]] && default
@@ -104,25 +113,21 @@ PATCHES=(
 
 src_prepare() {
 	if ! use vanilla; then
-		if use ssl; 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
-		if use highvolume; then
-			PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-		fi
+		use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
 
 		if use qmail-spp; then
 			if use ssl; then
-				SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
+				PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" )
 			else
-				SPP_PATCH="${QMAIL_SPP_S}/netqmail-spp.diff"
+				PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" )
 			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
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-08-05 16:17 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2020-08-05 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ed75e8b6c81f9257290d5b7e743699accdbcf406
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 16:15:10 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 16:17:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed75e8b6

mail-mta/notqmail: Keyword 1.08-r2 arm, #727256

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r2.ebuild b/mail-mta/notqmail/notqmail-1.08-r2.ebuild
index f6de8967357..f277610d306 100644
--- a/mail-mta/notqmail/notqmail-1.08-r2.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-10-06 15:00 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2020-10-06 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     d2412fa9ba2dca68a9abc11491d117aed1a6b74b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 14:59:20 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 14:59:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2412fa9

mail-mta/notqmail: Keyword 1.08-r3 arm64, #727256

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index 73025375ced..3a6c2ffbd8f 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-12-10  2:53 Matt Turner
  0 siblings, 0 replies; 27+ messages in thread
From: Matt Turner @ 2020-12-10  2:53 UTC (permalink / raw
  To: gentoo-commits

commit:     43c9a159f7ca45671918b474dd6266d93991ec2f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 02:53:32 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 02:53:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c9a159

mail-mta/notqmail: Keyword 1.08-r3 alpha, #727256

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index 3a6c2ffbd8f..fb99546c87e 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2020-12-30 15:55 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2020-12-30 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     d430e8b009e09f0c9531ac6e28e7183825c20136
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Dec 30 13:15:55 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 15:54:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d430e8b0

mail-mta/notqmail: remove broken USE=libressl

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r3.ebuild | 9 +++------
 mail-mta/notqmail/notqmail-9999.ebuild    | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index fb99546c87e..3e4ded9011a 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
@@ -56,18 +56,15 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )"
+IUSE="authcram gencertdaily highvolume -pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	net-dns/libidn2
 	net-mail/queue-repair
 	sys-apps/gentoo-functions
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( >=dev-libs/openssl-1.1:0= )
 	test? ( dev-libs/check )
 "
 RDEPEND="${DEPEND}

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 207bd50aa15..f5ec0ad8013 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -56,18 +56,15 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume libressl -pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl ) libressl? ( ssl )"
+IUSE="authcram gencertdaily highvolume -pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	net-dns/libidn2
 	net-mail/queue-repair
 	sys-apps/gentoo-functions
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( >=dev-libs/openssl-1.1:0= )
 	test? ( dev-libs/check )
 "
 RDEPEND="${DEPEND}


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2021-06-03 19:15 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-06-03 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     61bd2b4ff9bbdfcccf1e6a0308a7b1a511feda74
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 23:54:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 19:14:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61bd2b4f

mail-mta/notqmail: fix BadDefaultUseFlags

-foo in IUSE is discouraged. It is equivalent (in every meaningful case) to 'foo' but confuses parsing
tools like e.g. packages.gentoo.org.

Dropping '-' from these flags has no impact on the actual default behaviour.

See: https://devmanual.gentoo.org/general-concepts/use-flags/index.html#iuse-defaults
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r3.ebuild | 4 ++--
 mail-mta/notqmail/notqmail-9999.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index 3e4ded9011a..e2dc2632e8d 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume -pop3 qmail-spp ssl test vanilla"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index f5ec0ad8013..d19ad72c59f 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume -pop3 qmail-spp ssl test vanilla"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2021-06-20 23:34 Joshua Kinard
  0 siblings, 0 replies; 27+ messages in thread
From: Joshua Kinard @ 2021-06-20 23:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b710266473145644ef29e96248e974af90ffce22
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 23:33:40 2021 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 23:33:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7102664

mail-mta/notqmail: Added ~mips to KEYWORDS

Bug: https://bugs.gentoo.org/727256
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3

 mail-mta/notqmail/notqmail-1.08-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index e2dc2632e8d..2e22ea16b1d 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	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"
 fi
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2021-07-23 17:05 Sergei Trofimovich
  0 siblings, 0 replies; 27+ messages in thread
From: Sergei Trofimovich @ 2021-07-23 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     5408f85de95386270256d5649bc1c595084be2b2
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Jul 23 17:04:08 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 17:05:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5408f85d

mail-mta/notqmail-9999: drop large DNS patch

This has been applied upstream.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mail-mta/notqmail/notqmail-9999.ebuild | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index d19ad72c59f..9c68b334dbf 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -11,8 +11,6 @@ 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
@@ -31,7 +29,6 @@ HOMEPAGE="
 "
 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}
@@ -104,11 +101,9 @@ src_unpack() {
 	[[ ${PV} != "9999" ]] && default
 }
 
-PATCHES=(
-	"${DISTDIR}/${QMAIL_LARGE_DNS}"
-)
-
 src_prepare() {
+	PATCHES=()
+
 	if ! use vanilla; then
 		if use qmail-spp; then
 			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2021-08-17  1:41 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-08-17  1:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c2e9d411c1ff8fb11087a92fee986fcc8506aaf5
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Aug 12 09:25:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 01:41:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e9d411

mail-mta/notqmail: bump 9999 to EAPI 8

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 9c68b334dbf..6694ca57362 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2021-08-17  1:41 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-08-17  1:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e228b5df333d8e3961f1ca9a03d471b4ca3a818e
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Aug 12 09:27:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 01:41:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e228b5df

mail-mta/notqmail: update DESCRIPTION

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r3.ebuild | 2 +-
 mail-mta/notqmail/notqmail-9999.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index 2e22ea16b1d..382f241e719 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+DESCRIPTION="Collaborative open-source successor to qmail"
 HOMEPAGE="
 	https://notqmail.org
 	https://cr.yp.to/qmail.html

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 6694ca57362..8673f74908f 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
 fi
 
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+DESCRIPTION="Collaborative open-source successor to qmail"
 HOMEPAGE="
 	https://notqmail.org
 	https://cr.yp.to/qmail.html


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2021-08-19  2:12 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-08-19  2:12 UTC (permalink / raw
  To: gentoo-commits

commit:     bbb6d19226e9f1942f9981633cab6635a5a8fbd8
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Aug 19 02:11:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 02:12:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb6d192

mail-mta/notqmail: put virtuals in PDEPEND

One provider of virtual/checkpassword is vpopmail, which in turn depends on
virtual/qmail, which may form a circular dependency.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../notqmail/{notqmail-1.08-r3.ebuild => notqmail-1.08-r4.ebuild} | 8 +++++---
 mail-mta/notqmail/notqmail-9999.ebuild                            | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r4.ebuild
similarity index 99%
rename from mail-mta/notqmail/notqmail-1.08-r3.ebuild
rename to mail-mta/notqmail/notqmail-1.08-r4.ebuild
index 6afc55ac3bd..e9e36f9d913 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
@@ -78,8 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	virtual/checkpassword
-	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
@@ -96,6 +94,10 @@ RDEPEND="${DEPEND}
 	!mail-mta/sendmail
 	!mail-mta/ssmtp[mta]
 "
+PDEPEND="
+	virtual/checkpassword
+	virtual/daemontools
+"
 
 src_unpack() {
 	genqmail_src_unpack

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 224aaed0628..baec765a78d 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -75,8 +75,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	virtual/checkpassword
-	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
@@ -93,6 +91,10 @@ RDEPEND="${DEPEND}
 	!mail-mta/sendmail
 	!mail-mta/ssmtp[mta]
 "
+PDEPEND="
+	virtual/checkpassword
+	virtual/daemontools
+"
 
 src_unpack() {
 	genqmail_src_unpack


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2021-11-07  7:51 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-11-07  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     05a89449b401ae6bcfedd77febb925ff4402bfa0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Oct 19 17:50:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 07:51:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a89449

mail-mta/notqmail: remove dependency to virtual/checkpassword

This is an optional runtime dependency.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/{notqmail-1.08-r4.ebuild => notqmail-1.08-r5.ebuild} | 1 -
 mail-mta/notqmail/notqmail-9999.ebuild                                 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r4.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
similarity index 99%
rename from mail-mta/notqmail/notqmail-1.08-r4.ebuild
rename to mail-mta/notqmail/notqmail-1.08-r5.ebuild
index e9e36f9d913..62f982fa263 100644
--- a/mail-mta/notqmail/notqmail-1.08-r4.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
@@ -95,7 +95,6 @@ RDEPEND="${DEPEND}
 	!mail-mta/ssmtp[mta]
 "
 PDEPEND="
-	virtual/checkpassword
 	virtual/daemontools
 "
 

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index baec765a78d..d622c556ab5 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -92,7 +92,6 @@ RDEPEND="${DEPEND}
 	!mail-mta/ssmtp[mta]
 "
 PDEPEND="
-	virtual/checkpassword
 	virtual/daemontools
 "
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2022-02-24 19:16 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2022-02-24 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cceb79a51dd951143e0d3ec9d1ca1be158790637
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 19:12:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:14:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cceb79a5

mail-mta/notqmail: sync live, conditionally inherit verify-sig for non-live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r6.ebuild | 11 ++++++-----
 mail-mta/notqmail/notqmail-9999.ebuild    | 26 ++++++++++++++++++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index 2150b53a5175..f8fec34a0f00 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -13,12 +13,13 @@ QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 
 QMAIL_LARGE_DNS="qmail-103.patch"
 
-inherit qmail systemd verify-sig
+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
@@ -63,13 +64,13 @@ 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 verify-sig"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-notqmail )
-"
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-notqmail )"
+fi
 DEPEND="
 	net-dns/libidn2
 	net-mail/queue-repair

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" )


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2022-02-24 19:16 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2022-02-24 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     a44a1e60c944538a87c47df7363c71d5af8d9603
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Feb 24 16:28:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:09:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44a1e60

mail-mta/notqmail: use verify-sig.eclass

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/Manifest                |   1 +
 mail-mta/notqmail/notqmail-1.08-r6.ebuild | 201 ++++++++++++++++++++++++++++++
 2 files changed, 202 insertions(+)

diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 7944b1c3be37..80377f0a52f7 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -5,4 +5,5 @@ 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

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..2150b53a5175
--- /dev/null
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -0,0 +1,201 @@
+# 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 verify-sig
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
+	inherit git-r3
+else
+	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 verify-sig"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-notqmail )
+"
+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
+}


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2022-12-20 16:31 Jakov Smolić
  0 siblings, 0 replies; 27+ messages in thread
From: Jakov Smolić @ 2022-12-20 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     80b4291d38816df39d34425f6b768166e026e6f6
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 16:21:49 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 16:30:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b4291d

mail-mta/notqmail: Remove USE=authcram

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 mail-mta/notqmail/metadata.xml            |  1 -
 mail-mta/notqmail/notqmail-1.08-r5.ebuild | 14 ++++----------
 mail-mta/notqmail/notqmail-1.08-r6.ebuild | 12 +++---------
 mail-mta/notqmail/notqmail-9999.ebuild    | 12 +++---------
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/mail-mta/notqmail/metadata.xml b/mail-mta/notqmail/metadata.xml
index b0dda7e29117..dd95c000ec99 100644
--- a/mail-mta/notqmail/metadata.xml
+++ b/mail-mta/notqmail/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="authcram">Enable AUTHCRAM support</flag>
 		<flag name="gencertdaily">Generate SSL certificates daily instead of
 			hourly</flag>
 		<flag name="highvolume">Prepare notqmail for high volume servers</flag>

diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 62f982fa263e..9717aa7f830d 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.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
@@ -56,8 +56,8 @@ SRC_URI="${SRC_URI}
 
 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 )"
+IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -78,7 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -133,12 +132,7 @@ src_prepare() {
 
 	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
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }

diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index f8fec34a0f00..8e5a4d4b1b99 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -64,8 +64,8 @@ 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 )"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} != 9999 ]] ; then
@@ -89,7 +89,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -149,12 +148,7 @@ src_prepare() {
 
 	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
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 6ce036b2f82c..f07147afa4d4 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -61,8 +61,8 @@ 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 )"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} != 9999 ]] ; then
@@ -86,7 +86,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -142,12 +141,7 @@ src_prepare() {
 
 	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
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2022-12-31 18:32 Jakov Smolić
  0 siblings, 0 replies; 27+ messages in thread
From: Jakov Smolić @ 2022-12-31 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     24dcd3918e1ac751ff9c8d868509ea1fd6390f78
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 18:21:34 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 18:31:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24dcd391

mail-mta/notqmail: Remove USE=pop3

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r5.ebuild | 5 +----
 mail-mta/notqmail/notqmail-1.08-r6.ebuild | 5 +----
 mail-mta/notqmail/notqmail-9999.ebuild    | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 9717aa7f830d..7c324e45672e 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+IUSE=" gencertdaily highvolume qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -78,9 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index 8e5a4d4b1b99..ea86d4a9ade7 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -64,7 +64,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+IUSE="gencertdaily highvolume qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -89,9 +89,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index f07147afa4d4..bfa7c200a49a 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -61,7 +61,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+IUSE="gencertdaily highvolume qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -86,9 +86,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2022-12-31 22:40 Sam James
  0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2022-12-31 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     476573cc2c55c78812da922595ed5da7eb31b7ab
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Dec 31 21:27:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 22:39:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476573cc

Revert "mail-mta/notqmail: Remove USE=pop3"

This reverts commit 24dcd3918e1ac751ff9c8d868509ea1fd6390f78.

Bug: https://bugs.gentoo.org/889216
Bug: https://bugs.gentoo.org/889218
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r5.ebuild | 5 ++++-
 mail-mta/notqmail/notqmail-1.08-r6.ebuild | 5 ++++-
 mail-mta/notqmail/notqmail-9999.ebuild    | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 7c324e45672e..9717aa7f830d 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE=" gencertdaily highvolume qmail-spp ssl test vanilla"
+IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -78,6 +78,9 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
+	ssl? (
+		pop3? ( sys-apps/ucspi-ssl )
+	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index ea86d4a9ade7..8e5a4d4b1b99 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -64,7 +64,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="gencertdaily highvolume qmail-spp ssl test vanilla"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -89,6 +89,9 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
+	ssl? (
+		pop3? ( sys-apps/ucspi-ssl )
+	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index bfa7c200a49a..f07147afa4d4 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -61,7 +61,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="gencertdaily highvolume qmail-spp ssl test vanilla"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
@@ -86,6 +86,9 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
+	ssl? (
+		pop3? ( sys-apps/ucspi-ssl )
+	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2024-02-15 13:17 Joonas Niilola
  0 siblings, 0 replies; 27+ messages in thread
From: Joonas Niilola @ 2024-02-15 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b79387b39129963ad4400cdfd002a3c386aade2b
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Jan 28 10:53:43 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 13:17:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79387b3

mail-mta/notqmail: clean old

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-mta/notqmail/notqmail-1.08-r5.ebuild | 177 ------------------------------
 1 file changed, 177 deletions(-)

diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
deleted file mode 100644
index e46c90306906..000000000000
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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
-	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"
-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
-		)
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
-RESTRICT="!test? ( test )"
-
-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
-	!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
-	[[ ${PV} != "9999" ]] && default
-}
-
-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
-
-	einfo "Enabled CRAM_MD5 support"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/
@ 2024-02-15 13:17 Joonas Niilola
  0 siblings, 0 replies; 27+ messages in thread
From: Joonas Niilola @ 2024-02-15 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     2e9bdd7248450a44d17b99e86c2e11f14509a2d2
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Jan 28 10:56:20 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 13:17:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9bdd72

mail-mta/notqmail: fix has collision with gentoo mirrors

In 88746d67250bc81b28f59c5f6845c00364e40158 I changed the commit hash of the
patch to use. But the old file is still on the Gentoo mirrors in the original
version, causing hash collisions. Use a new filename to solve the issue.

Closes: https://bugs.gentoo.org/922121
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/35053
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-mta/notqmail/Manifest                | 2 +-
 mail-mta/notqmail/notqmail-1.08-r6.ebuild | 4 ++--
 mail-mta/notqmail/notqmail-9999.ebuild    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 80377f0a52f7..6c000d335a7a 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -2,7 +2,7 @@ DIST genqmail-20200817.tar.bz2 10071 BLAKE2B dfeb8aa094c0db1b672e5e7a39f3866e02c
 DIST notqmail-1.08-auth.patch 71183 BLAKE2B c980475ef7a2ad6e05d71f494293579e5082b63606fd0bbbd51fff5d067912b1548b4033f36de8030d60b195a684ff0845afe022d316ad835b1ad0b360cafbd6 SHA512 697b8b2a26a10c0029918193046dd2758bb3e84af97fb2e99f29bfb23efb0a9e0ee6ecca0431369e348d1414ef70bc5c446420b4f019ba427d16d0f07f23f6e3
 DIST notqmail-1.08-big-todo.patch 7179 BLAKE2B f7582d0193096f17316feb15e65c2b841545e274309351fc2921120ec3a4fb35b1998fbd8b8ca573c7dbd690ab7197f4b4f9105671f7d299687bf339b747deb2 SHA512 8444c8b4558410682d46e4954973721a1fb5e90585c9a3a4d7603448faf68cc0d07d2b5d51977ce72d35551b5c43b03014638251b542e48fe9cbef327cacc7c6
 DIST notqmail-1.08-spp.patch 14304 BLAKE2B 61cb1cf48e0af93d4928906fa115fe71df888d676d38bf4e2c23106900d7f66964a915f90cb0cc3b36130a9a9a2050f209471fdc9c03bb16a82cae2e35b94278 SHA512 b0671b6a370f4eda0721a655a140f24b0585ab752f46260f90aa3afbcf86d5ba2970985c7f88af95402c8e4e7c9e2fe54a75b9cf7a598f8fb1901dccc4960c8a
-DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300eb89b367c239ae7a60256c417a2abfa583984e6273eae6df22d44b98dcefce4904f6db9625ff2a57f4b30a8fff8c629d374b SHA512 bdccdf98024f811802504872b8e3f3ac3010c1f218a0ec79bb12e635c35bfa15471c2b7e499c14e6bec9b5d3e48f1e584e26ba2ca01f1ce73a347a338de2a304
+DIST notqmail-1.08-tls_auth-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

diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index 4ce54e1ba59c..f90b5bbd44e5 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20200107
-QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_F=notqmail-1.08-tls_auth-${QMAIL_TLS_PV}.patch
 
 QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 60f5e80274c0..937c90fd5439 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20200107
-QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_F=notqmail-1.08-tls_auth-${QMAIL_TLS_PV}.patch
 
 QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 


^ permalink raw reply related	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2024-02-15 13:17 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-03 19:15 [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-02-15 13:17 Joonas Niilola
2024-02-15 13:17 Joonas Niilola
2022-12-31 22:40 Sam James
2022-12-31 18:32 Jakov Smolić
2022-12-20 16:31 Jakov Smolić
2022-02-24 19:16 Sam James
2022-02-24 19:16 Sam James
2021-11-07  7:51 Sam James
2021-08-19  2:12 Sam James
2021-08-17  1:41 Sam James
2021-08-17  1:41 Sam James
2021-07-23 17:05 Sergei Trofimovich
2021-06-20 23:34 Joshua Kinard
2020-12-30 15:55 Sergei Trofimovich
2020-12-10  2:53 Matt Turner
2020-10-06 15:00 Sam James
2020-08-05 16:17 Sam James
2020-07-26  8:01 Sergei Trofimovich
2020-07-25 19:56 Sam James
2020-06-27  7:28 Sergei Trofimovich
2020-06-20 14:49 Thomas Deutschmann
2020-06-17 18:08 Sergei Trofimovich
2020-06-14 20:01 Sergei Trofimovich
2020-06-14 19:59 Sergei Trofimovich
2020-06-06 18:49 Sergei Trofimovich
2020-06-05 16:03 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox