lm_sensors:bumped to latest.

5 files changed, 93 insertions, 27 deletions

diff --git a/abs/extra/lm_sensors/ChangeLog b/abs/extra/lm_sensors/ChangeLog
index dfec49d..6f99fe0 100644
--- a/abs/extra/lm_sensors/ChangeLog
+++ b/abs/extra/lm_sensors/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-11  Eric Belanger  <eric@archlinux.org>
+
+	* lm_sensors 3.2.0-1
+	* Upstream update
+	* Updated license
+	* Removed superfluous install scriptlet
+
+2010-09-23  Eric Belanger  <eric@archlinux.org>
+
+	* Added comment about beep dependency in healthd.conf (close FS#20802)
+	* Cleaned up PKGBUILD
+
 2010-02-02  Eric Belanger  <eric@archlinux.org>
 
 	* lm_sensors 3.1.2-1
diff --git a/abs/extra/lm_sensors/PKGBUILD b/abs/extra/lm_sensors/PKGBUILD
index 226139a..95eabdd 100644
--- a/abs/extra/lm_sensors/PKGBUILD
+++ b/abs/extra/lm_sensors/PKGBUILD
@@ -1,44 +1,47 @@
-# $Id: PKGBUILD 67093 2010-02-03 03:55:56Z eric $
+# $Id: PKGBUILD 94897 2010-10-12 01:12:40Z eric $
 # Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=lm_sensors
-pkgver=3.1.2
-pkgrel=7
+pkgver=3.2.0
+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')
+license=('GPL' 'LGPL')
 depends=('perl' 'sysfsutils' 'rrdtool')
 backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
 options=('!emptydirs')
-install=sensors.install
+changelog=ChangeLog
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
 	sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \
-        sensord.conf sensord.rc)
-md5sums=('58a9a225808ac4587c4c8cbd12b40b5c' 'c370f5e620bfe41113354a1e22c0c18c'\
-         '1e04aad66debdb72557b4528bf79b742' '47c40b381d1f25d6634ae84cecf35f33'\
-         '6549050897c237514aeaa2bb6cfd29ea' 'f649261f52bd4329347bf93f5f83cb0a'\
+        sensord.conf sensord.rc daemonarg.patch)
+md5sums=('829d88fb09d67723fbf42853eb84d1fd' 'c370f5e620bfe41113354a1e22c0c18c'\
+         '232bedf043dd5dedde82df1a399c682c' '47c40b381d1f25d6634ae84cecf35f33'\
+         '6549050897c237514aeaa2bb6cfd29ea' 'f8af587038b0e2a89c441f7eeaa5e640'\
          '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7'\
-         '41a5c20854bbff00ea7174bd2276b736')
-sha1sums=('4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\
-         '66f3cdde688127f4e4e81b5ec3c180149b5c36ea' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\
-         '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' 'c6ddfebc20685ba69700f66038c6b00a7c0bdb80'\
+         '41a5c20854bbff00ea7174bd2276b736' '40c8eb16af8249a0f1d851fc1057ea15')
+sha1sums=('9c9ac470289e831076da52d644185b34058a457d' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\
+         'a068ac0a3115a6191a487e11422506baa922b40a' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\
+         '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'\
          'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'\
-         '72a60251d1d55a67307dab4105d9f3f01a080af4')
+         '72a60251d1d55a67307dab4105d9f3f01a080af4' '34241388c4001bfb6e49b7e10da1217e29a258d6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../sensors-detect.patch || return 1
+  patch -p1 < ../sensors-detect.patch
+  patch -p1 < ../daemonarg.patch
+  make PREFIX=/usr
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install || return 1
-
-  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" || return 1
-  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" || return 1
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" || return 1
-  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" || return 1
-  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" || return 1
-  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" || return 1
-  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" || return 1
+    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
+  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
+  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
+  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
+  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd"
+  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
+  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
 }
diff --git a/abs/extra/lm_sensors/daemonarg.patch b/abs/extra/lm_sensors/daemonarg.patch
new file mode 100644
index 0000000..4b80cef
--- /dev/null
+++ b/abs/extra/lm_sensors/daemonarg.patch
@@ -0,0 +1,50 @@
+diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
+--- lm_sensors-3.1.2-1/prog/pwm/fancontrol	2010-02-03 03:45:15.000000000 +0100
++++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol	2010-03-07 01:37:09.000000000 +0100
+@@ -5,7 +5,9 @@
+ #
+ # Version 0.70
+ #
+-# Usage: fancontrol [CONFIGFILE]
++# Usage: fancontrol [-D] [CONFIGFILE]
++#
++# (-D causes fancontrol to 'fork' to the background after some tests)
+ #
+ # Dependencies:
+ #   bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
+@@ -43,6 +45,12 @@
+ #DEBUG=1
+ MAX=255
+ 
++DAEMON=0
++if [ "$1" = "-D" ]; then
++	DAEMON=1
++	shift
++fi
++
+ declare -i pwmval
+ 
+ function LoadConfig {
+@@ -303,7 +311,6 @@
+ 	echo "File $PIDFILE exists, is fancontrol already running?"
+ 	exit 1
+ fi
+-echo $$ > "$PIDFILE"
+ 
+ # $1 = pwm file name
+ function pwmdisable()
+@@ -475,6 +482,14 @@
+ 	let fcvcount=$fcvcount+1
+ done
+ 
++if [ "$DAEMON" -gt 0 ]; then
++	echo "Forking..."
++	$0 $* &> /dev/null &
++	exit 0
++fi
++
++echo $$ > "$PIDFILE"
++
+ echo 'Starting automatic fan control...'
+ 
+ # main loop calling the main function at specified intervals
diff --git a/abs/extra/lm_sensors/fancontrol.rc b/abs/extra/lm_sensors/fancontrol.rc
index bce5d7e..8e98d06 100644
--- a/abs/extra/lm_sensors/fancontrol.rc
+++ b/abs/extra/lm_sensors/fancontrol.rc
@@ -7,8 +7,8 @@ PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
 case "$1" in
   start)
     stat_busy "Starting fancontrol"
-    [ -z "$PID" ] && /usr/sbin/fancontrol >/dev/null 2>&1 &
-    if [ $? -gt 0 ]; then
+    [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
+    if [ $? -gt 0 -o -n "$PID" ]; then
       stat_fail
     else
       add_daemon fancontrol
diff --git a/abs/extra/lm_sensors/healthd.conf b/abs/extra/lm_sensors/healthd.conf
index 36c5f55..a8b2c3f 100644
--- a/abs/extra/lm_sensors/healthd.conf
+++ b/abs/extra/lm_sensors/healthd.conf
@@ -13,4 +13,5 @@ ADMIN_EMAIL="root"
 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"