main/rng-tools: upgrade to 6.12

Upgrade to latest version.
Remove patches no longer needed.
Remove dependency on libsysfs as no longer needed.

3 files changed, 5 insertions, 94 deletions

diff --git a/main/rng-tools/01-fix-jitter-format-warning.patch b/main/rng-tools/01-fix-jitter-format-warning.patch
deleted file mode 100644
index 1e1319a4385..00000000000
--- a/main/rng-tools/01-fix-jitter-format-warning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Wed, 13 Jan 2021 15:26 +0000
-Subject: [PATCH] rngd_jitter: fix format warning
-
-Fixes compile warning regarding type of an argument.
-
-This has been reported upstream as PR #115.
-
----
-
-diff -aur a/rngd_jitter.c b/rngd_jitter.c
---- a/rngd_jitter.c
-+++ b/rngd_jitter.c
-@@ -143,7 +143,7 @@
- 	size_t total;
- try_again:
- 	while (need) {
--		message_entsrc(ent_src,LOG_DAEMON|LOG_DEBUG, "xread_jitter requests %d bytes from pipe\n", need);
-+		message_entsrc(ent_src,LOG_DAEMON|LOG_DEBUG, "xread_jitter requests %ld bytes from pipe\n", need);
- 		request = read(pipefds[0], &bptr[size-need], need);
- 		if ((request < need) && ent_src->rng_options[JITTER_OPT_USE_AES].int_val) {
- 			message_entsrc(ent_src,LOG_DAEMON|LOG_DEBUG, "xread_jitter falls back to AES\n");
diff --git a/main/rng-tools/02-fix-list-for-enabled-sources.patch b/main/rng-tools/02-fix-list-for-enabled-sources.patch
deleted file mode 100644
index 480b9fdd60c..00000000000
--- a/main/rng-tools/02-fix-list-for-enabled-sources.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Thu, 21 Jan 2021 19:47 +0000
-Subject: [PATCH] Add output to list option for entropy sources that failed init
-
-When we --list entropy source, it may be that a source is enabled at build
-time, but fails at run time due to lack of hw, etc.  Those don't get
-reported with the --list option, so lets add them in for complete reporting.
-
-This patch is already present in upstream master and so can be removed
-in future after version update.
-
----
-
-diff -aur a/rngd.c b/rngd.c
---- a/rngd.c
-+++ b/rngd.c
-@@ -857,6 +857,7 @@
- 				found = 1;
- 				message(LOG_CONS|LOG_INFO, "%d: %s (%s)\n", i,
- 					entropy_sources[i].rng_name, entropy_sources[i].rng_sname);
-+				entropy_sources[i].failed_init = false;
- 			}
- 		if (!found)
- 			message(LOG_CONS|LOG_INFO, "None");
-@@ -874,9 +875,11 @@
- 				ent_src->fipsctx = malloc(sizeof(fips_ctx_t));
- 				fips_init(ent_src->fipsctx, discard_initial_data(ent_src));
- 				message_entsrc(ent_src, LOG_DAEMON|LOG_INFO, "Initialized\n");
-+				ent_src->failed_init = false;
- 			} else {
- 				message_entsrc(ent_src, LOG_DAEMON|LOG_ERR, "Initialization Failed\n");
- 				ent_src->disabled = true;
-+				ent_src->failed_init = true;
- 			}
- 		}
- 	}
-@@ -891,6 +894,14 @@
- 				message(LOG_CONS|LOG_INFO, "%d: %s (%s)\n", i,
- 					entropy_sources[i].rng_name, entropy_sources[i].rng_sname);
- 			}
-+		message(LOG_CONS|LOG_INFO, "Available entropy sources that failed initalization:\n");
-+		for (i=0; i < ENT_MAX; i++)
-+			if (entropy_sources[i].init && entropy_sources[i].disabled == true && entropy_sources[i].failed_init == true) {
-+				rc = 1;
-+				message(LOG_CONS|LOG_INFO, "%d: %s (%s)\n", i,
-+					entropy_sources[i].rng_name, entropy_sources[i].rng_sname);
-+			}
-+
- 		quiet = true;
- 		close_all_entropy_sources();
- 		return rc;
-diff -aur a/rngd.h b/rngd.h
---- a/rngd.h
-+++ b/rngd.h
-@@ -140,6 +140,7 @@
- 	char *rng_fname;
- 	int rng_fd;
- 	bool disabled;
-+	bool failed_init;
- 	int failures;
- 	int success;
- 	size_t ent_gathered;
diff --git a/main/rng-tools/APKBUILD b/main/rng-tools/APKBUILD
index cdddc667ed9..36d57124f61 100644
--- a/main/rng-tools/APKBUILD
+++ b/main/rng-tools/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
 # Maintainer: Dermot Bradley <dermot_bradley@yahoo.com>
 pkgname=rng-tools
