From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 28 Feb 2016 00:12:42 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~60
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=6258e772d808f4e76ea8e23d9e2750cfc7e6c60d

Merge branch 'collectd-5.4' into collectd-5.5
---

6258e772d808f4e76ea8e23d9e2750cfc7e6c60d
diff --cc contrib/redhat/collectd.spec
index 7407dc8d,1e6cd2a7..73da03d0
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2054,19 -1801,11 +2054,19 @@@ f
  %{_includedir}/collectd/network_buffer.h
  %{_includedir}/collectd/lcc_features.h
  %{_libdir}/pkgconfig/libcollectdclient.pc
+ %{_libdir}/libcollectdclient.so
  
  %files -n libcollectdclient
- %{_libdir}/libcollectdclient.so
  %{_libdir}/libcollectdclient.so.*
  
 +%files -n collectd-utils
 +%{_bindir}/collectd-nagios
 +%{_bindir}/collectd-tg
 +%{_bindir}/collectdctl
 +%{_mandir}/man1/collectdctl.1*
 +%{_mandir}/man1/collectd-nagios.1*
 +%{_mandir}/man1/collectd-tg.1*
 +
  %if %{with_amqp}
  %files amqp
  %{_libdir}/%{name}/amqp.so
diff --cc src/processes.c
index 2d79c7f6,faeb7c9e..8f94fc25
--- a/src/processes.c
+++ b/src/processes.c
@@@ -1706,9 -1701,9 +1705,9 @@@ static int ps_read (void
  
  	struct dirent *ent;
  	DIR           *proc;
- 	int            pid;
+ 	long           pid;
  
 -	char cmdline[ARG_MAX];
 +	char cmdline[CMDLINE_BUFFER_SIZE];
  
  	int        status;
  	procstat_t ps;