[arch-commits] Commit in haveged/trunk (PKGBUILD cleanexit.patch)

[Jan Steffens]

    Date: Tuesday, November 5, 2013 @ 22:52:08
  Author: heftig
Revision: 100563

exit 0 on signal

Added:
  haveged/trunk/cleanexit.patch
Modified:
  haveged/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   12 +++++++++---
 cleanexit.patch |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-05 21:31:17 UTC (rev 100562)
+++ PKGBUILD	2013-11-05 21:52:08 UTC (rev 100563)
@@ -6,7 +6,7 @@
 pkgname=haveged
 pkgver=1.7.c
 _pkgver=${pkgver/.c/c}
-pkgrel=2
+pkgrel=3
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64')
 url='http://www.issihosts.com/haveged'
@@ -13,10 +13,16 @@
 license=('GPL')
 depends=('glibc')
 source=($url/$pkgname-$_pkgver.tar.gz
-        service)
+        service cleanexit.patch)
 sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121'
-            'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12')
+            'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12'
+            'be896659dd96cb85915ac5a9c2bd8d81d1ff348508362d1b71d64b207f69fa5c')
 
+prepare() {
+  cd $pkgname-$_pkgver
+  patch -Np1 -i ../cleanexit.patch
+}
+
 build() {
   cd $pkgname-$_pkgver
   ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin

Added: cleanexit.patch
===================================================================
--- cleanexit.patch	                        (rev 0)
+++ cleanexit.patch	2013-11-05 21:52:08 UTC (rev 100563)
@@ -0,0 +1,21 @@
+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