[arch-commits] Commit in lm_sensors/trunk (3 files)

Eric Bélanger eric at archlinux.org
Fri Jul 22 20:44:09 EDT 2011


    Date: Friday, July 22, 2011 @ 20:44:08
  Author: eric
Revision: 132325

upgpkg: lm_sensors 3.3.1-1
Upstream update, Replace patch with sed command, Remove old patches

Modified:
  lm_sensors/trunk/PKGBUILD
Deleted:
  lm_sensors/trunk/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
  lm_sensors/trunk/sensors-detect.patch

------------------------------------------------------------------+
 PKGBUILD                                                         |   25 +---
 changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff |   44 -------
 sensors-detect.patch                                             |   61 ----------
 3 files changed, 10 insertions(+), 120 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-22 23:39:47 UTC (rev 132324)
+++ PKGBUILD	2011-07-23 00:44:08 UTC (rev 132325)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=lm_sensors
-pkgver=3.3.0
-pkgrel=3
+pkgver=3.3.1
+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/"
@@ -14,37 +14,32 @@
 backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
 options=('!emptydirs')
 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 daemonarg.patch \
-        changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff)
-md5sums=('5eb18d7531ead4f54f28a1133a606535'
+	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
+        sensord.rc daemonarg.patch)
+md5sums=('8c0eebda8524fc87da1393b4564d279b'
          'c370f5e620bfe41113354a1e22c0c18c'
          '232bedf043dd5dedde82df1a399c682c'
-         '47c40b381d1f25d6634ae84cecf35f33'
          '6549050897c237514aeaa2bb6cfd29ea'
          'f8af587038b0e2a89c441f7eeaa5e640'
          '970408d2e509dc4138927020efefe323'
          '96a8dd468e81d455ec9b165bdf33e0b7'
          '41a5c20854bbff00ea7174bd2276b736'
-         '40c8eb16af8249a0f1d851fc1057ea15'
-         '2f1c004bd525bdc9b2495503a77d375a')
-sha1sums=('16c13a186557164fa51459a02209b120c0335f96'
+         '40c8eb16af8249a0f1d851fc1057ea15')
+sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a'
           'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
           'a068ac0a3115a6191a487e11422506baa922b40a'
-          '47095a32a918d6be50bd8daa8aaa9c24940d60e9'
           '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8'
           '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
           'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f'
           'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
           '72a60251d1d55a67307dab4105d9f3f01a080af4'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6'
-          '0de66445805adaf65935764da9974df1db125865')
+          '34241388c4001bfb6e49b7e10da1217e29a258d6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../sensors-detect.patch
+  sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
+         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/detect/sensors-detect
   patch -p1 < ../daemonarg.patch
-  patch -p2 < ../changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
   make PREFIX=/usr
 }
 

Deleted: changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
===================================================================
--- changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff	2011-07-22 23:39:47 UTC (rev 132324)
+++ changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff	2011-07-23 00:44:08 UTC (rev 132325)
@@ -1,44 +0,0 @@
-Index: lm-sensors/trunk/prog/detect/sensors-detect
-===================================================================
---- lm-sensors/trunk/prog/detect/sensors-detect	(revision 5963)
-+++ lm-sensors/trunk/prog/detect/sensors-detect	(revision 5964)
-@@ -2416,5 +2416,5 @@
- 		# Try some known default udev db locations, just in case
- 		if (-e '/dev/.udev.tdb' || -e '/dev/.udev'
--		 || -e '/dev/.udevdb') {
-+		 || -e '/dev/.udevdb' || -e '/run/udev') {
- 			$use_udev = 1;
- 			$dev_i2c = '/dev/i2c-';
-@@ -6460,4 +6460,20 @@
- 		close(SYSCONFIG);
- 
-+		if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
-+		    ! -f "/lib/systemd/system/lm_sensors.service") {
-+			print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
-+			      "and run 'systemctl enable lm_sensors.service'\n".
-+			      "for initialization at boot time.\n";
-+			return;
-+		}
-+
-+		if (-x "/bin/systemctl" &&
-+		    -f "/lib/systemd/system/lm_sensors.service") {
-+			system("/bin/systemctl", "enable", "lm_sensors.service");
-+			system("/bin/systemctl", "start", "lm_sensors.service");
-+			# All done, don't check for /etc/init.d/lm_sensors
-+			return;
-+		}
-+
- 		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
- 		      "for initialization at boot time.\n"
-@@ -6513,7 +6497,9 @@
- 		exit -1;
- 	}
- 
--	if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
--	    -f "/var/lock/subsys/lm_sensors") {
-+       if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
-+               system("/bin/systemctl", "stop", "lm_sensors.service");
-+       } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-+                -f "/var/lock/subsys/lm_sensors") {
- 		system("/sbin/service", "lm_sensors", "stop");
- 	}

