Hello community, here is the log from the commit of package sensors for openSUSE:Factory checked in at 2012-11-12 07:06:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sensors (Old) and /work/SRC/openSUSE:Factory/.sensors.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sensors", Maintainer is "jdelv...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sensors/sensors.changes 2012-11-02 17:42:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sensors.new/sensors.changes 2012-11-12 07:06:49.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Nov 9 21:40:32 UTC 2012 - hrvoje.sen...@gmail.com + +- Update to lm_sensors 3.3.3 + * documentation: Update fan-divisors, fan divisors are optional + * libsensors: Fix warning about library path not in /etc/ld.so.conf + * sensors: Fix libiconv linkage need detection in rare corner case + Add support for humidity output + Add long switches to manual page + * sensors-detect: Don't choke on systems without PCI + Avoid probing EDID addresses on graphics cards (#2386) + Add detection of NCT6779D and NCT6102D/NCT6106D + Add detection of SMSC LPC47N217 and SIO10N268 + Do not scan I2C adapters on graphics cards by default + Fix parent class discovery when multiplexer is present + +------------------------------------------------------------------- Old: ---- lm_sensors-3.3.2.tar.bz2 New: ---- lm_sensors-3.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.FLlRuj/_old 2012-11-12 07:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FLlRuj/_new 2012-11-12 07:06:52.000000000 +0100 @@ -21,7 +21,7 @@ BuildRequires: flex BuildRequires: rrdtool-devel Url: http://www.lm-sensors.org/ -Version: 3.3.2 +Version: 3.3.3 Release: 0 Summary: Hardware health monitoring for Linux License: GPL-2.0+ ++++++ lm_sensors-3.3.2.tar.bz2 -> lm_sensors-3.3.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/CHANGES new/lm_sensors-3.3.3/CHANGES --- old/lm_sensors-3.3.2/CHANGES 2012-03-14 08:43:39.000000000 +0100 +++ new/lm_sensors-3.3.3/CHANGES 2012-11-06 21:10:47.000000000 +0100 @@ -1,6 +1,19 @@ lm-sensors CHANGES file ----------------------- +3.3.3 "Happy Birthday Sophie" (2012-11-06) + documentation: Update fan-divisors, fan divisors are optional + libsensors: Fix warning about library path not in /etc/ld.so.conf + sensors: Fix libiconv linkage need detection in rare corner case + Add support for humidity output + Add long switches to manual page + sensors-detect: Don't choke on systems without PCI + Avoid probing EDID addresses on graphics cards (#2386) + Add detection of NCT6779D and NCT6102D/NCT6106D + Add detection of SMSC LPC47N217 and SIO10N268 + Do not scan I2C adapters on graphics cards by default + Fix parent class discovery when multiplexer is present + 3.3.2 (2012-03-14) libsensors: Added support for new sysfs attributes Change sysfs detection to survive upcoming kernel changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/doc/developers/lm_sensors.lsm new/lm_sensors-3.3.3/doc/developers/lm_sensors.lsm --- old/lm_sensors-3.3.2/doc/developers/lm_sensors.lsm 2012-03-14 08:43:39.000000000 +0100 +++ new/lm_sensors-3.3.3/doc/developers/lm_sensors.lsm 2012-11-06 21:10:47.000000000 +0100 @@ -1,7 +1,7 @@ Begin4 Title: lm_sensors -Version: 3.3.2 -Entered-date: 2012-03-14 +Version: 3.3.3 +Entered-date: 2012-11-06 Description: Hardware health monitoring package for Linux. It consists of a library to allow applications to read sensors data more easily, and of an example program to pretty print this data. @@ -11,8 +11,8 @@ Author: kh...@linux-fr.org (Jean Delvare) Maintained-by: kh...@linux-fr.org (Jean Delvare) Primary-site: http://dl.lm-sensors.org /lm-sensors/releases/ - lm_sensors-3.3.2.tar.bz2 - lm_sensors-3.3.2.tar.bz2.sig + lm_sensors-3.3.3.tar.bz2 + lm_sensors-3.3.3.tar.bz2.sig Alternate-site: ftp.netroedge.com /pub/lm-sensors/ Copying-policy: GPL/LGPL End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/doc/developers/release_checklist new/lm_sensors-3.3.3/doc/developers/release_checklist --- old/lm_sensors-3.3.2/doc/developers/release_checklist 2010-10-14 14:25:16.000000000 +0200 +++ new/lm_sensors-3.3.3/doc/developers/release_checklist 2012-11-06 21:10:47.000000000 +0100 @@ -7,16 +7,13 @@ (edit lib/Module.mk and change LIBMAINVER and/or LIBMINORVER) Remember: update main number when interface changes, minor if new functionality is added, and patch if only bugs are fixed. - `svn diff -r Vx-y-z lib' is your friend. - Update the CHANGES file (set version and release date) -- Update lm_sensors.lsm (Version, Entered-date and Primary-site) -- Update libsensors-API.txt and SENSORS_API_VERSION in lib/sensors.h +- Update doc/developers/lm_sensors.lsm (Version, Entered-date and Primary-site) +- Update doc/libsensors-API.txt and SENSORS_API_VERSION in lib/sensors.h - Update version.h - Commit - Tag the release using SVN: - svn copy http://lm-sensors.org/svn/lm-sensors/trunk \ - http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x \ - -m "3.x.x release" + svn copy http://lm-sensors.org/svn/lm-sensors/trunk http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x -m "3.x.x release" - Move to a temporary directory and get a copy of the freshly tagged code: svn export http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x lm_sensors-3.x.x @@ -25,23 +22,21 @@ - Sign it: gpg -b lm_sensors-3.x.x.tar.bz2 - Post it: - scp lm_sensors-3.x.x.tar.bz2{,.sig} \ - devel.atrpms.net:/srv/lm-sensors.org/dl/lm-sensors/releases + scp lm_sensors-3.x.x.tar.bz2{,.sig} devel.atrpms.net:/srv/lm-sensors.org/dl/lm-sensors/releases - Set correct permissions: - ssh devel.atrpms.net chmod 664 \ - '/srv/lm-sensors.org/dl/lm-sensors/releases/lm_sensors-3.x.x.tar.bz2{,.sig}' + ssh devel.atrpms.net chmod 664 '/srv/lm-sensors.org/dl/lm-sensors/releases/lm_sensors-3.x.x.tar.bz2{,.sig}' After release, remember to: - Copy to mirrors - Update the Download page on lm-sensors.org, then add a news item - Announce on the lm-sensors mailing list -- Announce on Freshmeat +- Announce on Freecode - Add "+SVN" to version.h and commit - Mark the corresponding release milestone as complete using trac-admin - e.g. 'trac-admin /srv/lm-sensors.org/trac milestone completed 3.0.0 now' + e.g. 'trac-admin /srv/lm-sensors.org/trac milestone completed 3.x.x now' - Create a new version for the bug tracking system using trac-admin - e.g. 'trac-admin /srv/lm-sensors.org/trac version add 3.0.0 now' + e.g. 'trac-admin /srv/lm-sensors.org/trac version add 3.x.x now' - Create a new release milestone using trac-admin - e.g. 'trac-admin /srv/lm-sensors.org/trac milestone add 3.0.1 2008-02-15' + e.g. 'trac-admin /srv/lm-sensors.org/trac milestone add 3.x.x+1 2012-05-10' - Send lm_sensors.lsm to the LSM by mailing it to l...@qqx.org with the subject `add' (no quotes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/doc/fan-divisors new/lm_sensors-3.3.3/doc/fan-divisors --- old/lm_sensors-3.3.2/doc/fan-divisors 2007-10-25 11:59:05.000000000 +0200 +++ new/lm_sensors-3.3.3/doc/fan-divisors 2012-09-14 13:35:43.000000000 +0200 @@ -9,7 +9,39 @@ Look and see. Fans with tachometer outputs have at least 3 wires. Fans with only 2 wires cannot, in general, report their speed. -- Try experimenting with the fan divisor settings: +- If your monitoring chip supports fan divisors, try experimenting + with the fan divisor settings. + + +Does my monitoring chip use fan divisors? +----------------------------------------- + + Recent monitoring chips tend to store fan speed values on 12 or even + 16 bits, so divisors are no longer required. In that case, you won't + see "div" values in the output of sensors, and nothing needs to be + configured: + + CPU1 Fan: 2160 RPM (min = 800 RPM) + CPU2 Fan: 0 RPM (min = 799 RPM) ALARM + Front3 Fan: 0 RPM (min = 0 RPM) + Front4 Fan: 779 RPM (min = 600 RPM) + + If your "sensors" output looks like the above, stop reading here, + the explanations below do not apply to your case. + + Older chips stored the fan speed values on 8 bits, which wasn't + sufficient to cover the full range from very slow fans to very + fast fans with good accuracy. This is where fan divisors came + into play: + + Case Fan: 0 RPM (min = 998 RPM, div = 8) ALARM + CPU Fan: 2500 RPM (min = 1500 RPM, div = 4) + + If your "sensors" output looks like the above, read below. + + As a notable exception, the w83627ehf driver exposes fan divisor + values, but they are adjusted automatically by the driver, so you + shouldn't have to care. Fan Divisor Settings @@ -97,3 +129,4 @@ ------------------ Copyright (c) 2000-2004 Mark D. Studebaker +Copyright (c) 2006-2012 Jean Delvare diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/doc/libsensors-API.txt new/lm_sensors-3.3.3/doc/libsensors-API.txt --- old/lm_sensors-3.3.2/doc/libsensors-API.txt 2012-03-14 08:43:39.000000000 +0100 +++ new/lm_sensors-3.3.3/doc/libsensors-API.txt 2012-11-06 21:10:47.000000000 +0100 @@ -6,7 +6,7 @@ authors can quickly figure out how to test for the availability of a given new feature. -0x432 +0x432 lm-sensors 3.3.2 to 3.3.3 * Added support for new sysfs attributes enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_AVERAGE enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LOWEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/lib/Module.mk new/lm_sensors-3.3.3/lib/Module.mk --- old/lm_sensors-3.3.2/lib/Module.mk 2012-03-14 08:43:39.000000000 +0100 +++ new/lm_sensors-3.3.3/lib/Module.mk 2012-04-19 15:21:00.000000000 +0200 @@ -144,10 +144,7 @@ echo ' Run the following command: rm /usr/lib/$(LIBSHBASENAME)*' ; \ echo '******************************************************************************' ; \ fi ; \ - grep -q '^$(LIBDIR)$$' /etc/ld.so.conf || \ - grep -q '^$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \ - grep -q '[[:space:]:,]$(LIBDIR)$$' /etc/ld.so.conf || \ - grep -q '[[:space:]:,]$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \ + cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf 2>/dev/null | grep -q '\(^\|[[:space:]:,]\)$(LIBDIR)\([[:space:]:,=]\|$$\)' || \ ( echo '******************************************************************************' ; \ echo 'Warning: Library directory $(LIBDIR) is not in /etc/ld.so.conf!' ; \ echo ' Add it and run /sbin/ldconfig for the userspace tools to work.' ; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/prog/detect/sensors-detect new/lm_sensors-3.3.3/prog/detect/sensors-detect --- old/lm_sensors-3.3.2/prog/detect/sensors-detect 2012-03-07 17:14:01.000000000 +0100 +++ new/lm_sensors-3.3.3/prog/detect/sensors-detect 2012-10-30 18:18:45.000000000 +0100 @@ -2,7 +2,7 @@ # # sensors-detect - Detect hardware monitoring chips # Copyright (C) 1998 - 2002 Frodo Looijaard <fro...@dds.nl> -# Copyright (C) 2004 - 2011 Jean Delvare <kh...@linux-fr.org> +# Copyright (C) 2004 - 2012 Jean Delvare <kh...@linux-fr.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids $i2c_addresses_to_scan $revision @i2c_byte_cache); -$revision = '$Revision: 6031 $ ($Date: 2012-03-07 17:14:01 +0100 (mer. 07 mars 2012) $)'; +$revision = '$Revision: 6085 $ ($Date: 2012-10-30 18:18:45 +0100 (mar. 30 oct. 2012) $)'; $revision =~ s/\$\w+: (.*?) \$/$1/g; $revision =~ s/ \([^()]*\)//; @@ -1904,6 +1904,10 @@ driver => "not-a-sensor", devid => 0x28, }, { + name => "SMSC LPC47N217 Super IO", + driver => "not-a-sensor", + devid => 0x7a, + }, { name => "SMSC LPC47N227 Super IO", driver => "not-a-sensor", devid => 0x5a, @@ -1911,6 +1915,10 @@ name => "SMSC LPC47N237 Super IO", driver => "not-a-sensor", devid => 0x13, + }, { + name => "SMSC SIO10N268 Notebook IO", + driver => "not-a-sensor", + devid => 0x5b, } ); @@ -2034,6 +2042,18 @@ logdev => 0x0b, features => FEAT_IN | FEAT_FAN | FEAT_TEMP, }, { + name => "Nuvoton NCT6779D Super IO Sensors", + driver => "to-be-written", # nct6775, new driver + devid => 0xC562, + logdev => 0x0b, + features => FEAT_IN | FEAT_FAN | FEAT_TEMP, + }, { + name => "Nuvoton NCT6102D/NCT6106D Super IO Sensors", + driver => "to-be-written", # nct6775, new driver + devid => 0x1061, + logdev => 0x0b, + features => FEAT_IN | FEAT_FAN | FEAT_TEMP, + }, { name => "Fintek F71805F/FG Super IO Sensors", driver => "f71805f", devid => 0x0406, @@ -2676,14 +2696,15 @@ } elsif ($link =~ m/^(.*)\/i2c-$nr$/) { $entry->{path} = "${base_dir}/i2c-$nr/device"; $entry->{parent} = "${base_dir}/i2c-$nr/$1"; - } else { - $entry->{path} = "${base_dir}/i2c-$nr"; - $entry->{parent} = "$entry->{path}/device"; } - } else { + } + + # This works for all recent kernels (with or without + # CONFIG_I2C_COMPAT) + if (!defined $entry->{path}) { my $link = readlink("${base_dir}/i2c-$nr"); - $link =~ s/\/i2c-$nr$//; $entry->{path} = "${base_dir}/i2c-$nr"; + $link =~ s/(\/i2c-[0-9]+)+$//; # Handle multiplexers too $entry->{parent} = "${base_dir}/$link"; } @@ -2996,7 +3017,7 @@ my ($dev, @pci_list); opendir(local *DEVICES, "$devices") - or die "$devices: $!"; + or return \@pci_list; while (defined($dev = readdir(DEVICES))) { my %record; @@ -3632,8 +3653,8 @@ my ($funcs, $chip, $addr, $class, $default, $input, @not_to_scan); $class = get_pci_class($i2c_adapters[$adapter_nr]->{parent}); - if (($class & 0xff00) == 0x0400) { - # Do not probe adapters on PCI multimedia cards by default + # Do not probe adapters on multimedia and graphics cards by default + if (($class & 0xff00) == 0x0400 || ($class & 0xff00) == 0x0300) { $default = 0; } elsif ($class == 0x0c01 || $class == 0x0c05 || find_i2c_adapter_driver($i2c_adapters[$adapter_nr]->{name})) { @@ -3660,6 +3681,9 @@ $input = <STDIN>; chomp($input); @not_to_scan = parse_not_to_scan(0x03, 0x77, $input); + } elsif (($class & 0xff00) == 0x0300) { + # Skip EDID addresses by default on graphics adapters + @not_to_scan = parse_not_to_scan(0x03, 0x77, "0x50-0x57"); } open(local *FILE, "$dev_i2c$adapter_nr") or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/prog/sensors/Module.mk new/lm_sensors-3.3.3/prog/sensors/Module.mk --- old/lm_sensors-3.3.2/prog/sensors/Module.mk 2008-03-26 14:37:12.000000000 +0100 +++ new/lm_sensors-3.3.3/prog/sensors/Module.mk 2012-04-19 15:13:27.000000000 +0200 @@ -37,7 +37,7 @@ REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS)) REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES)) -LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi) +LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi) $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME) $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/prog/sensors/chips.c new/lm_sensors-3.3.3/prog/sensors/chips.c --- old/lm_sensors-3.3.2/prog/sensors/chips.c 2012-03-07 17:12:56.000000000 +0100 +++ new/lm_sensors-3.3.3/prog/sensors/chips.c 2012-11-06 20:44:01.000000000 +0100 @@ -658,6 +658,27 @@ free(label); } +static void print_chip_humidity(const sensors_chip_name *name, + const sensors_feature *feature, + int label_size) +{ + char *label; + const sensors_subfeature *subfeature; + double humidity; + + subfeature = sensors_get_subfeature(name, feature, + SENSORS_SUBFEATURE_HUMIDITY_INPUT); + if (!subfeature) + return; + + if ((label = sensors_get_label(name, feature)) + && !sensors_get_value(name, subfeature->number, &humidity)) { + print_label(label, label_size); + printf("%6.1f %%RH\n", humidity); + } + free(label); +} + static void print_chip_beep_enable(const sensors_chip_name *name, const sensors_feature *feature, int label_size) @@ -792,6 +813,9 @@ case SENSORS_FEATURE_INTRUSION: print_chip_intrusion(name, feature, label_size); break; + case SENSORS_FEATURE_HUMIDITY: + print_chip_humidity(name, feature, label_size); + break; default: continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/prog/sensors/sensors.1 new/lm_sensors-3.3.3/prog/sensors/sensors.1 --- old/lm_sensors-3.3.2/prog/sensors/sensors.1 2007-10-25 11:59:05.000000000 +0200 +++ new/lm_sensors-3.3.3/prog/sensors/sensors.1 2012-10-22 13:51:27.000000000 +0200 @@ -49,23 +49,23 @@ is used to generate bus statements suitable for the configuration file. .SH OPTIONS -.IP "-c config-file" +.IP "-c, --config-file config-file" Specify a configuration file. If no file is specified, the libsensors default configuration file is used. Use `-c /dev/null' to temporarily disable this default configuration file. -.IP -h +.IP "-h, --help" Print a help text and exit. -.IP -s +.IP "-s, --set" Evaluate all `set' statements in the configuration file and exit. You must be `root' to do this. If this parameter is not specified, no `set' statement is evaluated. -.IP -A +.IP "-A, --no-adapter" Do not show the adapter for each chip. .IP -u Raw output. This mode is only meant for debugging. -.IP -v +.IP "-v, --version" Print the program version and exit. -.IP -f +.IP "-f, --fahrenheit" Print the temperatures in degrees Fahrenheit instead of Celsius. .IP --bus-list Generate bus statements suitable for using in sensors.conf. Such bus statements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.2/version.h new/lm_sensors-3.3.3/version.h --- old/lm_sensors-3.3.2/version.h 2012-03-14 08:43:39.000000000 +0100 +++ new/lm_sensors-3.3.3/version.h 2012-11-06 21:10:47.000000000 +0100 @@ -1 +1 @@ -#define LM_VERSION "3.3.2" +#define LM_VERSION "3.3.3" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
