From ae14915b51079ec175a79e5a4db441fe46b74f73 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Mon, 25 Jan 2021 00:22:17 +0000 Subject: [PATCH] rng-tools: update to 6.11. --- ...-configure-ac-fix-with-rtlsdr-option.patch | 27 ---------- ..._jitter-disambiguate-call-to-encrypt.patch | 51 ------------------- ...move-name-conflict-with-libc-encrypt.patch | 42 --------------- ...igure-ac-jitterentropy-needs-pthread.patch | 15 ------ srcpkgs/rng-tools/template | 6 +-- 5 files changed, 3 insertions(+), 138 deletions(-) delete mode 100644 srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch delete mode 100644 srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch delete mode 100644 srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch delete mode 100644 srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch diff --git a/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch b/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch deleted file mode 100644 index 840906e9c15..00000000000 --- a/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch +++ /dev/null @@ -1,27 +0,0 @@ -upstream: yes - -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 ---- - 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] - ) diff --git a/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch b/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch deleted file mode 100644 index e3b54940524..00000000000 --- a/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch +++ /dev/null @@ -1,51 +0,0 @@ -upstream: yes - -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 ---- - 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; diff --git a/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch b/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch deleted file mode 100644 index 71c506ee38c..00000000000 --- a/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch +++ /dev/null @@ -1,42 +0,0 @@ -upstream: yes - -From a4b6d9ce64f132e463b9091d0536913ddaf11516 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 30 Apr 2020 16:57:35 -0400 -Subject: [PATCH] Remove name conflict with libc encrypt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Forgot to fixup the funciton name conflict with libcs encrypt() function -on power systems - -Signed-off-by: Neil Horman -Reported-by: Natanael Copa -Reported-by: "Milan P. Stanić" ---- - rngd_darn.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rngd_darn.c b/rngd_darn.c -index 35df7a1..9345895 100644 ---- a/rngd_darn.c -+++ b/rngd_darn.c -@@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src) - return 0; - } - --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) - { - int len; -@@ -150,7 +150,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); - printf("Calling mangle with len %d\n", ciphertext_len); - if (!ciphertext_len) diff --git a/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch b/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch deleted file mode 100644 index 4e9147b3b5e..00000000000 --- a/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch +++ /dev/null @@ -1,15 +0,0 @@ -New jitterentropy library broke configure. This patch fixes it. - -Upstream patch: https://github.com/nhorman/rng-tools/commit/daff4e2dd9d3abb74829f41e72607681163bd309 - ---- a/configure.ac 2020-12-03 20:59:11.086238518 +0100 -+++ b/configure.ac 2020-12-03 21:00:40.978593727 +0100 -@@ -91,7 +91,7 @@ - AC_SEARCH_LIBS(jent_version,jitterentropy, - [AM_CONDITIONAL([JITTER], [true]) - AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])], -- AC_MSG_NOTICE([No Jitterentropy library found])) -+ AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) - ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] - ) - diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template index 57f9cb42cf3..8f8c9dc4748 100644 --- a/srcpkgs/rng-tools/template +++ b/srcpkgs/rng-tools/template @@ -1,7 +1,7 @@ # Template file for 'rng-tools' pkgname=rng-tools -version=6.10 -revision=4 +version=6.11 +revision=1 wrksrc=${pkgname}-${version} build_style=gnu-configure configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr" @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="https://github.com/nhorman/rng-tools" distfiles="https://github.com/nhorman/rng-tools/archive/v${version}.tar.gz" -checksum=2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef +checksum=644d8bd4e84cee29debddc7e6db72aff27e628e5a879ce310562edf50f12be41 patch_args="-Np1" case "$XBPS_TARGET_MACHINE" in