Remove command-args use flag, as it pretty much does nothing anyways ... (#289722)

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

5 files changed, 16 insertions, 208 deletions

diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index a24563502b08..8083ed9f41d0 100644
--- a/net-analyzer/nagios-nrpe/ChangeLog
+++ b/net-analyzer/nagios-nrpe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagios-nrpe
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.66 2009/12/31 10:06:18 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.67 2010/10/31 15:49:13 dertobi123 Exp $
+
+*nagios-nrpe-2.12-r104 (31 Oct 2010)
+
+  31 Oct 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-nrpe-2.12.ebuild, -nagios-nrpe-2.12-r1.ebuild,
+  -nagios-nrpe-2.12-r103.ebuild, +nagios-nrpe-2.12-r104.ebuild:
+  Remove command-args use flag, as it pretty much does nothing anyways ...
+  (#289722)
 
 *nagios-nrpe-2.12-r103 (31 Dec 2009)
 
diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest
index 736759e5bbfd..a683274f8d76 100644
--- a/net-analyzer/nagios-nrpe/Manifest
+++ b/net-analyzer/nagios-nrpe/Manifest
@@ -2,9 +2,7 @@ AUX multiline.patch 6649 RMD160 78d552c005b3af412d9ba844e9bd865d689d78df SHA1 79
 AUX nrpe 591 RMD160 27dec27f122cc022215e1c049b8749cc75746150 SHA1 08c79e7a2e0458c2e896e1470fe6de1591095881 SHA256 795470c9bce54145e54879b22ae9a1a3c288c87418bc45e4b9f5420112a27d5e
 AUX nrpe-nagios3 584 RMD160 959ce8e40f61a172195e49a604ad60b5192e3a68 SHA1 6468fed5634fca87520f84ab506dac7c5401e03e SHA256 3fa45bb6136eba8a5b37f484c68887898e88dc1762a8f8b85ded4bb3d57e32c8
 DIST nrpe-2.12.tar.gz 405725 RMD160 3413f84c9bb926a4dd55cc02d7b0a01bd7fc99ee SHA1 208595c175d726e8e377d565b21897f4de1648cc SHA256 7e8d093abef7d7ffc7219ad334823bdb612121df40de2dbaec9c6d0adeb04cfc
-EBUILD nagios-nrpe-2.12-r1.ebuild 2718 RMD160 abb78ee371c301f177417d6d978fb6af24d2b9e6 SHA1 988fa2dc289cb9f0b8843a3f12b858eaf89df8af SHA256 4c2314ecff27382f264c8980ea529f014c3e13a075c9a13d2ecc107b4f033505
 EBUILD nagios-nrpe-2.12-r102.ebuild 2604 RMD160 3bb0addd6b21a07a9ebb4ac5fdccc0e21e5510ba SHA1 b9e695f154e39b395adfce9ce3fba7ab7d3ec9b5 SHA256 4c1c410fccea8fc29c8c2923902e9a288a85a0efb714703a3c197794217f78c3
-EBUILD nagios-nrpe-2.12-r103.ebuild 2814 RMD160 11a3f658d36eee5c98a38adb55e67fd103fb2fc6 SHA1 c02a83a826dbfb9e0fe3ced66bb292bfb047c833 SHA256 edc6efc973332f020e5322bdd099958853d00bc7fd7f31a679853fbd072ccd18
-EBUILD nagios-nrpe-2.12.ebuild 2464 RMD160 75dfde668ba12f9e8165b44e24808cf91b68e18c SHA1 bb83423d0d6ac751a408c79f000eea427321163c SHA256 60e091c45c2d3266702c4752f37d1a94416f2b6061bd4c946bdcc45041c991a6
-MISC ChangeLog 9144 RMD160 4436036cb3ab29242621acfefca82f25a8c297c6 SHA1 a964d5474caabd92234113427e106826f440df6a SHA256 a5d2902373b40439d5897c6527c3df4dc73bfcd263cba790ab6009c44a44cf75
+EBUILD nagios-nrpe-2.12-r104.ebuild 2454 RMD160 05463eb6b1d95ac6c95cede722793bc7de417317 SHA1 606932a96d24dc766b9b7d67bca1611c741171ec SHA256 43afa519f2490310a4d8341c097a64cd9824bde4b1d07c0e580f85c5b11191e4
+MISC ChangeLog 9447 RMD160 8ecc7f9a10ce697be7954605ce18ed777776a65f SHA1 6bd8cf7e4204d9d01145dd42677168b1e0a48e93 SHA256 4740566c902bd19b49c50cf5b2c929809577fb85b1bc6554066706440b6ed213
 MISC metadata.xml 512 RMD160 99cbbaa29ce23d47eda611af3175756469239cf4 SHA1 32adea7baf4160520fab486693e5fbc6e1cede73 SHA256 575224ce1224c4119d597bdbba6b31691b41387243b59b515dcca3be1a798d84
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r1.ebuild
deleted file mode 100644
index 18e08f6fc93d..000000000000
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r1.ebuild,v 1.1 2008/08/04 15:55:31 dertobi123 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nrpe-${PV}.tar.gz"
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="ssl command-args"
-DEPEND=">=net-analyzer/nagios-plugins-1.3.0
-	ssl? ( dev-libs/openssl )"
-S="${WORKDIR}/nrpe-${PV}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} $(use_enable ssl) \
-					  $(use_enable command-args)"
-
-	# Generate the dh.h header file for better security (2005 Mar 20 eldad)
-	if useq ssl ; then
-		openssl dhparam -C 512 | sed -n '1,/BEGIN DH PARAMETERS/p' | grep -v "BEGIN DH PARAMETERS" > "${S}"/src/dh.h
-	fi
-
-	econf ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nrpe-user=nagios \
-		--with-nrpe-grp=nagios || die "econf failed"
-	emake all || die "make failed"
-	# Add nifty nrpe check tool
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o nrpe_check_control	nrpe_check_control.c
-}
-
-src_install() {
-	dodoc LEGAL Changelog README SECURITY README.SSL \
-		contrib/README.nrpe_check_control
-
-	insinto /etc/nagios
-	newins "${S}"/sample-config/nrpe.cfg nrpe.cfg
-	fowners root:nagios /etc/nagios/nrpe.cfg
-	fperms 0640 /etc/nagios/nrpe.cfg
-
-	exeopts -m0750 -o nagios -g nagios
-	exeinto /usr/nagios/bin
-	doexe src/nrpe
-
-	exeopts -m0750 -o nagios -g nagios
-	exeinto /usr/nagios/libexec
-	doexe src/check_nrpe contrib/nrpe_check_control
-
-	newinitd "${FILESDIR}"/nrpe nrpe
-
-	cat << EOF > "${T}"/55-nagios-nrpe-revdep
-SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
-EOF
-
-	insinto /etc/revdep-rebuild
-	doins "${T}"/55-nagios-nrpe-revdep
-
-	# Create pidfile in /var/run/nrpe, bug #233859
-	keepdir /var/run/nrpe
-	fowners nagios:nagios /var/run/nrpe
-	sed -i -e \
-		"s#pid_file=/var/run/nrpe.pid#pid_file=/var/run/nrpe/nrpe.pid#" \
-		"${D}"/etc/nagios/nrpe.cfg || die "sed failed"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are using the nrpe daemon, remember to edit"
-	einfo "the config file /etc/nagios/nrpe.cfg"
-	einfo
-
-	if useq command-args ; then
-		ewarn "You have enabled command-args for NRPE. This enables"
-		ewarn "the ability for clients to supply arguments to commands"
-		ewarn "which should be run. "
-		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
-		ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
-	fi
-}
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r104.ebuild
index e341bc88318d..3189c71e131d 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r104.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild,v 1.1 2009/12/31 10:06:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r104.ebuild,v 1.1 2010/10/31 15:49:13 dertobi123 Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ SLOT="0"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="ssl command-args"
+IUSE="ssl"
 DEPEND=">=net-analyzer/nagios-plugins-1.3.0
 	ssl? ( dev-libs/openssl )"
 S="${WORKDIR}/nrpe-${PV}"
@@ -35,8 +35,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	myconf="${myconf} $(use_enable ssl) \
-					  $(use_enable command-args)"
+	myconf="${myconf} $(use_enable ssl)"
 
 	# Generate the dh.h header file for better security (2005 Mar 20 eldad)
 	if useq ssl ; then
@@ -92,12 +91,4 @@ pkg_postinst() {
 	einfo "If you are using the nrpe daemon, remember to edit"
 	einfo "the config file /etc/nagios/nrpe.cfg"
 	einfo
-
-	if useq command-args ; then
-		ewarn "You have enabled command-args for NRPE. This enables"
-		ewarn "the ability for clients to supply arguments to commands"
-		ewarn "which should be run. "
-		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
-		ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
-	fi
 }
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild
deleted file mode 100644
index db7eff258526..000000000000
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12.ebuild,v 1.7 2008/07/02 15:05:57 jer Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nrpe-${PV}.tar.gz"
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 hppa ~ppc ppc64 sparc x86"
-
-IUSE="ssl command-args"
-DEPEND=">=net-analyzer/nagios-plugins-1.3.0
-	ssl? ( dev-libs/openssl )"
-S="${WORKDIR}/nrpe-${PV}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} $(use_enable ssl) \
-					  $(use_enable command-args)"
-
-	# Generate the dh.h header file for better security (2005 Mar 20 eldad)
-	if useq ssl ; then
-		openssl dhparam -C 512 | sed -n '1,/BEGIN DH PARAMETERS/p' | grep -v "BEGIN DH PARAMETERS" > "${S}"/src/dh.h
-	fi
-
-	econf ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nrpe-user=nagios \
-		--with-nrpe-grp=nagios || die "econf failed"
-	emake all || die "make failed"
-	# Add nifty nrpe check tool
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o nrpe_check_control	nrpe_check_control.c
-}
-
-src_install() {
-	dodoc LEGAL Changelog README SECURITY README.SSL \
-		contrib/README.nrpe_check_control
-
-	insinto /etc/nagios
-	newins "${S}"/sample-config/nrpe.cfg nrpe.cfg
-	fowners root:nagios /etc/nagios/nrpe.cfg
-	fperms 0640 /etc/nagios/nrpe.cfg
-
-	exeopts -m0750 -o nagios -g nagios
-	exeinto /usr/nagios/bin
-	doexe src/nrpe
-
-	exeopts -m0750 -o nagios -g nagios
-	exeinto /usr/nagios/libexec
-	doexe src/check_nrpe contrib/nrpe_check_control
-
-	newinitd "${FILESDIR}"/nrpe nrpe
-
-	cat << EOF > "${T}"/55-nagios-nrpe-revdep
-SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
-EOF
-
-	insinto /etc/revdep-rebuild
-	doins "${T}"/55-nagios-nrpe-revdep
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are using the nrpe daemon, remember to edit"
-	einfo "the config file /etc/nagios/nrpe.cfg"
-	einfo
-
-	if useq command-args ; then
-		ewarn "You have enabled command-args for NRPE. This enables"
-		ewarn "the ability for clients to supply arguments to commands"
-		ewarn "which should be run. "
-		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
-		ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
-	fi
-}