[arch-commits] Commit in lm_sensors/repos (28 files)
Eric Bélanger
eric at nymeria.archlinux.org
Wed Jan 22 23:53:58 UTC 2014
Date: Thursday, January 23, 2014 @ 00:53:58
Author: eric
Revision: 204568
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
lm_sensors/repos/extra-i686/PKGBUILD
(from rev 204567, lm_sensors/trunk/PKGBUILD)
lm_sensors/repos/extra-i686/healthd
(from rev 204567, lm_sensors/trunk/healthd)
lm_sensors/repos/extra-i686/healthd.conf
(from rev 204567, lm_sensors/trunk/healthd.conf)
lm_sensors/repos/extra-i686/healthd.service
(from rev 204567, lm_sensors/trunk/healthd.service)
lm_sensors/repos/extra-i686/lm_sensors-fancontrol.patch
(from rev 204567, lm_sensors/trunk/lm_sensors-fancontrol.patch)
lm_sensors/repos/extra-i686/sensord.conf
(from rev 204567, lm_sensors/trunk/sensord.conf)
lm_sensors/repos/extra-x86_64/PKGBUILD
(from rev 204567, lm_sensors/trunk/PKGBUILD)
lm_sensors/repos/extra-x86_64/healthd
(from rev 204567, lm_sensors/trunk/healthd)
lm_sensors/repos/extra-x86_64/healthd.conf
(from rev 204567, lm_sensors/trunk/healthd.conf)
lm_sensors/repos/extra-x86_64/healthd.service
(from rev 204567, lm_sensors/trunk/healthd.service)
lm_sensors/repos/extra-x86_64/lm_sensors-fancontrol.patch
(from rev 204567, lm_sensors/trunk/lm_sensors-fancontrol.patch)
lm_sensors/repos/extra-x86_64/sensord.conf
(from rev 204567, lm_sensors/trunk/sensord.conf)
Deleted:
lm_sensors/repos/extra-i686/PKGBUILD
lm_sensors/repos/extra-i686/fancontrol.service
lm_sensors/repos/extra-i686/healthd
lm_sensors/repos/extra-i686/healthd.conf
lm_sensors/repos/extra-i686/healthd.service
lm_sensors/repos/extra-i686/linux_3.0.patch
lm_sensors/repos/extra-i686/lm_sensors-fancontrol.patch
lm_sensors/repos/extra-i686/sensord.service
lm_sensors/repos/extra-x86_64/PKGBUILD
lm_sensors/repos/extra-x86_64/fancontrol.service
lm_sensors/repos/extra-x86_64/healthd
lm_sensors/repos/extra-x86_64/healthd.conf
lm_sensors/repos/extra-x86_64/healthd.service
lm_sensors/repos/extra-x86_64/linux_3.0.patch
lm_sensors/repos/extra-x86_64/lm_sensors-fancontrol.patch
lm_sensors/repos/extra-x86_64/sensord.service
------------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++
/healthd | 106 +++++++++++++++++++++++++++++
/healthd.conf | 34 +++++++++
/healthd.service | 18 ++++
/lm_sensors-fancontrol.patch | 58 +++++++++++++++
extra-i686/PKGBUILD | 53 --------------
extra-i686/fancontrol.service | 9 --
extra-i686/healthd | 53 --------------
extra-i686/healthd.conf | 17 ----
extra-i686/healthd.service | 9 --
extra-i686/linux_3.0.patch | 11 ---
extra-i686/lm_sensors-fancontrol.patch | 29 -------
extra-i686/sensord.conf | 9 ++
extra-i686/sensord.service | 9 --
extra-x86_64/PKGBUILD | 53 --------------
extra-x86_64/fancontrol.service | 9 --
extra-x86_64/healthd | 53 --------------
extra-x86_64/healthd.conf | 17 ----
extra-x86_64/healthd.service | 9 --
extra-x86_64/linux_3.0.patch | 11 ---
extra-x86_64/lm_sensors-fancontrol.patch | 29 -------
extra-x86_64/sensord.conf | 9 ++
extra-x86_64/sensord.service | 9 --
23 files changed, 334 insertions(+), 380 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/PKGBUILD 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=lm_sensors
-pkgver=3.3.4
-pkgrel=1
-pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-arch=('i686' 'x86_64')
-url="http://www.lm-sensors.org/"
-license=('GPL' 'LGPL')
-depends=('perl' 'sysfsutils')
-makedepends=('rrdtool')
-optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/healthd.conf')
-options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
- healthd healthd.conf fancontrol.service sensord.service healthd.service \
- linux_3.0.patch lm_sensors-fancontrol.patch)
-sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8'
- 'SKIP'
- '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
- '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
- '73cd658f4a418197dc75f65d6d309701c72cfd81'
- 'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
- 'd72ec328e9303acef86342483b6f8537de6117d9'
- '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
- 'b0bc977348610d6a008d75a43f65800251c4c9f7')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service}
- sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1 at g' prog/detect/sensors-detect
- sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
- patch -p0 -i "${srcdir}/linux_3.0.patch"
- patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- make PREFIX=/usr
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
- PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
- install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
- install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
- install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
- install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
- install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
- install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
-}
Copied: lm_sensors/repos/extra-i686/PKGBUILD (from rev 204567, lm_sensors/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lm_sensors
+pkgver=3.3.5
+pkgrel=1
+pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
+arch=('i686' 'x86_64')
+url="http://www.lm-sensors.org/"
+license=('GPL' 'LGPL')
+depends=('perl' 'sysfsutils')
+makedepends=('rrdtool')
+optdepends=('rrdtool: for logging with sensord')
+backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
+source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig}
+ healthd healthd.conf healthd.service sensord.conf
+ lm_sensors-fancontrol.patch)
+sha1sums=('179989a52bae8f01ba8ed77e8a15af6ec653d89e'
+ 'SKIP'
+ '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
+ '1edd4d72ade22adfc128fb8d670e85c633fd1d18'
+ 'd72ec328e9303acef86342483b6f8537de6117d9'
+ 'f4b5f21fdb3b2a55aa353afa1603f953b207b73b'
+ 'b0bc977348610d6a008d75a43f65800251c4c9f7')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service}
+ sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
+ patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make PREFIX=/usr
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
+ PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+
+ install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
+
+ install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
+ install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
+
+ install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
+ install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/"
+}
Deleted: extra-i686/fancontrol.service
===================================================================
--- extra-i686/fancontrol.service 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/fancontrol.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/bin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
Deleted: extra-i686/healthd
===================================================================
--- extra-i686/healthd 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/healthd 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/bin/healthd
-#
-
-. /etc/healthd.conf
-
-cmd="${ALARM_CMD}"
-addr="${ADMIN_EMAIL}"
-slp="${ALARM_SLEEP}"
-sensors="/usr/bin/sensors"
-
-
-while [ $# -gt 0 ] ; do
- case "${1}" in
- -c ) cmd="${2}" ; shift 2 ;;
- -m ) addr="${2}" ; shift 2 ;;
- -s ) slp="${2}" ; shift 2 ;;
- * ) shift 1 ;;
- esac
-done
-
-case "${ALARM_RESET}" in
- yes) /usr/bin/sensors > /dev/null
- ;;
- no) true
- ;;
-esac
-
-[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
- [ -n "${addr}" ] || exit 1
-
-[ "${slp}" -ge 2 ] || slp=600
-
-while true ; do
- sleep 15
- message="$( $sensors )"
- case "$message" in
- '' ) message='Could not get any sensor values !' ;;
- *ALARM* ) : ;;
- * ) message='' ;;
- esac
- if [ -n "$message" ]; then
- if [ -n "${addr}" ]; then
- echo "$message" | mail -s \
- "Sensors ALARM detected at host: $( hostname )" \
- "${addr}"
- fi
- [ -z "${cmd}" ] || ${cmd} &
- sleep ${slp}
- fi
-done &
Copied: lm_sensors/repos/extra-i686/healthd (from rev 204567, lm_sensors/trunk/healthd)
===================================================================
--- extra-i686/healthd (rev 0)
+++ extra-i686/healthd 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+#
+# /usr/bin/healthd
+#
+
+. /etc/healthd.conf
+
+cmd="${ALARM_CMD}"
+addr="${ADMIN_EMAIL}"
+slp="${ALARM_SLEEP}"
+sensors="/usr/bin/sensors"
+
+
+while [ $# -gt 0 ] ; do
+ case "${1}" in
+ -c ) cmd="${2}" ; shift 2 ;;
+ -m ) addr="${2}" ; shift 2 ;;
+ -s ) slp="${2}" ; shift 2 ;;
+ * ) shift 1 ;;
+ esac
+done
+
+case "${ALARM_RESET}" in
+ yes) /usr/bin/sensors > /dev/null
+ ;;
+ no) true
+ ;;
+esac
+
+[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
+ [ -n "${addr}" ] || exit 1
+
+[ "${slp}" -ge 2 ] || slp=600
+
+while true ; do
+ sleep 15
+ message="$( $sensors )"
+ case "$message" in
+ '' ) message='Could not get any sensor values !' ;;
+ *ALARM* ) : ;;
+ * ) message='' ;;
+ esac
+ if [ -n "$message" ]; then
+ if [ -n "${addr}" ]; then
+ echo "$message" | mail -s \
+ "Sensors ALARM detected at host: $( hostname )" \
+ "${addr}"
+ fi
+ [ -z "${cmd}" ] || ${cmd} &
+ sleep ${slp}
+ fi
+done &
Deleted: extra-i686/healthd.conf
===================================================================
--- extra-i686/healthd.conf 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/healthd.conf 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,17 +0,0 @@
-#
-# /etc/conf.d/healthd
-#
-
-# reset any pending alarms on startup
-ALARM_RESET="yes"
-
-# where to sent mails on alarm
-ADMIN_EMAIL="root"
-
-# Seconds to sleep when alarm detected before checking again
-# If you want to fill up your mail inbox set this to 2. ;-)
-ALARM_SLEEP=600
-
-# command to run in background on each alarm
-# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
-ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
Copied: lm_sensors/repos/extra-i686/healthd.conf (from rev 204567, lm_sensors/trunk/healthd.conf)
===================================================================
--- extra-i686/healthd.conf (rev 0)
+++ extra-i686/healthd.conf 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,17 @@
+#
+# /etc/healthd.conf
+#
+
+# reset any pending alarms on startup
+ALARM_RESET="yes"
+
+# where to sent mails on alarm
+ADMIN_EMAIL="root"
+
+# Seconds to sleep when alarm detected before checking again
+# If you want to fill up your mail inbox set this to 2. ;-)
+ALARM_SLEEP=600
+
+# command to run in background on each alarm
+# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
+ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
Deleted: extra-i686/healthd.service
===================================================================
--- extra-i686/healthd.service 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/healthd.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,9 +0,0 @@
-[Unit]
-Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/healthd
-
-[Install]
-WantedBy=multi-user.target
Copied: lm_sensors/repos/extra-i686/healthd.service (from rev 204567, lm_sensors/trunk/healthd.service)
===================================================================
--- extra-i686/healthd.service (rev 0)
+++ extra-i686/healthd.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,9 @@
+[Unit]
+Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/healthd
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-i686/linux_3.0.patch
===================================================================
--- extra-i686/linux_3.0.patch 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/linux_3.0.patch 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,11 +0,0 @@
---- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200
-+++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200
-@@ -2472,7 +2472,7 @@
-
- sub initialize_kernel_version
- {
-- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
-+ `uname -r` =~ /(\d+)\.(\d+)(.*)/;
- @kernel_version = ($1, $2, $3, $4);
- chomp($kernel_arch = `uname -m`);
-
Deleted: extra-i686/lm_sensors-fancontrol.patch
===================================================================
--- extra-i686/lm_sensors-fancontrol.patch 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/lm_sensors-fancontrol.patch 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,29 +0,0 @@
---- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200
-+++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200
-@@ -297,7 +297,7 @@
- cd $DIR
-
- # Check for configuration change
--if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
-+if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]]
- then
- echo "Configuration is too old, please run pwmconfig again" >&2
- exit 1
-@@ -337,7 +337,7 @@
- # It didn't work, try pwmN_enable=1 pwmN=255
- echo 1 > $ENABLE 2> /dev/null
- echo $MAX > $1
-- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ]
-+ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ]
- then
- # Success
- return 0
-@@ -469,7 +469,7 @@
- else
- # calculate the new value from temperature and settings
- pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}"
-- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ]
-+ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ]
- then # if fan was stopped start it using a safe value
- echo $minsa > $pwmo
- # Sleep while still handling signals
Copied: lm_sensors/repos/extra-i686/lm_sensors-fancontrol.patch (from rev 204567, lm_sensors/trunk/lm_sensors-fancontrol.patch)
===================================================================
--- extra-i686/lm_sensors-fancontrol.patch (rev 0)
+++ extra-i686/lm_sensors-fancontrol.patch 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,29 @@
+--- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200
++++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200
+@@ -297,7 +297,7 @@
+ cd $DIR
+
+ # Check for configuration change
+-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]]
+ then
+ echo "Configuration is too old, please run pwmconfig again" >&2
+ exit 1
+@@ -337,7 +337,7 @@
+ # It didn't work, try pwmN_enable=1 pwmN=255
+ echo 1 > $ENABLE 2> /dev/null
+ echo $MAX > $1
+- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ]
++ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ]
+ then
+ # Success
+ return 0
+@@ -469,7 +469,7 @@
+ else
+ # calculate the new value from temperature and settings
+ pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}"
+- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ]
++ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ]
+ then # if fan was stopped start it using a safe value
+ echo $minsa > $pwmo
+ # Sleep while still handling signals
Copied: lm_sensors/repos/extra-i686/sensord.conf (from rev 204567, lm_sensors/trunk/sensord.conf)
===================================================================
--- extra-i686/sensord.conf (rev 0)
+++ extra-i686/sensord.conf 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,9 @@
+#
+# /etc/conf.d/sensord
+#
+
+#Specify the interval between scanning for sensor alarms
+INTERVAL=60s
+
+#Specify the interval between logging all sensor readings
+LOG_INTERVAL=30m
Deleted: extra-i686/sensord.service
===================================================================
--- extra-i686/sensord.service 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-i686/sensord.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/bin/sensord
-
-[Install]
-WantedBy=multi-user.target
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/PKGBUILD 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=lm_sensors
-pkgver=3.3.4
-pkgrel=1
-pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-arch=('i686' 'x86_64')
-url="http://www.lm-sensors.org/"
-license=('GPL' 'LGPL')
-depends=('perl' 'sysfsutils')
-makedepends=('rrdtool')
-optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/healthd.conf')
-options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
- healthd healthd.conf fancontrol.service sensord.service healthd.service \
- linux_3.0.patch lm_sensors-fancontrol.patch)
-sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8'
- 'SKIP'
- '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
- '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
- '73cd658f4a418197dc75f65d6d309701c72cfd81'
- 'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
- 'd72ec328e9303acef86342483b6f8537de6117d9'
- '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
- 'b0bc977348610d6a008d75a43f65800251c4c9f7')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service}
- sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1 at g' prog/detect/sensors-detect
- sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
- patch -p0 -i "${srcdir}/linux_3.0.patch"
- patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- make PREFIX=/usr
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
- PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
- install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
- install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
- install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
- install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
- install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
- install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
-}
Copied: lm_sensors/repos/extra-x86_64/PKGBUILD (from rev 204567, lm_sensors/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lm_sensors
+pkgver=3.3.5
+pkgrel=1
+pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
+arch=('i686' 'x86_64')
+url="http://www.lm-sensors.org/"
+license=('GPL' 'LGPL')
+depends=('perl' 'sysfsutils')
+makedepends=('rrdtool')
+optdepends=('rrdtool: for logging with sensord')
+backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
+source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig}
+ healthd healthd.conf healthd.service sensord.conf
+ lm_sensors-fancontrol.patch)
+sha1sums=('179989a52bae8f01ba8ed77e8a15af6ec653d89e'
+ 'SKIP'
+ '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
+ '1edd4d72ade22adfc128fb8d670e85c633fd1d18'
+ 'd72ec328e9303acef86342483b6f8537de6117d9'
+ 'f4b5f21fdb3b2a55aa353afa1603f953b207b73b'
+ 'b0bc977348610d6a008d75a43f65800251c4c9f7')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service}
+ sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
+ patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make PREFIX=/usr
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
+ PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+
+ install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
+
+ install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
+ install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
+
+ install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
+ install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/"
+}
Deleted: extra-x86_64/fancontrol.service
===================================================================
--- extra-x86_64/fancontrol.service 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/fancontrol.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/bin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
Deleted: extra-x86_64/healthd
===================================================================
--- extra-x86_64/healthd 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/healthd 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/bin/healthd
-#
-
-. /etc/healthd.conf
-
-cmd="${ALARM_CMD}"
-addr="${ADMIN_EMAIL}"
-slp="${ALARM_SLEEP}"
-sensors="/usr/bin/sensors"
-
-
-while [ $# -gt 0 ] ; do
- case "${1}" in
- -c ) cmd="${2}" ; shift 2 ;;
- -m ) addr="${2}" ; shift 2 ;;
- -s ) slp="${2}" ; shift 2 ;;
- * ) shift 1 ;;
- esac
-done
-
-case "${ALARM_RESET}" in
- yes) /usr/bin/sensors > /dev/null
- ;;
- no) true
- ;;
-esac
-
-[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
- [ -n "${addr}" ] || exit 1
-
-[ "${slp}" -ge 2 ] || slp=600
-
-while true ; do
- sleep 15
- message="$( $sensors )"
- case "$message" in
- '' ) message='Could not get any sensor values !' ;;
- *ALARM* ) : ;;
- * ) message='' ;;
- esac
- if [ -n "$message" ]; then
- if [ -n "${addr}" ]; then
- echo "$message" | mail -s \
- "Sensors ALARM detected at host: $( hostname )" \
- "${addr}"
- fi
- [ -z "${cmd}" ] || ${cmd} &
- sleep ${slp}
- fi
-done &
Copied: lm_sensors/repos/extra-x86_64/healthd (from rev 204567, lm_sensors/trunk/healthd)
===================================================================
--- extra-x86_64/healthd (rev 0)
+++ extra-x86_64/healthd 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+#
+# /usr/bin/healthd
+#
+
+. /etc/healthd.conf
+
+cmd="${ALARM_CMD}"
+addr="${ADMIN_EMAIL}"
+slp="${ALARM_SLEEP}"
+sensors="/usr/bin/sensors"
+
+
+while [ $# -gt 0 ] ; do
+ case "${1}" in
+ -c ) cmd="${2}" ; shift 2 ;;
+ -m ) addr="${2}" ; shift 2 ;;
+ -s ) slp="${2}" ; shift 2 ;;
+ * ) shift 1 ;;
+ esac
+done
+
+case "${ALARM_RESET}" in
+ yes) /usr/bin/sensors > /dev/null
+ ;;
+ no) true
+ ;;
+esac
+
+[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
+ [ -n "${addr}" ] || exit 1
+
+[ "${slp}" -ge 2 ] || slp=600
+
+while true ; do
+ sleep 15
+ message="$( $sensors )"
+ case "$message" in
+ '' ) message='Could not get any sensor values !' ;;
+ *ALARM* ) : ;;
+ * ) message='' ;;
+ esac
+ if [ -n "$message" ]; then
+ if [ -n "${addr}" ]; then
+ echo "$message" | mail -s \
+ "Sensors ALARM detected at host: $( hostname )" \
+ "${addr}"
+ fi
+ [ -z "${cmd}" ] || ${cmd} &
+ sleep ${slp}
+ fi
+done &
Deleted: extra-x86_64/healthd.conf
===================================================================
--- extra-x86_64/healthd.conf 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/healthd.conf 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,17 +0,0 @@
-#
-# /etc/conf.d/healthd
-#
-
-# reset any pending alarms on startup
-ALARM_RESET="yes"
-
-# where to sent mails on alarm
-ADMIN_EMAIL="root"
-
-# Seconds to sleep when alarm detected before checking again
-# If you want to fill up your mail inbox set this to 2. ;-)
-ALARM_SLEEP=600
-
-# command to run in background on each alarm
-# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
-ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
Copied: lm_sensors/repos/extra-x86_64/healthd.conf (from rev 204567, lm_sensors/trunk/healthd.conf)
===================================================================
--- extra-x86_64/healthd.conf (rev 0)
+++ extra-x86_64/healthd.conf 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,17 @@
+#
+# /etc/healthd.conf
+#
+
+# reset any pending alarms on startup
+ALARM_RESET="yes"
+
+# where to sent mails on alarm
+ADMIN_EMAIL="root"
+
+# Seconds to sleep when alarm detected before checking again
+# If you want to fill up your mail inbox set this to 2. ;-)
+ALARM_SLEEP=600
+
+# command to run in background on each alarm
+# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
+ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
Deleted: extra-x86_64/healthd.service
===================================================================
--- extra-x86_64/healthd.service 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/healthd.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,9 +0,0 @@
-[Unit]
-Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/healthd
-
-[Install]
-WantedBy=multi-user.target
Copied: lm_sensors/repos/extra-x86_64/healthd.service (from rev 204567, lm_sensors/trunk/healthd.service)
===================================================================
--- extra-x86_64/healthd.service (rev 0)
+++ extra-x86_64/healthd.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,9 @@
+[Unit]
+Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/healthd
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/linux_3.0.patch
===================================================================
--- extra-x86_64/linux_3.0.patch 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/linux_3.0.patch 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,11 +0,0 @@
---- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200
-+++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200
-@@ -2472,7 +2472,7 @@
-
- sub initialize_kernel_version
- {
-- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
-+ `uname -r` =~ /(\d+)\.(\d+)(.*)/;
- @kernel_version = ($1, $2, $3, $4);
- chomp($kernel_arch = `uname -m`);
-
Deleted: extra-x86_64/lm_sensors-fancontrol.patch
===================================================================
--- extra-x86_64/lm_sensors-fancontrol.patch 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/lm_sensors-fancontrol.patch 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,29 +0,0 @@
---- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200
-+++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200
-@@ -297,7 +297,7 @@
- cd $DIR
-
- # Check for configuration change
--if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
-+if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]]
- then
- echo "Configuration is too old, please run pwmconfig again" >&2
- exit 1
-@@ -337,7 +337,7 @@
- # It didn't work, try pwmN_enable=1 pwmN=255
- echo 1 > $ENABLE 2> /dev/null
- echo $MAX > $1
-- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ]
-+ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ]
- then
- # Success
- return 0
-@@ -469,7 +469,7 @@
- else
- # calculate the new value from temperature and settings
- pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}"
-- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ]
-+ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ]
- then # if fan was stopped start it using a safe value
- echo $minsa > $pwmo
- # Sleep while still handling signals
Copied: lm_sensors/repos/extra-x86_64/lm_sensors-fancontrol.patch (from rev 204567, lm_sensors/trunk/lm_sensors-fancontrol.patch)
===================================================================
--- extra-x86_64/lm_sensors-fancontrol.patch (rev 0)
+++ extra-x86_64/lm_sensors-fancontrol.patch 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,29 @@
+--- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200
++++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200
+@@ -297,7 +297,7 @@
+ cd $DIR
+
+ # Check for configuration change
+-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]]
+ then
+ echo "Configuration is too old, please run pwmconfig again" >&2
+ exit 1
+@@ -337,7 +337,7 @@
+ # It didn't work, try pwmN_enable=1 pwmN=255
+ echo 1 > $ENABLE 2> /dev/null
+ echo $MAX > $1
+- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ]
++ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ]
+ then
+ # Success
+ return 0
+@@ -469,7 +469,7 @@
+ else
+ # calculate the new value from temperature and settings
+ pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}"
+- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ]
++ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ]
+ then # if fan was stopped start it using a safe value
+ echo $minsa > $pwmo
+ # Sleep while still handling signals
Copied: lm_sensors/repos/extra-x86_64/sensord.conf (from rev 204567, lm_sensors/trunk/sensord.conf)
===================================================================
--- extra-x86_64/sensord.conf (rev 0)
+++ extra-x86_64/sensord.conf 2014-01-22 23:53:58 UTC (rev 204568)
@@ -0,0 +1,9 @@
+#
+# /etc/conf.d/sensord
+#
+
+#Specify the interval between scanning for sensor alarms
+INTERVAL=60s
+
+#Specify the interval between logging all sensor readings
+LOG_INTERVAL=30m
Deleted: extra-x86_64/sensord.service
===================================================================
--- extra-x86_64/sensord.service 2014-01-22 23:52:59 UTC (rev 204567)
+++ extra-x86_64/sensord.service 2014-01-22 23:53:58 UTC (rev 204568)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/bin/sensord
-
-[Install]
-WantedBy=multi-user.target
More information about the arch-commits
mailing list