gentoo auto-resync : 07:01:2025 - 06:41:06

3 files changed, 52 insertions, 3 deletions

diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 5ce22d37e02b..a424eb40047c 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,3 +1,4 @@
+AUX bolt-0.9.8-sockaddr.patch 2983 BLAKE2B c920e37e0929aba68cf600c9c46845ac39f93b313a22ffe7879ba512e655bcb8fa707678049482976ae11d5fdaa41daa27e1ed8bb3996f0c2a9d9680c1a3d750 SHA512 8524b546ea1b1ee8343cdb0b874dce5805a4592ee88ea076c22202004b9e0a06e9eaaf02bf01a416add21d44a6a4df563cbebd101f09ecfa612955d5ed26cd51
 AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
 DIST bolt-0.9.3.tar.gz 253085 BLAKE2B 7547a35aa16a7681737989c72dfd2e13245eb50c7b814de979974750e3c8805156fd22054308d715299baab3ebd4144923aacc04ef301ee039e84b6370cbcba7 SHA512 2160831011090e75cf54408525f53ead6c0e7797de8a4afdd07ef5a035f8e1aa58f34efb9bd52e6e7cd93ac17751e72ff27e99f2b372a5720b2cbadd6abb3c26
@@ -7,5 +8,5 @@ DIST bolt-0.9.8.tar.bz2 192836 BLAKE2B 7a06572562af5586d479fee58fb2469b8d804d6ea
 EBUILD bolt-0.9.3.ebuild 1510 BLAKE2B e4bb0dc43a908819536be8f6bfef2192b0bd91bdb7709591a7d6ec6456ea5c4acd26321853827991ef06c3132881a0dca72a8d2bfc934dc38b7205e6489ea7cf SHA512 f1aa444fc9b97175c4835e25bd680ec25e4a84dc3f68dd1c3987f2125cd68f93f2be639f13b2d1cf0b868be33906ca082c26c151a2dbe1cf06c6237b2c038d2d
 EBUILD bolt-0.9.6.ebuild 1513 BLAKE2B 0e226e6df150925b5959cb2152e9d4916a428a120fe9fb70a8fdcd3362b03c58332e9e3ae6739d95437de6c9cb2438430715ec4b458b4fe3f06cff0314955d50 SHA512 df6053b1cac9ced5343215ead505d856c591174d56198acdf215eba3d080c702e6eaeb8ecdf5b2208d251dd101505dbeb93f3e7d2807ae6df72526baf944bc18
 EBUILD bolt-0.9.7.ebuild 1512 BLAKE2B caaa983eafc672942494982a5625ca9132abe5b0e3b3e81425b23c173b1e7aef84c6b637bcf29d3304eef284ecf01653d74e638f572e960b163a2e4e91b39849 SHA512 3c348403e36266a8f2cf6203f7e34e76830791c7d1d6507f522b2fb53c82c841e607eef078494b0c2f7be459f4ea73daf08dfff4c3967262f5b40ee27f62d91c
-EBUILD bolt-0.9.8-r1.ebuild 1810 BLAKE2B 09e9cf0f8da6d9eb3c14faacb6091940cf8c1cc2b77e59f813c0a13ad9366888d0d88e087a21e6b9b44234a3c6b70eb6e4a259bb0f490b59ca9f04d51e96f9ef SHA512 e4d3ee20640bd78020f046a9bb1ba1932f275059a64e84b74d80fb3495a8d3c3c7c4c1632aae0bae3cd4c6109522f5476ad19ab19bbce14b788c3aebc69e769d
+EBUILD bolt-0.9.8-r1.ebuild 1857 BLAKE2B e3790fbcd41e03ecd1ff357206e77e3a5f78fe9c60a6201340618bf71bd351aa579a954b8310adaf75274a4fa563944675dae851393508c74d22b406a3a89c82 SHA512 8f9b05699e833ee05fb5db7783a883ab4704ab288568a370ba4e43364ee27e779b1eb1ffb430b2885280628d356c56d39069a5be09605890d03ea2fe3b9bed6a
 MISC metadata.xml 451 BLAKE2B 94c6636aad24b94547fb550df1140079bb97aabbbeb4834f60760926f5ca21b5da7617621afb2f27744dd1fc93110e0f13cf7b1190dff0d5c9593e730aa69d0a SHA512 0f136a7526bfa3c8edf6ca2c6e065cfff5fc591d5be4f3bfbc68886b8e880ea870b7505a342098a9406eb942fb11dc2b34f0f8c7da53c5514640f508c95658db
