gentoo auto-resync : 21:02:2023 - 08:23:43

3 files changed, 69 insertions, 1 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 404d2761ad2b..1dd0f8b5e133 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -5,11 +5,12 @@ AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b7
 AUX qemu-7.1.0-also-build-virtfs-proxy-helper.patch 1167 BLAKE2B dee6c98a547a510827f422a5d2b03edd6d467e4713f357a5841e01d632578891a0e2e715c57153c7842b51f5199cea70d8e76ff31f0372308e26202e1587af62 SHA512 d2fb9db139588961434663910dc7151c91b82c1820f62ed5ae690e4f868f1957d8ad2dc1b812813a2081ce6bbdd0f8e59cddd9459de6ef493df02b5a4478de63
 AUX qemu-7.1.0-capstone-include-path.patch 1076 BLAKE2B cb595acb50ff2a64d0b879d5d8439d89b0d6295434ae09d1c45c01d3b18f547dcac201e79140eb9dc376d2d8c1d1b72a5adfe7ac477da61c86da148ed486ff2b SHA512 857504916325984150f8e0869aa44b158ed829b53d2bcb7f7012390d2d404ae1553af50184be6e2d8f91ffedfc5c061b7f64b9f28feb38bf18379dee56704732
 AUX qemu-7.2.0-disable-gmp.patch 1554 BLAKE2B ac21e5985676123e8b61de8d590d8489de1d7401e5005899e5a95d7e86b77741572087a294d4b63533c26fe53f81c76e23ee482fd3a371f2e3700859644b6c8a SHA512 d4a600cfe42f1c49d45cffae64ba1e1225ae8e75a92454cbb534be5f95e1b8dbdbf441d092764cc9f9e97ed6bf6367175d7b56cdf97694dec57da2c8fabd1969
+AUX qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch 2320 BLAKE2B 64022da1b085dd945ac03fdf7af98648aa16879a5f08999175e30bd2547b39ea0d5357b057e11a9b533d6d64e136ceb7bec24ffad98af541a5ab85217f9ad1d0 SHA512 f7ad30bf240faf7f5346ffa05fadc37345d7d35dc8c738e450be0531ada81f276cb87a12e630ee47fd75f130e46f897544f623987c645e7123ebf48b13e7636e
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06 SHA512 a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530 SHA512 f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
-EBUILD qemu-7.2.0-r2.ebuild 27449 BLAKE2B d4e4281fd6524488fa4688057fc0e24b5681a94e83ddb2fc2a4960d37a1b22ab497cd9c9684b2e13ff741824359ae76eff7416ed1d4617b012ea0e1db9c55532 SHA512 5a7a8091b006b34744384ca578f23cca4978ce24961e725f96e9a76ffe4ab6b40f2435c458df69d57e6b416908426e7e88b740a17fe3c65bc6e877603cda470d
+EBUILD qemu-7.2.0-r2.ebuild 27511 BLAKE2B 42b6f37ac0884baec367ee08783d8605bab17c9d396a29d71a2f4d29171f27f41ade4c22918d9818460d1554ea354b844a0cbd3f967898ce0f8f5fc0d61339e3 SHA512 d92da3cbe562f29b1cdeaab456dd68eec0a57e54230deecce53537ff54ecab7a4abb839ae491eb3958f7635dcdc4327ba9ff4d879d7e2db3fecb62f44b693131
 EBUILD qemu-7.2.0.ebuild 27190 BLAKE2B e8043e113cef4b06501c0141126925ee21906c187868202b8c4b885120dc6552305558b55ba88f4cdc5c004771d8e888d86a6f8140f17200279e3b2ee85da9f8 SHA512 c413dfa2382e993022d079128afd5e49ce41eebd276323836058ce5fe2d620baad35868bf213cae3c0d212eb9bf7ba53c0eb58380435cb5808d96a11a8980822
 EBUILD qemu-9999.ebuild 27365 BLAKE2B d8fda510a06bd1164b36c215978254710b0c924a0667dd0ab2c89d907d51df8b366b7b8f69b55bf4a20621dd3df5de36cc6166c5e12c194c08b341ef658568a7 SHA512 a3a4333404505538f96ffac67741fe04f6a047cdd0f9a5a19e2e784f752dfd2b07950b28ee0ea5d715deed4d118a3b29cb3c17502a434d214575e152c7fb6ea1
 MISC metadata.xml 4249 BLAKE2B 56e23de79e691a3634c21f2c7d3d2d02461cc5d2569c4ff15856f8ea99f8d53837cfa7c4dede988c304fdbe3c831f9cd776b9d62191e87f593d9643594abc133 SHA512 c4fd2aea291de484c24e3ef8d1b88a95fe3ac0b73d44bbae99f0de076b2335222f32e1b49a3fe7bd7168dc5cc290274a13bd7c615aeb54d06a04c8819e1f1b96
diff --git a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
new file mode 100644
index 000000000000..856997886cc9
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/895662
+https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a
+
+From 9f0246539ae84a5e21efd1cc4516fc343f08115a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 10 Jan 2023 12:49:00 -0500
+Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Message-Id: <20230110174901.2580297-2-berrange@redhat.com>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include <linux/fs.h>
+ #endif
+-- 
+GitLab
diff --git a/app-emulation/qemu/qemu-7.2.0-r2.ebuild b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
index 7632e13429ee..c13da1572122 100644
--- a/app-emulation/qemu/qemu-7.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
@@ -315,6 +315,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
 	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
 	"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
+	"${FILESDIR}"/${PN}-7.2.0-linux-headers-6.2-glibc-2.36.patch
 )
 
 QA_PREBUILT="