[arch-commits] Commit in rng-tools/trunk (PKGBUILD rngd rngd.service)

[Massimiliano Torromeo]

    Date: Sunday, May 12, 2013 @ 22:48:40
  Author: mtorromeo
Revision: 90468

upgpkg: rng-tools 4-2

Removed rc.d script and moved /usr/sbin to /usr/bin

Modified:
  rng-tools/trunk/PKGBUILD
  rng-tools/trunk/rngd.service
Deleted:
  rng-tools/trunk/rngd

--------------+
 PKGBUILD     |   10 ++++------
 rngd         |   41 -----------------------------------------
 rngd.service |    2 +-
 3 files changed, 5 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 20:43:22 UTC (rev 90467)
+++ PKGBUILD	2013-05-12 20:48:40 UTC (rev 90468)
@@ -3,20 +3,20 @@
 
 pkgname=rng-tools
 pkgver=4
-pkgrel=1
+pkgrel=2
 pkgdesc="Random number generator related utilities"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/gkernel/"
 license=('GPL')
+depends=('glibc')
 backup=(etc/conf.d/rngd)
 source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz
-        rngd
         rngd.conf
         rngd.service)
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
+	./configure --prefix=/usr --sbindir=/usr/bin
 	make
 }
 
@@ -24,11 +24,9 @@
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	install -Dm0644 "$srcdir/rngd.service" "$pkgdir/usr/lib/systemd/system/rngd.service"
-	install -Dm0755 "$srcdir/rngd" "$pkgdir/etc/rc.d/rngd"
 	install -Dm0644 "$srcdir/rngd.conf" "$pkgdir/etc/conf.d/rngd"
 }
 
 sha256sums=('b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195'
-            '45084eff83306c74e707a72b44b5b20d8b94777377af414e1c43f738c7a720ed'
             'a4a19dbe5403b9dcb2bc6b3699dcaba7a47ff3e3ccf58aa3bdbfe14eb1d16003'
-            'abf163089fc466e45955fd0da98a20a966b3b0b4c714c27b470d03fedfc04ca3')
+            'd3e38ac1460e3072792def73281faf5f59dffe9ac43b00916252cc69f7c7d1b5')

Deleted: rngd
===================================================================
--- rngd	2013-05-12 20:43:22 UTC (rev 90467)
+++ rngd	2013-05-12 20:48:40 UTC (rev 90468)
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-rnd_device=/dev/random
-rng_device=/dev/hw_random
-timeout=0
-
-[ -f /etc/conf.d/rngd ] && . /etc/conf.d/rngd
-PID=$(pidof -o %PPID /usr/sbin/rngd)
-case "$1" in
-  start)
-    stat_busy "Starting RNG"
-    [ -z "$PID" ] && /usr/sbin/rngd $RNGD_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rngd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RNG"
-    [ ! -z "$PID" ]  && kill -s SIGALRM $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rngd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0

Modified: rngd.service
===================================================================
--- rngd.service	2013-05-12 20:43:22 UTC (rev 90467)
+++ rngd.service	2013-05-12 20:48:40 UTC (rev 90468)
@@ -3,7 +3,7 @@
 
 [Service]
 EnvironmentFile=/etc/conf.d/rngd
-ExecStart=/usr/sbin/rngd -f $RNGD_OPTS
+ExecStart=/usr/bin/rngd -f $RNGD_OPTS
 
 [Install]
 WantedBy=multi-user.target