summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2011-04-05 15:05:39 +0000
committerJeremy Olexa <darkside@gentoo.org>2011-04-05 15:05:39 +0000
commit12e71eb693d22bb6ae92142e0c8d95bcef954648 (patch)
treea3c2d348313eb0f590690bebb4bdec85686c8eb6 /sys-apps/timer_entropyd
parenthttp://my.opera.com/desktopteam/blog/2011/04/05/crash-fix-build (diff)
downloadgentoo-2-12e71eb693d22bb6ae92142e0c8d95bcef954648.tar.gz
gentoo-2-12e71eb693d22bb6ae92142e0c8d95bcef954648.tar.bz2
gentoo-2-12e71eb693d22bb6ae92142e0c8d95bcef954648.zip
Revision bump that adds patch to create less logspam, signed off by maintainer
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'sys-apps/timer_entropyd')
-rw-r--r--sys-apps/timer_entropyd/ChangeLog12
-rw-r--r--sys-apps/timer_entropyd/files/timer_entropyd-0.1-syslog.patch28
-rw-r--r--sys-apps/timer_entropyd/metadata.xml3
-rw-r--r--sys-apps/timer_entropyd/timer_entropyd-0.1-r2.ebuild41
4 files changed, 82 insertions, 2 deletions
diff --git a/sys-apps/timer_entropyd/ChangeLog b/sys-apps/timer_entropyd/ChangeLog
index 998f39984e9a..86e5efb70cb9 100644
--- a/sys-apps/timer_entropyd/ChangeLog
+++ b/sys-apps/timer_entropyd/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-apps/timer_entropyd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/timer_entropyd/ChangeLog,v 1.3 2010/10/14 15:05:04 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/timer_entropyd/ChangeLog,v 1.4 2011/04/05 15:05:38 darkside Exp $
+
+*timer_entropyd-0.1-r2 (05 Apr 2011)
+
+ 05 Apr 2011; Jeremy Olexa <darkside@gentoo.org>
+ +timer_entropyd-0.1-r2.ebuild, +files/timer_entropyd-0.1-syslog.patch,
+ metadata.xml:
+ Revision bump that adds patch to create less logspam, signed off by
+ maintainer
14 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
timer_entropyd-0.1-r1.ebuild:
diff --git a/sys-apps/timer_entropyd/files/timer_entropyd-0.1-syslog.patch b/sys-apps/timer_entropyd/files/timer_entropyd-0.1-syslog.patch
new file mode 100644
index 000000000000..91be4a2ffdf0
--- /dev/null
+++ b/sys-apps/timer_entropyd/files/timer_entropyd-0.1-syslog.patch
@@ -0,0 +1,28 @@
+From 51dc916e4466d0033728dd14f318203f995b3ad0 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+Date: Tue, 5 Apr 2011 14:19:49 +0000
+Subject: [PATCH] Move syslog call to ifdef _DEBUG
+
+In order to prevent logfile spamming (once every 7 seconds), move the
+syslog call only be used if compiled with -D_DEBUG
+---
+ main.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/main.c b/main.c
+index 13b95dd..781b321 100644
+--- a/main.c
++++ b/main.c
+@@ -66,8 +66,8 @@ int main(int argc, char *argv[])
+
+ kernel_rng_add_entropy(bytes, sizeof(bytes), cur_n_bits);
+
+- syslog(LOG_DEBUG, "added %d bits of entropy data", cur_n_bits);
+ #ifdef _DEBUG
++ syslog(LOG_DEBUG, "added %d bits of entropy data", cur_n_bits);
+ printf("added %d bits of entropy data\n", cur_n_bits);
+ #endif
+
+--
+1.7.3.4
+
diff --git a/sys-apps/timer_entropyd/metadata.xml b/sys-apps/timer_entropyd/metadata.xml
index e12def24c0a2..9af7d2adfdef 100644
--- a/sys-apps/timer_entropyd/metadata.xml
+++ b/sys-apps/timer_entropyd/metadata.xml
@@ -9,4 +9,7 @@
<email>pavel.stratil-jun@fenix.cz</email>
<description>Proxied co-maintainer, CC on all bugs</description>
</maintainer>
+ <use>
+ <flag name='debug'>Enable printf debugging and logging to the syslog at DEBUG level</flag>
+ </use>
</pkgmetadata>
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.1-r2.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.1-r2.ebuild
new file mode 100644
index 000000000000..40d5e4a9c990
--- /dev/null
+++ b/sys-apps/timer_entropyd/timer_entropyd-0.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/timer_entropyd/timer_entropyd-0.1-r2.ebuild,v 1.1 2011/04/05 15:05:38 darkside Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A timer-based entropy generator"
+HOMEPAGE="http://www.vanheusden.com/te/"
+SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+src_prepare() {
+ sed -i -e 's:-O2::' Makefile || die
+ epatch "${FILESDIR}"/${P}-syslog.patch
+}
+
+src_compile() {
+ use debug && append-flags -D_DEBUG
+
+ tc-export CC
+ emake DEBUG= || die
+}
+
+src_install() {
+ exeinto /usr/libexec
+ doexe ${PN} || die "doexe failed"
+ dodoc Changes readme.txt || die
+ newinitd "${FILESDIR}/timer_entropyd.initd" ${PN} || die
+}
+
+pkg_postinst() {
+ elog "To start ${PN} at boot do rc-update add ${PN} default"
+ elog "To start ${PN} now do /etc/init.d/${PN} start"
+ elog "To check the amount of entropy, cat /proc/sys/kernel/random/entropy_avail"
+}