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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51E82158F56 for ; Tue, 17 Aug 2021 01:41:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A408E0833; Tue, 17 Aug 2021 01:41:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73B40E0833 for ; Tue, 17 Aug 2021 01:41:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E725233EDD8 for ; Tue, 17 Aug 2021 01:41:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C9CA8C3 for ; Tue, 17 Aug 2021 01:41:30 +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: <1629164480.7b8138b6093d4dc09f5131439c7f3b35175169c4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/notqmail/, mail-mta/netqmail/, eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qmail.eclass mail-mta/netqmail/netqmail-1.06-r14.ebuild mail-mta/notqmail/notqmail-1.08-r3.ebuild mail-mta/notqmail/notqmail-9999.ebuild X-VCS-Directories: mail-mta/netqmail/ eclass/ mail-mta/notqmail/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7b8138b6093d4dc09f5131439c7f3b35175169c4 X-VCS-Branch: master Date: Tue, 17 Aug 2021 01:41:30 +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: c2652f16-ac6c-4417-9e0f-2d24e80acd39 X-Archives-Hash: c217e014c81650ff83b411b8966af8d3 commit: 7b8138b6093d4dc09f5131439c7f3b35175169c4 Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri Aug 13 10:42:47 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 17 01:41:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8138b6 qmail.eclass: retire qmail_tcprules_fixup() This has been in all ebuilds since the move of the portage tree to git, so everyone should have already moved the files. Signed-off-by: Rolf Eike Beer sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/21999 Signed-off-by: Sam James gentoo.org> eclass/qmail.eclass | 22 ---------------------- mail-mta/netqmail/netqmail-1.06-r14.ebuild | 4 ---- mail-mta/notqmail/notqmail-1.08-r3.ebuild | 4 ---- mail-mta/notqmail/notqmail-9999.ebuild | 4 ---- 4 files changed, 34 deletions(-) diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass index c95072650f1..33157b7e787 100644 --- a/eclass/qmail.eclass +++ b/eclass/qmail.eclass @@ -367,28 +367,6 @@ qmail_rootmail_fixup() { chown -R alias:qmail "${ROOT}${QMAIL_HOME}"/alias/.maildir 2>/dev/null } -qmail_tcprules_fixup() { - mkdir -p "${TCPRULES_DIR}" - local POP_FILES= - use pop3 && POP_FILES="pop3 pop3.cdb" - for f in {smtp,qmtp,qmqp}{,.cdb} ${POP_FILES}; do - old="/etc/tcp.${f}" - new="${TCPRULES_DIR}/tcp.qmail-${f}" - fail=0 - if [[ -f "${old}" && ! -f "${new}" ]]; then - einfo "Moving ${old} to ${new}" - cp "${old}" "${new}" || fail=1 - else - fail=1 - fi - if [[ "${fail}" = 1 && -f "${old}" ]]; then - eerror "Error moving ${old} to ${new}, be sure to check the" - eerror "configuration! You may have already moved the files," - eerror "in which case you can delete ${old}" - fi - done -} - qmail_tcprules_build() { for f in tcp.qmail-{smtp,qmtp,qmqp,pop3,pop3s}; do # please note that we don't check if it exists diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild index aef1ed5b4dd..e1f20404872 100644 --- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild @@ -173,10 +173,6 @@ pkg_postinst() { elog } -pkg_preinst() { - qmail_tcprules_fixup -} - pkg_config() { # avoid some weird locale problems export LC_ALL=C diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild index 382f241e719..6afc55ac3bd 100644 --- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild +++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild @@ -173,10 +173,6 @@ pkg_postinst() { elog } -pkg_preinst() { - qmail_tcprules_fixup -} - pkg_config() { # avoid some weird locale problems export LC_ALL=C diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild index 8673f74908f..224aaed0628 100644 --- a/mail-mta/notqmail/notqmail-9999.ebuild +++ b/mail-mta/notqmail/notqmail-9999.ebuild @@ -168,10 +168,6 @@ pkg_postinst() { elog } -pkg_preinst() { - qmail_tcprules_fixup -} - pkg_config() { # avoid some weird locale problems export LC_ALL=C