svn commit: r382553 - head/net-mgmt/collectd5/files

[Dmitry Sivachenko]

Author: demon
Date: Sat Mar 28 20:29:29 2015
New Revision: 382553
URL: https://svnweb.freebsd.org/changeset/ports/382553
QAT: https://qat.redports.org/buildarchive/r382553/

Log:
  Fix broken curl_xml plugin.
  Obtained from upstream (https://github.com/collectd/collectd/issues/931)
  
  Approved by:	maintainer

Added:
  head/net-mgmt/collectd5/files/patch-src-curl_xml.c   (contents, props changed)

Added: head/net-mgmt/collectd5/files/patch-src-curl_xml.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/collectd5/files/patch-src-curl_xml.c	Sat Mar 28 20:29:29 2015	(r382553)
@@ -0,0 +1,11 @@
+--- src/curl_xml.c.orig	2015-03-28 23:25:34.546602000 +0300
++++ src/curl_xml.c	2015-03-28 23:25:51.513304000 +0300
+@@ -385,7 +385,7 @@ static int cx_handle_instance_xpath (xml
+   /* If the base xpath returns more than one block, the result is assumed to be
+    * a table. The `Instance' option is not optional in this case. Check for the
+    * condition and inform the user. */
+-  if (is_table)
++  if (is_table && (vl->type_instance == NULL))
+   {
+     WARNING ("curl_xml plugin: "
+         "Base-XPath %s is a table (more than one result was returned), "