Date: Thursday, March 5, 2015 @ 12:10:39
Author: mtorromeo
Revision: 128756
archrelease: copy trunk to community-i686, community-x86_64
Added:
rng-tools/repos/community-i686/PKGBUILD
(from rev 128755, rng-tools/trunk/PKGBUILD)
rng-tools/repos/community-i686/rngd-test-signal-in-loop.patch
(from rev 128755, rng-tools/trunk/rngd-test-signal-in-loop.patch)
rng-tools/repos/community-i686/rngd.conf
(from rev 128755, rng-tools/trunk/rngd.conf)
rng-tools/repos/community-i686/rngd.service
(from rev 128755, rng-tools/trunk/rngd.service)
rng-tools/repos/community-x86_64/PKGBUILD
(from rev 128755, rng-tools/trunk/PKGBUILD)
rng-tools/repos/community-x86_64/rngd-test-signal-in-loop.patch
(from rev 128755, rng-tools/trunk/rngd-test-signal-in-loop.patch)
rng-tools/repos/community-x86_64/rngd.conf
(from rev 128755, rng-tools/trunk/rngd.conf)
rng-tools/repos/community-x86_64/rngd.service
(from rev 128755, rng-tools/trunk/rngd.service)
Deleted:
rng-tools/repos/community-i686/PKGBUILD
rng-tools/repos/community-i686/rngd.conf
rng-tools/repos/community-i686/rngd.service
rng-tools/repos/community-x86_64/PKGBUILD
rng-tools/repos/community-x86_64/rngd.conf
rng-tools/repos/community-x86_64/rngd.service
-------------------------------------------------+
/PKGBUILD | 80 ++++++++++++++++++++++
/rngd.conf | 2
/rngd.service | 20 +++++
community-i686/PKGBUILD | 33 ---------
community-i686/rngd-test-signal-in-loop.patch | 36 +++++++++
community-i686/rngd.conf | 1
community-i686/rngd.service | 10 --
community-x86_64/PKGBUILD | 33 ---------
community-x86_64/rngd-test-signal-in-loop.patch | 36 +++++++++
community-x86_64/rngd.conf | 1
community-x86_64/rngd.service | 10 --
11 files changed, 174 insertions(+), 88 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-03-05 11:09:52 UTC (rev 128755)
+++ community-i686/PKGBUILD 2015-03-05 11:10:39 UTC (rev 128756)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <[email protected]>
-# Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk>
-
-pkgname=rng-tools
-pkgver=5
-pkgrel=2
-pkgdesc="Random number generator related utilities"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/gkernel/";
-license=('GPL')
-depends=('libgcrypt')
-backup=(etc/conf.d/rngd)
-source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz
- rngd.conf
- rngd.service)
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm0644 "$srcdir"/rngd.service
"$pkgdir"/usr/lib/systemd/system/rngd.service
- install -Dm0644 "$srcdir"/rngd.conf "$pkgdir"/etc/conf.d/rngd
-}
-
-sha256sums=('60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e'
- 'f4fd197dd682cdab07ddeabe8d3b73b1bc2e1cf322237be238a26b49a7dcb047'
- '33c2ab16ca13bc5275f0f1280bfa0dbf37c66d4a96e492774a4587a17946957d')
Copied: rng-tools/repos/community-i686/PKGBUILD (from rev 128755,
rng-tools/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-03-05 11:10:39 UTC (rev 128756)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <[email protected]>
+# Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk>
+
+pkgname=rng-tools
+pkgver=5
+pkgrel=3
+pkgdesc="Random number generator related utilities"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/gkernel/";
+license=('GPL')
+depends=('libgcrypt')
+backup=(etc/conf.d/rngd)
+source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz
+ rngd.conf
+ rngd.service
+ rngd-test-signal-in-loop.patch)
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+ patch -p1 -i "$srcdir"/rngd-test-signal-in-loop.patch
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm0644 "$srcdir"/rngd.service
"$pkgdir"/usr/lib/systemd/system/rngd.service
+ install -Dm0644 "$srcdir"/rngd.conf "$pkgdir"/etc/conf.d/rngd
+}
+
+sha256sums=('60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e'
+ 'f4fd197dd682cdab07ddeabe8d3b73b1bc2e1cf322237be238a26b49a7dcb047'
+ '33c2ab16ca13bc5275f0f1280bfa0dbf37c66d4a96e492774a4587a17946957d'
+ 'fec42e65a2f48a4b1a96d839b45d5890651877016f4767f63a5186424dd61a2d')
Copied: rng-tools/repos/community-i686/rngd-test-signal-in-loop.patch (from rev
128755, rng-tools/trunk/rngd-test-signal-in-loop.patch)
===================================================================
--- community-i686/rngd-test-signal-in-loop.patch
(rev 0)
+++ community-i686/rngd-test-signal-in-loop.patch 2015-03-05 11:10:39 UTC
(rev 128756)
@@ -0,0 +1,36 @@
+From: Leonardo Chiquitto <[email protected]>
+Subject: Check for signals in update_kernel_random()
+
+When running as a daemon, a signal handler is installed to catch
+SIGINT/SIGTERM. This handler sets a flag that's tested in the main
+loop. However, rngd loops in update_kernel_random() as well, where
+the flag was not tested.
+
+This patch adds the check to update_kernel_random() so that the
+daemon exits properly after receiving a SIGINT/SIGTERM signal.
+
+Index: rng-tools-5/rngd.c
+===================================================================
+--- rng-tools-5.orig/rngd.c
++++ rng-tools-5/rngd.c
+@@ -218,6 +218,8 @@ static int update_kernel_random(int rand
+
+ for (p = buf; p + random_step <= &buf[FIPS_RNG_BUFFER_SIZE];
+ p += random_step) {
++ if (!server_running)
++ return 0;
+ random_add_entropy(p, random_step);
+ random_sleep();
+ }
+@@ -239,10 +241,10 @@ static void do_loop(int random_step)
+ {
+ int rc;
+
++ retry_same:
+ if (!server_running)
+ return;
+
+- retry_same:
+ if (iter->disabled)
+ continue; /* failed, no work */
+
Deleted: community-i686/rngd.conf
===================================================================
--- community-i686/rngd.conf 2015-03-05 11:09:52 UTC (rev 128755)
+++ community-i686/rngd.conf 2015-03-05 11:10:39 UTC (rev 128756)
@@ -1 +0,0 @@
-RNGD_OPTS=""
Copied: rng-tools/repos/community-i686/rngd.conf (from rev 128755,
rng-tools/trunk/rngd.conf)
===================================================================
--- community-i686/rngd.conf (rev 0)
+++ community-i686/rngd.conf 2015-03-05 11:10:39 UTC (rev 128756)
@@ -0,0 +1 @@
+RNGD_OPTS=""
Deleted: community-i686/rngd.service
===================================================================
--- community-i686/rngd.service 2015-03-05 11:09:52 UTC (rev 128755)
+++ community-i686/rngd.service 2015-03-05 11:10:39 UTC (rev 128756)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/rngd
-ExecStart=/usr/bin/rngd $RNGD_OPTS
-
-[Install]
-WantedBy=multi-user.target
Copied: rng-tools/repos/community-i686/rngd.service (from rev 128755,
rng-tools/trunk/rngd.service)
===================================================================
--- community-i686/rngd.service (rev 0)
+++ community-i686/rngd.service 2015-03-05 11:10:39 UTC (rev 128756)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Hardware RNG Entropy Gatherer Daemon
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/rngd
+ExecStart=/usr/bin/rngd $RNGD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-03-05 11:09:52 UTC (rev 128755)
+++ community-x86_64/PKGBUILD 2015-03-05 11:10:39 UTC (rev 128756)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <[email protected]>
-# Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk>
-
-pkgname=rng-tools
-pkgver=5
-pkgrel=2
-pkgdesc="Random number generator related utilities"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/gkernel/";
-license=('GPL')
-depends=('libgcrypt')
-backup=(etc/conf.d/rngd)
-source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz
- rngd.conf
- rngd.service)
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm0644 "$srcdir"/rngd.service
"$pkgdir"/usr/lib/systemd/system/rngd.service
- install -Dm0644 "$srcdir"/rngd.conf "$pkgdir"/etc/conf.d/rngd
-}
-
-sha256sums=('60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e'
- 'f4fd197dd682cdab07ddeabe8d3b73b1bc2e1cf322237be238a26b49a7dcb047'
- '33c2ab16ca13bc5275f0f1280bfa0dbf37c66d4a96e492774a4587a17946957d')
Copied: rng-tools/repos/community-x86_64/PKGBUILD (from rev 128755,
rng-tools/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-03-05 11:10:39 UTC (rev 128756)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <[email protected]>
+# Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk>
+
+pkgname=rng-tools
+pkgver=5
+pkgrel=3
+pkgdesc="Random number generator related utilities"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/gkernel/";
+license=('GPL')
+depends=('libgcrypt')
+backup=(etc/conf.d/rngd)
+source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz
+ rngd.conf
+ rngd.service
+ rngd-test-signal-in-loop.patch)
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+ patch -p1 -i "$srcdir"/rngd-test-signal-in-loop.patch
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm0644 "$srcdir"/rngd.service
"$pkgdir"/usr/lib/systemd/system/rngd.service
+ install -Dm0644 "$srcdir"/rngd.conf "$pkgdir"/etc/conf.d/rngd
+}
+
+sha256sums=('60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e'
+ 'f4fd197dd682cdab07ddeabe8d3b73b1bc2e1cf322237be238a26b49a7dcb047'
+ '33c2ab16ca13bc5275f0f1280bfa0dbf37c66d4a96e492774a4587a17946957d'
+ 'fec42e65a2f48a4b1a96d839b45d5890651877016f4767f63a5186424dd61a2d')
Copied: rng-tools/repos/community-x86_64/rngd-test-signal-in-loop.patch (from
rev 128755, rng-tools/trunk/rngd-test-signal-in-loop.patch)
===================================================================
--- community-x86_64/rngd-test-signal-in-loop.patch
(rev 0)
+++ community-x86_64/rngd-test-signal-in-loop.patch 2015-03-05 11:10:39 UTC
(rev 128756)
@@ -0,0 +1,36 @@
+From: Leonardo Chiquitto <[email protected]>
+Subject: Check for signals in update_kernel_random()
+
+When running as a daemon, a signal handler is installed to catch
+SIGINT/SIGTERM. This handler sets a flag that's tested in the main
+loop. However, rngd loops in update_kernel_random() as well, where
+the flag was not tested.
+
+This patch adds the check to update_kernel_random() so that the
+daemon exits properly after receiving a SIGINT/SIGTERM signal.
+
+Index: rng-tools-5/rngd.c
+===================================================================
+--- rng-tools-5.orig/rngd.c
++++ rng-tools-5/rngd.c
+@@ -218,6 +218,8 @@ static int update_kernel_random(int rand
+
+ for (p = buf; p + random_step <= &buf[FIPS_RNG_BUFFER_SIZE];
+ p += random_step) {
++ if (!server_running)
++ return 0;
+ random_add_entropy(p, random_step);
+ random_sleep();
+ }
+@@ -239,10 +241,10 @@ static void do_loop(int random_step)
+ {
+ int rc;
+
++ retry_same:
+ if (!server_running)
+ return;
+
+- retry_same:
+ if (iter->disabled)
+ continue; /* failed, no work */
+
Deleted: community-x86_64/rngd.conf
===================================================================
--- community-x86_64/rngd.conf 2015-03-05 11:09:52 UTC (rev 128755)
+++ community-x86_64/rngd.conf 2015-03-05 11:10:39 UTC (rev 128756)
@@ -1 +0,0 @@
-RNGD_OPTS=""
Copied: rng-tools/repos/community-x86_64/rngd.conf (from rev 128755,
rng-tools/trunk/rngd.conf)
===================================================================
--- community-x86_64/rngd.conf (rev 0)
+++ community-x86_64/rngd.conf 2015-03-05 11:10:39 UTC (rev 128756)
@@ -0,0 +1 @@
+RNGD_OPTS=""
Deleted: community-x86_64/rngd.service
===================================================================
--- community-x86_64/rngd.service 2015-03-05 11:09:52 UTC (rev 128755)
+++ community-x86_64/rngd.service 2015-03-05 11:10:39 UTC (rev 128756)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/rngd
-ExecStart=/usr/bin/rngd $RNGD_OPTS
-
-[Install]
-WantedBy=multi-user.target
Copied: rng-tools/repos/community-x86_64/rngd.service (from rev 128755,
rng-tools/trunk/rngd.service)
===================================================================
--- community-x86_64/rngd.service (rev 0)
+++ community-x86_64/rngd.service 2015-03-05 11:10:39 UTC (rev 128756)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Hardware RNG Entropy Gatherer Daemon
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/rngd
+ExecStart=/usr/bin/rngd $RNGD_OPTS
+
+[Install]
+WantedBy=multi-user.target
