| Message ID | 20210331185001.24790-1-ps.report@gmx.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] package/haveged: bump version to 1.9.14 | expand |
Peter, All, On 2021-03-31 20:50 +0200, Peter Seiderer spake thusly: > - add patch to fix uclibc compile (disable dependency on sys/auxv.h > introduced with upstream commit [1]) [--SNIP--] > 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 <ps.report@gmx.net> > +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 <sys/auxv.h> > + | ^~~~~~~~~~~~ > + > +[Upstream: https://github.com/jirka-h/haveged/pull/59] Upstream has merged your patch, hwever I think it is flawed, see below... > +Signed-off-by: Peter Seiderer <ps.report@gmx.net> [--SNIP--] > +diff --git a/src/haveged.c b/src/haveged.c > +index b9cb77b..dad3072 100644 > +--- a/src/haveged.c > ++++ b/src/haveged.c > +@@ -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 Are you sure this is correct? Later on in that file, 'path' is forcibly assigned as thus: 200 path[0] = '/'; And then, 'path' is used to start the daemon: 527 else run_daemon(handle, path, argv); So, if the original argv[0] does not start with a '/' (e.g. because it is called from the PATH), then 'path' will contain a mangled program name: argv[0] = "haveged" path = strdup(argv[0]) = "haveged" and thus with line 200: path = "/aveged" Did I miss something? Regards, Yann E. MORIN. > + 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 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Hello Yann, On Wed, 31 Mar 2021 22:07:10 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > Peter, All, > > On 2021-03-31 20:50 +0200, Peter Seiderer spake thusly: > > - add patch to fix uclibc compile (disable dependency on sys/auxv.h > > introduced with upstream commit [1]) > [--SNIP--] > > 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 <ps.report@gmx.net> > > +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 <sys/auxv.h> > > + | ^~~~~~~~~~~~ > > + > > +[Upstream: https://github.com/jirka-h/haveged/pull/59] > > Upstream has merged your patch, hwever I think it is flawed, see > below... > > > +Signed-off-by: Peter Seiderer <ps.report@gmx.net> > [--SNIP--] > > +diff --git a/src/haveged.c b/src/haveged.c > > +index b9cb77b..dad3072 100644 > > +--- a/src/haveged.c > > ++++ b/src/haveged.c > > +@@ -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 This is the fallback in case haveged is started without an absolute path, note the buildroot start scripts use an absolute path... > > Are you sure this is correct? Later on in that file, 'path' is > assigned as thus: > > 200 path[0] = '/'; With the full context: 197 first_byte = arg0[0]; 198 if (access("/etc/initrd-release", F_OK) >= 0) { 199 arg0[0] = '@'; 200 path[0] = '/'; 201 } This is only used in case /etc/initrd-release exists... > > And then, 'path' is used to start the daemon: > > 527 else run_daemon(handle, path, argv); > > So, if the original argv[0] does not start with a '/' (e.g. because it > is called from the PATH), then 'path' will contain a mangled program > name: > > argv[0] = "haveged" > path = strdup(argv[0]) = "haveged" > > and thus with line 200: > path = "/aveged" > > Did I miss something? If not started with absolute path and /etc/initrd-release exists (both not valid for buildroot or easy to avoid)... And as good/usable as before upstream commit [1]..., only possible improvement would be to error out (with an early and meaningful error message) in case not started with absolute path and in case getauxval() is not available (instead of error out later with with some unusual path/executable name in the error message) and remove the redundant forcibly set of path[0]? Regards, Peter [1] https://github.com/jirka-h/haveged/commit/26d35af198da01220ba4f7a1b987f17012476c00 > > Regards, > Yann E. MORIN. > > > + 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 > > > > _______________________________________________ > > buildroot mailing list > > buildroot@busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot >
Peter, All, On 2021-03-31 23:52 +0200, Peter Seiderer spake thusly: > On Wed, 31 Mar 2021 22:07:10 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > > On 2021-03-31 20:50 +0200, Peter Seiderer spake thusly: > > > - add patch to fix uclibc compile (disable dependency on sys/auxv.h > > > introduced with upstream commit [1]) [--SNIP--] > > Upstream has merged your patch, hwever I think it is flawed, see > > below... > > > > > +Signed-off-by: Peter Seiderer <ps.report@gmx.net> > > [--SNIP--] > > > +diff --git a/src/haveged.c b/src/haveged.c > > > +index b9cb77b..dad3072 100644 > > > +--- a/src/haveged.c > > > ++++ b/src/haveged.c > > > +@@ -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 > > This is the fallback in case haveged is started without an absolute path, > note the buildroot start scripts use an absolute path... Yes, this is the case for Buildroot. But will this *always* be the case in *all* potential setups? What of people debugging their systems and running the program manually? > > Are you sure this is correct? Later on in that file, 'path' is > > assigned as thus: > > > > 200 path[0] = '/'; > > With the full context: > > 197 first_byte = arg0[0]; > 198 if (access("/etc/initrd-release", F_OK) >= 0) { > 199 arg0[0] = '@'; > 200 path[0] = '/'; > 201 } > > This is only used in case /etc/initrd-release exists... Again, even if that does not exist in Buildroot, the check is here and may sometime be hit. > > And then, 'path' is used to start the daemon: > > > > 527 else run_daemon(handle, path, argv); > > > > So, if the original argv[0] does not start with a '/' (e.g. because it > > is called from the PATH), then 'path' will contain a mangled program > > name: > > > > argv[0] = "haveged" > > path = strdup(argv[0]) = "haveged" > > > > and thus with line 200: > > path = "/aveged" > > > > Did I miss something? > > If not started with absolute path and /etc/initrd-release exists (both not > valid for buildroot or easy to avoid)... Having both is probably not very often, but still. Again, in the more general case, i.e. not limited to Buildroot, this now-upstream change does introduce a latent bug. Starting without a full path is trivial: log on to the device, and run the daemon in foreground to debug it. /etc/initrd-release is defined by systemd, so this is not a random file either: https://systemd.io/INITRD_INTERFACE/ So, people debugging haveged in a systemd-based initrd system will be hit. Or people actually being dumped into a recovery systemd-based initrd and trying to run haveged to have some good entropy to regenerate ssh keys for theis ssh server or whatelse, will be hit. > And as good/usable as before upstream commit [1]..., only possible improvement > would be to error out (with an early and meaningful error message) in case not > started with absolute path and in case getauxval() is not available (instead of > error out later with with some unusual path/executable name in the error message) > and remove the redundant forcibly set of path[0]? I have no idea what would be the best course of actions that upstream would see fit. But, if the program is started without an absolute path, then most probably re-running argv[0] will also resolve it to the same program: - if the program was run as 'haveged', it was (most probably) found in $PATH, and so re-running argv[0] would yield the same; - if the priogram was run as './haveged' (e.g. during development on the developers machine), then again, re-running argv[0] should again yeld the same. So I am not sure what this is supposed to attempt. I may have missed something, though, so upstream should really find a proper fix... Seeing that upstream is getting for a new relase, we should at the very least inform them about this issue. Will you do that, or do you want me to do it? In the mean time, I am totally OK with making haveged unavailable on uClibc... Regards, Yann E. MORIN.
Peter, All, On 2021-04-02 22:01 +0200, Yann E. MORIN spake thusly: > On 2021-03-31 23:52 +0200, Peter Seiderer spake thusly: > > On Wed, 31 Mar 2021 22:07:10 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > > > On 2021-03-31 20:50 +0200, Peter Seiderer spake thusly: > > > > - add patch to fix uclibc compile (disable dependency on sys/auxv.h > > > > introduced with upstream commit [1]) [--SNIP--] > > If not started with absolute path and /etc/initrd-release exists (both not > > valid for buildroot or easy to avoid)... > > Having both is probably not very often, but still. Again, in the more > general case, i.e. not limited to Buildroot, this now-upstream change > does introduce a latent bug. > > Starting without a full path is trivial: log on to the device, and run > the daemon in foreground to debug it. > > /etc/initrd-release is defined by systemd, so this is not a random file > either: https://systemd.io/INITRD_INTERFACE/ > > So, people debugging haveged in a systemd-based initrd system will be > hit. Or people actually being dumped into a recovery systemd-based > initrd and trying to run haveged to have some good entropy to regenerate > ssh keys for theis ssh server or whatelse, will be hit. > > > And as good/usable as before upstream commit [1]..., only possible improvement > > would be to error out (with an early and meaningful error message) in case not > > started with absolute path and in case getauxval() is not available (instead of > > error out later with with some unusual path/executable name in the error message) > > and remove the redundant forcibly set of path[0]? > > I have no idea what would be the best course of actions that upstream > would see fit. > > But, if the program is started without an absolute path, then most > probably re-running argv[0] will also resolve it to the same program: > > - if the program was run as 'haveged', it was (most probably) found in > $PATH, and so re-running argv[0] would yield the same; > > - if the priogram was run as './haveged' (e.g. during development on > the developers machine), then again, re-running argv[0] should again > yeld the same. > > So I am not sure what this is supposed to attempt. I may have missed > something, though, so upstream should really find a proper fix... Seeing > that upstream is getting for a new relase, we should at the very least > inform them about this issue. Will you do that, or do you want me to do > it? So, I've added a comment on the upstream MR: https://patchwork.ozlabs.org/project/buildroot/patch/20210331185001.24790-1-ps.report@gmx.net/ Let's see what upstream has to say about that. If they don't care, then we can apply that patch. If they get a better fix, we can backport it. > In the mean time, I am totally OK with making haveged unavailable on > uClibc... Thats still my position... Regards, Yann E. MORIN.
On Wed, 31 Mar 2021 20:50:01 +0200 Peter Seiderer <ps.report@gmx.net> wrote: > - 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 <ps.report@gmx.net> Thanks, I have applied to master. > +# '--disable-init' as buildroot ships its own sysv/systemd init files For the systemd case, we actually prefer to use upstream-provided unit files in general. Do you think you could have a look at using --enable-init in the systemd case ? Thanks! Thomas
Hello, On Wed, 31 Mar 2021 22:07:10 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > Are you sure this is correct? Later on in that file, 'path' is forcibly > assigned as thus: > > 200 path[0] = '/'; > > And then, 'path' is used to start the daemon: > > 527 else run_daemon(handle, path, argv); > > So, if the original argv[0] does not start with a '/' (e.g. because it > is called from the PATH), then 'path' will contain a mangled program > name: > > argv[0] = "haveged" > path = strdup(argv[0]) = "haveged" > > and thus with line 200: > path = "/aveged" > > Did I miss something? I agree with you that this is weird. *But* if you look at https://github.com/jirka-h/haveged/commit/26d35af198da01220ba4f7a1b987f17012476c00#diff-043ded6506fb937c60ed15d0e9cfe02d6de6c72bcbd0bb14b7ad5e64ee7a6713L19 which is the commit that introduced this, they really just added the <sys/auxv.h> usage as an additional thing if the path doesn't start with /. So what Peter's patch does it make that new "feature" compile time conditional, while it didn't exist at all before. So with Peter's patch, on uClibc, you're just back to exactly how haveged was behaving in its 1.9.13 version. But I agree overall that all this string manipulation dance looks very fragile :-/ Thomas
Hello Thomas, On Sun, 25 Jul 2021 23:38:59 +0200, Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > On Wed, 31 Mar 2021 20:50:01 +0200 > Peter Seiderer <ps.report@gmx.net> wrote: > > > - 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 <ps.report@gmx.net> > > Thanks, I have applied to master. > > > +# '--disable-init' as buildroot ships its own sysv/systemd init files > > For the systemd case, we actually prefer to use upstream-provided unit > files in general. Do you think you could have a look at using > --enable-init in the systemd case ? The buildroot systemd file is carefully handcrafted (see e.g. [1] and [2]), I do not feel empowered enough to do changes to it ;-), maybe Norbert? Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587067.html [2] http://lists.busybox.net/pipermail/buildroot/2020-June/284216.html > > Thanks! > > Thomas
Am Di., 27. Juli 2021 um 23:03 Uhr schrieb Peter Seiderer <ps.report@gmx.net>: > > Hello Thomas, > > On Sun, 25 Jul 2021 23:38:59 +0200, Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > > On Wed, 31 Mar 2021 20:50:01 +0200 > > Peter Seiderer <ps.report@gmx.net> wrote: > > > > > - 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 <ps.report@gmx.net> > > > > Thanks, I have applied to master. > > > > > +# '--disable-init' as buildroot ships its own sysv/systemd init files > > > > For the systemd case, we actually prefer to use upstream-provided unit > > files in general. Do you think you could have a look at using > > --enable-init in the systemd case ? > > The buildroot systemd file is carefully handcrafted (see e.g. [1] and [2]), > I do not feel empowered enough to do changes to it ;-), maybe Norbert? > Well, there is not one but 3 upstream unit files. The rationale for using a special unit file is simply that alot of the isolation options from the unit file I used as reference [2] either need kernel-support or other subsystems running. (as noted in the commit message [1]) In other words, I did cut stuff down until I got no warnings/errors in the system log while running a pretty minimalist kernel. Norbert [1] http://lists.busybox.net/pipermail/buildroot/2020-June/587067.html [2] https://github.com/jirka-h/haveged/commits/master/init.d/service.fedora
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 <ps.report@gmx.net> +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 <sys/auxv.h> + | ^~~~~~~~~~~~ + +[Upstream: https://github.com/jirka-h/haveged/pull/59] +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + 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 <http://www.gnu.org/licenses/>. + */ + #include "config.h" ++#if defined(HAVE_SYS_AUXV_H) + #include <sys/auxv.h> ++#endif + #include <stdlib.h> + #include <stdio.h> + #include <getopt.h> +@@ -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
- 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 <ps.report@gmx.net> --- Changes v1 -> v2: - fix typo (touchign vs. touching, suggested by Thomas Petazzoni) - change options from yes/no style to disable/enable one (suggested by Thomas Petazzoni) - fix commit message typo (introduces vs. introduced) - add upstream link to patch --- ...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