Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v4 1/3] package/systemd: bump version to 258.12
@ 2026-10-28 15:51 Fiona Klute via buildroot
  2026-10-28 15:51 ` [Buildroot] [PATCH v4 2/3] package/tpm2-tss: enable host build Fiona Klute via buildroot
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Fiona Klute via buildroot @ 2026-10-28 15:51 UTC (permalink / raw)
  To: buildroot
  Cc: Norbert Lange, Sen Hastings, Thomas Petazzoni,
	Fiona Klute (othermo GmbH)

From: "Fiona Klute (othermo GmbH)" <fiona.klute@gmx.de>

This is a stable patch release, no changes to options/services. The
default for the dns-servers option in meson_options.txt has changed to
use different domain names for the Cloudflare DNS servers, but the
same IP addresses.

Remove patch included upstream [1].

[1] https://github.com/systemd/systemd/commit/3ed9869c4780846b4a5380bf921073fa2fac0730

Signed-off-by: Fiona Klute (othermo GmbH) <fiona.klute@gmx.de>
---
Changes v3 -> v4:
* replace adding a ukify patch with update to a fixed version from the
  same stable branch

 ...compilation-with-openssl-4.0.0-beta1.patch | 86 -------------------
 package/systemd/systemd.hash                  |  2 +-
 package/systemd/systemd.mk                    |  2 +-
 3 files changed, 2 insertions(+), 88 deletions(-)
 delete mode 100644 package/systemd/0001-various-fix-compilation-with-openssl-4.0.0-beta1.patch

diff --git a/package/systemd/0001-various-fix-compilation-with-openssl-4.0.0-beta1.patch b/package/systemd/0001-various-fix-compilation-with-openssl-4.0.0-beta1.patch
deleted file mode 100644
index d38be8d51b..0000000000
--- a/package/systemd/0001-various-fix-compilation-with-openssl-4.0.0-beta1.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 693ecaac7e12c120d1323478b2433d77367aa0c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@amutable.com>
-Date: Tue, 14 Apr 2026 18:59:07 +0200
-Subject: [PATCH] various: fix compilation with openssl-4.0.0-beta1
-
-Various types have been made opaque, so we need to use some accessor
-functions.
-
-Upstream: https://github.com/systemd/systemd/commit/693ecaac7e12c120d1323478b2433d77367aa0c9
-
-[Bernd: rebased for 258.7]
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/sbsign/sbsign.c      |  5 +++--
- src/shared/pkcs11-util.c | 15 ++++++++-------
- 2 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c
-index ee1c0f77ab..f54dacf65a 100644
---- a/src/sbsign/sbsign.c
-+++ b/src/sbsign/sbsign.c
-@@ -262,8 +262,9 @@ static int spc_indirect_data_content_new(const void *digest, size_t digestsz, ui
-                 return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to get SpcPeImageData object: %s",
-                                        ERR_error_string(ERR_get_error(), NULL));
- 
--        idc->data->value->value.sequence->data = TAKE_PTR(peidraw);
--        idc->data->value->value.sequence->length = peidrawsz;
-+        if (!ASN1_STRING_set(idc->data->value->value.sequence, peidraw, peidrawsz))
-+                return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to set ASN1_STRING data.");
-+
-         idc->messageDigest->digestAlgorithm->algorithm = OBJ_nid2obj(NID_sha256);
-         if (!idc->messageDigest->digestAlgorithm->algorithm)
-                 return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to get SHA256 object: %s",
-diff --git a/src/shared/pkcs11-util.c b/src/shared/pkcs11-util.c
-index 165fefbea1..96b25c4ac3 100644
---- a/src/shared/pkcs11-util.c
-+++ b/src/shared/pkcs11-util.c
-@@ -555,7 +555,11 @@ int pkcs11_token_read_public_key(
-                         return log_debug_errno(SYNTHETIC_ERRNO(EIO), "Failed to init an EVP_PKEY_CTX for EC.");
- 
-                 OSSL_PARAM ec_params[8] = {
--                        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, os->data, os->length)
-+                        /* We need to drop the const from the data param, because ec_params is
-+                         * modified below. But we'll not modify ec_params[0]. */
-+                        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-+                                                (unsigned char *) ASN1_STRING_get0_data(os),
-+                                                ASN1_STRING_length(os)),
-                 };
- 
-                 _cleanup_free_ void *order = NULL, *p = NULL, *a = NULL, *b = NULL, *generator = NULL;
-@@ -683,13 +687,10 @@ int pkcs11_token_read_x509_certificate(
-                 CK_OBJECT_HANDLE object,
-                 X509 **ret_cert) {
- 
--        _cleanup_free_ char *t = NULL;
-         CK_ATTRIBUTE attribute = {
-                 .type = CKA_VALUE
-         };
-         CK_RV rv;
--        _cleanup_(X509_freep) X509 *x509 = NULL;
--        X509_NAME *name = NULL;
-         int r;
- 
-         r = dlopen_p11kit();
-@@ -713,15 +714,15 @@ int pkcs11_token_read_x509_certificate(
-                                        "Failed to read X.509 certificate data off token: %s", sym_p11_kit_strerror(rv));
- 
-         const unsigned char *p = attribute.pValue;
--        x509 = d2i_X509(NULL, &p, attribute.ulValueLen);
-+        _cleanup_(X509_freep) X509 *x509 = d2i_X509(NULL, &p, attribute.ulValueLen);
-         if (!x509)
-                 return log_debug_errno(SYNTHETIC_ERRNO(EBADMSG), "Failed to parse X.509 certificate.");
- 
--        name = X509_get_subject_name(x509);
-+        const X509_NAME *name = X509_get_subject_name(x509);
-         if (!name)
-                 return log_debug_errno(SYNTHETIC_ERRNO(EBADMSG), "Failed to acquire X.509 subject name.");
- 
--        t = X509_NAME_oneline(name, NULL, 0);
-+        _cleanup_free_ char *t = X509_NAME_oneline(name, NULL, 0);
-         if (!t)
-                 return log_debug_errno(SYNTHETIC_ERRNO(EIO), "Failed to format X.509 subject name as string.");
- 
--- 
-2.47.3
-
diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
index e96d3ba7ad..cb652998cd 100644
--- a/package/systemd/systemd.hash
+++ b/package/systemd/systemd.hash
@@ -1,5 +1,5 @@
 # sha256 locally computed
-sha256  6bd311c25f00d634ae3b4544d582e27df0d4166e6ba3d403b18b3129d7f44cae  systemd-258.7.tar.gz
+sha256  5062da9c9b0b6fd3ed0efaa2c6ec37be2e634c6e516abd6275ee42f85282c891  systemd-258.12.tar.gz
 sha256  ac4985facb553559981f507982444d779115e3e3a4c8b7847ae956198490c1b3  LICENSE.GPL2
 sha256  6d9bb3b7fc818a8facc4cc296060a0883fef8710d6498f86165335846e82ee9d  LICENSE.LGPL2.1
 sha256  c9e7bf5b7c243c719b8b43c36158effb9b54c5e80abc9d82e4b2d4b2a4aa64ad  LICENSES/alg-sha1-public-domain.txt
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 52c434b28e..346d034822 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -19,7 +19,7 @@
 # - Diff sysusers.d with the previous version
 # - Diff factory/etc/nsswitch.conf with the previous version
 #   (details are often sprinkled around in README and manpages)
-SYSTEMD_VERSION = 258.7
+SYSTEMD_VERSION = 258.12
 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = \
 	LGPL-2.1+, \
-- 
2.55.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-10-28 17:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-28 15:51 [Buildroot] [PATCH v4 1/3] package/systemd: bump version to 258.12 Fiona Klute via buildroot
2026-10-28 15:51 ` [Buildroot] [PATCH v4 2/3] package/tpm2-tss: enable host build Fiona Klute via buildroot
2026-10-28 15:51 ` [Buildroot] [PATCH v4 3/3] package/systemd: add option to build host systemd-measure Fiona Klute via buildroot
2026-10-28 17:21 ` [Buildroot] [PATCH v4 1/3] package/systemd: bump version to 258.12 Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox