gentoo auto-resync : 04:02:2025 - 00:10:23

3 files changed, 49 insertions, 3 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index e381c87b0375..271cc9847e05 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,6 +14,7 @@ AUX qemu-9.0.0-capstone-include-path.patch 1433 BLAKE2B 7ad95b5f4ce68ceb74e13183
 AUX qemu-9.0.0-disable-keymap.patch 1434 BLAKE2B daef38624095a5bd861e04930decd86dd8f5a8f505e0a885df1abd5dac79217e7b0db24429bb48d7a95b0c184c24ec2da333528db619955102432b7fd7898707 SHA512 603525c4549b6a7c7f6f83150d47949ace89e659054d1a67b523d61a816c51986a56df2f972a08587a8e127823768cd2f5c6ae3b32c52f893e4fb481b7884aed
 AUX qemu-9.1.0-capstone-include-path.patch 1097 BLAKE2B d59702b5e4ea11dc03e337f9cd281079f1bdbbe727f891b27c52c4a8d0b3579c2d0df1e78f3f81d86f1826f39121005373193dc4cbe2dae55be94aa028beccfc SHA512 dded3cd21740f704dab6c80c6a6037a512aa2f5777b3f7a940d12450c0ee93f0c6a0f3cda537e05d6cd2d8e854752f195f1f420d0fe89270c3f672a49f845f23
 AUX qemu-9.2.0-capstone-include-path.patch 1355 BLAKE2B e35e72378bf5c4e832da1061cfecd9b5ab14cf52a27abd519f44283cf8858935b996129b8530cce795289c409e9648295eb29493b0cba0659cfe646dc3d7cd9b SHA512 5f0e58ec87245495ea6e68f0494484f5ab5f57412ac05240547bf3df723aa0a0baaded9b50c3d4caf0be35f3e61a2cc71aafce260fba81f871e3262be633ed74
+AUX qemu-9.2.0-glibc-2.41.patch 1674 BLAKE2B e30d8ee1c806d825aa05e1ecf6192f72765920c2e7b95c0db47a777491c52e535ee54159b689a65d92df2250a70a8699bea37c4a04c2cc1dea22dab87e8af9b2 SHA512 f086fb27bcb40929d5e559bd12e58799d3ecd0b37abe0b860a3c836475792048e7fa0a27118c9a2ec8964f3f1161933b0a121750ac984108e8cac4c3ae3408c8
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.bz2 84094 BLAKE2B 396f9df2e6ad559545054e89916915c3a3c8ff80e5e409498fec497b564d8b3ac9dd3cb966e26dce232ddff82af18a0e84e864ca18a80c2a2f4fe47e320249c2 SHA512 93c20d50a356c90f4293d8c7593611b2e0a9bc7567b6d946319f8ae06962ae1e297c8788f66fd38a1d3a0d44661bff9a07a63eaa84c8bb40ae01a45476be446c
@@ -39,6 +40,6 @@ EBUILD qemu-8.2.7.ebuild 28076 BLAKE2B 1560832941e14183cb7837bff7da86a8208f9dcf0
 EBUILD qemu-8.2.8.ebuild 28080 BLAKE2B 68226fb94d2febe2e47d27c9452376d420803cd26471ab3e2cf0ca89fdd32b427a3288dfc05dd82c6a1f7d6cd86c6241e5cc22c333247b5d801efbcdb6fef5dc SHA512 b984b809661d79dbbb3b7050da56a14a767b8514c9a2dc88e8f56fa05854d86a5983141dd2c537340bdd74d0a8a29d905670dabcbe86d55f185ed6988ba7f160
 EBUILD qemu-9.0.4.ebuild 28295 BLAKE2B 825f64425eede13d8f3be3ddbe002e3976b9a8a341a73665f72e14fa61819ef14b3d20527b082c549584344f9d1811c9ee80be817f5a0b167fd36c4fdc0f1e09 SHA512 d65ae4a48ab9e35cadde02f21150ac055072b4d186da9389db3c147d140a4e510170bb3fe3b02e69d61456e7e5bce2f847fa40015d96272d233690584ea55902
 EBUILD qemu-9.1.2.ebuild 28286 BLAKE2B c1774c10edf579952c369bcc3001732ae0f65112f88145b6c40a988a7d7458214a2837085efce4233861f10a2adacb8a1e762d524dcd6d3d4f4e4954d1c7a546 SHA512 33f78a6155229fa15182c610961500f8a4194fdec76b07bcaedbc81396150e4a5d6fee456c31db4d478751c03e8e99b3739042fac14f19d4dfabd2e90dde7440
