From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-982247-garchives=archives.gentoo.org@lists.gentoo.org>
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 4A69A1396DA
for <garchives@archives.gentoo.org>; Sat, 4 Nov 2017 23:40:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2BEB7E0DE9;
Sat, 4 Nov 2017 23:40:23 +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 0AAE3E0DE9
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Nov 2017 23:40:23 +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 06600341765
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Nov 2017 23:40:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A5B19529
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Nov 2017 23:40:20 +0000 (UTC)
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1509838640.184ae2c637ba60cd8f65d33c9098a2f4a079b4dc.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/pnp4nagios/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
X-VCS-Directories: net-analyzer/pnp4nagios/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 184ae2c637ba60cd8f65d33c9098a2f4a079b4dc
X-VCS-Branch: master
Date: Sat, 4 Nov 2017 23:40:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a8729ac1-71fb-4683-90ce-3de82a8c593d
X-Archives-Hash: d9056e120d77c079b42f13778148cf7b
commit: 184ae2c637ba60cd8f65d33c9098a2f4a079b4dc
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 2 17:08:14 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Nov 4 23:37:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=184ae2c6
net-analyzer/pnp4nagios: new revision with a better fix for CVE-2012-3457.
In CVE-2012-3457, it was reported that one particular file should not
be world-readable. To fix that, our ebuild made all of /etc/pnp
unreadable; that made other permissions issues difficult to work
around. This r2 sets o-rwx only on /etc/pnp/process_perfdata.cfg.
Bug: https://bugs.gentoo.org/430358
Package-Manager: Portage-2.3.8, Repoman-2.3.3
...0.6.26-r1.ebuild => pnp4nagios-0.6.26-r2.ebuild} | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
similarity index 84%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
index c15a8c98de6..818bc3104ff 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r1.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r2.ebuild
@@ -74,25 +74,18 @@ src_install() {
rm "${ED%/}/usr/share/pnp/install.php" || \
die "unable to remove ${ED%/}/usr/share/pnp/install.php"
+ # Fix CVE-2012-3457 (Gentoo bug 430358)
+ fperms o-rwx /etc/pnp/process_perfdata.cfg
+
if use apache2 ; then
insinto "${APACHE_MODULES_CONFDIR}"
newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
- # Allow the apache user to read our config files. This same
- # approach is used in net-analyzer/nagios-core.
- chgrp -R apache "${ED%/}/etc/pnp" \
- || die "failed to change group of ${ED%/}/etc/pnp"
+ # This one file isn't world-readable, but it should be group-
+ # readable. Give it to the "apache" group to let the web
+ # server read it.
+ fowners :apache /etc/pnp/process_perfdata.cfg
fi
-
- # Bug 430358 - CVE-2012-3457
- local f
- while IFS="" read -d $'\0' -r f ; do
- chmod 0640 "${f}" || die
- done < <(find "${ED%/}/etc/pnp" -type f)
-
- while IFS="" read -d $'\0' -r f ; do
- chmod 0750 "${f}" || die
- done < <(find "${ED%/}/etc/pnp" -type d)
}
pkg_postinst() {