Housekeeping

(Portage version: 2.1.3_rc6)

8 files changed, 7 insertions, 375 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index d1d934528e23..1b8874f7707e 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.67 2007/06/19 07:04:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.68 2007/06/30 15:33:18 dertobi123 Exp $
+
+  30 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/nagios-plugins-1.4-autoconf-fix.patch, -files/check_swap.c.patch,
+  -files/nagios-plugins-noradius.patch, -nagios-plugins-1.3.1-r1.ebuild,
+  -nagios-plugins-1.4.2.ebuild:
+  Housekeeping
 
   19 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   nagios-plugins-1.4.8-r1.ebuild:
diff --git a/net-analyzer/nagios-plugins/files/check_swap.c.patch b/net-analyzer/nagios-plugins/files/check_swap.c.patch
deleted file mode 100644
index 9daceedac56e..000000000000
--- a/net-analyzer/nagios-plugins/files/check_swap.c.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- plugins/check_swap.c.orig	2003-02-18 05:46:15.000000000 +0200
-+++ plugins/check_swap.c	2004-08-23 17:08:21.328421472 +0300
-@@ -70,30 +70,37 @@
- 
- #ifdef HAVE_PROC_MEMINFO
- 	fp = fopen (PROC_MEMINFO, "r");
-+	if (!fp) {
-+        	printf ("Could not open meminfo proc file\n");
-+		return STATE_UNKNOWN;
-+	}
- 	asprintf (&status, "%s", "Swap used:");
- 	while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
--		if (sscanf (input_buffer, " %s %lu %lu %lu", str, &total, &used, &free) == 4 &&
--		    strstr (str, "Swap")) {
--			total_swap += total;
--			used_swap += used;
-+		if (sscanf (input_buffer, "%s %lu", str, &total) == 2 &&
-+		    strstr (str, "SwapTotal:")) {
-+			total *= 1024;
-+                        total_swap += total;
-+			used_swap += total_swap;
-+		} else
-+		if (sscanf (input_buffer, "%s %lu", str, &free) == 2 &&
-+		    strstr (str, "SwapFree:")) {
-+			free *= 1024;
- 			free_swap += free;
--			if (allswaps) {
--				percent = 100 * (((double) used) / ((double) total));
--				if (percent >= crit_percent || free <= crit_size)
--					result = max_state (STATE_CRITICAL, result);
--				else if (percent >= warn_percent || free <= warn_size)
--					result = max_state (STATE_WARNING, result);
--				if (verbose)
--					asprintf (&status, "%s [%lu/%lu]", status, used, total);
--			}
-+			used_swap -= free_swap;
- 		}
- 	}
--	percent_used = 100 * (((double) used_swap) / ((double) total_swap));
--	if (percent_used >= crit_percent || free_swap <= crit_size)
-+	
-+        if (total_swap == 0) {
-+		percent_used = 100;
- 		result = max_state (STATE_CRITICAL, result);
--	else if (percent_used >= warn_percent || free_swap <= warn_size)
--		result = max_state (STATE_WARNING, result);
--	asprintf (&status, "%s %2d%% (%lu out of %lu)", status, percent_used,
-+	} else {
-+		percent_used = 100 * (0.005 + ((double) used_swap) / ((double) total_swap));
-+		if (percent_used >= crit_percent || free_swap <= crit_size)
-+			result = max_state (STATE_CRITICAL, result);
-+		else if (percent_used >= warn_percent || free_swap <= warn_size)
-+			result = max_state (STATE_WARNING, result);
-+	}
-+        asprintf (&status, "%s %2d%% (%lu out of %lu)", status, percent_used,
- 	          used_swap, total_swap);
- 	fclose (fp);
- #else
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.3.1-r1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.3.1-r1
deleted file mode 100644
index 7d53901bd2ff..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.3.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0078c9c8137694181a4cdf596fdbd74f nagios-plugins-1.3.1.tar.gz 532516
-RMD160 356308fa8354ada43e7ef492fbd580dff7b7b398 nagios-plugins-1.3.1.tar.gz 532516
-SHA256 bb6d00fff033070ef5e790da63f17bf91c667e47b5da6f00f17f4473e86f5e67 nagios-plugins-1.3.1.tar.gz 532516
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2
deleted file mode 100644
index ab34bd0c4a74..000000000000
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1f2bee15ade3d98ec79964a43479e328 nagios-plugins-1.4.2.tar.gz 971447
-RMD160 93d747bb445e4e59cdb72ef210feb052b7855cac nagios-plugins-1.4.2.tar.gz 971447
-SHA256 a329b3e1c7daf79dc002eacc44af9d4706555342b7d20227cc8eb3139767e652 nagios-plugins-1.4.2.tar.gz 971447
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-autoconf-fix.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-autoconf-fix.patch
deleted file mode 100644
index d3f316a04b4e..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-autoconf-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.old	2006-07-14 23:41:39.000000000 -0500
-+++ configure.in	2006-07-14 23:43:40.000000000 -0500
-@@ -1626,7 +1626,9 @@
- 		#endif],
- 		[va_list args;],
- 		[AC_MSG_RESULT(yes)],
--		[NEED_VA_LIST=-DNEED_VA_LIST AC_SUBST(NEED_VA_LIST) AC_MSG_RESULT(no)])
-+		[NEED_VA_LIST=-DNEED_VA_LIST 
-+		 AC_SUBST(NEED_VA_LIST) 
-+		 AC_MSG_RESULT(no)])
- 
- case $host in
- 	*bsd*)
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-noradius.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-noradius.patch
deleted file mode 100644
index 8c0b85594b91..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-noradius.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- configure.orig	2004-08-20 17:21:50.447958256 +0300
-+++ configure	2004-08-20 17:22:30.045938448 +0300
-@@ -6629,83 +6629,6 @@
- 
- _SAVEDLIBS="$LIBS"
- 
--echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient" >&5
--echo $ECHO_N "checking for rc_read_config in -lradiusclient... $ECHO_C" >&6
--if test "${ac_cv_lib_radiusclient_rc_read_config+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lradiusclient  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char rc_read_config ();
--int
--main ()
--{
--rc_read_config ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_radiusclient_rc_read_config=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_radiusclient_rc_read_config=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_radiusclient_rc_read_config" >&5
--echo "${ECHO_T}$ac_cv_lib_radiusclient_rc_read_config" >&6
--if test $ac_cv_lib_radiusclient_rc_read_config = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRADIUSCLIENT 1
--_ACEOF
--
--  LIBS="-lradiusclient $LIBS"
--
--fi
--
--if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
--  EXTRAS="$EXTRAS check_radius"
--	RADIUSLIBS="-lradiusclient"
--
--else
--  { echo "$as_me:$LINENO: WARNING: Skipping radius plugin" >&5
--echo "$as_me: WARNING: Skipping radius plugin" >&2;}
--  { echo "$as_me:$LINENO: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&5
--echo "$as_me: WARNING: install radius libs to compile this plugin (see REQUIREMENTS)." >&2;}
--fi
--LIBS="$_SAVEDLIBS"
--
--_SAVEDLIBS="$LIBS"
--
- echo "$as_me:$LINENO: checking for main in -lldap" >&5
- echo $ECHO_N "checking for main in -lldap... $ECHO_C" >&6
- if test "${ac_cv_lib_ldap_main+set}" = set; then
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
deleted file mode 100644
index 54c694da766b..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2006 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.3.1-r1.ebuild,v 1.22 2006/11/23 19:51:53 vivo Exp $
-
-inherit eutils
-
-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="x86 sparc ~ppc amd64"
-IUSE="ldap mysql postgres ssl samba snmp nagios-dns nagios-ntp nagios-ping nagios-ssh"
-
-RESTRICT="test"
-
-DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-RDEPEND=">=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
-	)
-	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 )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-}
-
-src_compile() {
-	# check for mtab, as this will otherwise let configure not detect a usable "df" command.
-	if [[ ! -r /etc/mtab ]];
-	then
-		eerror "Can't find /etc/mtab. Are you running under chroot?"
-		eerror "If so copy the /etc/mtab to the chroot'ed enviornment and try again."
-		die "can't find /etc/mtab."
-	fi
-
-	local myconf
-	use mysql && myconf="${myconf} --with-mysql" || myconf="${myconf} --without-mysql"
-	use postgres && myconf="${myconf} --with-pgsql" || myconf="${myconf} --without-pgsql"
-	use ssl && myconf="${myconf} --with-openssl" || myconf="${myconf} --without-openssl"
-
-	epatch ${FILESDIR}/nagios-plugins-noradius.patch
-	epatch ${FILESDIR}/check_swap.c.patch
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--with-nagios-user=nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-}
-
-src_install() {
-	# bring contribs into shape... (21 Nov 2004 eldad)
-	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
-	sed -i -e '30s/use lib utils.pm;/use utils;/' ${S}/contrib/check_file_age.pl
-
-	dodoc AUTHORS CODING COPYING ChangeLog FAQ INSTALL LEGALNEWS README REQUIREMENTS ROADMAP Requirements
-	make DESTDIR=${D} install || die
-
-	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 -R nagios: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"
-}
-
-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"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
deleted file mode 100644
index 43e7869dfd48..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2006 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.2.ebuild,v 1.9 2006/11/29 21:25:16 cedk Exp $
-
-WANT_AUTOCONF=2.58
-WANT_AUTOMAKE=1.8
-
-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="~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
-	)
-	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 /dev/null nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	if ! use radius; then
-		EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch \
-			"${FILESDIR}"/nagios-plugins-1.4-autoconf-fix.patch
-	fi
-	if ! use radius; then
-		cd ${S}
-		aclocal -I m4 || die "Failed to run aclocal"
-		autoconf || die "Failed to run autoconf"
-		automake || die "Failed to run automake"
-	fi
-}
-
-src_compile() {
-
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with ssl openssl) \
-		$(use_with ipv6) \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--with-nagios-user=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
-
-	make 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 -R nagios: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"
-}
-
-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"
-}
-