From a2a5b1bd944b822b6acab068393cb695a6a01b27 Mon Sep 17 00:00:00 2001 From: octo Date: Mon, 30 Jan 2006 20:26:56 +0000 Subject: [PATCH 1/1] Bumped version to 3.7.0, updated Specfile and Debian changelog Updated `collectd.conf(5)': Added `MulticastTTL' option Added note about new network code to `ChangeLog' --- ChangeLog | 5 ++++- collectd.spec | 22 ++++++++++------------ configure.in | 2 +- debian/changelog | 8 +++++++- src/collectd.conf.pod | 4 ++++ src/hddtemp.c | 11 +---------- 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index f592a63a..eecef0fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2006-01-28, Version 3.7.0 +2006-01-30, Version 3.7.0 * The `battery' plugin has been added. It collects information about laptop batteries.. * The MySQL plugin has been improved: It now writes two more RRD @@ -9,6 +9,9 @@ * The `hddtemp' plugin can now be configured to connect to another address and/or port than localhost. * The `df' plugin now prefers `statvfs' over `statfs'. + * The network code has been rewritten. collectd now supports unicast + and multicast, and IPv4 and IPv6. Also, the TTL of multicast packets + can be set in the configfile. 2006-01-24, Version 3.6.2 * Due to a bug in the configfile handling collectd wouldn't start in diff --git a/collectd.spec b/collectd.spec index ba2e1448..ef98eecf 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,6 +1,6 @@ Summary: Statistics collection daemon for filling RRD files. Name: collectd -Version: 3.6.1 +Version: 3.7.0 Release: 1 Source: http://verplant.org/collectd/%{name}-%{version}.tar.gz License: GPL @@ -18,14 +18,6 @@ Since the daemon doesn't need to startup every time it wants to update the files it's very fast and easy on the system. Also, the statistics are very fine grained since the files are updated every 10 seconds. -%package hddtemp -Summary: hddtemp-module for collectd. -Group: System Environment/Daemons -Requires: collectd = %{version}, hddtemp >= 0.3 -%description hddtemp -This plugin for collectd provides querying the hddtemp-daemon. For more -information see hddtemp's homepage: http://www.guzu.net/linux/hddtemp.php - %package mysql Summary: mysql-module for collectd. Group: System Environment/Daemons @@ -71,10 +63,12 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_sbindir}/collectd %attr(0444,root,root) %{_mandir}/man1/* %attr(0444,root,root) %{_mandir}/man5/* +%attr(0444,root,root) %{_libdir}/%{name}/battery.so* %attr(0444,root,root) %{_libdir}/%{name}/cpu.so* %attr(0444,root,root) %{_libdir}/%{name}/cpufreq.so* %attr(0444,root,root) %{_libdir}/%{name}/df.so* %attr(0444,root,root) %{_libdir}/%{name}/disk.so* +%attr(0444,root,root) %{_libdir}/%{name}/hddtemp.so* %attr(0444,root,root) %{_libdir}/%{name}/load.so* %attr(0444,root,root) %{_libdir}/%{name}/memory.so* %attr(0444,root,root) %{_libdir}/%{name}/nfs.so* @@ -86,9 +80,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0444,root,root) %{_libdir}/%{name}/users.so* %dir /var/lib/collectd -%files hddtemp -%attr(0444,root,root) %{_libdir}/%{name}/hddtemp.so* - %files mysql %attr(0444,root,root) %{_libdir}/%{name}/mysql.so* @@ -96,6 +87,13 @@ rm -rf $RPM_BUILD_ROOT %attr(0444,root,root) %{_libdir}/%{name}/sensors.so* %changelog +* Mon Jan 30 2006 Florian octo Forster 3.7.0-1 +- New upstream version +- Removed the extra `hddtemp' package + +* Tue Jan 24 2006 Florian octo Forster 3.6.2-1 +- New upstream version + * Fri Jan 20 2006 Florian octo Forster 3.6.1-1 - New upstream version diff --git a/configure.in b/configure.in index 6937227e..36849468 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(collectd, 3.7.alpha2) +AC_INIT(collectd, 3.7.0) AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_HEADERS(src/config.h) AM_INIT_AUTOMAKE(dist-bzip2) diff --git a/debian/changelog b/debian/changelog index eaaf3a86..94e86077 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,13 @@ collectd (3.7.0-1) unstable; urgency=low * New upstream version * Removed package `collectd-hddtemp' - -- Florian Forster Thu, 26 Jan 2006 10:34:17 +0200 + -- Florian Forster Mon, 30 Jan 2006 21:19:19 +0200 + +collectd (3.6.2-1) unstable; urgency=low + + * New upstream version + + -- Florian Forster Tue, 24 Jan 2006 10:48:22 +0200 collectd (3.6.1-1) unstable; urgency=low diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index 88800853..dfbe1eab 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -90,6 +90,10 @@ The optional I argument sets the port to use. It can either be given using a numeric port number or a service name. If the argument is omited the default port B<25826> is assumed. +=item B I<1-255> + +Set the time-to-live of multicast packets. The default is a TTL of C<1>. + =back =head1 PLUGIN OPTIONS diff --git a/src/hddtemp.c b/src/hddtemp.c index bea7edf1..9d272f54 100644 --- a/src/hddtemp.c +++ b/src/hddtemp.c @@ -34,16 +34,6 @@ #include #include /* for basename */ -#if 0 -/* LOCALHOST_ADDR - The ip address 127.0.0.1, as a 32 bit. */ -#define LOCALHOST_ADDR 0x7F000001 - -/* HDDTEMP_PORT - The tcp port the hddtemp daemon is listening on. */ -#define HDDTEMP_PORT 7634 -#endif - #define HDDTEMP_DEF_HOST "127.0.0.1" #define HDDTEMP_DEF_PORT "7634" @@ -101,6 +91,7 @@ static char *hddtemp_port = NULL; * * FIXME: * we need to create a new socket each time. Is there another way? + * Hm, maybe we can re-use the `sockaddr' structure? -octo */ static int hddtemp_query_daemon (char *buffer, int buffer_size) { -- 2.11.0