diff -Nru lm-sensors-3.4.0/debian/changelog lm-sensors-3.4.0/debian/changelog --- lm-sensors-3.4.0/debian/changelog 2016-05-19 19:24:52.000000000 +0000 +++ lm-sensors-3.4.0/debian/changelog 2017-04-05 20:07:33.000000000 +0000 @@ -1,3 +1,15 @@ +lm-sensors (1:3.4.0-4) unstable; urgency=medium + + * Drop the sensord package, it is not really maintained upstream, and + the RRD part has some issues (closes: #244037, #469096, #790796). + - Stop building it. + - Remove corresponding patches. + - Remove corresponding debhelper files. + - Drop the build-depends on librrd-dev. + * Fix udevadm path in sensors-detect (closes: #852558). + + -- Aurelien Jarno Wed, 05 Apr 2017 20:07:33 +0000 + lm-sensors (1:3.4.0-3) unstable; urgency=medium * Switch lm-sensors and sensord packages to architecture linux-any. Add a diff -Nru lm-sensors-3.4.0/debian/control lm-sensors-3.4.0/debian/control --- lm-sensors-3.4.0/debian/control 2016-05-19 19:24:48.000000000 +0000 +++ lm-sensors-3.4.0/debian/control 2017-04-05 19:38:06.000000000 +0000 @@ -1,7 +1,7 @@ Source: lm-sensors Section: utils Priority: extra -Build-Depends: debhelper (>= 9), bison, flex, librrd-dev, dh-systemd (>= 1.3) +Build-Depends: debhelper (>= 9), bison, flex, dh-systemd (>= 1.3) Maintainer: Aurelien Jarno Standards-Version: 3.9.8 Homepage: http://www.lm-sensors.org @@ -10,7 +10,7 @@ Architecture: linux-any Section: utils Depends: sed (>= 4.0.5-1), lsb-base (>= 3.2-13), ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends} -Suggests: fancontrol, sensord, read-edid, i2c-tools +Suggests: fancontrol, read-edid, i2c-tools Description: utilities to read temperature/voltage/fan sensors Lm-sensors is a hardware health monitoring package for Linux. It allows you to access information from temperature, voltage, and fan speed sensors. It @@ -68,17 +68,3 @@ and sets the corresponding PWM outputs to the computed values. This is useful when this feature is not provided by the BIOS or ACPI, which should normally be the case on a laptop. - -Package: sensord -Architecture: linux-any -Section: utils -Depends: lm-sensors, lsb-base (>= 3.2-13), ${shlibs:Depends}, ${misc:Depends} -Suggests: rrdtool -Description: hardware sensor information logging daemon - Lm-sensors is a hardware health monitoring package for Linux. It allows you - to access information from temperature, voltage, and fan speed sensors. It - works with most newer systems. - . - This package contains a daemon that logs hardware health status to the - system log with optional warnings on potential system problems. - diff -Nru lm-sensors-3.4.0/debian/lm-sensors.postinst lm-sensors-3.4.0/debian/lm-sensors.postinst --- lm-sensors-3.4.0/debian/lm-sensors.postinst 2014-05-08 12:20:45.000000000 +0000 +++ lm-sensors-3.4.0/debian/lm-sensors.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#!/bin/sh -# postinst script for sensord -# -# see: dh_installdeb(1) -set -e - -case "$1" in - configure) - # Remove shutdown and reboot links; this init script does not need them. - if dpkg --compare-versions "$2" lt "1:3.0.2-2"; then - rm -f /etc/rc0.d/K[0-9][0-9]sensord /etc/rc6.d/K[0-9][0-9]sensord - fi - ;; - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# diff -Nru lm-sensors-3.4.0/debian/patches/01-sensors-detect-udevadm.patch lm-sensors-3.4.0/debian/patches/01-sensors-detect-udevadm.patch --- lm-sensors-3.4.0/debian/patches/01-sensors-detect-udevadm.patch 1970-01-01 00:00:00.000000000 +0000 +++ lm-sensors-3.4.0/debian/patches/01-sensors-detect-udevadm.patch 2017-04-05 19:38:06.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -3048,7 +3048,7 @@ sub load_module + # udev may take some time to create device nodes when loading modules + sub udev_settle + { +- if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0) ++ if (!(-x "/bin/udevadm" && system("/bin/udevadm settle") == 0) + && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) { + sleep(1); + } diff -Nru lm-sensors-3.4.0/debian/patches/03-sensord-loadavg.patch lm-sensors-3.4.0/debian/patches/03-sensord-loadavg.patch --- lm-sensors-3.4.0/debian/patches/03-sensord-loadavg.patch 2013-05-06 21:22:25.000000000 +0000 +++ lm-sensors-3.4.0/debian/patches/03-sensord-loadavg.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ ---- - prog/sensord/rrd.c | 12 ++++++++++-- - prog/sensord/sensord.h | 1 + - 2 files changed, 11 insertions(+), 2 deletions(-) - ---- a/prog/sensord/sensord.h -+++ b/prog/sensord/sensord.h -@@ -66,6 +66,7 @@ - DataType_voltage = 0, - DataType_rpm, - DataType_temperature, -+ DataType_loadavg, - DataType_other = -1 - } DataType; - ---- a/prog/sensord/rrd.c -+++ b/prog/sensord/rrd.c -@@ -238,6 +238,10 @@ - min = "-100"; - max = "250"; - break; -+ case DataType_loadavg: -+ min = "0"; -+ max = "U"; -+ break; - default: - min = max = "U"; - break; -@@ -257,8 +261,12 @@ - int ret = 0; - struct ds data = { 0, argv}; - ret = applyToFeatures(rrdGetSensors_DS, &data); -- if (!ret && sensord_args.doLoad) -- rrdGetSensors_DS(&data, LOADAVG, LOAD_AVERAGE, NULL); -+ if (!ret && sensord_args.doLoad) { -+ FeatureDescriptor feature; -+ feature.type = DataType_loadavg; -+ feature.rrd = 1; -+ rrdGetSensors_DS(&data, LOADAVG, LOAD_AVERAGE, &feature); -+ } - return ret ? -1 : data.num; - } - diff -Nru lm-sensors-3.4.0/debian/patches/04-sensord-log.patch lm-sensors-3.4.0/debian/patches/04-sensord-log.patch --- lm-sensors-3.4.0/debian/patches/04-sensord-log.patch 2012-04-03 14:56:13.000000000 +0000 +++ lm-sensors-3.4.0/debian/patches/04-sensord-log.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ ---- - prog/sensord/sense.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - ---- a/prog/sensord/sense.c -+++ b/prog/sensord/sense.c -@@ -239,9 +239,14 @@ - { - int ret = 0; - -- sensorLog(LOG_DEBUG, "sensor read started"); -+ /* -+ * Debian mod: kill the debug messages, since they spam syslog every -+ * minute. -- JEH -+ */ -+ -+ /* sensorLog(LOG_DEBUG, "sensor read started"); */ - ret = doChips(DO_READ); -- sensorLog(LOG_DEBUG, "sensor read finished"); -+ /* sensorLog(LOG_DEBUG, "sensor read finished"); */ - - return ret; - } diff -Nru lm-sensors-3.4.0/debian/patches/05-sensord-manpage.patch lm-sensors-3.4.0/debian/patches/05-sensord-manpage.patch --- lm-sensors-3.4.0/debian/patches/05-sensord-manpage.patch 2015-09-07 14:56:02.000000000 +0000 +++ lm-sensors-3.4.0/debian/patches/05-sensord-manpage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ ---- - prog/sensord/sensord.8 | 22 +--------------------- - 1 file changed, 1 insertion(+), 21 deletions(-) - -Index: lm-sensors-3.4.0/prog/sensord/sensord.8 -=================================================================== ---- lm-sensors-3.4.0.orig/prog/sensord/sensord.8 -+++ lm-sensors-3.4.0/prog/sensord/sensord.8 -@@ -291,9 +291,9 @@ that we disable logging of sensor readin - and enable logging of the load average. - .IP - .nf --mkdir /var/www/sensord --chown www-data:staff /var/www/sensord --chmod a=rwxs /var/www/sensord -+mkdir /var/www/html/sensord -+chown www-data:staff /var/www/html/sensord -+chmod a=rwxs /var/www/html/sensord - .fi - .PP - Here, we create a world-writable, Web-accessible directory in which -@@ -304,7 +304,7 @@ ownership that is appropriate for your m - .nf - sensord --load-average \\ - --rrd-file /var/log/sensord.rrd \\ -- --rrd-cgi /var/www/sensord \\ -+ --rrd-cgi /var/www/html/sensord \\ - > /usr/lib/cgi-bin/sensord.cgi - chmod a+rx /usr/lib/cgi-bin/sensord.cgi - .fi -@@ -330,27 +330,7 @@ the URL `http://localhost/cgi-bin/sensor - It is expected that all required sensor modules are loaded prior to - this daemon being started. This can either be achieved with a system - specific module loading scheme (e.g., listing the required modules --in the file `/etc/modules' under Debian) or with explicit --.BR modprobe (1) --commands in an init script before loading the daemon. -- --For example, a `sensord' initialization script might --contain (among others) the following commands: --.IP --.nf --# Sample init.d scriptlet --echo -n "Loading AMD756 module: " --modprobe i2c-amd756 || { echo Fail. ; exit 1 ; } --echo OK. --echo -n "Loading W83781D module: " --modprobe w83781d || { echo Fail. ; exit 1 ; } --echo OK. --echo -n "Starting sensord: " --daemon sensord --.fi --.PP --Ignore the platform-specific shell functions; the general idea --should be fairly clear. -+in the file `/etc/modules' under Debian). - .SH ERRORS - Errors encountered by this daemon are logged to - .BR syslogd (8) diff -Nru lm-sensors-3.4.0/debian/patches/series lm-sensors-3.4.0/debian/patches/series --- lm-sensors-3.4.0/debian/patches/series 2016-05-17 09:24:17.000000000 +0000 +++ lm-sensors-3.4.0/debian/patches/series 2017-04-05 19:38:06.000000000 +0000 @@ -1,7 +1,5 @@ +01-sensors-detect-udevadm.patch 02-sensors-conf-convert-improvements.patch -03-sensord-loadavg.patch -04-sensord-log.patch -05-sensord-manpage.patch 06-sensors-detect-debian.patch 07-sensors3.conf-local-changes.patch 08-sensors-detect-lm85.patch diff -Nru lm-sensors-3.4.0/debian/rules lm-sensors-3.4.0/debian/rules --- lm-sensors-3.4.0/debian/rules 2015-09-07 15:16:03.000000000 +0000 +++ lm-sensors-3.4.0/debian/rules 2017-04-05 17:08:21.000000000 +0000 @@ -8,7 +8,6 @@ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ MANDIR=/usr/share/man MAKEARGS_ARCH = $(MAKEARGS_INDP) \ - PROG_EXTRA=sensord \ CFLAGS="$(CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ LDFLAGS="$(LDFLAGS)" \ @@ -57,4 +56,3 @@ override_dh_installinit-arch: dh_installinit -plm-sensors --no-start - dh_installinit -psensord --restart-after-upgrade diff -Nru lm-sensors-3.4.0/debian/sensord.default lm-sensors-3.4.0/debian/sensord.default --- lm-sensors-3.4.0/debian/sensord.default 2011-02-06 13:46:22.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.default 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# Interval between scanning for alarms; e.g., 30s, 1m, 1h -# ALARM_INTERVAL=1m -# Interval between logging sensor measurements; e.g., 30s, 1m, 1h -# LOG_INTERVAL=30m -# Syslog facility to use -SYSLOG_FACILITY=daemon -# Libsensors config file to use -# CONFIG_FILE=/etc/sensors3.conf -# Chips to scan -# SCAN_CHIPS=... - -# Uncomment this to enable a 7-day round-robin database of sensor -# readings. See the ROUND ROBIN DATABASES section of the sensord -# manual page for details. -# RRD_FILE=/var/log/sensord.rrd -# Interval between RRD readings; e.g. 30s, 5m (default), 1h -# RRD_INTERVAL=5m -# Include the load average in the RRD file. If you enable this you -# must remove your old RRD file and rebuild your CGI script. -# RRD_LOADAVG=yes diff -Nru lm-sensors-3.4.0/debian/sensord.dirs lm-sensors-3.4.0/debian/sensord.dirs --- lm-sensors-3.4.0/debian/sensord.dirs 2014-04-06 18:23:45.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/sbin -usr/share/man/man8 -etc/default diff -Nru lm-sensors-3.4.0/debian/sensord.init lm-sensors-3.4.0/debian/sensord.init --- lm-sensors-3.4.0/debian/sensord.init 2011-02-06 13:46:22.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.init 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: sensord -# Required-Start: $remote_fs $syslog lm-sensors -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: lm-sensors daemon -# Description: hardware sensor information logging daemon -### END INIT INFO - -. /lib/lsb/init-functions - -[ -f /etc/default/rcS ] && . /etc/default/rcS -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/sensord -DESC="sensor daemon" -NAME="sensord" -PIDFILE=/var/run/sensord.pid -CONFIG=/etc/default/sensord - -test -x $DAEMON || exit 0 - -if [ -f $CONFIG ]; then . $CONFIG; fi - -if [ -n "$ALARM_INTERVAL" ]; then ALARM_INTERVAL="-i $ALARM_INTERVAL"; fi -if [ -n "$LOG_INTERVAL" ]; then LOG_INTERVAL="-l $LOG_INTERVAL"; fi -if [ -n "$SYSLOG_FACILITY" ]; then SYSLOG_FACILITY="-f $SYSLOG_FACILITY"; fi -if [ -n "$CONFIG_FILE" ]; then CONFIG_FILE="-c $CONFIG_FILE"; fi -if [ -n "$RRD_FILE" ]; then RRD_FILE="-r $RRD_FILE"; fi -if [ -n "$RRD_INTERVAL" ]; then RRD_INTERVAL="-t $RRD_INTERVAL"; fi -if [ -n "$RRD_LOADAVG" ]; then RRD_LOADAVG="-a"; fi - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - /sbin/start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $ALARM_INTERVAL $LOG_INTERVAL $SYSLOG_FACILITY $RRD_INTERVAL $RRD_FILE $RRD_LOADAVG $CONFIG_FILE $SCAN_CHIPS - log_end_msg $? - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --exec $DAEMON - log_end_msg $? - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - force-reload) - if start-stop-daemon --stop --test --quiet --pidfile $PIDFILE --exec $DAEMON ; then - $0 restart - fi - ;; - status) - status_of_proc $DAEMON $NAME && exit 0 || exit $? - ;; - *) - echo "Usage: /etc/init.d/sensord {start|stop|restart|force-reload|status}" - exit 1 -esac - -exit 0 diff -Nru lm-sensors-3.4.0/debian/sensord.install lm-sensors-3.4.0/debian/sensord.install --- lm-sensors-3.4.0/debian/sensord.install 2011-06-14 21:16:12.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/sbin/sensord -usr/share/man/man8/sensord.8 diff -Nru lm-sensors-3.4.0/debian/sensord.logcheck.ignore.workstation lm-sensors-3.4.0/debian/sensord.logcheck.ignore.workstation --- lm-sensors-3.4.0/debian/sensord.logcheck.ignore.workstation 2011-02-06 13:46:22.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.logcheck.ignore.workstation 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -sensord: -sensord: Adapter: -sensord: Algorithm: -sensord: Chip: -sensord: sensor read diff -Nru lm-sensors-3.4.0/debian/sensord.maintscript lm-sensors-3.4.0/debian/sensord.maintscript --- lm-sensors-3.4.0/debian/sensord.maintscript 2015-08-09 09:24:49.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.maintscript 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# Remove old logcheck ignore file -rm_conffile /etc/logcheck/ignore.d.server/sensord 1:3.4.0-1 diff -Nru lm-sensors-3.4.0/debian/sensord.NEWS lm-sensors-3.4.0/debian/sensord.NEWS --- lm-sensors-3.4.0/debian/sensord.NEWS 2011-02-06 13:46:22.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -lm-sensors (1:2.9.0-7) unstable; urgency=low - - Since version 2.9.0 sensord doesn't scale the loadavg itself (* 10) as - RRDs work with floating-point values and thus do very well with - non-integer values even < 1. - - They can even be scaled later at display time by rrdtool itself using: - DEF:load=sensord.rrd:loadavg:AVERAGE - CDEF:load10=load,10,* - - -- Aurelien Jarno Tue, 11 Jan 2005 22:41:34 +0100 - diff -Nru lm-sensors-3.4.0/debian/sensord.postinst lm-sensors-3.4.0/debian/sensord.postinst --- lm-sensors-3.4.0/debian/sensord.postinst 2011-04-09 13:45:16.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#!/bin/sh -# postinst script for sensord -# -# see: dh_installdeb(1) -set -e - -case "$1" in - configure) - # Remove shutdown and reboot links; this init script does not need them. - if dpkg --compare-versions "$2" lt "1:3.1.1-5"; then - rm -f /etc/rc0.d/K[0-9][0-9]sensord /etc/rc1.d/K[0-9][0-9]sensord /etc/rc6.d/K[0-9][0-9]sensord - fi - ;; - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# diff -Nru lm-sensors-3.4.0/debian/sensord.README.Debian lm-sensors-3.4.0/debian/sensord.README.Debian --- lm-sensors-3.4.0/debian/sensord.README.Debian 2011-02-06 13:46:22.000000000 +0000 +++ lm-sensors-3.4.0/debian/sensord.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -This is the Debian packaging of sensord, the sensord logging daemon. - -The file /etc/default/sensord specifies the configuration parameters -used to start the daemon. In particular, the syslog facility is set -to `daemon' and not `local4'. - -You must load the appropriate lm-sensors modules during system boot in -order for the daemon to function correctly. - -The file /etc/modules is a useful place to list these modules; for -example, you might list i2c-amd756 (an I2C/SMBUS module) and w83781d -(a sensor chip module). - -The daemon does not setup the sensors limits from /etc/sensors3.conf, -this is the job of sensors, when called with -s. Note that 'sensors -s' -is called at boot time from /etc/init.d/lm-sensors, so that the sensors -limits should be the right ones in normal use. Don't forget to run -sensors -s again if you changed the limits in /etc/sensors3.conf. - -For full documentation on setting up lm-sensors on your system, -see /usr/share/doc/lm-sensors. - --- David Z. Maze