[arch-commits] Commit in lm_sensors/repos (32 files)

Eric Bélanger eric at nymeria.archlinux.org
Sun May 12 02:52:48 EDT 2013


    Date: Sunday, May 12, 2013 @ 08:52:48
  Author: eric
Revision: 185203

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  lm_sensors/repos/extra-i686/PKGBUILD
    (from rev 185202, lm_sensors/trunk/PKGBUILD)
  lm_sensors/repos/extra-i686/fancontrol.service
    (from rev 185202, lm_sensors/trunk/fancontrol.service)
  lm_sensors/repos/extra-i686/healthd
    (from rev 185202, lm_sensors/trunk/healthd)
  lm_sensors/repos/extra-i686/healthd.conf
    (from rev 185202, lm_sensors/trunk/healthd.conf)
  lm_sensors/repos/extra-i686/healthd.service
    (from rev 185202, lm_sensors/trunk/healthd.service)
  lm_sensors/repos/extra-i686/linux_3.0.patch
    (from rev 185202, lm_sensors/trunk/linux_3.0.patch)
  lm_sensors/repos/extra-i686/lm_sensors-fancontrol.patch
    (from rev 185202, lm_sensors/trunk/lm_sensors-fancontrol.patch)
  lm_sensors/repos/extra-i686/sensord.service
    (from rev 185202, lm_sensors/trunk/sensord.service)
  lm_sensors/repos/extra-x86_64/PKGBUILD
    (from rev 185202, lm_sensors/trunk/PKGBUILD)
  lm_sensors/repos/extra-x86_64/fancontrol.service
    (from rev 185202, lm_sensors/trunk/fancontrol.service)
  lm_sensors/repos/extra-x86_64/healthd
    (from rev 185202, lm_sensors/trunk/healthd)
  lm_sensors/repos/extra-x86_64/healthd.conf
    (from rev 185202, lm_sensors/trunk/healthd.conf)
  lm_sensors/repos/extra-x86_64/healthd.service
    (from rev 185202, lm_sensors/trunk/healthd.service)
  lm_sensors/repos/extra-x86_64/linux_3.0.patch
    (from rev 185202, lm_sensors/trunk/linux_3.0.patch)
  lm_sensors/repos/extra-x86_64/lm_sensors-fancontrol.patch
    (from rev 185202, lm_sensors/trunk/lm_sensors-fancontrol.patch)
  lm_sensors/repos/extra-x86_64/sensord.service
    (from rev 185202, lm_sensors/trunk/sensord.service)
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                                |  106 +++++++++++++++++++++++++++++
 /fancontrol.service                      |   18 ++++
 /healthd                                 |  106 +++++++++++++++++++++++++++++
 /healthd.conf                            |   34 +++++++++
 /healthd.service                         |   18 ++++
 /linux_3.0.patch                         |   22 ++++++
 /lm_sensors-fancontrol.patch             |   58 +++++++++++++++
 /sensord.service                         |   18 ++++
 extra-i686/PKGBUILD                      |   49 -------------
 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.service               |    9 --
 extra-x86_64/PKGBUILD                    |   49 -------------
 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.service             |    9 --
 24 files changed, 380 insertions(+), 372 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/PKGBUILD	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=lm_sensors
