diff options
Diffstat (limited to 'extra/haveged')
-rw-r--r-- | extra/haveged/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/haveged/cleanexit.patch | 21 |
2 files changed, 8 insertions, 36 deletions
diff --git a/extra/haveged/PKGBUILD b/extra/haveged/PKGBUILD index a404e9c06..be9c9dea8 100644 --- a/extra/haveged/PKGBUILD +++ b/extra/haveged/PKGBUILD @@ -1,27 +1,21 @@ -# $Id: PKGBUILD 199016 2013-11-06 11:28:54Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 203089 2014-01-04 07:54:11Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: kfgz <kfgz at interia dot pl> # Contributor: pootzko <pootzko at gmail dot com> pkgname=haveged -pkgver=1.7.c +pkgver=1.8 _pkgver=${pkgver/.c/c} -pkgrel=3 +pkgrel=1 pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64') url='http://www.issihosts.com/haveged' license=('GPL') depends=('glibc') source=($url/$pkgname-$_pkgver.tar.gz - service cleanexit.patch) -sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121' - 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12' - 'be896659dd96cb85915ac5a9c2bd8d81d1ff348508362d1b71d64b207f69fa5c') - -prepare() { - cd $pkgname-$_pkgver - patch -Np1 -i ../cleanexit.patch -} + service) +md5sums=('e0034fd8a645b7499157a31a3e3b224d' + '777c7ac7fa145c03fca3ba9dcd4501de') build() { cd $pkgname-$_pkgver @@ -33,7 +27,6 @@ package() { cd $pkgname-$_pkgver make DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/etc/init.d - install -D -m644 "$srcdir"/service \ + install -Dm644 "$srcdir"/service \ "$pkgdir"/usr/lib/systemd/system/haveged.service } diff --git a/extra/haveged/cleanexit.patch b/extra/haveged/cleanexit.patch deleted file mode 100644 index 01f8c7f94..000000000 --- a/extra/haveged/cleanexit.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r haveged-1.7c/src/haveged.c haveged-1.7c-cleanexit/src/haveged.c ---- haveged-1.7c/src/haveged.c 2013-01-12 19:20:04.000000000 +0100 -+++ haveged-1.7c-cleanexit/src/haveged.c 2013-11-05 22:40:22.202935493 +0100 -@@ -642,7 +642,16 @@ - static void tidy_exit( /* OUT: nothing */ - int signum) /* IN: signal number */ - { -- error_exit("Stopping due to signal %d\n", signum); -+#ifndef NO_DAEMON -+ if (params->detached!=0) { -+ unlink(params->pid_file); -+ syslog(LOG_INFO, "%s Stopping due to signal %d", params->daemon, signum); -+ } -+ else -+#endif -+ fprintf(stderr, "%s Stopping due to signal %d\n", params->daemon, signum); -+ havege_destroy(handle); -+ exit(0); - } - /** - * send usage display to stderr |