From 766ac5d06501d7d7306c1e184a10ac99add9ea9f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 31 Mar 2021 20:50:01 +0200 Subject: [PATCH] package/haveged: bump version to 1.9.14 - change clock_gettime option from yes/no style to disable/enable one (still omitting the explicit disable to keep the configure logic defaulting to yes in case no rdtsc is available) - change to set all available configure options: * '--enable-daemon': previous default * '--disable-diagnostic': previous default * '-disable-init': do not install init files as buildroot ships its own sysv/systemd init files * '--disable-nistest': disable tests, previous default * '--disable-enttest': new option, disable tests * '--disable-olt': previous default was yes, disable builtin test * '--enable-tune': previous default - add patch to fix uclibc compile (disable dependency on sys/auxv.h introduced with upstream commit [1]) Changelog ([2]): - made enttest configurable - havegecmd.c - new command added to close the communication socket [Werner Fink] [1] https://github.com/jirka-h/haveged/commit/26d35af198da01220ba4f7a1b987f17012476c00 [2] https://github.com/jirka-h/haveged/releases/tag/v1.9.14 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...Check-for-sys-auxv.h-before-using-it.patch | 60 +++++++++++++++++++ package/haveged/haveged.hash | 2 +- package/haveged/haveged.mk | 22 ++++++- 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 package/haveged/0001-Check-for-sys-auxv.h-before-using-it.patch diff --git a/package/haveged/0001-Check-for-sys-auxv.h-before-using-it.patch b/package/haveged/0001-Check-for-sys-auxv.h-before-using-it.patch new file mode 100644 index 0000000000..042135f127 --- /dev/null +++ b/package/haveged/0001-Check-for-sys-auxv.h-before-using-it.patch @@ -0,0 +1,60 @@ +From 676abde95bab10e1d26e91682772514010143343 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 21 Mar 2021 17:00:08 +0100 +Subject: [PATCH] Check for sys/auxv.h before using it. + +- fixes uclibc-ng compile (does not provide sys/auxv.h header file) + +Fixes: + + haveged.c:22:10: fatal error: sys/auxv.h: No such file or directory + 22 | #include + | ^~~~~~~~~~~~ + +[Upstream: https://github.com/jirka-h/haveged/pull/59] +Signed-off-by: Peter Seiderer +--- + configure.ac | 1 + + src/haveged.c | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index c172a10..a0263f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -125,6 +125,7 @@ AC_CHECK_HEADERS(stdio.h) + AC_CHECK_HEADERS(stdlib.h) + AC_CHECK_HEADERS(string.h) + AC_CHECK_HEADERS(sys/ioctl.h) ++AC_CHECK_HEADERS(sys/auxv.h) + AC_CHECK_HEADERS(sys/mman.h) + AC_CHECK_HEADERS(sys/types.h) + AC_CHECK_HEADERS(sys/socket.h) +diff --git a/src/haveged.c b/src/haveged.c +index b9cb77b..dad3072 100644 +--- a/src/haveged.c ++++ b/src/haveged.c +@@ -19,7 +19,9 @@ + ** along with this program. If not, see . + */ + #include "config.h" ++#if defined(HAVE_SYS_AUXV_H) + #include ++#endif + #include + #include + #include +@@ -135,8 +137,10 @@ int main(int argc, char **argv) + { + volatile char *path = strdup(argv[0]); + volatile char *arg0 = argv[0]; ++#if defined(HAVE_SYS_AUXV_H) + if (path[0] != '/') + path = (char*)getauxval(AT_EXECFN); ++#endif + static const char* cmds[] = { + "b", "buffer", "1", SETTINGR("Buffer size [KW], default: ",COLLECT_BUFSIZE), + "d", "data", "1", SETTINGR("Data cache size [KB], with fallback to: ", GENERIC_DCACHE ), +-- +2.30.2 + diff --git a/package/haveged/haveged.hash b/package/haveged/haveged.hash index df8c48e214..f55e004923 100644 --- a/package/haveged/haveged.hash +++ b/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d17bd22fa1745daca5ac72e014ed3b0fe5720da4c115953124b1bf2a0aa2b04b haveged-1.9.13.tar.gz +sha256 938cb494bcad7e4f24e61eb50fab4aa0acbc3240c80f3ad5c6cf7e6e922618c3 haveged-1.9.14.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index 3980f80132..5d76bdc3c9 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -4,14 +4,32 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.13 +HAVEGED_VERSION = 1.9.14 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING HAVEGED_SELINUX_MODULES = entropyd +# patch touching configure.ac +HAVEGED_AUTORECONF = YES + +# '--disable-init' as buildroot ships its own sysv/systemd init files +HAVEGED_CONF_OPTS = \ + --enable-daemon \ + --disable-diagnostic \ + --disable-init \ + --disable-nistest \ + --disable-enttest \ + --disable-olt \ + --enable-tune ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -HAVEGED_CONF_OPTS += --enable-clock_gettime=yes +HAVEGED_CONF_OPTS += --enable-clock_gettime +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +HAVEGED_CONF_OPTS += --enable-threads +else +HAVEGED_CONF_OPTS += --disable-threads endif define HAVEGED_INSTALL_INIT_SYSV -- 2.30.2