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 A7309138334 for ; Tue, 18 Jun 2019 10:16:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5F23E0886; Tue, 18 Jun 2019 10:16:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 B85A3E0886 for ; Tue, 18 Jun 2019 10:16:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8754E3463CC for ; Tue, 18 Jun 2019 10:16:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99E9B614 for ; Tue, 18 Jun 2019 10:16:55 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1560852167.643150fedc69f86f53b6b14cf71f5a5a5663a6b3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/i2pd/i2pd-2.26.0.ebuild X-VCS-Directories: net-vpn/i2pd/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 643150fedc69f86f53b6b14cf71f5a5a5663a6b3 X-VCS-Branch: master Date: Tue, 18 Jun 2019 10:16:55 +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: d167c220-bd0e-4317-a9e1-b50306591651 X-Archives-Hash: 893961b87258cad8405ab014fc42461c commit: 643150fedc69f86f53b6b14cf71f5a5a5663a6b3 Author: Alexey Korepanov yandex ru> AuthorDate: Sat Jun 15 21:18:09 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jun 18 10:02:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643150fe net-vpn/i2pd: move user&group to pkg_preinst Signed-off-by: Alexey Korepanov yandex.ru> Signed-off-by: Michał Górny gentoo.org> net-vpn/i2pd/i2pd-2.26.0.ebuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net-vpn/i2pd/i2pd-2.26.0.ebuild b/net-vpn/i2pd/i2pd-2.26.0.ebuild index 751c24c92d1..43b8c34e8a5 100644 --- a/net-vpn/i2pd/i2pd-2.26.0.ebuild +++ b/net-vpn/i2pd/i2pd-2.26.0.ebuild @@ -79,20 +79,10 @@ src_install() { doins contrib/i2pd.conf doins contrib/tunnels.conf - # grant i2pd group read and write access to config files - fowners "root:${I2PD_GROUP}" \ - /etc/i2pd/i2pd.conf \ - /etc/i2pd/tunnels.conf - fperms 660 \ - /etc/i2pd/i2pd.conf \ - /etc/i2pd/tunnels.conf - # working directory keepdir /var/lib/i2pd insinto /var/lib/i2pd doins -r contrib/certificates - fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/ - fperms 700 /var/lib/i2pd/ # add /var/lib/i2pd/certificates to CONFIG_PROTECT doenvd "${FILESDIR}/99i2pd" @@ -107,9 +97,19 @@ src_install() { newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd } -pkg_setup() { +pkg_preinst() { enewgroup "${I2PD_GROUP}" enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}" + + fowners "root:${I2PD_GROUP}" \ + /etc/i2pd/i2pd.conf \ + /etc/i2pd/tunnels.conf + fperms 660 \ + /etc/i2pd/i2pd.conf \ + /etc/i2pd/tunnels.conf + + fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/ + fperms 700 /var/lib/i2pd/ } pkg_postinst() {