Revbump, fix #243384 and #253893

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 124 insertions, 4 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/Manifest b/net-analyzer/nagios-plugins/Manifest
index 41cf2b4031e8..c7dbad6edffb 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,9 +2,11 @@ AUX CVE-2007-5623.patch 1060 RMD160 c8704e0c39a4194ee153b444a7285f0a44363030 SHA
 AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278
 AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229
 AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 RMD160 6090168654e888ce9b5bb1c5c6b493f3a019472d SHA1 db41a7f6b57f1119045fb90707a7a8182225d9b8 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455
+AUX nagios-plugins-1.4.13-mysqlpass-917fcc7.patch 2288 RMD160 b380e74de9210f7dd0be0bd4a0dd0a612690df1b SHA1 d216f0b20ea7c3077fe532edd033b1d41c787ac3 SHA256 57a10f238f1fd56aaaea54d783ad42669d72ec9f04fdeb01e6801020467bb5d6
+AUX nagios-plugins-1.4.13-upslogout.patch 1126 RMD160 4828c688c9af03f3e91d09e053b562b37e182cb0 SHA1 aad34ad3ad39f5785eb649a33e52162a92fed506 SHA256 9a9398d8ef8995763ce915fe3ce660e62fd582dbb74d825d603b8a3367cca898
 DIST nagios-plugins-1.4.13.tar.gz 2279556 RMD160 38de32581581b21e36e047138a94a70a9a031a02 SHA1 fb22eba22095bdd709a65b1477bfb566aac9077e SHA256 592fe3329777e53f8fb526cb61e625a85ae9a1fd850b4039f78a2c460b1607c5
 EBUILD nagios-plugins-1.4.13-r1.ebuild 4095 RMD160 e6631308d30928cab3c8217e2eb19cf1afd924ff SHA1 e0141cabfd0eeaa34118954aa59493d07ba127f1 SHA256 953f7ae9cfb3c4fb64459625573eea0c4f9a88611c6e0da90a0e954411587dda
-EBUILD nagios-plugins-1.4.13-r3.ebuild 4223 RMD160 841c6be71c79cdcae965dd3e7a90ac6d11dea3bb SHA1 5bce469a064e2c1445e11ed45c3df8563e056ddb SHA256 25c45007444df307753cd384dccf465689aa17e6f4ee6ad6c4b19d2fa4bd9724
+EBUILD nagios-plugins-1.4.13-r4.ebuild 4480 RMD160 7b043d4061780b6322d4e28761478e37ab3fdf5b SHA1 d6ebf042e23c3d316857df29018520e86bf7832e SHA256 d704882b890e9e5f1491cf10b02f98b80e5a0fba44baae753642703372310cb1
 EBUILD nagios-plugins-1.4.13.ebuild 3740 RMD160 d2000e9fec552e81f0b55a0f1261d6c4022e9c02 SHA1 d0c1e7da27d3336c11539a42eac2f44de6f74121 SHA256 04769c24d9261012679d7a4d8b625b82074b87dc7aa093f98c350e85c212581a
-MISC ChangeLog 5092 RMD160 0ffcb4f32c9d7a3a3db9097884d53ec2fc85ab9a SHA1 9a81fc8db2e82155a787735d6f2dd1970c2b1d5b SHA256 b852c9229c0722e4494abc4efe6b5afc15908bc65e452b7f26119e6d8f1deb43
+MISC ChangeLog 5399 RMD160 178f6dc9e1d62c09f83e65d9e0d6009f6bfae2be SHA1 4d0441baf3688e5935d692c311e1c92328325949 SHA256 4d5985b031c26c192bd55969ba253a67846782895fb210e6c94eac6faee1348f
 MISC metadata.xml 846 RMD160 c586646ae8e50e5530570a9e7dbdc3bfef074d89 SHA1 4a58e0ba3dde6f44a5227c0c232a0f2d2f06ed1d SHA256 ca1e7a175629f4ce6866ca6408744e222216e12c4ce37c6075bf2ded87916ff7
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
 }