Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

3 files changed, 9 insertions, 81 deletions

diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD
index 2c27c4d2e..dd35bcb2f 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 90697 2013-05-13 14:32:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: jlvsimoes
 
 pkgname=osiris
 pkgver=4.2.3
-pkgrel=5
+pkgrel=6
 pkgdesc="A file integrity management system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://osiris.shmoo.com/"
@@ -13,21 +13,14 @@ 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')
 
 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
   make all
@@ -36,11 +29,16 @@ build() {
   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
 
   install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.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/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