mjo 14/11/26 23:38:53 Modified: nagios-plugins-2.0.3-r1.ebuild ChangeLog Log: Fix ROOT variable usage in configure parameters. (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!)
Revision Changes Path 1.2 net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild?r1=1.1&r2=1.2 Index: nagios-plugins-2.0.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nagios-plugins-2.0.3-r1.ebuild 26 Nov 2014 02:04:33 -0000 1.1 +++ nagios-plugins-2.0.3-r1.ebuild 26 Nov 2014 23:38:53 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild,v 1.1 2014/11/26 02:04:33 mjo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild,v 1.2 2014/11/26 23:38:53 mjo Exp $ EAPI=5 @@ -46,7 +46,7 @@ src_prepare() { # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:${ROOT}usr/bin/perl:" \ + sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ "${S}"/plugins-scripts/*.pl || die } @@ -63,10 +63,10 @@ # The autodetection for these two commands can hang if localhost is # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="${ROOT}bin/ping -n -U -w %d -c %d %s" ) + myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) if use ipv6; then - myconf+=( --with-ping6-command="${ROOT}bin/ping6 -n -U -w %d -c %d %s" ) + myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) fi econf \ @@ -75,8 +75,8 @@ $(use_with ldap) \ $(use_with postgres pgsql /usr) \ "${myconf[@]}" \ - --libexecdir="${ROOT}usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="${ROOT}etc/nagios" + --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="/etc/nagios" } DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ 1.170 net-analyzer/nagios-plugins/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.170&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?rev=1.170&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog?r1=1.169&r2=1.170 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- ChangeLog 26 Nov 2014 02:04:33 -0000 1.169 +++ ChangeLog 26 Nov 2014 23:38:53 -0000 1.170 @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/nagios-plugins # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.169 2014/11/26 02:04:33 mjo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.170 2014/11/26 23:38:53 mjo Exp $ + + 26 Nov 2014; Michael Orlitzky <[email protected]> nagios-plugins-2.0.3-r1.ebuild: + Fix ROOT variable usage in configure parameters. *nagios-plugins-2.0.3-r1 (26 Nov 2014)
