Thu Jul 19 00:01:52 UTC 2012

4 files changed, 85 insertions, 30 deletions

diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index cf00e6549..94073ce8f 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -1,48 +1,53 @@
-# $Id: PKGBUILD 160663 2012-06-03 10:40:04Z bisson $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 163630 2012-07-17 14:24:03Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Damir Perisa <damir@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"
-arch=('i686' 'x86_64')
-url="http://www.guzu.net/linux/hddtemp.php"
+url='https://savannah.nongnu.org/projects/hddtemp/'
 license=('GPL')
-depends=('glibc')
+arch=('i686' 'x86_64')
 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
-
-  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"
+	cd "${srcdir}/${pkgname}-${_origver}"
+
+	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"
 }
diff --git a/extra/hddtemp/conf.d b/extra/hddtemp/conf.d
new file mode 100644
index 000000000..6a1e18e0b
--- /dev/null
+++ b/extra/hddtemp/conf.d
@@ -0,0 +1,2 @@
+PARAMS="-q -l 127.0.0.1"
+DRIVES="/dev/sda"
diff --git a/extra/hddtemp/rc.d b/extra/hddtemp/rc.d
new file mode 100644
index 000000000..62f090808
--- /dev/null
+++ b/extra/hddtemp/rc.d
@@ -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
diff --git a/extra/hddtemp/service b/extra/hddtemp/service
new file mode 100644
index 000000000..bc56d16b0
--- /dev/null
+++ b/extra/hddtemp/service
@@ -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