Cleanup

(Portage version: 2.2_rc42/cvs/Linux x86_64)

4 files changed, 6 insertions, 141 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 6617795c9ee6..631906194b1d 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.116 2009/09/16 16:25:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.117 2009/09/28 10:31:50 dertobi123 Exp $
+
+  28 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/nagios-plugins-1.4.13-mysqlpass-917fcc7.patch,
+  -files/nagios-plugins-1.4.13-upslogout.patch, -files/CVE-2007-5623.patch:
+  Cleanup
 
 *nagios-plugins-1.4.14 (16 Sep 2009)
 
diff --git a/net-analyzer/nagios-plugins/files/CVE-2007-5623.patch b/net-analyzer/nagios-plugins/files/CVE-2007-5623.patch
deleted file mode 100644
index 6fc954038f6e..000000000000
--- a/net-analyzer/nagios-plugins/files/CVE-2007-5623.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- plugins/check_snmp.c.old	2007-05-29 07:22:32.000000000 +0200
-+++ plugins/check_snmp.c	2007-10-17 22:08:49.000000000 +0200
-@@ -219,12 +219,16 @@ main (int argc, char **argv)
- 
- 	ptr = output;
- 
--	strcat(perfstr, "| ");
-+	strncat(perfstr, "| ", sizeof(perfstr)-strlen(perfstr)-1);
- 	while (ptr) {
- 		char *foo;
-+		unsigned int copylen;
- 
- 		foo = strstr (ptr, delimiter);
--		strncat(perfstr, ptr, foo-ptr);
-+		copylen = foo-ptr;
-+		if (copylen > sizeof(perfstr)-strlen(perfstr)-1)
-+			copylen = sizeof(perfstr)-strlen(perfstr)-1;
-+		strncat(perfstr, ptr, copylen);
- 		ptr = foo; 
- 
- 		if (ptr == NULL)
-@@ -357,11 +361,11 @@ main (int argc, char **argv)
- 
- 		i++;
- 
--		strcat(perfstr, "=");
--		strcat(perfstr, show);
-+		strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
-+		strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1);
- 		if (type)
--			strcat(perfstr, type);
--		strcat(perfstr, " ");
-+			strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
-+		strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
- 
- 	}	/* end while (ptr) */
- 
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-mysqlpass-917fcc7.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-mysqlpass-917fcc7.patch
deleted file mode 100644
index e0292730fd24..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-mysqlpass-917fcc7.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Thomas Guyot-Sionnest <dermoth@aei.ca>
-Date: Wed, 20 May 2009 04:20:11 +0000 (-0400)
-Subject: Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby)
-X-Git-Url: http://repo.or.cz/w/nagiosplugins.git?a=commitdiff_plain;h=917fcc7c302f67b42482a1a3e16e62f3b39d4e80
-
-Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby)
----
-
-diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
-index 689648e..05d2b01 100644
---- a/plugins/check_mysql.c
-+++ b/plugins/check_mysql.c
-@@ -5,7 +5,7 @@
- * License: GPL
- * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
- * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
--* Copyright (c) 1999-2007 Nagios Plugins Development Team
-+* Copyright (c) 1999-2009 Nagios Plugins Development Team
- * 
- * Description:
- * 
-@@ -358,9 +358,6 @@ validate_arguments (void)
- 	if (db_host == NULL)
- 		db_host = strdup("");
- 
--	if (db_pass == NULL)
--		db_pass = strdup("");
--
- 	if (db == NULL)
- 		db = strdup("");
- 
-@@ -417,6 +414,9 @@ print_help (void)
- 	printf ("\n");
- 	printf ("%s\n", _("Notes:"));
- 	printf (_(UT_EXTRA_OPTS_NOTES));
-+	printf ("\n");
-+	printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
-+	printf (" %s\n", _("overriding any my.cnf settings."));
- #endif
- 
- 	printf (_(UT_SUPPORT));
-diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
-index 802e345..47dd861 100644
---- a/plugins/check_mysql_query.c
-+++ b/plugins/check_mysql_query.c
-@@ -3,7 +3,7 @@
- * Nagios check_mysql_query plugin
- * 
- * License: GPL
--* Copyright (c) 2006-2007 Nagios Plugins Development Team
-+* Copyright (c) 2006-2009 Nagios Plugins Development Team
- * Original code from check_mysql, copyright 1999 Didi Rieder
- * 
- * Description:
-@@ -266,9 +266,6 @@ validate_arguments (void)
- 	if (db_host == NULL)
- 		db_host = strdup("");
- 
--	if (db_pass == NULL)
--		db_pass = strdup("");
--
- 	if (db == NULL)
- 		db = strdup("");
- 
-@@ -317,6 +314,9 @@ print_help (void)
- 	printf ("\n");
- 	printf ("%s\n", _("Notes:"));
- 	printf (_(UT_EXTRA_OPTS_NOTES));
-+	printf ("\n");
-+	printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
-+	printf (" %s\n", _("overriding any my.cnf settings."));
- #endif
- 
- 	printf (_(UT_SUPPORT));
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-upslogout.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-upslogout.patch
deleted file mode 100644
index 7d100c2496dd..000000000000
--- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-upslogout.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/plugins/check_ups.c b/plugins/check_ups.c
-index 154508d..bbd963a 100644
---- a/plugins/check_ups.c
-+++ b/plugins/check_ups.c
-@@ -398,12 +398,15 @@ get_ups_variable (const char *varname, char *buf, size_t buflen)
- 	char temp_buffer[MAX_INPUT_BUFFER];
- 	char send_buffer[MAX_INPUT_BUFFER];
- 	char *ptr;
-+	char *logout = "OK Goodbye\n";
-+	int logout_len = strlen(logout);
- 	int len;
- 
- 	*buf=0;
- 	
- 	/* create the command string to send to the UPS daemon */
--	sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname);
-+	/* Add LOGOUT to avoid read failure logs */
-+	sprintf (send_buffer, "GET VAR %s %s\nLOGOUT\n", ups_name, varname);
- 
- 	/* send the command to the daemon and get a response back */
- 	if (process_tcp_request
-@@ -415,6 +418,7 @@ get_ups_variable (const char *varname, char *buf, size_t buflen)
- 
- 	ptr = temp_buffer;
- 	len = strlen(ptr);
-+	if (len > logout_len && strcmp (ptr + len - logout_len, logout) == 0) len -= logout_len;
- 	if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
- 	if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
- 		printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name);