5 files changed, 18 insertions, 87 deletions
diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD
index 2c27c4d2e..6345b3475 100644
--- a/community/osiris/PKGBUILD
+++ b/community/osiris/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78366 2012-10-17 15:27:49Z spupykin $
+# $Id: PKGBUILD 91866 2013-05-28 17:38:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: jlvsimoes
 
 pkgname=osiris
 pkgver=4.2.3
-pkgrel=5
+pkgrel=7
 pkgdesc="A file integrity management system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://osiris.shmoo.com/"
@@ -13,35 +13,36 @@ depends=('openssl' 'readline')
 install=$pkgname.install
 #source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz
 source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz
-	osirismd.init
-	osirisd.init
 	osirismd.service
 	osirisd.service)
 md5sums=('1951c7dc0fe729af9ffaf58910340d12'
-         '96c1ba5433bd0ed7d9520583a07b9bdd'
-         'b6dde0a539ca798fa81489f717507f25'
-         '48644676b88b231803785b8e2da956e5'
-         'c0355b453770f6bbc6a58f5cd80766b4')
+         '8398d60bcbf0c90034473365abc3ece6'
+         '758d029a1ff53be11756330de595e77f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt
-  mkdir -p $pkgdir/etc/rc.d
 
-  ./configure --prefix=/usr --enable-fancy-cli  --with-md-root-dir=/usr/share/$pkgname --build=$CHOST
+  sed -i "s|/sbin|/bin|g" src/install/install.sh.in
+
+  ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST \
+    --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname
   make all
 
   # Arch-ify install locations
   sed -i "s|^INSTALL_OSIRISM=0|INSTALL_OSIRISM=1|" src/install/install.sh
   sed -i "s|^INSTALL_OSIRISD=0|INSTALL_OSIRISD=1|" src/install/install.sh
   sed -i "s|^ROOT_GROUP=wheel|ROOT_GROUP=root|" src/install/install.sh
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  mkdir -p $pkgdir/usr/share/licenses/$pkgname/
+  install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt
 
   make DESTDIR=$pkgdir install
 
-  install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd
-  install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd
-  rm -rf $pkgdir/usr/osiris
+  rm -rf $pkgdir/usr/osiris $pkgdir/etc/init.d
 
   install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service
   install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service
diff --git a/community/osiris/osirisd.init b/community/osiris/osirisd.init
deleted file mode 100644
index 8262d902e..000000000
--- a/community/osiris/osirisd.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-LOCKFILE=/var/run/osirisd.lock
-
-case "$1" in
-  start)
-    stat_busy "Starting Osiris Scanning Daemon"
-    [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && /usr/sbin/osirisd && touch $LOCKFILE
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Osiris Scanning Daemon"
-    [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirisd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service
index 199737c9f..3b162160f 100644
--- a/community/osiris/osirisd.service
+++ b/community/osiris/osirisd.service
@@ -4,7 +4,7 @@ Description=A file integrity management system
 [Service]
 User=osiris
 Type=forking
-ExecStart=/usr/sbin/osirisd
+ExecStart=/usr/bin/osirisd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/osiris/osirismd.init b/community/osiris/osirismd.init
deleted file mode 100644
index 0bdae5e10..000000000
--- a/community/osiris/osirismd.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-LOCKFILE=/var/run/osirismd.lock
-
-case "$1" in
-  start)
-    stat_busy "Starting Osiris Management Daemon"
-    [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && touch $LOCKFILE && /usr/sbin/osirismd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Osiris Management Daemon"
-    [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirismd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service
index d51cef22c..ec4c40702 100644
--- a/community/osiris/osirismd.service
+++ b/community/osiris/osirismd.service
@@ -4,7 +4,7 @@ Description=A file integrity management system
 [Service]
 User=osiris
 Type=forking
-ExecStart=/usr/sbin/osirismd
+ExecStart=/usr/bin/osirismd
 
 [Install]
 WantedBy=multi-user.target