-pkgver=3.3.3
-pkgrel=2
-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=('b55c06f425993e42f13553f204066c446da36fd3'
-          '035a721f20e4ad568f4fdde2d7c25d906c192458'
-          'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
-          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
-          'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
-          'a7a20eb3c799d70287e6c7968a7ab42165925293'
-          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
-          'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
-
-build() {
-  cd "${srcdir}/${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"
-  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
-  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/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 185202, lm_sensors/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lm_sensors
+pkgver=3.3.3
+pkgrel=3
+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=('b55c06f425993e42f13553f204066c446da36fd3'
+          'SKIP'
+          '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
+          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
+          '73cd658f4a418197dc75f65d6d309701c72cfd81'
+          'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
+          'd72ec328e9303acef86342483b6f8537de6117d9'
+          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
+          'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
+
+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"
+}

Deleted: extra-i686/fancontrol.service
===================================================================
--- extra-i686/fancontrol.service	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/fancontrol.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target

Copied: lm_sensors/repos/extra-i686/fancontrol.service (from rev 185202, lm_sensors/trunk/fancontrol.service)
===================================================================
--- extra-i686/fancontrol.service	                        (rev 0)
+++ extra-i686/fancontrol.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,9 @@
+[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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/healthd	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/sbin/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 185202, lm_sensors/trunk/healthd)
===================================================================
--- extra-i686/healthd	                        (rev 0)
+++ extra-i686/healthd	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/healthd.conf	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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 185202, lm_sensors/trunk/healthd.conf)
===================================================================
--- extra-i686/healthd.conf	                        (rev 0)
+++ extra-i686/healthd.conf	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,17 @@
+#
+# /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"

Deleted: extra-i686/healthd.service
===================================================================
--- extra-i686/healthd.service	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/healthd.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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/sbin/healthd
-
-[Install]
-WantedBy=multi-user.target

Copied: lm_sensors/repos/extra-i686/healthd.service (from rev 185202, lm_sensors/trunk/healthd.service)
===================================================================
--- extra-i686/healthd.service	                        (rev 0)
+++ extra-i686/healthd.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/linux_3.0.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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`);
- 

Copied: lm_sensors/repos/extra-i686/linux_3.0.patch (from rev 185202, lm_sensors/trunk/linux_3.0.patch)
===================================================================
--- extra-i686/linux_3.0.patch	                        (rev 0)
+++ extra-i686/linux_3.0.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,11 @@
+--- 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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/lm_sensors-fancontrol.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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 [ -z "$DEVPATH" -o -z "$DEVNAME" ]
-+if [ -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 185202, lm_sensors/trunk/lm_sensors-fancontrol.patch)
===================================================================
--- extra-i686/lm_sensors-fancontrol.patch	                        (rev 0)
+++ extra-i686/lm_sensors-fancontrol.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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 [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [ -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

Deleted: extra-i686/sensord.service
===================================================================
--- extra-i686/sensord.service	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-i686/sensord.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
-
-[Install]
-WantedBy=multi-user.target

Copied: lm_sensors/repos/extra-i686/sensord.service (from rev 185202, lm_sensors/trunk/sensord.service)
===================================================================
--- extra-i686/sensord.service	                        (rev 0)
+++ extra-i686/sensord.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,9 @@
+[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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/PKGBUILD	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=lm_sensors
-pkgver=3.3.3
-pkgrel=2
-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=('b55c06f425993e42f13553f204066c446da36fd3'
-          '035a721f20e4ad568f4fdde2d7c25d906c192458'
-          'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
-          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
-          'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
-          'a7a20eb3c799d70287e6c7968a7ab42165925293'
-          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
-          'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
-
-build() {
-  cd "${srcdir}/${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"
-  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
-  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/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 185202, lm_sensors/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lm_sensors
+pkgver=3.3.3
+pkgrel=3
+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=('b55c06f425993e42f13553f204066c446da36fd3'
+          'SKIP'
+          '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
+          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
+          '73cd658f4a418197dc75f65d6d309701c72cfd81'
+          'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
+          'd72ec328e9303acef86342483b6f8537de6117d9'
+          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
+          'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
+
+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"
+}

Deleted: extra-x86_64/fancontrol.service
===================================================================
--- extra-x86_64/fancontrol.service	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/fancontrol.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target

Copied: lm_sensors/repos/extra-x86_64/fancontrol.service (from rev 185202, lm_sensors/trunk/fancontrol.service)
===================================================================
--- extra-x86_64/fancontrol.service	                        (rev 0)
+++ extra-x86_64/fancontrol.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,9 @@
+[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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/healthd	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/sbin/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 185202, lm_sensors/trunk/healthd)
===================================================================
--- extra-x86_64/healthd	                        (rev 0)
+++ extra-x86_64/healthd	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/healthd.conf	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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 185202, lm_sensors/trunk/healthd.conf)
===================================================================
--- extra-x86_64/healthd.conf	                        (rev 0)
+++ extra-x86_64/healthd.conf	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,17 @@
+#
+# /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"

Deleted: extra-x86_64/healthd.service
===================================================================
--- extra-x86_64/healthd.service	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/healthd.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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/sbin/healthd
-
-[Install]
-WantedBy=multi-user.target

Copied: lm_sensors/repos/extra-x86_64/healthd.service (from rev 185202, lm_sensors/trunk/healthd.service)
===================================================================
--- extra-x86_64/healthd.service	                        (rev 0)
+++ extra-x86_64/healthd.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/linux_3.0.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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`);
- 

Copied: lm_sensors/repos/extra-x86_64/linux_3.0.patch (from rev 185202, lm_sensors/trunk/linux_3.0.patch)
===================================================================
--- extra-x86_64/linux_3.0.patch	                        (rev 0)
+++ extra-x86_64/linux_3.0.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,11 @@
+--- 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	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/lm_sensors-fancontrol.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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 [ -z "$DEVPATH" -o -z "$DEVNAME" ]
-+if [ -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 185202, lm_sensors/trunk/lm_sensors-fancontrol.patch)
===================================================================
--- extra-x86_64/lm_sensors-fancontrol.patch	                        (rev 0)
+++ extra-x86_64/lm_sensors-fancontrol.patch	2013-05-12 06:52:48 UTC (rev 185203)
@@ -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 [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [ -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

Deleted: extra-x86_64/sensord.service
===================================================================
--- extra-x86_64/sensord.service	2013-05-12 06:51:48 UTC (rev 185202)
+++ extra-x86_64/sensord.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
-
-[Install]
-WantedBy=multi-user.target

Copied: lm_sensors/repos/extra-x86_64/sensord.service (from rev 185202, lm_sensors/trunk/sensord.service)
===================================================================
--- extra-x86_64/sensord.service	                        (rev 0)
+++ extra-x86_64/sensord.service	2013-05-12 06:52:48 UTC (rev 185203)
@@ -0,0 +1,9 @@
+[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