From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A956A15800D for ; Sat, 31 Dec 2022 22:41:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0ED6DE0825; Sat, 31 Dec 2022 22:41:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E730FE0825 for ; Sat, 31 Dec 2022 22:41:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E134340D4A for ; Sat, 31 Dec 2022 22:41:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D61D27FA for ; Sat, 31 Dec 2022 22:40:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672526403.9e1bcf7d0aa3975961de47467ed2185b3330c348.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, eclass/, mail-mta/notqmail/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qmail.eclass mail-mta/netqmail/netqmail-1.06-r14.ebuild mail-mta/netqmail/netqmail-1.06-r16.ebuild mail-mta/notqmail/notqmail-1.08-r5.ebuild mail-mta/notqmail/notqmail-1.08-r6.ebuild mail-mta/notqmail/notqmail-9999.ebuild X-VCS-Directories: mail-mta/notqmail/ eclass/ mail-mta/netqmail/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9e1bcf7d0aa3975961de47467ed2185b3330c348 X-VCS-Branch: master Date: Sat, 31 Dec 2022 22:40:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 735b81fe-5369-445f-9826-639c62234bbb X-Archives-Hash: 99c6c1c00795d3f4e295730ef3db36f2 commit: 9e1bcf7d0aa3975961de47467ed2185b3330c348 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sat Dec 31 21:32:05 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 31 22:40:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1bcf7d mail-mta/n[eo]tqmail: drop ucspi-ssl dependency for pop3s Bug: https://bugs.gentoo.org/889216 Bug: https://bugs.gentoo.org/889218 Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> eclass/qmail.eclass | 10 ++-------- mail-mta/netqmail/netqmail-1.06-r14.ebuild | 5 +---- mail-mta/netqmail/netqmail-1.06-r16.ebuild | 5 +---- mail-mta/notqmail/notqmail-1.08-r5.ebuild | 3 --- mail-mta/notqmail/notqmail-1.08-r6.ebuild | 3 --- mail-mta/notqmail/notqmail-9999.ebuild | 3 --- 6 files changed, 4 insertions(+), 25 deletions(-) diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass index 67069087376d..b647ac5d8e3a 100644 --- a/eclass/qmail.eclass +++ b/eclass/qmail.eclass @@ -240,7 +240,7 @@ qmail_tcprules_install() { insinto "${TCPRULES_DIR}" doins "${GENQMAIL_S}"/tcprules/Makefile.qmail doins "${GENQMAIL_S}"/tcprules/tcp.qmail-* - use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd + rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd } qmail_supervise_install_one() { @@ -263,7 +263,6 @@ qmail_supervise_install() { if use pop3; then qmail_supervise_install_one qmail-pop3d - use ssl && qmail_supervise_install_one qmail-pop3sd fi } @@ -344,7 +343,7 @@ qmail_rootmail_fixup() { } qmail_tcprules_build() { - for f in tcp.qmail-{smtp,qmtp,qmqp,pop3,pop3s}; do + for f in tcp.qmail-{smtp,qmtp,qmqp,pop3}; do # please note that we don't check if it exists # as we want it to make the cdb files anyway! src="${ROOT}${TCPRULES_DIR}/${f}" @@ -371,11 +370,6 @@ qmail_supervise_config_notice() { elog "To start the pop3 server as well, create the following link:" elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d" elog - if use ssl; then - elog "To start the pop3s server as well, create the following link:" - elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd" - elog - fi fi elog "Additionally, the QMTP and QMQP protocols are supported, " elog "and can be started as:" diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild index e1f204048728..b97074ac9ce7 100644 --- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -67,9 +67,6 @@ RDEPEND="${DEPEND} 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 diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild b/mail-mta/netqmail/netqmail-1.06-r16.ebuild index 3a8a3899566f..eac15c056ce8 100644 --- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r16.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 @@ -65,9 +65,6 @@ DEPEND=" RDEPEND="${DEPEND} 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 diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild index 9717aa7f830d..e46c90306906 100644 --- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild +++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild @@ -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..55cc84b9f590 100644 --- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild +++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild @@ -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..3b797f2022b1 100644 --- a/mail-mta/notqmail/notqmail-9999.ebuild +++ b/mail-mta/notqmail/notqmail-9999.ebuild @@ -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