diff --git a/sys-apps/bolt/bolt-0.9.8-r1.ebuild b/sys-apps/bolt/bolt-0.9.8-r1.ebuild
index 52152993deca..53796044710b 100644
--- a/sys-apps/bolt/bolt-0.9.8-r1.ebuild
+++ b/sys-apps/bolt/bolt-0.9.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_1{0..2} )
+PYTHON_COMPAT=( python3_1{0..3} )
 inherit linux-info python-any-r1 meson udev
 
 DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
@@ -44,6 +44,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-sockaddr.patch )
+
 pkg_setup() {
 	if use kernel_linux && kernel_is lt 5 6; then
 		CONFIG_CHECK="~THUNDERBOLT"
diff --git a/sys-apps/bolt/files/bolt-0.9.8-sockaddr.patch b/sys-apps/bolt/files/bolt-0.9.8-sockaddr.patch
new file mode 100644
index 000000000000..684e31c5e60c
--- /dev/null
+++ b/sys-apps/bolt/files/bolt-0.9.8-sockaddr.patch
@@ -0,0 +1,46 @@
+https://gitlab.freedesktop.org/bolt/bolt/-/commit/9f85914f1efd7b74fb7bd906b339fcba2214d86a
+From 9f85914f1efd7b74fb7bd906b339fcba2214d86a Mon Sep 17 00:00:00 2001
+From: Kate Hsuan <hpa@redhat.com>
+Date: Mon, 6 Jan 2025 14:12:47 +0800
+Subject: [PATCH] tests: bolt-test: Fix build error with gcc14
+
+Fix build errors with gcc14.
+The fix includes:
+1. Cast sockaddr correctly.
+
+build errors:
+
+x86_64-pc-linux-musl-gcc -Itest-auth.p -I. -I../bolt-0.9.8 -I../bolt-0.9.8/tests -I../bolt-0.9.8/common -I../bolt-0.9.8/boltd -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/lib/libffi/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/polkit-1 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu99 -fstack-protector-strong -Waggregate-return -Wunused -Warray-bounds -Wcast-align -Wclobbered -Wdeclaration-after-statement -Wempty-body -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-signedness -Wignored-qualifiers -Wimplicit-function-declaration -Winit-self -Wmissing-declarations -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-parameter-type -Wmissing-prototypes -Wnested-externs -Wno-discarded-qualifiers -Wno-missing-field-initializers -Wno-suggest-attribute=format -Wno-unused-parameter -Wold-style-definition -Woverride-init -Wpointer-arith -Wredundant-decls -Wreturn-type -Wshadow -Wsign-compare -Wstrict-aliasing=3 -Wstrict-prototypes -Wstringop-overflow -Wstringop-truncation -Wtype-limits -Wundef -Wuninitialized -Wunused-but-set-variable -Wwrite-strings -O2 -pipe -march=native -fno-diagnostics-color -pthread -MD -MQ test-auth.p/tests_bolt-test.c.o -MF test-auth.p/tests_bolt-test.c.o.d -o test-auth.p/tests_bolt-test.c.o -c ../bolt-0.9.8/tests/bolt-test.c
+../bolt-0.9.8/tests/bolt-test.c: In function 'notify_socket_new':
+../bolt-0.9.8/tests/bolt-test.c:131:17: error: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types]
+  131 |   r = bind (fd, &sau, socklen);
+      |                 ^~~~
+      |                 |
+      |                 struct sockaddr_un *
+In file included from ../bolt-0.9.8/tests/bolt-test.c:37:
+/usr/include/sys/socket.h:385:16: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *'
+  385 | int bind (int, const struct sockaddr *, socklen_t);
+      |                ^~~~~~~~~~~~~~~~~~~~~~~
+
+Resolves: #192
+Link: https://bugs.gentoo.org/937273
+---
+ tests/bolt-test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/bolt-test.c b/tests/bolt-test.c
+index beabb8d..aa94222 100644
+--- a/tests/bolt-test.c
++++ b/tests/bolt-test.c
+@@ -128,7 +128,7 @@ notify_socket_new (void)
+     + strlen (sau.sun_path)
+     + 1;
+ 
+-  r = bind (fd, &sau, socklen);
++  r = bind (fd, (struct sockaddr *) &sau, socklen);
+   g_assert_cmpint (r, >, -1);
+ 
+   r = setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof (one));
+-- 
+GitLab
+