From patchwork Sun Jan 10 13:00:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1424245 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=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JNUp39Tm; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDH5W0MLVz9sW8 for ; Mon, 11 Jan 2021 00:01:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EEBC120366; Sun, 10 Jan 2021 13:00:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8PAsq1NSLs44; Sun, 10 Jan 2021 13:00:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AF3A820335; Sun, 10 Jan 2021 13:00:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1D55A1BF4D6 for ; Sun, 10 Jan 2021 13:00:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1A10F85F80 for ; Sun, 10 Jan 2021 13:00:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z7GBGV1XnytZ for ; Sun, 10 Jan 2021 13:00:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D470E85F7B for ; Sun, 10 Jan 2021 13:00:49 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id n16so9377656wmc.0 for ; Sun, 10 Jan 2021 05:00:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WIWWK7b0I1HnXOJ8e80o5nPIPOh9pj0oiZU3uWMEBL0=; b=JNUp39TmG9FOiWIKbyHV8d3GoYL+kuE5tmMnyS3BrP83SaExeHW2byqLomogv32gt1 EubPZubC1t7cIOk/0sD9Or/htahRCVuacOEq6c4MKvmop68D5tjTQKPU7XwNWZklBpcr gvst1NMuULwYb8RgfuIrpEPAex30ayJuZJQExo/Xd3myqTd5s899QF30LHJpjFpwMkqP y888mlFW9w4BSGRDPX5jB7HCsZ7XxpW7syn+vcDhvtsSm5nN+EkyxglaWfNm4pL/pbZe g6yAm5yJP12ehatzbF8fXo4vRI2Vjt3FgeiKMG4lwsC2/tKkfdGcADv809VGMliRkP0E xK5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WIWWK7b0I1HnXOJ8e80o5nPIPOh9pj0oiZU3uWMEBL0=; b=Fe/0vuBmEWkghsoyrl9Bg597Pi7jtw8y0HyHny9xo2m9GmGvjwLVMZxjXUqFaMzJCq CfMt/J+bVaNO0JSXw8iDTLENakx4i5A3SocCbacl/XvMg1NwwYa8wW4ge7UPE+956GMD 9RFBfjaB7/Rcc9ldfceTtojgc5WtemaaqfKD7XJh0qFHZBE0Yyv+jVAnyH43rZcIzH8Y sIo6pkhN5ap1nRVOmaxLnJYoOV/hGy6holWxAbNWCSbIC13dUv+rGjoeLVJOboQ/lEJj +2AE6uLcfsN+QQ1JMeyaWSW71UjGiVx7j2cfdpvOrsZNMG6ZUM3cVJj/aSSjNmDil2Vi Oe+w== X-Gm-Message-State: AOAM533BHR0ITW50JiYfVGlxP6YVMml3LQfwvYszWqCLDwgqi9B6w13h aU9b5+hL9SN7zU7BjXd4DfgreTjlmG4yXQ== X-Google-Smtp-Source: ABdhPJxPK/eROgfo1AH1CkndSUbAwC0aKr7NQ4NWqi4QOiOihEznFXkMrYyOvBnvQcNKm4oSPA919A== X-Received: by 2002:a7b:c19a:: with SMTP id y26mr10431074wmi.20.1610283647849; Sun, 10 Jan 2021 05:00:47 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id s205sm18633359wmf.46.2021.01.10.05.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Jan 2021 05:00:47 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 10 Jan 2021 14:00:13 +0100 Message-Id: <20210110130013.793192-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 1/1] package/rng-tools: bump to version 6.11 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: Matt Weber , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/V6.11 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Yann E. Morin): - Fix patch ...-configure.ac-fix-with-rtlsdr-option.patch | 29 ---------- ..._jitter-disambiguate-call-to-encrypt.patch | 53 ------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 4 +- 4 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch delete mode 100644 package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch diff --git a/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch b/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch deleted file mode 100644 index 586a44e21f..0000000000 --- a/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 45a8c51a20a518ed78c5ea1829a307c045f737be Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Mar 2020 22:19:42 +0100 -Subject: [PATCH] configure.ac: fix --with-rtlsdr option - -Add missing ',' to allow the user to explicitly disable or enable rtlsdr - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nhorman/rng-tools/pull/88] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ba796f8..1f55052 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,7 +43,7 @@ AC_ARG_WITH([pkcs11], - - AC_ARG_WITH([rtlsdr], - AS_HELP_STRING([--without-rtlsdr], -- [Disable rtlsdr support. ]) -+ [Disable rtlsdr support. ]), - [], - [with_rtlsdr=no] - ) --- -2.25.1 - diff --git a/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch b/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch deleted file mode 100644 index 99997ce866..0000000000 --- a/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch +++ /dev/null @@ -1,53 +0,0 @@ -From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 30 Mar 2020 00:10:46 +0200 -Subject: [PATCH] rngd_jitter: disambiguate call to encrypt - -Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to -encrypt in rngd_rdrand.c but did not update rngd_jitter.c. - -This raise the following build failure: - -rngd_jitter.c:75:12: error: conflicting types for 'encrypt' - static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, - ^~~~~~~ -In file included from rngd_jitter.c:27: -/home/dawncrow/buildroot-test/scripts/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:1132:13: note: previous declaration of 'encrypt' was here - extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); - ^~~~~~~ -Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed - -Fixes: - - http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nhorman/rng-tools/pull/89] ---- - rngd_jitter.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index c1b1aca..49a3825 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -72,7 +72,7 @@ unsigned char *aes_buf; - char key[AES_BLOCK]; - static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128))); - --static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, -+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, - unsigned char *iv, unsigned char *ciphertext) - { - EVP_CIPHER_CTX *ctx; -@@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src) - unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS]; - - /* Encrypt the plaintext */ -- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf, -+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf, - ciphertext); - if (!ciphertext_len) - return -1; --- -2.25.1 - diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 3202a88d67..de1f72617c 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef rng-tools-6.10.tar.gz +sha256 644d8bd4e84cee29debddc7e6db72aff27e628e5a879ce310562edf50f12be41 rng-tools-6.11.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8a971de5e9..ae20d96362 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.10 -RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) +RNG_TOOLS_VERSION = 6.11 +RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),V$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING RNG_TOOLS_DEPENDENCIES = libsysfs host-pkgconf openssl