diff options
Diffstat (limited to 'net-analyzer')
6 files changed, 7 insertions, 205 deletions
diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog index c0b8396e2280..2ae34ce63201 100644 --- a/net-analyzer/nagios-plugins/ChangeLog +++ b/net-analyzer/nagios-plugins/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/nagios-plugins # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.75 2007/10/04 14:35:01 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.76 2007/10/23 19:43:06 dertobi123 Exp $ + + 23 Oct 2007; Tobias Scherbaum <dertobi123@gentoo.org> + -files/nagios-plugins-1.4.8-mysql.patch, + -files/nagios-plugins-1.4-contrib.patch, + -files/nagios-plugins-1.4-noradius.patch, -nagios-plugins-1.4.8-r1.ebuild: + Housekeeping 04 Oct 2007; Steve Dibb <beandog@gentoo.org> nagios-plugins-1.4.10.ebuild: amd64 stable, security bug 194178 diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.8-r1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.8-r1 deleted file mode 100644 index 73aa45de0e8a..000000000000 --- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.8-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ab16f99f8bd8a9b2897d003d3ba7024e nagios-plugins-1.4.8.tar.gz 1356563 -RMD160 28754b5e09ef0617530fdc6f54c62f5f94c0bd03 nagios-plugins-1.4.8.tar.gz 1356563 -SHA256 ce59972199049e587f2ee078888beb3824a6612d75a8efc9feaafe64d6ee83ef nagios-plugins-1.4.8.tar.gz 1356563 diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-contrib.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-contrib.patch deleted file mode 100644 index c3f34cc592fa..000000000000 --- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-contrib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nru nagios-plugins-1.4.8.orig/contrib/check_dns_random.pl nagios-plugins-1.4.8/contrib/check_dns_random.pl ---- nagios-plugins-1.4.8.orig/contrib/check_dns_random.pl 2003-01-29 07:27:20.000000000 +0200 -+++ nagios-plugins-1.4.8/contrib/check_dns_random.pl 2007-05-11 18:58:36.000000000 +0300 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/bin/perl -w - # ------------------------------------------------------------------------------ - # File Name: check_dns_random.pl - # Author: Richard Mayhew - South Africa -@@ -33,9 +33,9 @@ - - my $host = shift || &usage; - --my $domainfile = "/usr/local/nagios/etc/domains.list"; -+my $domainfile = "/etc/nagios/domains.list"; - my $wc = `/usr/bin/wc -l $domainfile`; --my $check = "/usr/local/nagios/libexec/check_dns"; -+my $check = "/usr/nagios/libexec/check_dns"; - my $x = 0; - my $srv_file = ""; - my $z = ""; -@@ -49,8 +49,7 @@ - my @data = split(/\n/,$srv_file); - - chomp $wc; --$wc =~ s/ //g; --$wc =~ s/domains//g; -+$wc =~ s/([[:digit:]]+) .*/$1/g; - - $x = rand $wc; - ($z,$y) = split(/\./,$x); -diff -Nru nagios-plugins-1.4.8.orig/contrib/check_linux_raid.pl nagios-plugins-1.4.8/contrib/check_linux_raid.pl ---- nagios-plugins-1.4.8.orig/contrib/check_linux_raid.pl 2006-06-07 17:28:33.000000000 +0300 -+++ nagios-plugins-1.4.8/contrib/check_linux_raid.pl 2007-05-11 18:45:52.000000000 +0300 -@@ -23,7 +23,7 @@ - # WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min - - use strict; --use lib utils.pm; -+use lib '/usr/nagios/libexec'; - use utils qw(%ERRORS); - - # die with an error if we're not on Linux diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-noradius.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-noradius.patch deleted file mode 100644 index aac5637ecd50..000000000000 --- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-noradius.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.in.orig 2005-09-10 16:40:43.000000000 +0000 -+++ configure.in 2005-09-10 16:43:18.000000000 +0000 -@@ -193,19 +193,6 @@ - LIBS="$_SAVEDLIBS" - CPPFLAGS="$_SAVEDCPPFLAGS" - --dnl Check for radius libraries --_SAVEDLIBS="$LIBS" --AC_CHECK_LIB(radiusclient,rc_read_config) --if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then -- EXTRAS="$EXTRAS check_radius" -- RADIUSLIBS="-lradiusclient" -- AC_SUBST(RADIUSLIBS) --else -- AC_MSG_WARN([Skipping radius plugin]) -- AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).]) --fi --LIBS="$_SAVEDLIBS" -- - dnl Check for LDAP libraries - _SAVEDLIBS="$LIBS" - AC_CHECK_LIB(ldap,main,,,-llber) diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.8-mysql.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.8-mysql.patch deleted file mode 100644 index ca26a1f6d4f1..000000000000 --- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.8-mysql.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru nagios-plugins-1.4.8.orig/configure.in nagios-plugins-1.4.8/configure.in ---- nagios-plugins-1.4.8.orig/configure.in 2007-04-11 15:08:05.000000000 +0300 -+++ nagios-plugins-1.4.8/configure.in 2007-05-11 19:44:10.000000000 +0300 -@@ -246,7 +246,7 @@ - AC_MSG_WARN([Skipping mysql plugin]) - AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) - else -- EXTRAS="$EXTRA check_mysql check_mysql_query" -+ EXTRAS="$EXTRAS check_mysql check_mysql_query" - MYSQLINCLUDE="$np_mysql_include" - MYSQLLIBS="$np_mysql_libs" - MYSQLCFLAGS="$np_mysql_cflags" diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.8-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.8-r1.ebuild deleted file mode 100644 index 8f64556f332a..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.8-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2007 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.8-r1.ebuild,v 1.7 2007/07/11 23:49:24 mr_bones_ Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=dev-db/postgresql-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -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 - >=net-analyzer/net-snmp-5.0.6 - ) - 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 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - if ! use radius; then - EPATCH_OPTS="-p0 -d ${S}" epatch \ - ${FILESDIR}/nagios-plugins-1.4-noradius.patch - fi - - epatch ${FILESDIR}/${P}-mysql.patch - epatch ${FILESDIR}/${PN}-1.4-contrib.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - econf \ - $(use_with mysql) \ - $(use_with postgres) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr/nagios \ - --sysconfdir=/etc/nagios \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv ${S}/contrib/check_compaq_insight.pl ${S}/contrib/check_compaq_insight.pl.msg - chmod +x ${S}/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' ${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" - - dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \ - Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/nagios/libexec - exeinto /usr/nagios/libexec - doexe ${S}/contrib/check_nagios_db.pl - fi - - dodir /usr/nagios/libexec/ - mv ${S}/contrib ${D}/usr/nagios/libexec/contrib - - chown root:nagios ${D}/usr/nagios || die "Failed Chown of ${D}usr/nagios" - chown -R root:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec" - - chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec" - - chmod 04710 ${D}/usr/nagios/libexec/check_icmp || "Failed Chmod of ${D}usr/nagios/libexec/check_icmp" -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/nagios/libexec/contrib" -} |