summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD4
-rw-r--r--lm_sensors-fancontrol.patch30
2 files changed, 2 insertions, 32 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 375898374cb8..85923d70e6d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=lm_sensors-git
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-pkgver=r5175.70f7e084
+pkgver=r5216.84f773b3
pkgrel=1
arch=('x86_64')
url="http://www.lm-sensors.org/"
@@ -11,7 +11,7 @@ depends=('perl' 'sysfsutils')
makedepends=('git' 'rrdtool')
optdepends=('rrdtool: for logging with sensord')
backup=('etc/sensors3.conf' 'etc/conf.d/sensord')
-source=(git+https://github.com/groeck/lm-sensors.git
+source=(git+https://github.com/lm-sensors/lm-sensors.git
sensord.conf)
sha1sums=('SKIP'
'f4b5f21fdb3b2a55aa353afa1603f953b207b73b')
diff --git a/lm_sensors-fancontrol.patch b/lm_sensors-fancontrol.patch
deleted file mode 100644
index e5fcce86cf22..000000000000
--- a/lm_sensors-fancontrol.patch
+++ /dev/null
@@ -1,30 +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
-