Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from buildroot:master #149

Merged
merged 18 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,6 @@ package/gdb/15.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.U
package/gdb/15.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream
package/gdb/15.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream
package/gdb/15.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream
package/gengetopt/0001-configure.ac-add-disable-doc-option.patch lib_patch.Upstream
package/genpart/0001-fix-return-code.patch lib_patch.Upstream
package/genromfs/0001-build-system.patch lib_patch.Sob lib_patch.Upstream
package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch lib_patch.Upstream
Expand Down Expand Up @@ -1226,7 +1225,6 @@ package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch lib_patc
package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch lib_patch.Upstream
package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch lib_patch.Upstream
package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch lib_patch.Upstream
package/rtmpdump/0001-include-limits.h.patch lib_patch.Upstream
package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patch.Upstream
package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream
package/rubix/0001-dont-use-legacy-functions.patch lib_patch.Upstream
Expand Down
1 change: 1 addition & 0 deletions DEVELOPERS
Original file line number Diff line number Diff line change
Expand Up @@ -2862,6 +2862,7 @@ F: package/biosdevname/

N: Saeed Kazemi <[email protected]>
F: package/eza/
F: package/parsec-tool/
F: package/procs/
F: package/mxt-app/
F: package/zoxide/
Expand Down
1 change: 1 addition & 0 deletions package/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,7 @@ menu "Crypto"
source "package/mbedtls/Config.in"
source "package/nettle/Config.in"
source "package/openssl/Config.in"
source "package/parsec-tool/Config.in"
source "package/pkcs11-helper/Config.in"
source "package/rhash/Config.in"
source "package/tinydtls/Config.in"
Expand Down
2 changes: 1 addition & 1 deletion package/eza/eza.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally computed
sha256 c01f11ba19956108e42244f0b094bbb6bc74c13ea2c68feecf6f0ff2f127df97 eza-0.18.17-cargo2.tar.gz
sha256 4ecb6221b28aaae309043b8403555eb6835de671c519c224a3807cea50f48001 eza-0.18.22-cargo2.tar.gz
sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE
2 changes: 1 addition & 1 deletion package/eza/eza.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

EZA_VERSION = 0.18.17
EZA_VERSION = 0.18.22
EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION))
EZA_LICENSE = MIT
EZA_LICENSE_FILES = LICENCE
Expand Down

This file was deleted.

5 changes: 2 additions & 3 deletions package/flashrom/flashrom.hash
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Locally computed after checking pgp signature
# https://download.flashrom.org/releases/flashrom-v1.3.0.tar.bz2.asc
sha256 a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623 flashrom-v1.3.0.tar.bz2
# Locally computed
sha256 318c54a4143a1a05b30cecd64fbff41a0f5cd35a020622864c11fb44f8ed04d4 flashrom-1.4.0-rc2.tar.gz
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
12 changes: 8 additions & 4 deletions package/flashrom/flashrom.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
#
################################################################################

FLASHROM_VERSION = 1.3.0
FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2
FLASHROM_SITE = https://download.flashrom.org/releases
FLASHROM_VERSION = 1.4.0-rc2
FLASHROM_SITE = $(call github,flashrom,flashrom,v$(FLASHROM_VERSION))
FLASHROM_LICENSE = GPL-2.0+
FLASHROM_LICENSE_FILES = COPYING
FLASHROM_INSTALL_STAGING = YES
FLASHROM_CONF_OPTS = \
-Dclassic_cli=enabled \
-Dclassic_cli_print_wiki=disabled \
-Dich_descriptors_tool=enabled \
-Dtests=disabled \
Expand Down Expand Up @@ -80,4 +78,10 @@ endif

FLASHROM_CONF_OPTS += -Dprogrammer=$(subst $(space),$(comma),$(strip $(FLASHROM_PROGRAMMERS)))

ifeq ($(BR2_SHARED_LIBS),)
FLASHROM_CONF_OPTS += -Dclassic_cli=enabled
else
FLASHROM_CONF_OPTS += -Dclassic_cli=disabled
endif