-pkgver=6.11
-pkgrel=1
+pkgver=6.12
+pkgrel=0
 pkgdesc="Random number generator daemon"
 url="https://github.com/nhorman/rng-tools"
 arch="all"
@@ -21,7 +21,6 @@ makedepends="
 	libxml2-dev
 	linux-headers
 	openssl-dev
-	sysfsutils-dev
 	"
 options="!check"  # No useful tests to be performed.
 subpackages="
@@ -30,13 +29,11 @@ subpackages="
 	rng-tools-extra:extra
 	rng-tools-extra-openrc:extra_openrc
 	"
-source="rng-tools-$pkgver.tar.gz::https://github.com/nhorman/rng-tools/archive/V$pkgver.tar.gz
+source="rng-tools-$pkgver.tar.gz::https://github.com/nhorman/rng-tools/archive/v$pkgver.tar.gz
 	rngd.confd
 	rngd.initd
 	rngd-extra.confd
 	rngd-extra.initd
-	01-fix-jitter-format-warning.patch
-	02-fix-list-for-enabled-sources.patch
 	"
 
 prepare() {
@@ -105,10 +102,8 @@ extra_openrc() {
 	install -m 755 -D "$srcdir"/rngd-extra.initd "$subpkgdir"/etc/init.d/rngd
 }
 
-sha512sums="0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb  rng-tools-6.11.tar.gz
+sha512sums="56dd334b65dcec1456f8dbdbee5d83590de27cb6ee1b7715828b5316a913557fd178e264139dc92a82e09635ca15b1eb5f6169bfb4412fbe1b06ea28a5064c64  rng-tools-6.12.tar.gz
 7b7bd87ee64417c63ad174da805b01f7287c742af6116091be8ce320b3587db31c15537860cba591f7115bf187541d07ef59df7b726dafccb7d6c8ea64ba22ee  rngd.confd
 08d268b7c00ce5ec2ad69c1b75a53e24e43cabe1dca309c6d693f8681e84b09688bbb8e85594d456cf34b891172e7e6c4f22b5c96c4a76f1e73a6475d70acc1e  rngd.initd
 ee33fd5fbdb0bdad8cb4373f71dc2e2cfdbc554151516daef915f7e6c26e694befd982128794147fb73b15e2ebdbc530b85f9051545967674451cdef23aa1b3d  rngd-extra.confd
-63a8c2cc6aa9be1705ce356988b5f7458d576bb349ae2b388713c971083e407e4877507878f9216304221e99767853d5ca85ac87d2faac99b6e942670e44c891  rngd-extra.initd
-9dbcf618d1cb1c4ec8941676d18979c8b221c2377c421d539e5a7104d6fc6c13f0744b467079d3caf21976a50fcde60a4879c5ebad9fb3e74e282970ab438fe0  01-fix-jitter-format-warning.patch
-ca96e33f9523a0a3c3b27ff99341b6cff44bab8570647cf2dc853988a245c961e0abb6c125517b4333e9813ae3ea0f53b5acb829862bfbd99e6891c4198d39b0  02-fix-list-for-enabled-sources.patch"
+63a8c2cc6aa9be1705ce356988b5f7458d576bb349ae2b388713c971083e407e4877507878f9216304221e99767853d5ca85ac87d2faac99b6e942670e44c891  rngd-extra.initd"