diff options
| -rw-r--r-- | net-analyzer/nagios-plugins/ChangeLog | 9 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch | 98 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild (renamed from net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r1.ebuild) | 27 |
3 files changed, 124 insertions, 10 deletions
diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog index c6b75ae690aa..0c7f96d7cfcc 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.130 2010/06/25 10:34:19 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.131 2010/07/30 14:34:41 dertobi123 Exp $ + +*nagios-plugins-1.4.15 (30 Jul 2010) + + 30 Jul 2010; Tobias Scherbaum <dertobi123@gentoo.org> + -nagios-plugins-1.4.13-r1.ebuild, +nagios-plugins-1.4.15.ebuild, + +files/nagios-plugins-1.4.15-vserver.patch: + Version bump 25 Jun 2010; Markos Chandras <hwoarang@gentoo.org> nagios-plugins-1.4.14.ebuild, diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch new file mode 100644 index 000000000000..867fdd3f4325 --- /dev/null +++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-vserver.patch @@ -0,0 +1,98 @@ +--- configure.in.orig 2010-07-30 16:22:01.000000000 +0200 ++++ configure.in 2010-07-30 16:24:30.000000000 +0200 +@@ -94,6 +94,8 @@ + REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'` + REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'` + ++first_ip=`/sbin/ifconfig | egrep "inet addr:" | sed -n '1p' | sed 's/ Bcast.*$//' | sed 's/^\s*inet addr://'` ++ + AC_SUBST(PKG_ARCH) + AC_SUBST(REV_DATESTAMP) + AC_SUBST(REV_TIMESTAMP) +@@ -950,14 +952,14 @@ + fi + + elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ +- $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ ++ $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -U -c %d %s" + ac_cv_ping_packets_first=yes + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ ++elif $PATH_TO_PING -n -U -w 10 -c 1 $first_ip 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" +@@ -965,52 +967,52 @@ + ac_cv_ping_has_timeout=yes + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ ++elif $PATH_TO_PING -n -U -c 1 $first_ip 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -U -c %d %s" + ac_cv_ping_packets_first=yes + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ ++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -c %d %s" + ac_cv_ping_packets_first=yes + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \ ++elif $PATH_TO_PING -n $first_ip -c 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n %s -c %d" + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \ ++elif $PATH_TO_PING $first_ip -n 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING %s -n %d" + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ ++elif $PATH_TO_PING -n -s $first_ip 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -s %s 56 %d" + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \ ++elif $PATH_TO_PING -n -h $first_ip -s 56 -c 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d" + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \ ++elif $PATH_TO_PING -n -s 56 -c 1 $first_ip 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s" + ac_cv_ping_packets_first=yes + AC_MSG_RESULT([$with_ping_command]) + +-elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ ++elif $PATH_TO_PING -n -c 1 $first_ip 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then + with_ping_command="$PATH_TO_PING -n -c %d %s" +@@ -1221,7 +1223,7 @@ + if test -n "$PATH_TO_NSLOOKUP" + then + AC_MSG_CHECKING(for nslookup syntax) +- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null ++ if $PATH_TO_NSLOOKUP -sil $first_ip 2>&1 | grep ["Invalid option: sil"] >/dev/null + then + ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" + AC_MSG_RESULT([$ac_cv_nslookup_command]) diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild index 5f12283b7b73..541ae4e4deba 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r1.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2010 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.13-r1.ebuild,v 1.10 2010/06/17 20:32:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.15.ebuild,v 1.1 2010/07/30 14:34:41 dertobi123 Exp $ -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" +EAPI=1 inherit eutils autotools @@ -13,9 +12,8 @@ SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 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" +KEYWORDS="~alpha ~amd64 ~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" DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) @@ -38,7 +36,8 @@ RDEPEND="${DEPEND} nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" + !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) ) + jabber? ( >=dev-perl/Net-Jabber-2.0 )" pkg_setup() { enewgroup nagios @@ -56,6 +55,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch + epatch "${FILESDIR}"/${P}-vserver.patch eautoreconf } @@ -93,6 +93,7 @@ src_install() { chmod +x "${S}"/contrib/*.pl sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" + sed -i -e s#/usr/nagios/libexec#/usr/$(get_libdir)/nagios/plugins#g "${S}"/contrib/*.pl || die "sed failed" sed -i -e '30s/use lib utils.pm;/use utils;/' \ "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" @@ -114,14 +115,22 @@ src_install() { mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib + if ! use jabber; then + rm "${D}"usr/$(get_libdir)/nagios/plugins/contrib/nagios_sendim.pl \ + || die "Failed to remove XMPP notification addon" + fi + chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \ || die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins" chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \ || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins" - chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp" + if use suid ; then + + chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/{check_icmp,check_ide_smart,check_dhcp} \ + || die "Failed setting the suid bit for various plugins" + fi dosym /usr/$(get_libdir)/nagios/plugins/utils.sh /usr/$(get_libdir)/nagios/plugins/contrib/utils.sh dosym /usr/$(get_libdir)/nagios/plugins/utils.pm /usr/$(get_libdir)/nagios/plugins/contrib/utils.pm |