moved 'use suid && fperms 04710 /check_{icmp,ide_smart,dhcp}' below chmod

should also solve bug #443642

(Portage version: 2.1.11.31/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x2471eb3e40ac5ac3)

2 files changed, 159 insertions, 16 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 917abd9fa7d7..94fef3f490a6 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # 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.158 2012/11/14 13:43:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.159 2012/11/19 05:40:50 prometheanfire Exp $
+
+*nagios-plugins-1.4.16-r3 (19 Nov 2012)
+
+  19 Nov 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +nagios-plugins-1.4.16-r3.ebuild:
+  moved 'use suid && fperms 04710 /check_{icmp,ide_smart,dhcp}' below chmod
+  should also solve bug #443642
 
   14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
   nagios-plugins-1.4.16-r2.ebuild:
@@ -10,14 +17,14 @@
   nagios-plugins-1.4.16-r2.ebuild:
   stable ppc ppc64, bug #441654
 
-  09 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  09 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   nagios-plugins-1.4.16-r2.ebuild:
   Enforce ownership of the nagios plugin directory. Should solve bug #441980.
 
   07 Nov 2012; Jeroen Roovers <jer@gentoo.org> nagios-plugins-1.4.16-r2.ebuild:
   Stable for HPPA (bug #441654).
 
-  04 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  04 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   -nagios-plugins-1.4.16-r1.ebuild:
   Remove old version.
 
@@ -25,29 +32,29 @@
   nagios-plugins-1.4.16-r2.ebuild:
   Keyword ~arm, bug #389115
 
-  25 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  25 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   nagios-plugins-1.4.16-r2.ebuild:
   Fix build with sudo USE flag disabled.
 
 *nagios-plugins-1.4.16-r2 (23 Aug 2012)
 
-  23 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  23 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +nagios-plugins-1.4.16-r2.ebuild, metadata.xml:
   Revision bump: cleanup contrib plugins install; add a sudo and smartctl USE
   flag so that plugins using sudo have a way to be configured.
 
-  19 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+  19 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
   nagios-plugins-1.4.16-r1.ebuild:
   Drop dependency over net-analyzer/net-snmp: all the SNMP plugins use dev-
   perl/Net::SNMP instead. Since the dependency does not require any rebuild,
   make this behave like nagios-game and don't remove the plugins.
 
-  19 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
+  19 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Re-assign to sysadmin herd.
 
 *nagios-plugins-1.4.16-r1 (18 Aug 2012)
 
-  18 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  18 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +nagios-plugins-1.4.16-r1.ebuild, -files/nagios-plugins-1.4.15-vserver.patch,
   -files/nagios-plugins-1.4.16-contrib.patch,
   -files/nagios-plugins-1.4.16-parallelmake.patch,
@@ -55,11 +62,11 @@
   -nagios-plugins-1.4.16.ebuild, metadata.xml:
   Cleanup old; revision bump and move patches to git backports instead.
 
-  15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/nagios-plugins-1.4.16-parallelmake.patch, nagios-plugins-1.4.16.ebuild:
   Fix building in parallel (tested on 32-way system).
 
-  15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  15 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   nagios-plugins-1.4.16.ebuild:
   QA: stop parallel build as the build system is unsafe. I'll provide a fix
   asap.
@@ -79,7 +86,7 @@
 
   29 Apr 2011; Markos Chandras <hwoarang@gentoo.org>
   files/nagios-plugins-1.4.15-openldap.patch:
-  Fix openldap patch thanks to Frieder Bürzele <evermind@tuxfamily.org>. Bug
+  Fix openldap patch thanks to Frieder Bürzele <evermind@tuxfamily.org>. Bug
   #336973
 
   22 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
@@ -99,7 +106,7 @@
   nagios-plugins-1.4.14-r2.ebuild:
   Stable for HPPA (bug #330519).
 
-  18 Sep 2010; Raúl Porcel <armin76@gentoo.org>
+  18 Sep 2010; Raúl Porcel <armin76@gentoo.org>
   nagios-plugins-1.4.14-r2.ebuild:
   alpha/sparc stable wrt #330519
 
@@ -141,7 +148,7 @@
   Add fix for indefinitely hang while checking ping on Linux VServer
   (#44382), patch by Norbert Klein and Ivan Chavero
 
-  31 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  31 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   nagios-plugins-1.4.14.ebuild:
   sparc stable wrt #298088
 
@@ -249,7 +256,7 @@
   nagios-plugins-1.4.13.ebuild:
   x86 stable, bug #252669
 
-  02 Jan 2009; Dawid Węgliński <cla@gentoo.org>
+  02 Jan 2009; Dawid Węgliński <cla@gentoo.org>
   nagios-plugins-1.4.12-r101.ebuild, nagios-plugins-1.4.13.ebuild:
   Stable on amd64 (bug #252669)
 
@@ -309,7 +316,7 @@
   +nagios-plugins-1.4.12-r100.ebuild:
   Version bump
 
-  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   nagios-plugins-1.4.11-r102.ebuild:
   Changed dependency for postgresql from dev-db/postgresql to
   virtual/postgresql-server
@@ -320,7 +327,7 @@
   USE=postgres should set --with-pgsql, reported by Krzysztof Tomczyk
   (#222317)
 
-  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   nagios-plugins-1.4.11.ebuild, nagios-plugins-1.4.11-r1.ebuild:
   Changed dependency for postgresql to virtual/postgresql-base
 
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
new file mode 100644
index 000000000000..66e8ee144759
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r3.ebuild
@@ -0,0 +1,136 @@
+# 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 $
+
+EAPI=4
+
+PATCHSET=2
+
+inherit autotools eutils multilib user
+
+DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber gnutls sudo smart"
+
+DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6g )
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( >=net-dialup/radiusclient-0.3.2 )"
+
+# tests try to ssh into the box itself
+RESTRICT="test"
+
+RDEPEND="${DEPEND}
+	>=dev-lang/perl-5.6.1-r7
+	samba? ( >=net-fs/samba-2.2.5-r1 )
+	snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 )
+	mysql? ( dev-perl/DBI
+			 dev-perl/DBD-mysql )
+	nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
+	nagios-ntp? ( >=net-misc/ntp-4.1.1a )
+	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
+	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
+	ups? ( >=sys-power/nut-1.4 )
+	nagios-game? ( >=games-util/qstat-2.6 )
+	jabber? ( >=dev-perl/Net-Jabber-2.0 )
+	sudo? ( >=app-admin/sudo-1.8.5 )
+	smart? ( sys-apps/smartmontools )"
+
+REQUIRED_USE="smart? ( sudo )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use ssl; then
+		myconf+="
+			$(use_with !gnutls openssl /usr)
+			$(use_with gnutls gnutls /usr)"
+	else
+		myconf+=" --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with radius) \
+		$(use_with postgres pgsql /usr) \
+		${myconf} \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--sysconfdir=/etc/nagios
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS BUGS CODING ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS )
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+
+	if use sudo; then
+		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)
+User_Alias NAGIOS_PLUGINS_USERS = nagios, icinga
+
+NAGIOS_PLUGINS_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_CMDS
+EOF
+
+		insinto /etc/sudoers.d
+		doins "${T}"/50${PN}
+	fi
+
+	cd contrib/
+	dodoc *README*
+
+	# remove stuff that is way too broken to fix, or for which the USE
+	# flag has been removed.
+	rm -r tarballs aix \
+		check_compaq_insight.pl *.c *README* \
+		$(usex !jabber nagios_sendim.pl) \
+		$(usex !smart check_smart.pl)
+
+	# fix perl interpreter
+	sed -i -e '1s:/usr/local/bin/perl:/usr/bin/perl:' \
+		"${S}"/contrib/* || die
+
+	exeinto ${nagiosplugindir}/contrib
+	doexe *
+
+	dosym ../utils.sh ${nagiosplugindir}/contrib/utils.sh
+	dosym ../utils.pm ${nagiosplugindir}/contrib/utils.pm
+
+	# enforce permissions/owners (seem to trigger only in some case)
+	chown -R root:nagios "${D}${nagiosplugindir}" || die
+	chmod -R o-rwx "${D}${nagiosplugindir}" || die
+
+	use suid && fperms 04710 ${nagiosplugindir}/check_{icmp,ide_smart,dhcp}
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags which determines what nagios is able to monitor."
+	elog "Depending on what you want to monitor with nagios, some or all of these USE"
+	elog "flags need to be set for nagios to function correctly."
+	elog "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
+}