[arch-commits] Commit in haveged/repos (10 files)
Jan Steffens
heftig at nymeria.archlinux.org
Tue Nov 5 21:52:50 UTC 2013
Date: Tuesday, November 5, 2013 @ 22:52:50
Author: heftig
Revision: 100564
archrelease: copy trunk to community-i686, community-x86_64
Added:
haveged/repos/community-i686/PKGBUILD
(from rev 100563, haveged/trunk/PKGBUILD)
haveged/repos/community-i686/cleanexit.patch
(from rev 100563, haveged/trunk/cleanexit.patch)
haveged/repos/community-i686/service
(from rev 100563, haveged/trunk/service)
haveged/repos/community-x86_64/PKGBUILD
(from rev 100563, haveged/trunk/PKGBUILD)
haveged/repos/community-x86_64/cleanexit.patch
(from rev 100563, haveged/trunk/cleanexit.patch)
haveged/repos/community-x86_64/service
(from rev 100563, haveged/trunk/service)
Deleted:
haveged/repos/community-i686/PKGBUILD
haveged/repos/community-i686/service
haveged/repos/community-x86_64/PKGBUILD
haveged/repos/community-x86_64/service
----------------------------------+
/PKGBUILD | 78 +++++++++++++++++++++++++++++++++++++
/service | 22 ++++++++++
community-i686/PKGBUILD | 33 ---------------
community-i686/cleanexit.patch | 21 +++++++++
community-i686/service | 11 -----
community-x86_64/PKGBUILD | 33 ---------------
community-x86_64/cleanexit.patch | 21 +++++++++
community-x86_64/service | 11 -----
8 files changed, 142 insertions(+), 88 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-11-05 21:52:08 UTC (rev 100563)
+++ community-i686/PKGBUILD 2013-11-05 21:52:50 UTC (rev 100564)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
-# Contributor: kfgz <kfgz at interia dot pl>
-# Contributor: pootzko <pootzko at gmail dot com>
-
-pkgname=haveged
-pkgver=1.7.c
-_pkgver=${pkgver/.c/c}
-pkgrel=2
-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)
-sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121'
- 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12')
-
-build() {
- cd $pkgname-$_pkgver
- ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin
- make
-}
-
-package() {
- cd $pkgname-$_pkgver
- make DESTDIR="$pkgdir" install
-
- rm -rf "$pkgdir"/etc/init.d
- install -D -m644 "$srcdir"/service \
- "$pkgdir"/usr/lib/systemd/system/haveged.service
-}
Copied: haveged/repos/community-i686/PKGBUILD (from rev 100563, haveged/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-11-05 21:52:50 UTC (rev 100564)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Contributor: kfgz <kfgz at interia dot pl>
+# Contributor: pootzko <pootzko at gmail dot com>
+
+pkgname=haveged
+pkgver=1.7.c
+_pkgver=${pkgver/.c/c}
+pkgrel=3
+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
+}
+
+build() {
+ cd $pkgname-$_pkgver
+ ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd $pkgname-$_pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir"/etc/init.d
+ install -D -m644 "$srcdir"/service \
+ "$pkgdir"/usr/lib/systemd/system/haveged.service
+}
Copied: haveged/repos/community-i686/cleanexit.patch (from rev 100563, haveged/trunk/cleanexit.patch)
===================================================================
--- community-i686/cleanexit.patch (rev 0)
+++ community-i686/cleanexit.patch 2013-11-05 21:52:50 UTC (rev 100564)
@@ -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
Deleted: community-i686/service
===================================================================
--- community-i686/service 2013-11-05 21:52:08 UTC (rev 100563)
+++ community-i686/service 2013-11-05 21:52:50 UTC (rev 100564)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Entropy Harvesting Daemon
-Documentation=man:haveged(8)
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/haveged -w 1024 -v 1
-PIDFile=/var/run/haveged.pid
-
-[Install]
-WantedBy=multi-user.target
Copied: haveged/repos/community-i686/service (from rev 100563, haveged/trunk/service)
===================================================================
--- community-i686/service (rev 0)
+++ community-i686/service 2013-11-05 21:52:50 UTC (rev 100564)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Entropy Harvesting Daemon
+Documentation=man:haveged(8)
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/haveged -w 1024 -v 1
+PIDFile=/var/run/haveged.pid
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-11-05 21:52:08 UTC (rev 100563)
+++ community-x86_64/PKGBUILD 2013-11-05 21:52:50 UTC (rev 100564)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
-# Contributor: kfgz <kfgz at interia dot pl>
-# Contributor: pootzko <pootzko at gmail dot com>
-
-pkgname=haveged
-pkgver=1.7.c
-_pkgver=${pkgver/.c/c}
-pkgrel=2
-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)
-sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121'
- 'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12')
-
-build() {
- cd $pkgname-$_pkgver
- ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin
- make
-}
-
-package() {
- cd $pkgname-$_pkgver
- make DESTDIR="$pkgdir" install
-
- rm -rf "$pkgdir"/etc/init.d
- install -D -m644 "$srcdir"/service \
- "$pkgdir"/usr/lib/systemd/system/haveged.service
-}
Copied: haveged/repos/community-x86_64/PKGBUILD (from rev 100563, haveged/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-11-05 21:52:50 UTC (rev 100564)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Contributor: kfgz <kfgz at interia dot pl>
+# Contributor: pootzko <pootzko at gmail dot com>
+
+pkgname=haveged
+pkgver=1.7.c
+_pkgver=${pkgver/.c/c}
+pkgrel=3
+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
+}
+
+build() {
+ cd $pkgname-$_pkgver
+ ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd $pkgname-$_pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir"/etc/init.d
+ install -D -m644 "$srcdir"/service \
+ "$pkgdir"/usr/lib/systemd/system/haveged.service
+}
Copied: haveged/repos/community-x86_64/cleanexit.patch (from rev 100563, haveged/trunk/cleanexit.patch)
===================================================================
--- community-x86_64/cleanexit.patch (rev 0)
+++ community-x86_64/cleanexit.patch 2013-11-05 21:52:50 UTC (rev 100564)
@@ -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
Deleted: community-x86_64/service
===================================================================
--- community-x86_64/service 2013-11-05 21:52:08 UTC (rev 100563)
+++ community-x86_64/service 2013-11-05 21:52:50 UTC (rev 100564)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Entropy Harvesting Daemon
-Documentation=man:haveged(8)
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/haveged -w 1024 -v 1
-PIDFile=/var/run/haveged.pid
-
-[Install]
-WantedBy=multi-user.target
Copied: haveged/repos/community-x86_64/service (from rev 100563, haveged/trunk/service)
===================================================================
--- community-x86_64/service (rev 0)
+++ community-x86_64/service 2013-11-05 21:52:50 UTC (rev 100564)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Entropy Harvesting Daemon
+Documentation=man:haveged(8)
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/haveged -w 1024 -v 1
+PIDFile=/var/run/haveged.pid
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list