4 files changed, 6 insertions, 68 deletions
diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD
index e084af3bc..1e66de54b 100644
--- a/community/inputattach/PKGBUILD
+++ b/community/inputattach/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77899 2012-10-15 16:07:24Z spupykin $
+# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=inputattach
 pkgver=1.24
-pkgrel=6
+pkgrel=10
 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxconsole.sourceforge.net/"
@@ -12,13 +12,9 @@ license=('GPL')
 depends=('bash')
 makedepends=('gcc')
 backup=(etc/conf.d/inputattach)
-install=inputattach.install
-#source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c'
-#	'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h'
 source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
 	'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
 	'inputattach.conf.d'
-	'inputattach.rc.d'
 	'inputattach.service'
 	'inputattachctl'
 	'0001-Add-w8001-flag.patch'
@@ -26,9 +22,8 @@ source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
 md5sums=('eb595a766ca363edb3b14c25404596ce'
          '93d34d96cd3ad19ea1aeca7f68a66b4a'
          '7ca903e54829764c8241233af5069216'
-         'aa2e404fc113abdd2ab14e2a6352c331'
          'c19b9ed38b243191cf5378b87a42a4cc'
-         '84c6463660c10bd34c0390102da087d5'
+         '7dd0690a9d2fe5e1052900650906e273'
          'f1b3ddae308351357f557cbd5c6cda81'
          '8f76908449cae24a95adbf0bc0a17721')
 
@@ -48,9 +43,8 @@ build() {
 
 package() {
   cd "$srcdir/src"
-  install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach"
-  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
-  install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach"
+  install -Dm755 inputattach "$pkgdir/usr/bin/inputattach"
   install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
+  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
   install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
 }
diff --git a/community/inputattach/inputattach.install b/community/inputattach/inputattach.install
deleted file mode 100644
index d705bceaf..000000000
--- a/community/inputattach/inputattach.install
+++ /dev/null
@@ -1,16 +0,0 @@
-## arg 1:  the new package version
-
-post_upgrade() {
-  (( $(vercmp 1.24-3 $2) > 0 )) && cat <<EOF
-ATTENTION:
-  /etc/conf.d/inputattach.conf has been replaced by /etc/conf.d/inputattach
-  Make sure you adjust the new config file, which has a new format.
-EOF
-}
-
-post_install() {
-  cat << EOF
-The correct device mode and /dev device file will need to be set in
-/etc/conf.d/inputattach before starting /etc/rc.d/inputattach
-EOF
-}
diff --git a/community/inputattach/inputattach.rc.d b/community/inputattach/inputattach.rc.d
deleted file mode 100644
index eb626e199..000000000
--- a/community/inputattach/inputattach.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/inputattach
-
-case "$1" in
-  start)
-    stat_busy "Starting inputattach"
-    for param in "${IAPARAMS[@]}"; do
-      if ! /usr/sbin/inputattach --daemon $param; then
-        stat_fail
-        exit 1
-      fi
-    done
-
-    add_daemon inputattach
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping inputattach"
-    PID=`pidof -o %PPID /usr/sbin/inputattach`
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon inputattach
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl
index 291c531ae..05dfa4af5 100755
--- a/community/inputattach/inputattachctl
+++ b/community/inputattach/inputattachctl
@@ -5,7 +5,7 @@
 case "$1" in
 	start)
 		for i in "${IAPARAMS[@]}"; do
-			/usr/sbin/inputattach --daemon $i || exit 1
+			/usr/bin/inputattach --daemon $i || exit 1
 		done
 		;;
 	stop)