From patchwork Wed Mar 31 18:50:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1460676 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=faQNR1fe; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F9b3W2Qqhz9sWF for ; Thu, 1 Apr 2021 05:50:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5874F60B1C; Wed, 31 Mar 2021 18:50:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bJkkWtC2AAsU; Wed, 31 Mar 2021 18:50:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 80D2660B3A; Wed, 31 Mar 2021 18:50:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 01C031BF2CA for ; Wed, 31 Mar 2021 18:50:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F291C848EB for ; Wed, 31 Mar 2021 18:50:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T8NcgQmaUGTS for ; Wed, 31 Mar 2021 18:50:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by smtp1.osuosl.org (Postfix) with ESMTPS id DF40E848CF for ; Wed, 31 Mar 2021 18:50:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1617216602; bh=lc0m+3kZGktz5YDCsDjO8RmCwvDFB1ChCPGxwHuEOeM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=faQNR1fe1mFjmYTf+OcpTfsjRinGCKVBpf9a9z2knqOAzIkTNvmfH8HC0teBlkFrC KFoBGGIc5D0iU4QRw7tSAJDI9cqP99cR7CIl7dItAhvUsXnTJXPhWyZMVSRUEwkOqs GSQ6CWntJDacVLAAZ0enU3MX6UN+FMaJ/47UgR20= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.181]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M9Fjb-1lVody3hlX-006P7L; Wed, 31 Mar 2021 20:50:01 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Wed, 31 Mar 2021 20:50:01 +0200 Message-Id: <20210331185001.24790-1-ps.report@gmx.net> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:zb4EoV9mhYkpuLi1IGyEPE4Lv/fgk5kPHvygNWW2MJ5NAKJFFRJ xg55DlpD8Veutohx4ZEJ9qI0DF44dxYQ5PNri74RSYNfJM6QiHKlIcN6QT8P6pD0lYx9K6f TDfZ5mtTr9FCmed6Jgq0029uOQJf/Cf3jb2YEtN8SqBeOm2NjotAJ11DG+7l3wCvCg+i0sk 42yatXj1J4Sbf0uJO1B3A== X-UI-Out-Filterresults: notjunk:1;V03:K0:bl5xH7oWJEE=:Sb18zWsDGKRcSOdFDGjRnz rTkCtJ5gjSHqrFW51qDgarQu/T/xf4XTbnzBfrqrxrWsRlZHxnGBzDoArz4kceSTcZNepIRZ4 4Ha9cEYYkRapyW0Hjkd2i8OnqmZYv+XWBx1IPGWqnZ5T7i349+kWV37ILAUbVQk0MCA37VSbs 7nKHD10Sh+G+GL6+dIpsV3P+axmLDndpdPkmSEsstdt3mlq89KikFvd32YqZA/PiMPuwzuisU dQE66pdw30ZuARIOjmApnFtBJaakDzz7bo0SGWeJXqnz985L2EGW0gXAI7FnIP7y2R1rRIETo ajYYtbkxTsCpCC1ZX3KMRr5U+SPmoXrgm4tHrlBeQwq3MqXXrWZ5d+bRstthlbTey0Few51/G n+qRAsP5RxUpf79TtrUNDIxaDhLn88AzMq/RVfUHi0vYAw7Zfhzdk4NCLrQJ8922dXgvG2lxJ jlNaLEn4tpMqVgjYsxqOrz/8blillOdTAeieAJO5Viq7wWPJLVw5TPAk0zyPORHV0ssdmMTyt wLjIW1i/BI1LV5bOB75+VGbODwhorU9RyrLD/92pRbw+6RnAm29FHb3U+X4sOeXsY1BJkd+tX uUW2VhlAYgs3yzSjVjJcEyNnViWvjEz/nHDjRwqgvyll74vvpZ78X/f0d4Eq8pWtfJW0ECegE 2Dway/JUN7A60v4vYIPlqbPZBGziX37z4eoNKo7dbeqJuF5ynwt0DPy8KLVh/yJoSjPNmeYmr y9hMiIO1IQZdcsgyArQG2skSWvOLu/mBNYGyWtnpuIFyqxCmcToer/cAg0KsOXSvWjuAOjWX8 Q60avih9zV3HgYAdwmOHWAvOFBf+i//nZwDaPLZBbf7yfZbTJGEE9v9j8U+WfO6mHwhXHEW/Q glwa6bc7xZj2CApt2nQWmrD7mvKWBtG+kEwiP3N/NDEABB0Z67vMbA9RFqg75w1ZjXS5rhGan Ha6zCf5px/xu6PMbJcxBvJT0wlAjMSQ57DjZk9KGhqsWY57dgWIXnj9n7DlnZaME81gvCfzOQ uEcIGPLZRP0x/wZf7jaRI5+Co4nKfp4r+t8Z+JODfKotXxY4C8Obowk2kt9sbqu4LgSDh/ZBO HP/GNJK4Wmzsa9Ry7CmEdMBZDStodgs3vIqdSwz2OepcvlsuX518px9i5od8cHaX0tOYetBWp RzZBxvsXq8k3rIMCmCg2ZECf38SdfAC1zzdZa+2ZzfVnoF+E+AdzYYeiztfhRHNNttrTTvKsc mxn3yCeAIIL1bz4Ar Subject: [Buildroot] [PATCH v2] package/haveged: bump version to 1.9.14 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre-Jean Texier , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - 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 --- 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 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