Date: Saturday, January 4, 2014 @ 08:54:01 Author: bpiotrowski Revision: 203088
upgpkg: haveged 1.8-1 - new upstream release Modified: haveged/trunk/PKGBUILD Deleted: haveged/trunk/cleanexit.patch -----------------+ PKGBUILD | 21 +++++++-------------- cleanexit.patch | 21 --------------------- 2 files changed, 7 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-01-03 23:43:22 UTC (rev 203087) +++ PKGBUILD 2014-01-04 07:54:01 UTC (rev 203088) @@ -1,12 +1,12 @@ # $Id$ -# Maintainer: Bartłomiej Piotrowski <[email protected]> +# Maintainer: Bartłomiej Piotrowski <[email protected]> # 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' @@ -13,16 +13,10 @@ license=('GPL') depends=('glibc') source=($url/$pkgname-$_pkgver.tar.gz - service cleanexit.patch) -sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121' - 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12' - 'be896659dd96cb85915ac5a9c2bd8d81d1ff348508362d1b71d64b207f69fa5c') + service) +md5sums=('e0034fd8a645b7499157a31a3e3b224d' + '777c7ac7fa145c03fca3ba9dcd4501de') -prepare() { - cd $pkgname-$_pkgver - patch -Np1 -i ../cleanexit.patch -} - build() { cd $pkgname-$_pkgver ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin @@ -33,7 +27,6 @@ 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 } Deleted: cleanexit.patch =================================================================== --- cleanexit.patch 2014-01-03 23:43:22 UTC (rev 203087) +++ cleanexit.patch 2014-01-04 07:54:01 UTC (rev 203088) @@ -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