Deleted: sensors-detect.patch
===================================================================
--- sensors-detect.patch	2011-07-22 23:39:47 UTC (rev 132324)
+++ sensors-detect.patch	2011-07-23 00:44:08 UTC (rev 132325)
@@ -1,61 +0,0 @@
-diff -Naur lm_sensors-3.1.0/prog/detect/sensors-detect lm_sensors-3.1.0-new/prog/detect/sensors-detect
---- lm_sensors-3.1.0/prog/detect/sensors-detect	2009-03-03 20:36:33.000000000 -0500
-+++ lm_sensors-3.1.0-new/prog/detect/sensors-detect	2009-03-03 20:52:06.000000000 -0500
-@@ -5282,21 +5282,21 @@
- 		}
- 	}
- 
--	my $have_sysconfig = -d '/etc/sysconfig';
--	printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
--	       (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-+	my $have_sysconfig = -d '/etc/conf.d';
-+	printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ",
-+	       (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'),
- 	       ($have_sysconfig ? 'YES/no' : 'yes/NO');
- 	$_ = <STDIN>;
- 	if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
- 		unless ($have_sysconfig) {
--			mkdir('/etc/sysconfig', 0777)
--				or die "Sorry, can't create /etc/sysconfig ($!)";
-+			mkdir('/etc/conf.d', 0777)
-+				or die "Sorry, can't create /etc/conf.d ($!)";
- 		}
--		open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--			or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+		open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors")
-+			or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)";
- 		print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- 		print SYSCONFIG <<'EOT';
--# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-+# This file is sourced by /etc/rc.d/lm_sensors and defines the modules to
- # be loaded/unloaded.
- #
- # The format of this file is a shell script that simply defines variables:
-@@ -5322,13 +5322,13 @@
- 		}
- 		close(SYSCONFIG);
- 
--		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-+		print "Copy prog/init/lm_sensors.init to /etc/rc.d/lm_sensors\n".
- 		      "for initialization at boot time.\n"
--			unless -f "/etc/init.d/lm_sensors";
-+			unless -f "/etc/rc.d/lm_sensors";
- 
--		if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
--			system("/sbin/insserv", "/etc/init.d/lm_sensors");
--		} elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
-+		if (-x "/sbin/insserv" && -f "/etc/rc.d/lm_sensors") {
-+			system("/sbin/insserv", "/etc/rc.d/lm_sensors");
-+		} elsif (-x "/sbin/chkconfig" && -f "/etc/rc.d/lm_sensors") {
- 			system("/sbin/chkconfig", "lm_sensors", "on");
- 			if (-x "/sbin/service") {
- 				system("/sbin/service", "lm_sensors", "start");
-@@ -5377,7 +5377,7 @@
- 		exit -1;
- 	}
- 
--	if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-+	if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
- 	    -f "/var/lock/subsys/lm_sensors") {
- 		system("/sbin/service", "lm_sensors", "stop");
- 	}



More information about the arch-commits mailing list