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 4BE95158090 for ; Thu, 5 May 2022 01:35:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 710C1E0794; Thu, 5 May 2022 01:35:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 1B14EE0794 for ; Thu, 5 May 2022 01:35:44 +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 2C620341AB3 for ; Thu, 5 May 2022 01:35:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 720A643B for ; Thu, 5 May 2022 01:35:41 +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: <1651714500.4ab9acecb1933be12a68032aa6d1fba06c4c642e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild net-analyzer/darkstat/darkstat-3.0.721.ebuild X-VCS-Directories: net-analyzer/darkstat/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4ab9acecb1933be12a68032aa6d1fba06c4c642e X-VCS-Branch: master Date: Thu, 5 May 2022 01:35:41 +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: 1b03a14b-3738-451e-bb9e-11429e49b4cb X-Archives-Hash: 913d6aeea9f4737677b2482dd4ce1ed5 commit: 4ab9acecb1933be12a68032aa6d1fba06c4c642e Author: Sam James gentoo org> AuthorDate: Thu May 5 01:35:00 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 5 01:35:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab9acec net-analyzer/darkstat: simplify chroot logic It's easier to just print the default value and let the user handle the rest. Signed-off-by: Sam James gentoo.org> .../{darkstat-3.0.721.ebuild => darkstat-3.0.721-r1.ebuild} | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/net-analyzer/darkstat/darkstat-3.0.721.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild similarity index 82% rename from net-analyzer/darkstat/darkstat-3.0.721.ebuild rename to net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild index dcd53be61eb1..3f38088b33e0 100644 --- a/net-analyzer/darkstat/darkstat-3.0.721.ebuild +++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild @@ -61,20 +61,12 @@ src_install() { } pkg_postinst() { - # Workaround bug #141619 - DARKSTAT_CHROOT_DIR=$( - sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat - ) - - if [[ -n "${DARKSTAT_CHROOT_DIR}" ]] && [[ "${DARKSTAT_CHROOT_DIR}" != "${EROOT:-/}" ]] ; then - chown darkstat:0 "${EROOT}/${DARKSTAT_CHROOT_DIR#/}/" - fi - elog "To start different darkstat instances which will listen on a different" elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to" elog "darkstat script where 'if' is the name of the interface." elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if" elog "and edit it to change default values." elog - elog "darkstat's default chroot directory is: ${EROOT}/${DARKSTAT_CHROOT_DIR#/}" + elog "darkstat's default chroot directory is: ${EROOT}/var/lib/darkstat." + elog "Please chown it to darkstat:0 (or a different directory if you change it)." }