← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/collectd/oneiric

~ubuntu-branches/ubuntu/oneiric/collectd/oneiric

« back to all changes in this revision

Viewing changes to src/sensors.c

Committer: Bazaar Package Importer
Author(s): Sebastian Harl
Date: 2008-06-17 10:35:51 UTC
mfrom: (1.1.4 upstream)
Revision ID: james.westby@ubuntu.com-20080617103551-9d0ym3zejc7agtt3

Tags: 4.4.1-1

http://bugs.debian.org/468143

http://bugs.debian.org/475120

http://bugs.debian.org/478759

http://bugs.debian.org/473435

http://bugs.debian.org/482667

* New upstream release.
  - Fixed another issue of the sensors plugin affecting some chip types
    (Closes: #468143).
  - Fixed creation of "vserver" graphs in collection.cgi (Closes: #475120).
  - Fixed a segfault when using libperl 5.10.
  - collectd now ships libiptc itself.
  New plugins:
  - Ascent server statistics: ascent
  - IPMI sensors information: ipmi
  - PowerDNS name server statistics: powerdns
  - incremental parsing of logfiles: tail
  - TeamSpeak2 server statistics: teamspeak2
  - detailed virtual memory statistics: vmem
* Disable "tcpconns" plugin by default (Closes: #478759).
* Reenabled iptables plugin on all architectures (Closes: #473435).
  - Added the plugin to collectd.conf.
  - Added /usr/share/doc/collectd/examples/iptables/.
  - Added build dependency on linux-libc-dev (>= 2.6.25-4) - that version is
    required because of #479899.
* New debconf template translations:
  - gl.po, thanks to Jacobo Tarrio (Closes: #482667).
* Added a work around for #474087 (broken openipmi .pc files) by forcing the
  inclusion of the ipmi plugin and manually specifying the dependencies.
* Updated standards-version to 3.8.0 (no changes).

files added:
debian/po/gl.po

src/ascent.c

src/ipmi.c

src/libiptc

src/libiptc/Makefile.am

src/libiptc/Makefile.in

src/libiptc/ipt_kernel_headers.h

src/libiptc/libip4tc.c

src/libiptc/libip6tc.c

src/libiptc/libip6tc.h

src/libiptc/libiptc.c

src/libiptc/libiptc.h

src/libiptc/linux_list.h

src/powerdns.c

src/tail.c

src/teamspeak2.c

src/utils_cmd_flush.c

src/utils_cmd_flush.h

src/utils_cmd_getval.c

src/utils_cmd_getval.h

src/utils_cmd_listval.c

src/utils_cmd_listval.h

src/utils_match.c

src/utils_match.h

src/utils_tail.c

src/utils_tail.h

src/utils_tail_match.c

src/utils_tail_match.h

src/vmem.c

ylwrap

files modified:
AUTHORS

COPYING

ChangeLog

Makefile.in

README

TODO

aclocal.m4

bindings/Makefile.in

bindings/perl/Collectd.pm

bindings/perl/Collectd/Unixsock.pm

config.guess

config.sub

configure

configure.in

contrib/collection.cgi

contrib/cussh.pl

contrib/migrate-3-4.px

debian/README.Debian

debian/changelog

debian/collectd.conf

debian/control

debian/copyright

debian/rules

debian/thresholds.conf

libltdl/Makefile.in

libltdl/acinclude.m4

libltdl/aclocal.m4

libltdl/config.guess

libltdl/config.sub

libltdl/configure

libltdl/ltmain.sh

ltmain.sh

src/Makefile.am

src/Makefile.in

src/apache.c

src/collectd-email.5

src/collectd-exec.5

src/collectd-nagios.1

src/collectd-nagios.c

src/collectd-perl.5

src/collectd-perl.pod

src/collectd-snmp.5

src/collectd-unixsock.5

src/collectd-unixsock.pod

src/collectd.1

src/collectd.c

src/collectd.conf.5

src/collectd.conf.in

src/collectd.conf.pod

src/collectd.h

src/collectd.pod

src/collectdmon.1

src/common.c

src/config.h.in

src/cpu.c

src/disk.c

src/email.c

src/exec.c

src/hddtemp.c

src/interface.c

src/iptables.c

src/liboconfig/Makefile.in

src/liboconfig/oconfig.c

src/liboping/Makefile.in

src/load.c

src/memory.c

src/network.c

src/nginx.c

src/ntpd.c

src/perl.c

src/plugin.c

src/plugin.h

src/rrdtool.c

src/sensors.c

src/swap.c

src/types.db

src/types.db.5

src/types_list.c

src/unixsock.c

src/users.c

src/utils_cache.c

src/utils_cache.h

src/utils_cmd_putnotif.c

src/utils_cmd_putnotif.h

src/utils_cmd_putval.c

src/utils_cmd_putval.h

src/utils_ignorelist.c

src/utils_llist.c

src/utils_threshold.c

version-gen.sh

Show diffs side-by-side

added added

removed removed

1

1

/**

2

2

* collectd - src/sensors.c

3

* Copyright (C) 2005-2007 Florian octo Forster

3

* Copyright (C) 2005-2008 Florian octo Forster

4

4

*

5

5

* This program is free software; you can redistribute it and/or modify it

6

6

* under the terms of the GNU General Public License as published by the

189

189

}

190

190

else if (chip->bus == SENSORS_CHIP_NAME_BUS_DUMMY)

191

191

{

192

snprintf (buf, buf_size, "%s-%s-%04x",

192

status = snprintf (buf, buf_size, "%s-%s-%04x",

193

193

chip->prefix,

194

194

chip->busname,

195

195

chip->addr);

196

196

}

197

197

else

198

198

{

199

snprintf (buf, buf_size, "%s-i2c-%d-%02x",

199

status = snprintf (buf, buf_size, "%s-i2c-%d-%02x",

200

200

chip->prefix,

201

201

chip->bus,

202

202

chip->addr);

Older »