[arch-commits] Commit in hddtemp/trunk (8 files)
Gaetan Bisson
bisson at archlinux.org
Tue Jul 17 14:23:13 UTC 2012
Date: Tuesday, July 17, 2012 @ 10:23:13
Author: bisson
Revision: 163629
upstream update, various cleanup and bikeshedding
Added:
hddtemp/trunk/conf.d
(from rev 163622, hddtemp/trunk/hddtemp.confd)
hddtemp/trunk/rc.d
(from rev 163622, hddtemp/trunk/hddtemp)
hddtemp/trunk/service
(from rev 163622, hddtemp/trunk/hddtemp.service)
Modified:
hddtemp/trunk/PKGBUILD
Deleted:
hddtemp/trunk/hddtemp
hddtemp/trunk/hddtemp-0.3-beta15-reg-eip.patch
hddtemp/trunk/hddtemp.confd
hddtemp/trunk/hddtemp.service
----------------------------------+
PKGBUILD | 61 ++++++++++++++++++++-----------------
conf.d | 2 +
hddtemp | 39 -----------------------
hddtemp-0.3-beta15-reg-eip.patch | 22 -------------
hddtemp.confd | 2 -
hddtemp.service | 9 -----
rc.d | 39 +++++++++++++++++++++++
service | 9 +++++
8 files changed, 83 insertions(+), 100 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-17 13:33:33 UTC (rev 163628)
+++ PKGBUILD 2012-07-17 14:23:13 UTC (rev 163629)
@@ -1,48 +1,53 @@
# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
# Contributor: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Roman Kyrylych <roman at archlinux.org>
# Contributor: Damir Perisa <damir at archlinux.org>
pkgname=hddtemp
-pkgver=0.3.beta15.46
_origver=0.3-beta15
-_patchver=46
-pkgrel=3
+_patchver=${_origver}-52
+pkgver=${_patchver//-/.}
+pkgrel=1
pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
+url='https://savannah.nongnu.org/projects/hddtemp/'
+license=('GPL')
arch=('i686' 'x86_64')
-url="http://www.guzu.net/linux/hddtemp.php"
-license=('GPL')
-depends=('glibc')
backup=('etc/conf.d/hddtemp')
-source=(http://www.guzu.net/files/hddtemp-${_origver}.tar.bz2
- http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_${_origver}-${_patchver}.diff.gz
- 'hddtemp' 'hddtemp.service' 'hddtemp.confd' 'hddtemp-0.3-beta15-reg-eip.patch')
-md5sums=('8b829339e1ae9df701684ec239021bb8'
- '040437845e28771c560b4bb40e41f933'
- 'b7ebb86dfeef3bc4577ed1040307e36b'
- 'b6767bdbb03b6cdbc1995418cafdb1e1'
- 'fdca5c43900406f0be76534ef2a5a697'
- '526ef28549dd0da7e38d32cfc8523592')
+source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2"
+ "http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz"
+ 'rc.d'
+ 'conf.d'
+ 'service')
+sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b'
+ 'b9bcdd0537c1540e55e5056445b571ea61d5a4a3'
+ '71159486b1505ec6acfb7585e0d8fbe78afe54ec'
+ 'd45e3022f614dbf8904ecb1a3e702bb71fcaa808'
+ '501fcf4faf8b2689d010f9cbbf39f917211f611f')
+
options=('!libtool')
build() {
- cd "$srcdir/$pkgname-${_origver}"
+ cd "${srcdir}/${pkgname}-${_origver}"
- patch -Np1 -i "$srcdir/${pkgname}_${_origver}-${_patchver}.diff"
- patch -Np1 -i "$srcdir/hddtemp-0.3-beta15-reg-eip.patch"
+ patch -p1 -i "../${pkgname}_${_patchver}.diff"
- ./configure --prefix=/usr --mandir=/usr/share/man --with-db-path=/usr/share/$pkgname/hddtemp.db
- make
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --with-db-path="/usr/share/${pkgname}/hddtemp.db"
+
+ make
}
package() {
- cd "$srcdir/$pkgname-${_origver}"
- make DESTDIR=$pkgdir install
+ cd "${srcdir}/${pkgname}-${_origver}"
- install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \
- "$pkgdir/usr/share/${pkgname}/hddtemp.db"
- install -D -m644 "$srcdir/hddtemp.confd" "$pkgdir/etc/conf.d/hddtemp"
- install -D -m644 "$srcdir/hddtemp.service" "$pkgdir/usr/lib/systemd/system/hddtemp.service"
- install -D -m755 "$srcdir/hddtemp" "$pkgdir/etc/rc.d/hddtemp"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "../${pkgname}-${_origver}/debian/hddtemp.db" "${pkgdir}/usr/share/${pkgname}/hddtemp.db"
+ install -Dm644 '../service' "${pkgdir}/usr/lib/systemd/system/hddtemp.service"
+ install -Dm644 '../conf.d' "${pkgdir}/etc/conf.d/hddtemp"
+ install -Dm755 '../rc.d' "${pkgdir}/etc/rc.d/hddtemp"
}
Copied: hddtemp/trunk/conf.d (from rev 163622, hddtemp/trunk/hddtemp.confd)
===================================================================
--- conf.d (rev 0)
+++ conf.d 2012-07-17 14:23:13 UTC (rev 163629)
@@ -0,0 +1,2 @@
+PARAMS="-q -l 127.0.0.1"
+DRIVES="/dev/sda"
Deleted: hddtemp
===================================================================
--- hddtemp 2012-07-17 13:33:33 UTC (rev 163628)
+++ hddtemp 2012-07-17 14:23:13 UTC (rev 163629)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARAMS=
-DRIVES=
-[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp
-PID=$(pidof -o %PPID /usr/sbin/hddtemp)
-case "$1" in
- start)
- stat_busy "Starting HDDTemp"
- [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon hddtemp
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping HDDTemp"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon hddtemp
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: hddtemp-0.3-beta15-reg-eip.patch
===================================================================
--- hddtemp-0.3-beta15-reg-eip.patch 2012-07-17 13:33:33 UTC (rev 163628)
+++ hddtemp-0.3-beta15-reg-eip.patch 2012-07-17 14:23:13 UTC (rev 163629)
@@ -1,22 +0,0 @@
-__USE_GNU needs to be in effect when including sys/ucontext.h,
-and signal.h pulls it in in some setups.
-
-diff -up hddtemp-0.3-beta15/src/backtrace.c~ hddtemp-0.3-beta15/src/backtrace.c
---- hddtemp-0.3-beta15/src/backtrace.c~ 2006-04-19 05:38:14.000000000 +0300
-+++ hddtemp-0.3-beta15/src/backtrace.c 2010-02-14 21:59:47.000000000 +0200
-@@ -27,13 +27,12 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <linux/ptrace.h>
-+#define __USE_GNU
-+#include <ucontext.h>
- #include <signal.h>
- #include <bits/sigcontext.h>
- #include <sys/param.h>
-
--#define __USE_GNU
--#include <ucontext.h>
--
- #define MAX_BTSIZE 64
-
- void backtrace_handler(int n, siginfo_t *ist, void *extra) {
Deleted: hddtemp.confd
===================================================================
--- hddtemp.confd 2012-07-17 13:33:33 UTC (rev 163628)
+++ hddtemp.confd 2012-07-17 14:23:13 UTC (rev 163629)
@@ -1,2 +0,0 @@
-PARAMS="-q -l 127.0.0.1"
-DRIVES="/dev/sda"
Deleted: hddtemp.service
===================================================================
--- hddtemp.service 2012-07-17 13:33:33 UTC (rev 163628)
+++ hddtemp.service 2012-07-17 14:23:13 UTC (rev 163629)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Hard drive temperature monitor daemon
-
-[Service]
-EnvironmentFile=/etc/conf.d/hddtemp
-ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES
-
-[Install]
-WantedBy=multi-user.target
Copied: hddtemp/trunk/rc.d (from rev 163622, hddtemp/trunk/hddtemp)
===================================================================
--- rc.d (rev 0)
+++ rc.d 2012-07-17 14:23:13 UTC (rev 163629)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PARAMS=
+DRIVES=
+[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp
+PID=$(pidof -o %PPID /usr/sbin/hddtemp)
+case "$1" in
+ start)
+ stat_busy "Starting HDDTemp"
+ [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon hddtemp
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping HDDTemp"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon hddtemp
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 2
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: hddtemp/trunk/service (from rev 163622, hddtemp/trunk/hddtemp.service)
===================================================================
--- service (rev 0)
+++ service 2012-07-17 14:23:13 UTC (rev 163629)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hard drive temperature monitor daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/hddtemp
+ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list