Housekeeping

Package-Manager: portage-2.1.3.15

7 files changed, 11 insertions, 229 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/Manifest b/net-analyzer/nagios-plugins/Manifest
index 9b34e2b5203f..7f2bccc6adbd 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,11 +1,3 @@
-AUX nagios-plugins-1.4-contrib.patch 1581 RMD160 8f643aa021d228b79479d8bede9d86bbaff2d82b SHA1 0c9a8e7f593af4766646c6ec53a3a67cb62dbdb9 SHA256 bcf878cb13d8a4671263da25d0e7a0965da80dca92afe24da03780807b646a18
-MD5 95c74832c7812b19353d002c28abff72 files/nagios-plugins-1.4-contrib.patch 1581
-RMD160 8f643aa021d228b79479d8bede9d86bbaff2d82b files/nagios-plugins-1.4-contrib.patch 1581
-SHA256 bcf878cb13d8a4671263da25d0e7a0965da80dca92afe24da03780807b646a18 files/nagios-plugins-1.4-contrib.patch 1581
-AUX nagios-plugins-1.4-noradius.patch 666 RMD160 5c1d6d73b39a5e1bf763dfa40a094a602a92e233 SHA1 6a5335d3e52e8202379f2186dd7a3c621e597fd9 SHA256 65dcc040bef18f6706a0534e29c04003920757b193010b07ff8740551c4c0865
-MD5 73ee36e67ff5948e0db8c99963a9e89f files/nagios-plugins-1.4-noradius.patch 666
-RMD160 5c1d6d73b39a5e1bf763dfa40a094a602a92e233 files/nagios-plugins-1.4-noradius.patch 666
-SHA256 65dcc040bef18f6706a0534e29c04003920757b193010b07ff8740551c4c0865 files/nagios-plugins-1.4-noradius.patch 666
 AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278
 MD5 d5a111b2c5cff8f253cb1003afc52b71 files/nagios-plugins-1.4.10-contrib.patch 1610
 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 files/nagios-plugins-1.4.10-contrib.patch 1610
@@ -14,24 +6,15 @@ AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968
 MD5 03db813b6ec458ef463fac07546ca497 files/nagios-plugins-1.4.10-noradius.patch 1029
 RMD160 e1e449d93966d822eca21782968e24fce4547a95 files/nagios-plugins-1.4.10-noradius.patch 1029
 SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229 files/nagios-plugins-1.4.10-noradius.patch 1029
-AUX nagios-plugins-1.4.8-mysql.patch 588 RMD160 79282c1f6e988ec1ff8e34f356277425fdeb85f6 SHA1 01febafe9465cc90f324b55bc5e2d4a0bd994fca SHA256 ba6940889d5352b28cf40180975f262d2db84014e73ca3b425a19fd93f295539
-MD5 4763f9482afd9e2bbf0e8fd8589d7d21 files/nagios-plugins-1.4.8-mysql.patch 588
-RMD160 79282c1f6e988ec1ff8e34f356277425fdeb85f6 files/nagios-plugins-1.4.8-mysql.patch 588
-SHA256 ba6940889d5352b28cf40180975f262d2db84014e73ca3b425a19fd93f295539 files/nagios-plugins-1.4.8-mysql.patch 588
 DIST nagios-plugins-1.4.10.tar.gz 1693979 RMD160 8f8167f07d6162165d7cb38c9c09ebff418151bd SHA1 8b41a69a90f9c656afb56b861f4505e5ad1aa5a4 SHA256 193ef480cd2b98d63de9183a83e277d6ef3b55032f44bd76616ef5e7a3d4a76e