$(eval $(meson-package))
13 changes: 7 additions & 6 deletions package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
From 250bee9e02546846d70dbe88ac36bb83c6a7ebdf Mon Sep 17 00:00:00 2001
From e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <[email protected]>
Date: Sun, 22 Sep 2019 09:27:24 +0200
Subject: [PATCH] configure.ac: add --disable-doc option
Subject: configure.ac: add --disable-doc option

Add --disable-doc option to allow the user to disable documentation

Signed-off-by: Fabrice Fontaine <[email protected]>
[Sent upstream: https://savannah.gnu.org/bugs/index.php?56931]
Upstream: https://git.savannah.gnu.org/cgit/gengetopt.git/commit/?id=e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a
---
Makefile.am | 6 +++++-
configure.ac | 7 +++++++
2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index dbb5719..2db307a 100644
index 1f184c2..76ac21a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,10 @@
@@ -18,7 +18,11 @@
ACLOCAL_AMFLAGS = -I m4 -I gl/m4

EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
Expand All @@ -28,6 +28,7 @@ index dbb5719..2db307a 100644
+endif

gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE

diff --git a/configure.ac b/configure.ac
index 0ee89db..915706c 100644
--- a/configure.ac
Expand All @@ -47,5 +48,5 @@ index 0ee89db..915706c 100644
[gengen],
[ --with-gengen=mygengen gengen to use],
--
2.23.0
cgit v1.1

65 changes: 31 additions & 34 deletions package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,49 @@ Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Vincent Fazio <[email protected]>
[Bernd: rebased for git rev 5452af422edeff70fcae8ea99dd28a0922051d7b]
Signed-off-by: Bernd Kuhls <[email protected]>
[Fabrice: rebase for rev183-2024-03-27]
Signed-off-by: Fabrice Fontaine <[email protected]>
---
src/LibSupport.h | 21 +++------------------
src/TcpServerPosix.c | 1 +
src/makefile | 2 ++
3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/LibSupport.h b/src/LibSupport.h
diff --git a/src/tpm_radix.h b/src/tpm_radix.h
index 5055560..48b1e16 100644
--- a/src/LibSupport.h
+++ b/src/LibSupport.h
@@ -64,32 +64,9 @@
#ifndef _LIB_SUPPORT_H_
#define _LIB_SUPPORT_H_

-/* kgold added power and s390 */
--- a/src/tpm_radix.h
+++ b/src/tpm_radix.h
@@ -61,27 +61,9 @@
//** Introduction
// Common defines for supporting large numbers and cryptographic buffer sizing.
//*********************
-#ifndef RADIX_BITS
-# if defined(__x86_64__) || defined(__x86_64) \
- || defined(__amd64__) || defined(__amd64) \
- || defined(_WIN64) || defined(_M_X64) \
- || defined(_M_ARM64) || defined(__aarch64__) \
- || defined(__powerpc64__) || defined(__PPC64__) || defined(__ppc64__) \
- || defined(__s390x__)
-# define RADIX_BITS 64
-# elif defined(__i386__) || defined(__i386) || defined(i386) \
- || defined(_WIN32) || defined(_M_IX86) \
- || defined(_M_ARM) || defined(__arm__) || defined(__thumb__) \
- || defined(__powerpc__) || defined(__PPC__)
-# define RADIX_BITS 32
-# elif defined(__riscv) || defined(__riscv__)
-# if __riscv_xlen == 32
-# define RADIX_BITS 32
-# elif __riscv_xlen == 64
-# define RADIX_BITS 64
-# else
-# error Unsupported __riscv_xlen value
-# endif
-# else
-# error Unable to determine RADIX_BITS from compiler environment
-# endif
-#endif // RADIX_BITS
-# if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) \
- || defined(__amd64) || defined(_WIN64) || defined(_M_X64) || defined(_M_ARM64) \
- || defined(__aarch64__) || defined(__PPC64__) || defined(__s390x__) \
- || defined(__powerpc64__) || defined(__ppc64__)
-# define RADIX_BITS 64
-# elif defined(__i386__) || defined(__i386) || defined(i386) || defined(_WIN32) \
- || defined(_M_IX86)
-# define RADIX_BITS 32
-# elif defined(_M_ARM) || defined(__arm__) || defined(__thumb__)
-# define RADIX_BITS 32
-# elif defined(__riscv)
-// __riscv and __riscv_xlen are standardized by the RISC-V community and should be available
-// on any compliant compiler.
-//
-// https://github.com/riscv-non-isa/riscv-toolchain-conventions
-# define RADIX_BITS __riscv_xlen
-# else
-# error Unable to determine RADIX_BITS from compiler environment
-# endif
-#endif // RADIX_BITS
+#include <limits.h>
+
+#define RADIX_BITS LONG_BIT

// These macros use the selected libraries to the proper include files.
#define LIB_QUOTE(_STRING_) #_STRING_
#if RADIX_BITS == 64
# define RADIX_BYTES 8
diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c
index cad0402..6293cdd 100644
--- a/src/TcpServerPosix.c
Expand Down
28 changes: 0 additions & 28 deletions package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
From 1b5d9eb91f0d24d09d711ef839d301ee8b640d61 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <[email protected]>
Date: Sun, 21 Jul 2024 09:08:39 +0200
Subject: [PATCH] src/BnToOsslMath.h: fix build with openssl 3.3.x

Fix the following build failure with openssl 3.3.x:

In file included from BnValues.h:327,
from Global.h:80,
from Tpm.h:78,
from AuditCommands.c:62:
TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version
83 | # error Untested OpenSSL version
| ^~~~~

Fixes:
- http://autobuild.buildroot.org/results/2fb5e1cb792fe25ef860ff8111622cd1ff3770bf

Signed-off-by: Fabrice Fontaine <[email protected]>
Upstream: https://github.com/kgoldman/ibmswtpm2/pull/15
---
src/BnToOsslMath.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h
index df4bcfb..72939ea 100644
--- a/src/BnToOsslMath.h
+++ b/src/BnToOsslMath.h
@@ -77,7 +77,7 @@
#include <openssl/ec.h>
#include <openssl/bn.h>

-#if OPENSSL_VERSION_NUMBER >= 0x30200ff0L
+#if OPENSSL_VERSION_NUMBER >= 0x30300ff0L
// Check the bignum_st definition against the one below and either update the
// version check or provide the new definition for this version.
# error Untested OpenSSL version
--
2.43.0

2 changes: 1 addition & 1 deletion package/ibm-sw-tpm2/ibm-sw-tpm2.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally computed:
sha256 da7799baa1d38cd9d2f491006de45d38805db9d5a77c38af6e78728bd318f93e ibm-sw-tpm2-5452af422edeff70fcae8ea99dd28a0922051d7b-git4.tar.gz
sha256 239cea3ec99cb31fb25c1ba4fe9b98a862bb20daefefeba8908d370bedd42a31 ibm-sw-tpm2-rev183-2024-03-27-git4.tar.gz
sha256 dd2d31b560011ea673e197251e710e52669d911367d83cd3cfd018f8ed58bde9 LICENSE
2 changes: 1 addition & 1 deletion package/ibm-sw-tpm2/ibm-sw-tpm2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

IBM_SW_TPM2_VERSION = 5452af422edeff70fcae8ea99dd28a0922051d7b
IBM_SW_TPM2_VERSION = rev183-2024-03-27
IBM_SW_TPM2_SITE = https://git.code.sf.net/p/ibmswtpm2/tpm2
IBM_SW_TPM2_SITE_METHOD = git
IBM_SW_TPM2_LICENSE = BSD-3-Clause
Expand Down
2 changes: 1 addition & 1 deletion package/iproute2/iproute2.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
sha256 2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0 iproute2-6.9.0.tar.xz
sha256 91a62f82737b44905a00fa803369c447d549e914e9a2a4018fdd75b1d54e8dce iproute2-6.10.0.tar.xz
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
2 changes: 1 addition & 1 deletion package/iproute2/iproute2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

IPROUTE2_VERSION = 6.9.0
IPROUTE2_VERSION = 6.10.0
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
Expand Down
Loading