-EBUILD qemu-9.2.0.ebuild 28237 BLAKE2B 358bd951084972f0ac9aaa70beb777a711170bb460704a9d4d27ef6a2c748d7ed6b9a21a6425601ed5d561df2a1e1d568f0330a66c360888d84b982a343ac8cd SHA512 252cf2c2fdfa12c0894adfbca82a5f8bd1b1e62dce9c3f2eb075a0e5e4855b490cea79aa4d3c01e0afa73788d273da813d840c026eaf9a289464a88a15cf4590
+EBUILD qemu-9.2.0.ebuild 28280 BLAKE2B 3b7299a6e20db1a62b3a9346861cacf7a139ad490c5f6e8038d92188247d7141801486c5dac409b7e28ac0b159fa19b0e38336d0d34190b274a767e3a8cb1f98 SHA512 bf1d8c5baa5c46b4900b0dc43c15d2fc6f30f4a75b772bb4c94d9c6cbe857d461e2a57444f592442ccd0b1c576788d2a1cfc66530edded70eb8452242cc5d919
 EBUILD qemu-9999.ebuild 28237 BLAKE2B 358bd951084972f0ac9aaa70beb777a711170bb460704a9d4d27ef6a2c748d7ed6b9a21a6425601ed5d561df2a1e1d568f0330a66c360888d84b982a343ac8cd SHA512 252cf2c2fdfa12c0894adfbca82a5f8bd1b1e62dce9c3f2eb075a0e5e4855b490cea79aa4d3c01e0afa73788d273da813d840c026eaf9a289464a88a15cf4590
 MISC metadata.xml 4516 BLAKE2B f46e6395374e5dd22a3304ee5c012311f1ea794038c490ee2e709e3e8ced4f476d34704581b35e049b5f06aa59b59a4392896b566020b35e638c3837eeff66f5 SHA512 34ecef876f4dbfcba11fd02aa40fef9a3a099f4e4912d7a9f81d3663130893b0e1327cd4725e60d47372ee3754435011681e9fff3bd9b97da198273947d47e04
diff --git a/app-emulation/qemu/files/qemu-9.2.0-glibc-2.41.patch b/app-emulation/qemu/files/qemu-9.2.0-glibc-2.41.patch
new file mode 100644
index 000000000000..ea52a1c94656
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-9.2.0-glibc-2.41.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/949098
+https://lists.nongnu.org/archive/html/qemu-devel/2024-10/msg02221.html
+
+glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions
+and struct sched_attr. Therefore, it needs to be checked for here as well before
+defining sched_attr
+
+Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0
+
+Fixes builds with glibc/trunk
+
+[1]
+https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Laurent Vivier <laurent@vivier.eu>
+Cc: Paolo Bonzini <pbonzini@redhat.com>
+---
+v2: Use SCHED_ATTR_SIZE_VER0 instead of glibc version check
+
+ linux-user/syscall.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 1ce4c79..a407d4a 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -358,7 +358,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
+ #define __NR_sys_sched_setaffinity __NR_sched_setaffinity
+ _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
+           unsigned long *, user_mask_ptr);
+-/* sched_attr is not defined in glibc */
++/* sched_attr is not defined in glibc < 2.41 */
++#ifndef SCHED_ATTR_SIZE_VER0
+ struct sched_attr {
+     uint32_t size;
+     uint32_t sched_policy;
+@@ -371,6 +372,7 @@ struct sched_attr {
+     uint32_t sched_util_min;
+     uint32_t sched_util_max;
+ };
++#endif
+ #define __NR_sys_sched_getattr __NR_sched_getattr
+ _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
+           unsigned int, size, unsigned int, flags);
diff --git a/app-emulation/qemu/qemu-9.2.0.ebuild b/app-emulation/qemu/qemu-9.2.0.ebuild
index a6895240627d..e62552d849ff 100644
--- a/app-emulation/qemu/qemu-9.2.0.ebuild
+++ b/app-emulation/qemu/qemu-9.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -319,7 +319,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9.2.0-capstone-include-path.patch
 	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
 	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
-
+	"${FILESDIR}"/${PN}-9.2.0-glibc-2.41.patch
 )
 
 QA_PREBUILT="