gentoo auto-resync : 20:08:2024 - 12:25:59

3 files changed, 0 insertions, 138 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 000a2ed92899..94e8c2a72d0e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index aeb7487a6716..04c3eda4f34b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -5,7 +5,6 @@ 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 5148 BLAKE2B 74d22dbc2113d7e7150908046f5c7c04be2f330143d7f61b5a08d8b837b3665857327f50176393a3df0078c5b856cd34b72e779825d10fb8faec9678812d8654 SHA512 3c4a7d41710b34bdce4ab09929aba25fe3995c85dfa1e2a88ea780179709e8ccfe7e7c5073ef321c986061282725896ca615193be68c48674d6b5632f4995661
 AUX qemu-8.0.0-disable-keymap.patch 968 BLAKE2B f9496eb2c1fd91c2b570d3328d309f880bc15380a5302266aa18a0e85ed63df2263efa12c2295a7a3ec94a7ab205394b817a066b66e61e7ed875e3c501a3465b SHA512 3d686bfb9b4d7d58f1aec1ebd28f158e4e4ea521df9da5d15e6e28fc11de74da141c88e4f0a1eda234eb06fcd1e1767847aaa1883009c8468099cfa6acbd8761
 AUX qemu-8.0.0-make.patch 231 BLAKE2B a38c26a1150a47b627add1ebf43d319cc405855515a6ee75a44dc31e042f2e5049e142367d1371efd3377d1a3be133ec95c1b9c4755097c0f522bfad67718178 SHA512 1c23959b5d860829000cf699a6943215f073530eb57745a8683d8df0978ddb380cbdcbdd9ed6936ca5d1c4b7897b8d92068bb37c894f8ffa39ee8c8751e0a56c
 AUX qemu-8.0.0-remove-python-meson-check.patch 1413 BLAKE2B b5e24afacb4289126b7b6b475406f2aead0dd62009a57649a929a15689caf3e41e9240e42930f05bf2889d902dee91bd5b7ef37825ab1a91bfd7a0ea8dfaa7af SHA512 fc59b3f413496337c84a63f85552fb571e77d343b7ad5271120f08b14aee9a2d6e5ea16b6c28c9fbbf22ce86924e399185797f3f18575d8c23334b0872fae592
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
deleted file mode 100644
index 2a58ca1ad735..000000000000
--- a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-https://bugs.gentoo.org/895662
-https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a
-https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e
-
-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
-
-From 6003159ce18faad4e1bc7bf9c85669019cd4950e 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:01 -0500
-Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36
- sys/mount.h"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
-
-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-3-berrange@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,25 +95,7 @@
- #include <linux/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>
--
--#ifdef HAVE_SYS_MOUNT_FSCONFIG
--/*
-- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
-- * which in turn prevents use of linux/fs.h. So we have to
-- * define the constants ourselves for now.
-- */
--#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
--#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
--#define FS_IOC_GETVERSION              _IOR('v', 1, long)
--#define FS_IOC_SETVERSION              _IOW('v', 2, long)
--#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
--#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
--#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
--#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
--#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
--#else
- #include <linux/fs.h>
--#endif
- #include <linux/fd.h>
- #if defined(CONFIG_FIEMAP)
- #include <linux/fiemap.h>
---- a/meson.build
-+++ b/meson.build
-@@ -2046,8 +2046,6 @@ config_host_data.set('HAVE_OPTRESET',
-                      cc.has_header_symbol('getopt.h', 'optreset'))
- config_host_data.set('HAVE_IPPROTO_MPTCP',
-                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
--config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
--                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
- 
- # has_member
- config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
--- 
-GitLab