[arch-commits] Commit in lm_sensors/trunk (ChangeLog PKGBUILD sensors-detect.patch)
Eric Bélanger
eric at archlinux.org
Wed Mar 4 03:45:37 UTC 2009
Date: Tuesday, March 3, 2009 @ 22:45:37
Author: eric
Revision: 28979
upgpkg: lm_sensors 3.1.0-1
Upstream update, Updated sensors-detect.patch
Modified:
lm_sensors/trunk/ChangeLog
lm_sensors/trunk/PKGBUILD
lm_sensors/trunk/sensors-detect.patch
----------------------+
ChangeLog | 6 ++
PKGBUILD | 14 ++---
sensors-detect.patch | 125 ++++++++++++++++++++++---------------------------
3 files changed, 70 insertions(+), 75 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-03-04 03:37:36 UTC (rev 28978)
+++ ChangeLog 2009-03-04 03:45:37 UTC (rev 28979)
@@ -1,3 +1,9 @@
+2009-03-03 Eric Belanger <eric at archlinux.org>
+
+ * lm_sensors 3.1.0-1
+ * Upstream update
+ * Updated sensors-detect.patch
+
2009-01-03 Eric Belanger <eric at archlinux.org>
* lm_sensors 3.0.3-2
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-04 03:37:36 UTC (rev 28978)
+++ PKGBUILD 2009-03-04 03:45:37 UTC (rev 28979)
@@ -3,8 +3,8 @@
# Contributor: Aurelien Foret <orelien at chez.com>
pkgname=lm_sensors
-pkgver=3.0.3
-pkgrel=2
+pkgver=3.1.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/"
@@ -16,16 +16,16 @@
install=sensors.install
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
sensors.rc fancontrol.rc sensors-detect.patch)
-md5sums=('e88b236228ac2a50821217015b8fd0fa' 'c370f5e620bfe41113354a1e22c0c18c'\
- 'f14e335a8eea27388892c36af8099782' 'c707f86b4808359d08eeb75438ba93bc')
-sha1sums=('2f68d003aef8f83bbef006c5b7b26a88bd9fd036'
+md5sums=('e23130eaa46c66b861729835e08bdccf' 'c370f5e620bfe41113354a1e22c0c18c'\
+ 'f14e335a8eea27388892c36af8099782' '47c40b381d1f25d6634ae84cecf35f33')
+sha1sums=('b36577ca07d3028910a93958e5809ba7b85e0bf8'
'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
'4a5c7b9114118f66e283a728d41b5fa7fe8b551d'
- '707edbe92324f7601e3c0fa1c9f5d6caa0aeb2ad')
+ '47095a32a918d6be50bd8daa8aaa9c24940d60e9')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np0 -i ${srcdir}/sensors-detect.patch || return 1
+ patch -p1 < ../sensors-detect.patch || return 1
make PREFIX=/usr PROG_EXTRA:=sensord user || return 1
make user_install PREFIX=/usr MANDIR=/usr/share/man DESTDIR=${pkgdir} || return 1
Modified: sensors-detect.patch
===================================================================
--- sensors-detect.patch 2009-03-04 03:37:36 UTC (rev 28978)
+++ sensors-detect.patch 2009-03-04 03:45:37 UTC (rev 28979)
@@ -1,72 +1,61 @@
---- prog/detect/sensors-detect.orig 2008-11-08 02:15:07.000000000 -0500
-+++ prog/detect/sensors-detect 2008-11-08 02:35:27.000000000 -0500
-@@ -5871,7 +5871,7 @@
- exit -1;
- }
+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 @@
+ }
+ }
-- if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-+ if (-x "/sbin/service" && -f "/etc/rc.d/lm_sensors" &&
- -f "/var/lock/subsys/lm_sensors") {
- system("/sbin/service", "lm_sensors", "stop");
- }
-@@ -6084,21 +6084,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 <<'EOT';
--# /etc/sysconfig/lm_sensors - Defines modules loaded by
--# /etc/init.d/lm_sensors
-+# /etc/conf.d/lm_sensors - Defines modules loaded by
-+# /etc/rc.d/lm_sensors
- # Copyright (c) 1998 - 2001 Frodo Looijaard <frodol at dds.nl>
+- 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.
#
- # This program is free software; you can redistribute it and/or modify
-@@ -6120,8 +6120,8 @@
- # See also the lm_sensors homepage at:
- # http://www.lm-sensors.org/
- #
--# This file is used by /etc/init.d/lm_sensors and defines the modules to
--# be loaded/unloaded. This file is sourced into /etc/init.d/lm_sensors.
-+# This file is used by /etc/rc.d/lm_sensors and defines the modules to
-+# be loaded/unloaded. This file is sourced into /etc/rc.d/lm_sensors.
- #
- # The format of this file is a shell script that simply defines the modules
- # in order as normal variables with the special names:
-@@ -6143,13 +6143,13 @@
- print SYSCONFIG $sysconfig;
- close(SYSCONFIG);
+ # 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";
+- 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");
+- 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