[arch-commits] Commit in hdapsd/trunk (4 files)

[Sébastien Luttringer]

    Date: Friday, May 31, 2013 @ 02:24:40
  Author: seblu
Revision: 92042

upgpkg: hdapsd 20090401-7

- /usr merge

Modified:
  hdapsd/trunk/PKGBUILD
  hdapsd/trunk/hdapsd.systemd
Deleted:
  hdapsd/trunk/hdapsd.conf.d
  hdapsd/trunk/hdapsd.wrapper

----------------+
 PKGBUILD       |   18 +++++-------------
 hdapsd.conf.d  |   22 ----------------------
 hdapsd.systemd |    2 +-
 hdapsd.wrapper |   20 --------------------
 4 files changed, 6 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 00:16:32 UTC (rev 92041)
+++ PKGBUILD	2013-05-31 00:24:40 UTC (rev 92042)
@@ -4,26 +4,21 @@
 
 pkgname=hdapsd
 pkgver=20090401
-pkgrel=6
+pkgrel=7
 pkgdesc='HDAPS userspace hard drive protection daemon'
 arch=('i686' 'x86_64')
 url='http://sourceforge.net/projects/hdaps/'
 license=('GPL')
-depends=('glibc')
-backup=('etc/conf.d/hdapsd')
+depends=('glibc' 'bash')
 source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz"
-        'hdapsd.conf.d'
-        'hdapsd.systemd'
-        'hdapsd.wrapper')
+        'hdapsd.systemd')
 md5sums=('897cee8b0192febd127470f3e9506aeb'
-         '07fc036c8717bf5a38bbc269ed38ad19'
-         '4b1378d43dc9431982f6605265c24f3b'
-         '11270661f3a543268786a68bbe74a6bb')
+         '61ac40d4d77e57863da68d9fd94c58e7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
   make ${MAKEFLAGS}
 }
 
@@ -32,8 +27,5 @@
 
   make DESTDIR="${pkgdir}/" install
 
-  # install rc script and its configuration file
-  install -Dm0644 "${srcdir}/hdapsd.conf.d" "${pkgdir}/etc/conf.d/hdapsd"
   install -Dm0644 "${srcdir}/hdapsd.systemd" "${pkgdir}/usr/lib/systemd/system/hdapsd.service"
-  install -Dm0755 "${srcdir}/hdapsd.wrapper" "${pkgdir}/usr/sbin/hdapsd-wrapper"
 }

Deleted: hdapsd.conf.d
===================================================================
--- hdapsd.conf.d	2013-05-31 00:16:32 UTC (rev 92041)
+++ hdapsd.conf.d	2013-05-31 00:24:40 UTC (rev 92042)
@@ -1,22 +0,0 @@
-# DEVICE specifies the device to monitor, defaults to "sda".
-#DEVICE='sda'
-
-# If an ultrabay hard drive is inserted, the following can be used:
-#DEVICE=('sda' 'sdb')
-
-# SENSITIVITY is self explanatory, defaults to "15".
-#SENSITIVITY='15'
-
-# Set ADAPTIVE to "yes" to enable adaptive threshold (automatically increase
-# when the built-in keyboard/mouse is used).
-#ADAPTIVE='yes'
-
-# Set SYSLOG to "yes" to have the daemon report errors to syslog (instead of
-# stderr/stdout).
-SYSLOG='yes'
-
-# Set FORCE to "yes" to force the kernel to use the unload heads feature on
-# some old hard drives for which support cannot be autodetected (don't use this
-# unless you're absolutely sure your hard drive really supports unloading
-# heads).
-#FORCE='yes'

Modified: hdapsd.systemd
===================================================================
--- hdapsd.systemd	2013-05-31 00:16:32 UTC (rev 92041)
+++ hdapsd.systemd	2013-05-31 00:24:40 UTC (rev 92042)
@@ -5,7 +5,7 @@
 [Service]
 Type=forking
 PIDFile=/var/run/hdapsd.pid
-ExecStart=/usr/sbin/hdapsd-wrapper
+ExecStart=/usr/bin/hdapsd-wrapper
 ExecReload=/bin/kill -HUP ${MAINPID}
 
 [Install]

Deleted: hdapsd.wrapper
===================================================================
--- hdapsd.wrapper	2013-05-31 00:16:32 UTC (rev 92041)
+++ hdapsd.wrapper	2013-05-31 00:24:40 UTC (rev 92042)
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/hdapsd ] && source /etc/conf.d/hdapsd
-
-OPTS="-bp"
-
-if [ -z "${DEVICE}" ]; then
-  OPTS="${OPTS} -d sda"
-else
-  for i in ${DEVICE[@]}; do
-    OPTS="${OPTS} -d ${i}"
-  done
-fi
-
-[ ! -z "${SENSITIVITY}" ] && OPTS="${OPTS} -s ${SENSITIVITY}"
-[ "${ADAPTIVE}" == "yes" ] && OPTS="${OPTS} -a"
-[ "${SYSLOG}" == "yes" ] && OPTS="${OPTS} -l"
-[ "${FORCE}" == "yes" ] && OPTS="${OPTS} -f"
-
-/usr/sbin/hdapsd ${OPTS}