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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94B991581FB for ; Sun, 1 Dec 2024 11:54:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB647E0833; Sun, 1 Dec 2024 11:54:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D748EE0833 for ; Sun, 1 Dec 2024 11:54:37 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F293341C4B for ; Sun, 1 Dec 2024 11:54:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A127F1F45 for ; Sun, 1 Dec 2024 11:54:34 +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: <1733053934.5d8c4baefd5b01df441088b75b33b2848fe60772.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/mailgraph/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/mailgraph/mailgraph-1.14-r3.ebuild net-mail/mailgraph/mailgraph-1.14-r4.ebuild net-mail/mailgraph/metadata.xml X-VCS-Directories: net-mail/mailgraph/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5d8c4baefd5b01df441088b75b33b2848fe60772 X-VCS-Branch: master Date: Sun, 1 Dec 2024 11:54:34 +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: 5a28b8aa-d202-43f4-ba40-c8f1cf0a0805 X-Archives-Hash: 4dd1e4683fc779c275a820dacb68d51f commit: 5d8c4baefd5b01df441088b75b33b2848fe60772 Author: Paul Zander gmail com> AuthorDate: Fri Jul 12 19:43:22 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 1 11:52:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8c4bae net-mail/mailgraph: BannedEapiCommand Misses migration after acct-user got introduced. Add apache2 and nginx to IUSE. Use the new `mgraph` USE-flag for acct-user/apache and acct-user/nginx in RDEPEND. Adjust pkg_postinst() to match. BannedEapiCommand 'gpasswd' banned in EAPI 7, used on line 81 'gpasswd -a apache mgraph' Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36445 Signed-off-by: Sam James gentoo.org> ...aph-1.14-r3.ebuild => mailgraph-1.14-r4.ebuild} | 35 +++++++--------------- net-mail/mailgraph/metadata.xml | 3 ++ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/net-mail/mailgraph/mailgraph-1.14-r3.ebuild b/net-mail/mailgraph/mailgraph-1.14-r4.ebuild similarity index 70% rename from net-mail/mailgraph/mailgraph-1.14-r3.ebuild rename to net-mail/mailgraph/mailgraph-1.14-r4.ebuild index 3622c4e6396c..868fe0fd041a 100644 --- a/net-mail/mailgraph/mailgraph-1.14-r3.ebuild +++ b/net-mail/mailgraph/mailgraph-1.14-r4.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -inherit user-info +EAPI=8 DESCRIPTION="A mail statistics RRDtool frontend for Postfix" -HOMEPAGE="http://mailgraph.schweikert.ch/" -SRC_URI="http://mailgraph.schweikert.ch//pub/${P}.tar.gz" +HOMEPAGE="https://mailgraph.schweikert.ch/" +SRC_URI="https://mailgraph.schweikert.ch/pub/${P}.tar.gz" LICENSE="GPL-2" # Change SLOT to 0 when appropriate SLOT="1.14" KEYWORDS="amd64 x86" +IUSE="apache2 nginx" # for the RRDs DEPEND=" @@ -20,6 +19,8 @@ DEPEND=" acct-user/mgraph" RDEPEND=" ${DEPEND} + apache2? ( acct-user/apache[mgraph] ) + nginx? ( acct-user/nginx[mgraph] ) dev-lang/perl dev-perl/File-Tail >=net-analyzer/rrdtool-1.2.2[graph,perl]" @@ -73,25 +74,11 @@ pkg_postinst() { ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know" ewarn "the corresponding events (virus/spam mail found etc.)." + elog "If you are using neither apache nor nginx and the included CGI script" + elog "is unable to read the mailgraph RRD files, please add the user for" + elog "that webserver to the group mgraph manually:" elog - elog "Checking for user apache:" - if egetent passwd apache >&/dev/null; then - elog "Adding user apache to group mgraph so the included" - elog "CGI script is able to read the mailgraph RRD files" - if ! gpasswd -a apache mgraph >&/dev/null; then - eerror "Failed to add user apache to group mgraph!" - eerror "Please check manually." - fi - else - elog - elog "User apache not found, maybe we will be running a" - elog "webserver with a different UID?" - elog "If that's the case, please add that user to the" - elog "group mgraph manually to enable the included" - elog "CGI script to read the mailgraph RRD files:" - elog - elog "\tgpasswd -a mgraph" - fi + elog "\tgpasswd -a mgraph" ewarn ewarn "mailgraph.cgi is installed in /usr/share/${PN}/" diff --git a/net-mail/mailgraph/metadata.xml b/net-mail/mailgraph/metadata.xml index bef24d2c2337..e8707cb9b9a7 100644 --- a/net-mail/mailgraph/metadata.xml +++ b/net-mail/mailgraph/metadata.xml @@ -2,4 +2,7 @@ + + Add nginx support +