* [Buildroot] [PATCH 1/1] package/ibm-sw-tpm2: bump version to rev183-2026-08-26
@ 2026-09-11 21:15 Bernd Kuhls
2026-09-12 14:58 ` Julien Olivain via buildroot
0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2026-09-11 21:15 UTC (permalink / raw)
To: buildroot; +Cc: Philippe Reynes
Rebased patch 0001 and added Upstream: tag.
Removed patches which are included in this release.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Gitlab pipelines passed:
https://gitlab.com/bkuhls/buildroot/-/commits/9036d3668af97e0c2683b2f54f2f8b52e7152f60
.checkpackageignore | 1 -
...01-Use-LONG_BIT-to-define-RADIX_BITS.patch | 10 +++--
...lMath.h-fix-build-with-openssl-3.3.x.patch | 40 -----------------
...lMath.h-fix-build-with-openssl-3.4.x.patch | 45 -------------------
.../0004-tpm-Update-to-OpenSSL-3.5.patch | 39 ----------------
.../0005-tpm-Update-to-OpenSSL-3.6.patch | 25 -----------
package/ibm-sw-tpm2/ibm-sw-tpm2.hash | 2 +-
package/ibm-sw-tpm2/ibm-sw-tpm2.mk | 2 +-
8 files changed, 8 insertions(+), 156 deletions(-)
delete mode 100644 package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch
delete mode 100644 package/ibm-sw-tpm2/0003-src-BnToOsslMath.h-fix-build-with-openssl-3.4.x.patch
delete mode 100644 package/ibm-sw-tpm2/0004-tpm-Update-to-OpenSSL-3.5.patch
delete mode 100644 package/ibm-sw-tpm2/0005-tpm-Update-to-OpenSSL-3.6.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index 2b61ff3bab..2fc8349f1e 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -402,7 +402,6 @@ package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch lib_patch.Upstr
package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch lib_patch.Upstream
package/i2pd/S99i2pd Shellcheck lib_sysv.Indent lib_sysv.Variables
package/i7z/0001-fix-build-with-gcc-10.patch lib_patch.Upstream
-package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch lib_patch.Upstream
package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch lib_patch.Upstream
package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch lib_patch.Upstream
package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch lib_patch.Upstream
diff --git a/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
index 8d83116dfc..225d70e00d 100644
--- a/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
+++ b/package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch
@@ -10,9 +10,11 @@ Also, add the necessary defines in the makefile to expose
LONG_BIT. Adding those defines end up requiring using <sys/select.h>
as we're now using >= POSIX.1-2001 definitions of fd_set and friends.
+Upstream: https://github.com/kgoldman/ibmswtpm2/pull/16 (rejected)
+
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
-[Bernd: rebased for git rev 5452af422edeff70fcae8ea99dd28a0922051d7b]
+[Bernd: rebase for rev183-2026-08-26]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Fabrice: rebase for rev183-2024-03-27]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
@@ -37,7 +39,7 @@ index 5055560..48b1e16 100644
- || defined(__powerpc64__) || defined(__ppc64__)
-# define RADIX_BITS 64
-# elif defined(__i386__) || defined(__i386) || defined(i386) || defined(_WIN32) \
-- || defined(_M_IX86)
+- || defined(_M_IX86) || defined(__PPC__)
-# define RADIX_BITS 32
-# elif defined(_M_ARM) || defined(__arm__) || defined(__thumb__)
-# define RADIX_BITS 32
@@ -61,7 +63,7 @@ diff --git a/src/TcpServerPosix.c b/src/TcpServerPosix.c
index cad0402..6293cdd 100644
--- a/src/TcpServerPosix.c
+++ b/src/TcpServerPosix.c
-@@ -66,6 +66,7 @@
+@@ -67,6 +67,7 @@
#include <stdio.h>
#include <stdbool.h>
@@ -79,7 +81,7 @@ index f124e78..6ee128e 100644
-D_POSIX_ \
+ -D_DEFAULT_SOURCE \
+ -D_XOPEN_SOURCE=500 \
- -DTPM_NUVOTON
+ -DTPM_NUVOTON $(CFLAGS)
# add this line for big endian platforms
--
diff --git a/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch b/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch
deleted file mode 100644
index a349c05d4c..0000000000
--- a/package/ibm-sw-tpm2/0002-src-BnToOsslMath.h-fix-build-with-openssl-3.3.x.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1b5d9eb91f0d24d09d711ef839d301ee8b640d61 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-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 <fontaine.fabrice@gmail.com>
-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
-
diff --git a/package/ibm-sw-tpm2/0003-src-BnToOsslMath.h-fix-build-with-openssl-3.4.x.patch b/package/ibm-sw-tpm2/0003-src-BnToOsslMath.h-fix-build-with-openssl-3.4.x.patch
deleted file mode 100644
index e65c1c898b..0000000000
--- a/package/ibm-sw-tpm2/0003-src-BnToOsslMath.h-fix-build-with-openssl-3.4.x.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d59535c8c605f0b23abbefd9b23200b1a5e937fe Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Fri, 6 Dec 2024 20:35:35 +0100
-Subject: [PATCH] src/BnToOsslMath.h: fix build with openssl 3.4.x
-
-Openssl 3.4.x is out:
-https://github.com/openssl/openssl/blob/openssl-3.4.0/NEWS.md#openssl-34
-
-So bump the max supported version number similar to how it was done by
-commit 89a4cb9cf8 "src/BnToOsslMath.h: fix build with openssl 3.3.x" to fix
-build failures with 3.4.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.net/results/be6c679b821183b4385c74471e26d9ad7d3d8967
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-Upstream: https://github.com/kgoldman/ibmswtpm2/pull/17
----
- src/BnToOsslMath.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h
-index 72939ea..165304d 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 >= 0x30300ff0L
-+#if OPENSSL_VERSION_NUMBER >= 0x30400ff0L
- // 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.39.5
-
diff --git a/package/ibm-sw-tpm2/0004-tpm-Update-to-OpenSSL-3.5.patch b/package/ibm-sw-tpm2/0004-tpm-Update-to-OpenSSL-3.5.patch
deleted file mode 100644
index 36a9cb97dc..0000000000
--- a/package/ibm-sw-tpm2/0004-tpm-Update-to-OpenSSL-3.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 720ed4b8c74c3b517a46b442be9482319ed027dd Mon Sep 17 00:00:00 2001
-From: Ken Goldman <kgold@linux.ibm.com>
-Date: Fri, 18 Apr 2025 13:41:59 -0400
-Subject: [PATCH] tpm: Update to OpenSSL 3.5
-
-Accept 3.5 as a supported version
-
-Signed-off-by: Ken Goldman <kgold@linux.ibm.com>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-Upstream: https://github.com/kgoldman/ibmswtpm2/commit/720ed4b8c74c3b517a46b442be9482319ed027dd
----
- src/BnToOsslMath.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h
-index 165304d..5fd5323 100644
---- a/src/BnToOsslMath.h
-+++ b/src/BnToOsslMath.h
-@@ -54,7 +54,7 @@
- /* arising in any way out of use or reliance upon this specification or any */
- /* information herein. */
- /* */
--/* (c) Copyright IBM Corp. and others, 2023 */
-+/* (c) Copyright IBM Corp. and others, 2023 - 2025 */
- /* */
- /********************************************************************************/
-
-@@ -77,7 +77,7 @@
- #include <openssl/ec.h>
- #include <openssl/bn.h>
-
--#if OPENSSL_VERSION_NUMBER >= 0x30400ff0L
-+#if OPENSSL_VERSION_NUMBER >= 0x30500ff0L
- // 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.39.5
-
diff --git a/package/ibm-sw-tpm2/0005-tpm-Update-to-OpenSSL-3.6.patch b/package/ibm-sw-tpm2/0005-tpm-Update-to-OpenSSL-3.6.patch
deleted file mode 100644
index a2a54717e2..0000000000
--- a/package/ibm-sw-tpm2/0005-tpm-Update-to-OpenSSL-3.6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7f727710326bc0a6d6f28397253ec3a89000300e Mon Sep 17 00:00:00 2001
-From: Pedro Monreal <pmonrealgonzalez@suse.com>
-Date: Fri, 3 Oct 2025 10:35:46 +0200
-Subject: [PATCH] tpm: Update to OpenSSL 3.6
-
-Upstream: https://github.com/kgoldman/ibmswtpm2/pull/22
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/BnToOsslMath.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h
-index 26828d0..731957e 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 >= 0x30500ff0L
-+#if OPENSSL_VERSION_NUMBER >= 0x30600ff0L
- // 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
diff --git a/package/ibm-sw-tpm2/ibm-sw-tpm2.hash b/package/ibm-sw-tpm2/ibm-sw-tpm2.hash
index 3c2d0e758f..e7b652adcf 100644
--- a/package/ibm-sw-tpm2/ibm-sw-tpm2.hash
+++ b/package/ibm-sw-tpm2/ibm-sw-tpm2.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 239cea3ec99cb31fb25c1ba4fe9b98a862bb20daefefeba8908d370bedd42a31 ibm-sw-tpm2-rev183-2024-03-27-git4.tar.gz
+sha256 8a19b5aab8aaf24ec953e860d2497584a3ff5747510968bbf222523ebade911c ibm-sw-tpm2-rev183-2026-08-26-git4.tar.gz
sha256 dd2d31b560011ea673e197251e710e52669d911367d83cd3cfd018f8ed58bde9 LICENSE
diff --git a/package/ibm-sw-tpm2/ibm-sw-tpm2.mk b/package/ibm-sw-tpm2/ibm-sw-tpm2.mk
index 67ecd45923..1f23bf7d83 100644
--- a/package/ibm-sw-tpm2/ibm-sw-tpm2.mk
+++ b/package/ibm-sw-tpm2/ibm-sw-tpm2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IBM_SW_TPM2_VERSION = rev183-2024-03-27
+IBM_SW_TPM2_VERSION = rev183-2026-08-26
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
--
2.47.3
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ibm-sw-tpm2: bump version to rev183-2026-08-26
2026-09-11 21:15 [Buildroot] [PATCH 1/1] package/ibm-sw-tpm2: bump version to rev183-2026-08-26 Bernd Kuhls
@ 2026-09-12 14:58 ` Julien Olivain via buildroot
0 siblings, 0 replies; 2+ messages in thread
From: Julien Olivain via buildroot @ 2026-09-12 14:58 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot, Philippe Reynes
On 11/09/2026 23:15, Bernd Kuhls wrote:
> Rebased patch 0001 and added Upstream: tag.
>
> Removed patches which are included in this release.
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Applied to master, thanks.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-12 14:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-11 21:15 [Buildroot] [PATCH 1/1] package/ibm-sw-tpm2: bump version to rev183-2026-08-26 Bernd Kuhls
2026-09-12 14:58 ` Julien Olivain via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.