-DIST nagios-plugins-1.4.8.tar.gz 1356563 RMD160 28754b5e09ef0617530fdc6f54c62f5f94c0bd03 SHA1 24446531e4f9647b0a633f1782ee34031d85fd1c SHA256 ce59972199049e587f2ee078888beb3824a6612d75a8efc9feaafe64d6ee83ef
 EBUILD nagios-plugins-1.4.10.ebuild 3635 RMD160 00e410b90800d325bb14a19c8088cedbcef762e4 SHA1 bd601f5ff2f6248f07c036840f97cde84470a50c SHA256 6c3d4014416e071a5923f24c5af4fb2749f363c507c1026c4ad6d814864f37cd
 MD5 a84b0cbf654b912ac86d876fc0c5a032 nagios-plugins-1.4.10.ebuild 3635
 RMD160 00e410b90800d325bb14a19c8088cedbcef762e4 nagios-plugins-1.4.10.ebuild 3635
 SHA256 6c3d4014416e071a5923f24c5af4fb2749f363c507c1026c4ad6d814864f37cd nagios-plugins-1.4.10.ebuild 3635
-EBUILD nagios-plugins-1.4.8-r1.ebuild 3657 RMD160 2edf4dae735a2399ec3b09c2679c373fbd972cca SHA1 04f49e37aca50f44d8a53cd5feb00c02bf09e9de SHA256 aef7f8b293d5181d36b0e3a4303230e4703cc9e5a1e523c018a5d9f89b64351c
-MD5 e23c2e379e3fba2abdd3d4264e59a76f nagios-plugins-1.4.8-r1.ebuild 3657
-RMD160 2edf4dae735a2399ec3b09c2679c373fbd972cca nagios-plugins-1.4.8-r1.ebuild 3657
-SHA256 aef7f8b293d5181d36b0e3a4303230e4703cc9e5a1e523c018a5d9f89b64351c nagios-plugins-1.4.8-r1.ebuild 3657
-MISC ChangeLog 13263 RMD160 1dfb92bf2eb66b2e6a93e559221d30e0578c8dd8 SHA1 6f7870cbf2f6dde4ea7534c35dbba76233c844e8 SHA256 7d3884118fdb66bb288a98b0e6407113ae6701dde921e350df3d1664978bb86b
-MD5 cbc84d8de3a2f8761b8a9b413a714ad6 ChangeLog 13263
-RMD160 1dfb92bf2eb66b2e6a93e559221d30e0578c8dd8 ChangeLog 13263
-SHA256 7d3884118fdb66bb288a98b0e6407113ae6701dde921e350df3d1664978bb86b ChangeLog 13263
+MISC ChangeLog 13501 RMD160 95e153fbbe710f17498304548d068edb08c86b2a SHA1 a55ee303ba12e84ab46a034bbd6163ada5ba19af SHA256 d41de98aa7b64e7d001a471029ffd4431198f98d289042c289eb3f01baf1ccc0
+MD5 f6262fd825a01e8c488f6a24d134cf1e ChangeLog 13501
+RMD160 95e153fbbe710f17498304548d068edb08c86b2a ChangeLog 13501
+SHA256 d41de98aa7b64e7d001a471029ffd4431198f98d289042c289eb3f01baf1ccc0 ChangeLog 13501
 MISC metadata.xml 374 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 SHA1 88da42b8cc7c08339067720081f61c110e00acb5 SHA256 4babbe654b066c416bb453a8decbd1e8bdaf450226d9ed6d4380bf17e5761f59
 MD5 afd013450a188e41979f4d528607d692 metadata.xml 374
 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 metadata.xml 374
@@ -39,6 +22,3 @@ SHA256 4babbe654b066c416bb453a8decbd1e8bdaf450226d9ed6d4380bf17e5761f59 metadata
 MD5 d75d2af2cab30c528f228913ad57570e files/digest-nagios-plugins-1.4.10 268
 RMD160 ec41e1b29051f95d8074af822de325f1209d00e8 files/digest-nagios-plugins-1.4.10 268
 SHA256 51cbacb57cfc44ca66a1ceb4a037409e106fc335ab15d5ccc4da3422547664bb files/digest-nagios-plugins-1.4.10 268
-MD5 bb2c03bcf04c01e804752addf2281d55 files/digest-nagios-plugins-1.4.8-r1 265
-RMD160 b08f8ed8e94124305adeff87ae406428690b267a files/digest-nagios-plugins-1.4.8-r1 265
-SHA256 a5f71eb154fc0d8cbaeecbc22c2d9a365775bd4990552e86e0ec84da6ea59add files/digest-nagios-plugins-1.4.8-r1 265
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"
-}