From 7176ab9b8afa3146f8aabe5097389d284308876f Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 26 Nov 2012 09:02:27 -0600 Subject: lmsensors: 3.3.3 --- abs/extra/lm_sensors/ChangeLog | 62 ------------------------------- abs/extra/lm_sensors/PKGBUILD | 56 +++++++++++++++++----------- abs/extra/lm_sensors/fancontrol.service | 9 +++++ abs/extra/lm_sensors/healthd | 9 ++++- abs/extra/lm_sensors/healthd.rc | 18 +-------- abs/extra/lm_sensors/healthd.service | 9 +++++ abs/extra/lm_sensors/linux_3.0.patch | 11 ++++++ abs/extra/lm_sensors/sensord.service | 9 +++++ abs/extra/lm_sensors/sensors-detect.patch | 61 ------------------------------ abs/extra/lm_sensors/sensors.install | 12 ------ 10 files changed, 82 insertions(+), 174 deletions(-) delete mode 100644 abs/extra/lm_sensors/ChangeLog create mode 100644 abs/extra/lm_sensors/fancontrol.service create mode 100644 abs/extra/lm_sensors/healthd.service create mode 100644 abs/extra/lm_sensors/linux_3.0.patch create mode 100644 abs/extra/lm_sensors/sensord.service delete mode 100644 abs/extra/lm_sensors/sensors-detect.patch delete mode 100644 abs/extra/lm_sensors/sensors.install diff --git a/abs/extra/lm_sensors/ChangeLog b/abs/extra/lm_sensors/ChangeLog deleted file mode 100644 index 6f99fe0..0000000 --- a/abs/extra/lm_sensors/ChangeLog +++ /dev/null @@ -1,62 +0,0 @@ -2010-10-11 Eric Belanger - - * lm_sensors 3.2.0-1 - * Upstream update - * Updated license - * Removed superfluous install scriptlet - -2010-09-23 Eric Belanger - - * Added comment about beep dependency in healthd.conf (close FS#20802) - * Cleaned up PKGBUILD - -2010-02-02 Eric Belanger - - * lm_sensors 3.1.2-1 - * Upstream update - * Fixed fancontrol daemon script (close FS#17775) - -2009-11-23 Eric Belanger - - * lm_sensors 3.1.1-4 - * Added more configs in backup array (close FS#17260) - * Changed rrdtool optdepends to a depends - -2009-11-20 Eric Belanger - - * lm_sensors 3.1.1-3 - * Fixed stopping of fancontrol daemon script (close FS#17083) - * Fixed healthd script (close FS#17089) - -2009-09-28 Eric Belanger - - * lm_sensors 3.1.1-2 - * Fixed fancontrol daemon script (close FS#15269) - * Added sensord daemon script (close FS#15811) - -2009-06-24 Eric Belanger - - * lm_sensors 3.1.1-1 - * Upstream update - * Added healthd daemon (close FS#14597) - -2009-03-03 Eric Belanger - - * lm_sensors 3.1.0-1 - * Upstream update - * Updated sensors-detect.patch - -2009-01-03 Eric Belanger - - * lm_sensors 3.0.3-2 - * Rebuilt against rrdtool 1.3.5 - -2008-11-08 Eric Belanger - - * lm_sensors 3.0.3-1 - * Upstream update - * Updated sensors-detect.patch patch - * FHS man pages - * Changed sensors daemon script to move config in new location (cf. FS#9516) - * Did several other fixes and clean up in sensors daemon script - * Added ChangeLog diff --git a/abs/extra/lm_sensors/PKGBUILD b/abs/extra/lm_sensors/PKGBUILD index 95eabdd..9635bb1 100644 --- a/abs/extra/lm_sensors/PKGBUILD +++ b/abs/extra/lm_sensors/PKGBUILD @@ -1,35 +1,45 @@ -# $Id: PKGBUILD 94897 2010-10-12 01:12:40Z eric $ -# Maintainer: Eric Belanger +# $Id: PKGBUILD 170399 2012-11-07 01:42:13Z eric $ +# Maintainer: Eric Bélanger pkgname=lm_sensors -pkgver=3.2.0 +pkgver=3.3.3 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/" license=('GPL' 'LGPL') -depends=('perl' 'sysfsutils' 'rrdtool') -backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') +depends=('perl' 'sysfsutils') +makedepends=('rrdtool') +optdepends=('rrdtool: for logging with sensord') +backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord') options=('!emptydirs') -changelog=ChangeLog -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) -md5sums=('829d88fb09d67723fbf42853eb84d1fd' 'c370f5e620bfe41113354a1e22c0c18c'\ - '232bedf043dd5dedde82df1a399c682c' '47c40b381d1f25d6634ae84cecf35f33'\ - '6549050897c237514aeaa2bb6cfd29ea' 'f8af587038b0e2a89c441f7eeaa5e640'\ - '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7'\ - '41a5c20854bbff00ea7174bd2276b736' '40c8eb16af8249a0f1d851fc1057ea15') -sha1sums=('9c9ac470289e831076da52d644185b34058a457d' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\ - 'a068ac0a3115a6191a487e11422506baa922b40a' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\ - '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'\ - 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'\ - '72a60251d1d55a67307dab4105d9f3f01a080af4' '34241388c4001bfb6e49b7e10da1217e29a258d6') +source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ + sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ + sensord.rc fancontrol.service sensord.service healthd.service \ + daemonarg.patch linux_3.0.patch) +sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' + '035a721f20e4ad568f4fdde2d7c25d906c192458' + 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' + 'a068ac0a3115a6191a487e11422506baa922b40a' + 'afaad558d2ad4732aa53b69afa23ccf37bc67ab1' + '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' + 'de5a46afc39a77ae8721246a0223baf21a2d4c9c' + 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' + '72a60251d1d55a67307dab4105d9f3f01a080af4' + '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' + 'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51' + 'a7a20eb3c799d70287e6c7968a7ab42165925293' + '34241388c4001bfb6e49b7e10da1217e29a258d6' + '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') 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,init/lm_sensors.service} + sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect + sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service patch -p1 < ../daemonarg.patch + patch -p0 < ../linux_3.0.patch make PREFIX=/usr } @@ -37,11 +47,15 @@ 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}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" - install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" + install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf" install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" + 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" } diff --git a/abs/extra/lm_sensors/fancontrol.service b/abs/extra/lm_sensors/fancontrol.service new file mode 100644 index 0000000..c86b498 --- /dev/null +++ b/abs/extra/lm_sensors/fancontrol.service @@ -0,0 +1,9 @@ +[Unit] +Description=Fan control daemon + +[Service] +PIDFile=/var/run/fancontrol.pid +ExecStart=/usr/sbin/fancontrol + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/lm_sensors/healthd b/abs/extra/lm_sensors/healthd index 0315dd7..5ffed56 100644 --- a/abs/extra/lm_sensors/healthd +++ b/abs/extra/lm_sensors/healthd @@ -4,7 +4,7 @@ # /usr/sbin/healthd # -. /etc/conf.d/healthd +. /etc/healthd.conf cmd="${ALARM_CMD}" addr="${ADMIN_EMAIL}" @@ -21,6 +21,13 @@ while [ $# -gt 0 ] ; do esac done +case "${ALARM_RESET}" in + yes) /usr/bin/sensors > /dev/null + ;; + no) true + ;; +esac + [ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \ [ -n "${addr}" ] || exit 1 diff --git a/abs/extra/lm_sensors/healthd.rc b/abs/extra/lm_sensors/healthd.rc index 7bb7951..f50f4a6 100644 --- a/abs/extra/lm_sensors/healthd.rc +++ b/abs/extra/lm_sensors/healthd.rc @@ -1,29 +1,13 @@ #!/bin/bash -# -# /etc/rc.d/healthd -# - . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/healthd - -maybe_alarm_reset() { - case "${ALARM_RESET}" in - yes) /usr/bin/sensors > /dev/null - ;; - no) true - ;; - *) false - esac - return $? -} PID=$(pidof -x -o %PPID /usr/sbin/healthd) case "${1}" in start) stat_busy "Starting Health Daemon" - [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null + [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/abs/extra/lm_sensors/healthd.service b/abs/extra/lm_sensors/healthd.service new file mode 100644 index 0000000..59d3270 --- /dev/null +++ b/abs/extra/lm_sensors/healthd.service @@ -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/sbin/healthd + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/lm_sensors/linux_3.0.patch b/abs/extra/lm_sensors/linux_3.0.patch new file mode 100644 index 0000000..da02a3d --- /dev/null +++ b/abs/extra/lm_sensors/linux_3.0.patch @@ -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`); + diff --git a/abs/extra/lm_sensors/sensord.service b/abs/extra/lm_sensors/sensord.service new file mode 100644 index 0000000..6d272f1 --- /dev/null +++ b/abs/extra/lm_sensors/sensord.service @@ -0,0 +1,9 @@ +[Unit] +Description=Sensor information logging daemon + +[Service] +PIDFile=/var/run/sensord.pid +ExecStart=/usr/sbin/sensord + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/lm_sensors/sensors-detect.patch b/abs/extra/lm_sensors/sensors-detect.patch deleted file mode 100644 index 1d12a2c..0000000 --- a/abs/extra/lm_sensors/sensors-detect.patch +++ /dev/null @@ -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'); - $_ = ; - 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"); - } diff --git a/abs/extra/lm_sensors/sensors.install b/abs/extra/lm_sensors/sensors.install deleted file mode 100644 index d593f84..0000000 --- a/abs/extra/lm_sensors/sensors.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - echo ">>> to control the lm_sensors daemon type" - echo ">>> \"/etc/rc.d/sensors start|stop|restart\" " - echo ">>> --------------------------------------" - echo ">>> before you can use the fancontrol daemon" - echo ">>> first create a fancontrol config file, use \"pwmconfig\"" - echo ">>> then type \"/etc/rc.d/fancontrol start|stop|restart\" " - echo ">>> --------------------------------------" - echo ">>> to decode memory SPD timings modprobe eeprom module" - echo ">>> and get this perl script from" - echo ">>> \"http://www.lm-sensors.org/browser/lm-sensors/trunk/prog/eeprom/decode-dimms.pl\"" -} -- cgit v0.12