summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-11-21 18:31:35 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-11-21 18:31:35 +0000
commit8dee784865ae0133de7f61bf36784f5893629a5f (patch)
treee464940959c5ddb3ff2bc4362dd5123a9f61190d /net-analyzer/nagios-plugins
parentStable on amd64 and x86, I need this to test my vdpau stuff on stable. (diff)
downloadgentoo-2-8dee784865ae0133de7f61bf36784f5893629a5f.tar.gz
gentoo-2-8dee784865ae0133de7f61bf36784f5893629a5f.tar.bz2
gentoo-2-8dee784865ae0133de7f61bf36784f5893629a5f.zip
Make sure not to install a wrong sudoers file if smart USE is disabled.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'net-analyzer/nagios-plugins')
-rw-r--r--net-analyzer/nagios-plugins/ChangeLog6
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild4
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index fc0973ce5fc6..f4ed2b7039c6 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nagios-plugins
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.160 2012/11/21 11:15:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.161 2012/11/21 18:31:35 flameeyes Exp $
+
+ 21 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+ nagios-plugins-1.4.16-r2.ebuild, nagios-plugins-1.4.16-r3.ebuild:
+ Make sure not to install a wrong sudoers file if smart USE is disabled.
21 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
nagios-plugins-1.4.16-r2.ebuild:
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild
index cced1f9c6205..a21360ff8d20 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild,v 1.8 2012/11/21 11:15:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild,v 1.9 2012/11/21 18:31:35 flameeyes Exp $
EAPI=4
@@ -93,7 +93,7 @@ src_install() {
cat - > "${T}"/50${PN} <<EOF
# we add /bin/false so that we don't risk causing syntax errors if all USE flags
# are off as we'd end up with an empty set
-Cmnd_Alias NAGIOS_PLUGINS_CMDS = /bin/false, $(usex smart /usr/sbin/smartctl)
+Cmnd_Alias NAGIOS_PLUGINS_CMDS = /bin/false $(use smart && echo ", /usr/sbin/smartctl")
User_Alias NAGIOS_PLUGINS_USERS = nagios, icinga
NAGIOS_PLUGINS_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_CMDS
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild
index 66e8ee144759..a888d6b1395a 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild,v 1.1 2012/11/19 05:40:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild,v 1.2 2012/11/21 18:31:35 flameeyes Exp $
EAPI=4
@@ -91,7 +91,7 @@ src_install() {
cat - > "${T}"/50${PN} <<EOF
# we add /bin/false so that we don't risk causing syntax errors if all USE flags
# are off as we'd end up with an empty set
-Cmnd_Alias NAGIOS_PLUGINS_CMDS = /bin/false, $(usex smart /usr/sbin/smartctl)
+Cmnd_Alias NAGIOS_PLUGINS_CMDS = /bin/false $(use smart && echo ", /usr/sbin/smartctl")
User_Alias NAGIOS_PLUGINS_USERS = nagios, icinga
NAGIOS_PLUGINS_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_CMDS