Revbump, fix #243384 and #253893

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

4 files changed, 120 insertions, 2 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index f14e3e694a42..6fa2e5fef0aa 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # 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.113 2009/05/15 17:32:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.114 2009/05/30 07:58:25 dertobi123 Exp $
+
+*nagios-plugins-1.4.13-r4 (30 May 2009)
+
+  30 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/nagios-plugins-1.4.13-mysqlpass-917fcc7.patch,
+  +files/nagios-plugins-1.4.13-upslogout.patch,
+  -nagios-plugins-1.4.13-r3.ebuild, +nagios-plugins-1.4.13-r4.ebuild:
+  Revbump, fix #243384 and #253893
 
 *nagios-plugins-1.4.13-r3 (15 May 2009)
 
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
new file mode 100644
index 000000000000..e0292730fd24
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-mysqlpass-917fcc7.patch
@@ -0,0 +1,74 @@
+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
new file mode 100644
index 000000000000..7d100c2496dd
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.13-upslogout.patch
@@ -0,0 +1,29 @@
+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);
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r4.ebuild
index 6992b7ccb6e9..53d29bc2ab9a 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r3.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/05/15 17:32:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r4.ebuild,v 1.1 2009/05/30 07:58:25 dertobi123 Exp $
 
 EAPI=1
 
@@ -56,6 +56,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
 	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
 
+	# Fix my.cnf usage, #253893, upstream fix commitid 917fcc7, will be fixed
+	# upstream in 1.4.14
+	epatch "${FILESDIR}"/${P}-mysqlpass-917fcc7.patch
+
+	# check_ups Logout, #243384 ,will be fixed upstream in 1.4.14
+	epatch "${FILESDIR}"/${P}--upslogout.patch
+
 	eautoreconf
 }