From: Florian Forster <octo@collectd.org>
Date: Mon, 18 Aug 2014 07:35:04 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd7673e5e9ad074624fc23cda5d2ec4549d43659;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	contrib/redhat/collectd.spec
---

fd7673e5e9ad074624fc23cda5d2ec4549d43659
diff --cc contrib/redhat/collectd.spec
index 2379c8d5b,2e374c664..43704c4f5
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -43,8 -43,8 +43,9 @@@
  %{?el6:%global _has_recent_libganglia 1}
  %{?el6:%global _has_working_libiptc 1}
  %{?el6:%global _has_ip_vs_h 1}
 +%{?el6:%global _has_lvm2app_h 1}
  %{?el6:%global _has_perl_extutils_embed 1}
+ %{?el6:%global _has_libmodbus 1}
  
  # plugins enabled by default
  %define with_aggregation 0%{!?_without_aggregation:1}
@@@ -92,8 -90,8 +93,9 @@@
  %define with_memcached 0%{!?_without_memcached:1}
  %define with_memory 0%{!?_without_memory:1}
  %define with_multimeter 0%{!?_without_multimeter:1}
+ %define with_modbus 0%{!?_without_modbus:0%{?_has_libmodbus}}
  %define with_mysql 0%{!?_without_mysql:1}
 +%define with_netlink 0%{!?_without_netlink:1}
  %define with_network 0%{!?_without_network:1}
  %define with_nfs 0%{!?_without_nfs:1}
  %define with_nginx 0%{!?_without_nginx:1}
@@@ -412,16 -383,16 +414,26 @@@ instance. Note that another plugin, nam
  similar job, without requiring the installation of libmemcached.
  %endif
  
 +%if %{with_mic}
 +%package mic
 +Summary:	mic plugin for collectd
 +Group:		System Environment/Daemons
 +Requires:	%{name}%{?_isa} = %{version}-%{release}
 +%description mic
 +The mic plugin collects CPU usage, memory usage, temperatures and power
 +consumption from Intel Many Integrated Core (MIC) CPUs.
 +%endif
 +
+ %if %{with_modbus}
+ %package modbus
+ Summary:       modbus plugin for collectd
+ Group:         System Environment/Daemons
+ Requires:      %{name}%{?_isa} = %{version}-%{release}
+ BuildRequires:	libmodbus-devel
+ %description modbus
+ The modbus plugin collects values from Modbus/TCP enabled devices
+ %endif
+ 
  %if %{with_mysql}
  %package mysql
  Summary:	MySQL plugin for collectd
@@@ -2007,12 -1889,9 +2025,15 @@@ f
  %doc contrib/
  
  %changelog
 +* Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.0-1
 +- New upstream version
 +- Build netlink plugin by default
 +- Enable cgroups, lvm and statsd plugins
 +- Enable (but don't build by default) mic, aquaero and sigrok plugins
 +
+ * Wed Aug 06 2014 Marc Fournier <marc.fournier@camptocamp.com> 5.3.1-2
+ - Enabled modbus plugin
+ 
  * Tue Aug 06 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.3.1-1
  - New upstream version
  - Added RHEL5 support:
diff --cc src/curl_json.c
index 42a3a10c8,a4afa02e4..9e0f6723c
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@@ -955,9 -854,17 +955,17 @@@ static int cj_read (user_data_t *ud) /
    db->state[db->depth].tree = db->tree;
    db->key = NULL;
  
 -  return cj_curl_perform (db, db->curl);
 +  return cj_perform (db);
  } /* }}} int cj_read */
  
+ static int cj_init (void) /* {{{ */
+ {
+   /* Call this while collectd is still single-threaded to avoid
+    * initialization issues in libgcrypt. */
+   curl_global_init (CURL_GLOBAL_SSL);
+   return (0);
+ } /* }}} int cj_init */
+ 
  void module_register (void)
  {
    plugin_register_complex_config ("curl_json", cj_config);