Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/gambas3/PKGBUILD
	community-staging/libextractor/PKGBUILD
	community/haveged/PKGBUILD
	community/libfm/PKGBUILD
	core/lvm2/PKGBUILD
	extra/geeqie/PKGBUILD
	staging/calligra/PKGBUILD

3 files changed, 68 insertions, 14 deletions

diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index cb66c777b..4b38607e7 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 72028 2012-06-06 10:37:52Z heftig $
+# $Id: PKGBUILD 75053 2012-08-13 05:31:00Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.4
-pkgrel=3
-pkgdesc="Entropy harvesting daemon using CPU timings"
+pkgver=1.5
+pkgrel=1
+pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.issihosts.com/haveged"
+url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
 source=(${url}/${pkgname}-${pkgver}.tar.gz
-        haveged haveged.service)
-md5sums=('39a03d4b8a4225706f78dbef3f623b0e'
+        rc.d service)
+md5sums=('89ea7d79c76160f13065301d952091d7'
          '264b725be5271288b40f363d7cfc6b68'
          'fc62a480f520377364503aca9efff0b0')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver/a/}
+  cd $srcdir/$pkgname-${pkgver/a/}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver/a/}
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc/init.d
+  cd $srcdir/$pkgname-${pkgver/a/}
+  make DESTDIR=$pkgdir install
+  rm -rf $pkgdir/etc/init.d
 
-  cd "${srcdir}"
-  install -D -m755 haveged "${pkgdir}"/etc/rc.d/haveged
-  install -D -m644 haveged.service "${pkgdir}"/usr/lib/systemd/system/haveged.service
+  install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/haveged
+  install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service
 }
diff --git a/community/haveged/rc.d b/community/haveged/rc.d
new file mode 100644
index 000000000..c0e13b40d
--- /dev/null
+++ b/community/haveged/rc.d
@@ -0,0 +1,44 @@
+#!/bin/bash
+##
+# chkconfig: 2345 75 25
+# description: havege entropy daemon
+#
+# source function library
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+RETVAL=0
+prog="haveged"
+
+case "$1" in
+start)
+  stat_busy $"Starting $prog"
+  /usr/sbin/$prog -w 1024 -v 1
+  if [ $? -gt 0 ]; then
+    stat_fail
+  else
+    add_daemon $prog
+    stat_done
+  fi
+  ;;
+
+stop)
+  stat_busy $"Stopping $prog"
+  kill `cat /var/run/$prog.pid`
+  if [ $? -gt 0 ]; then
+    stat_fail
+  else
+    rm_daemon $prog
+    stat_done
+    rm -f /var/lock/$prog
+  fi
+  ;;
+  
+restart)
+  $0 stop
+  $0 start
+  ;;
+
+*)
+  echo "usage: $prog [start|stop|restart]"
+esac
diff --git a/community/haveged/service b/community/haveged/service
new file mode 100644
index 000000000..6803a0dec
--- /dev/null
+++ b/community/haveged/service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Entropy Harvesting Daemon
+Documentation=man:haveged(8)
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/haveged -w 1024 -v 1
+PIDFile=/var/run/haveged.pid
+
+[Install]
+WantedBy=multi-user.target