[arch-commits] Commit in lm_sensors/trunk (PKGBUILD lm_sensors-fancontrol.patch)

[Antonio Rojas]

    Date: Saturday, May 26, 2018 @ 12:24:31
  Author: arojas
Revision: 325011

Remove obsolete patch

Modified:
  lm_sensors/trunk/PKGBUILD
Deleted:
  lm_sensors/trunk/lm_sensors-fancontrol.patch

-----------------------------+
 PKGBUILD                    |   17 +++++++----------
 lm_sensors-fancontrol.patch |   29 -----------------------------
 2 files changed, 7 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-26 12:22:53 UTC (rev 325010)
+++ PKGBUILD	2018-05-26 12:24:31 UTC (rev 325011)
@@ -3,7 +3,7 @@
 
 pkgname=lm_sensors
 pkgver=3.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('x86_64')
 url="https://hwmon.wiki.kernel.org/lm_sensors"
@@ -13,14 +13,12 @@
 optdepends=('rrdtool: for logging with sensord')
 backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
 source=($pkgname-$pkgver::https://github.com/groeck/lm-sensors/archive/V${pkgver//\./-}.tar.gz
-	healthd healthd.conf healthd.service sensord.conf
-        lm_sensors-fancontrol.patch)
-sha1sums=('4a9026e4db894c98ee7cea0bec1188108e415f71'
-          '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
-          '1edd4d72ade22adfc128fb8d670e85c633fd1d18'
-          'd72ec328e9303acef86342483b6f8537de6117d9'
-          'f4b5f21fdb3b2a55aa353afa1603f953b207b73b'
-          'b0bc977348610d6a008d75a43f65800251c4c9f7')
+	healthd healthd.conf healthd.service sensord.conf)
+sha256sums=('e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e'
+            '0ac9afb2a9155dd74ab393756ed552cd542dde1081149beb2ab4ec7ff55b8f4a'
+            '5d17a366b175cf9cb4bb0115c030d4b8d91231546f713784a74935b6e533da9f'
+            '2638cd363e60f8d36bcac468f414a6ba29a1b5599f40fc651ca953858c8429d7'
+            '23bebef4c250f8c0aaba2c75fd3d2c8ee9473cc91a342161a9f5b3a34ddfa9e5')
 validpgpkeys=('7CA69F4460F1BDC41FD2C858A5526B9BB3CD4E6A')
 
 prepare() {
@@ -27,7 +25,6 @@
   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() {

Deleted: lm_sensors-fancontrol.patch
===================================================================
--- lm_sensors-fancontrol.patch	2018-05-26 12:22:53 UTC (rev 325010)
+++ lm_sensors-fancontrol.patch	2018-05-26 12:24:31 UTC (rev 325011)
@@ -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