From eb2235d914984bff74c625de4fa4887d4f86f971 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Oct 2022 19:13:18 +0100 Subject: gentoo auto-resync : 02:10:2022 - 19:13:17 --- app-emulation/libvirt/Manifest | 3 - .../libvirt/files/libvirt-7.10.0-fix_soname.patch | 13 ----- .../libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch | 32 ----------- .../libvirt/files/libvirt-8.5.0-glibc-2.36.patch | 67 ---------------------- 4 files changed, 115 deletions(-) delete mode 100644 app-emulation/libvirt/files/libvirt-7.10.0-fix_soname.patch delete mode 100644 app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch delete mode 100644 app-emulation/libvirt/files/libvirt-8.5.0-glibc-2.36.patch (limited to 'app-emulation/libvirt') diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 22df07d08111..248b81f12b28 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -2,12 +2,9 @@ AUX README.gentoo-r3 2065 BLAKE2B f3677b916121126c431ba32e324bcc9f04b4dfeef1ee54 AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2 AUX libvirt-6.7.0-do-not-use-sysconfig.patch 5001 BLAKE2B 65e6dfacc598ba771fccc1c45c504aadcc83d0d8df211e70721dd0d7e3653c2c4d44a892ece19ee7e22d95552950e21f9d9e0a4ff960d66ebd2f9999c4cd52d1 SHA512 7dd3e4cf03dd8351a644a1669be70fcc6397b27983c0ec7b716dde61c92cf7dc9c46fc841cead5ae616897d9ed60209b03d5d78a4247215f4e79d11282da91ad AUX libvirt-6.7.0-fix-paths-for-apparmor.patch 1974 BLAKE2B b5e9a151aa6bfbccf76ef0d6638b00cfbc3f8c4d5a722ba83699d29a32ef2f9a7d9eb678c1f61a128b0fee958a3349a4b843be08cec940f7d1e22757bc66bb95 SHA512 f81627e9c3d6c117e76a7a30af162a8ff8fafa191313155ceecf39bae2c457417152a0380d06cd3a4958b52a6ba410730cf66cd912072f7ec951b507c0a83f96 -AUX libvirt-7.10.0-fix_soname.patch 488 BLAKE2B 83a69686fa431f0ac360b9658abec16fb08c8373b4b79c75aaaa0c38c3251f803d907396f4cc92762d7e72be18b78da83def39dbb235cf543585d0d1e98407f9 SHA512 a492dc55799165b4b23e773e198a7092115bf128a5a6e368e802f04e504f5fd68ab80560c76fc37e204fb92149fd64f252e82e4fff394318e5c212e0da826a9a -AUX libvirt-7.9.0-fix_cgroupv2.patch 1273 BLAKE2B a51442511a9f3b1ce3702dec2c59cb1cdbc7a67710b5e7e48e16265ddd48d8e5bfca908ad2c6000497fea9332c1d62b9786a2fb96bbc3cace6dc002448a4d5a9 SHA512 f00dfb1ed1f4f3e2f26178b6c2b821af9deb3ee6c63f79c194612432f9a735567c4d81c8928a02e1c9dbe7d6ac0f16bb526e506b0c6d84b727b99ae8f654417d AUX libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch 2214 BLAKE2B f36e1e3fecb846834d09699a914e1e79afd8f283cdef1ce1085574d1ec5b573075af26854be2e3002db49aad87d005995606bc1cb501476209ed6eba5c514928 SHA512 24f49141cfe21eee27bc9cd4c3766bca4dec10afb8e2249198e083f5f3980d157c84aa59816f448993bf6ed30d4fe2795714adf16066e8fd185df87f363a18d8 AUX libvirt-8.2.0-do-not-use-sysconfig.patch 8420 BLAKE2B 37856003bc58b69531be6b55fcc3304b71558b7a5306c2da3fbad2d5eac006ca3ebb54bd56f8e761363311a5c865d2cd072c418794fcb605562fc32f997c88a9 SHA512 84a693b870aebe0f87f518473d28d97e613b6069f497e6e49c3e8feffc96c2e709d0a7a3530c52d4d034c6b0bc7374ab61f40ddd2f071735c5baacdebcfca8b6 AUX libvirt-8.2.0-fix-paths-for-apparmor.patch 3006 BLAKE2B 641c8942d28b8f3050f67809f332b76acb9d46ccfba30387603a7f3a60f80162a290b0b3ba3dac51c488ba14ac457ecc49526e98251380eb1fd3aaf293f444c2 SHA512 1b267df41892dcf5791720a9e7cd819b65024eaa3469d7b9496b86fc67d89d90dcebddcb5baf627fdde3277400fbc6611d056267a0aa4baa4083da3f532679ec -AUX libvirt-8.5.0-glibc-2.36.patch 2195 BLAKE2B 265c5e03e60eacb39aa882f5422918458f02d458d8c35544f93415181b74072fd3afea51953dab1a8aa2bc36beb81dd4197a72a4bc930b3020ed1623273867f7 SHA512 1bcd02eb717c31aaef34ffd4e853585b8a1098f28b4e62b480fd13db03f5496c823f0b18da904a52db7be48ecb11000f342352d34fc8229f39b623b9c9e7c0da AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91 diff --git a/app-emulation/libvirt/files/libvirt-7.10.0-fix_soname.patch b/app-emulation/libvirt/files/libvirt-7.10.0-fix_soname.patch deleted file mode 100644 index 8e89fc818fb5..000000000000 --- a/app-emulation/libvirt/files/libvirt-7.10.0-fix_soname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/nss/meson.build b/tools/nss/meson.build -index 198936f3d42e1827d0f03ff3b27a198bdc4fa59c..f77309ebcab8063c515ae2bf95dbff542238a2ee 100644 ---- a/tools/nss/meson.build -+++ b/tools/nss/meson.build -@@ -59,7 +59,7 @@ nss_libvirt_guest_syms = '@0@@1@'.format( - meson.current_source_dir() / nss_guest_sym_file, - ) - --nss_libvirt_lib = shared_module( -+nss_libvirt_lib = shared_library( - 'nss_libvirt', - name_prefix: nss_prefix, - name_suffix: 'so.@0@'.format(nss_so_ver), diff --git a/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch b/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch deleted file mode 100644 index 1309996f3ecf..000000000000 --- a/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c80a05cd7d5f17ee16a2bc2546981863451fcab7 Mon Sep 17 00:00:00 2001 -From: "System user; portage" -Date: Wed, 8 Dec 2021 15:07:06 -0600 -Subject: [PATCH] Revert "lxc: controller: Fix container launch on cgroup v1" - -This reverts commit 1b9ce05ce241a581d4e80228c92ceb0266f21f94. ---- - src/lxc/lxc_controller.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c -index 444f728af4..8953e0c904 100644 ---- a/src/lxc/lxc_controller.c -+++ b/src/lxc/lxc_controller.c -@@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl) - nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1); - - if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def, -- getpid(), -+ ctrl->initpid, - ctrl->nnicindexes, - ctrl->nicindexes))) - goto cleanup; - -- if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0) -+ if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0) - goto cleanup; - - /* Add all qemu-nbd tasks to the cgroup */ --- -2.32.0 - diff --git a/app-emulation/libvirt/files/libvirt-8.5.0-glibc-2.36.patch b/app-emulation/libvirt/files/libvirt-8.5.0-glibc-2.36.patch deleted file mode 100644 index e02c5ea44086..000000000000 --- a/app-emulation/libvirt/files/libvirt-8.5.0-glibc-2.36.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://bugs.gentoo.org/863446 -https://github.com/libvirt/libvirt/commit/9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 -https://github.com/libvirt/libvirt/commit/c0d9adf220dc0d223330a7bac37b174132d330ba - -From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Mon, 1 Aug 2022 15:20:38 -0400 -Subject: [PATCH] lxc: containter: fix build with glibc 2.36 - -With glibc 2.36, sys/mount.h and linux/mount.h conflict: -https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in -linux/mount.h. - -linux/fs.h isn't required here though. glibc sys/mount.h has had -MS_MOVE since 2.12 in 2010 - -Reviewed-by: Erik Skultety -Signed-off-by: Cole Robinson ---- a/src/lxc/lxc_container.c -+++ b/src/lxc/lxc_container.c -@@ -33,9 +33,6 @@ - /* Yes, we want linux private one, for _syscall2() macro */ - #include - --/* For MS_MOVE */ --#include -- - #if WITH_CAPNG - # include - #endif - -From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Mon, 1 Aug 2022 15:24:01 -0400 -Subject: [PATCH] virfile: Fix build with glibc 2.36 - -With glibc 2.36, sys/mount.h and linux/mount.h conflict: -https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -virfile.c imports sys/mount.h and linux/fs.h, which pulls in -linux/mount.h. - -Manually define the constants we need from linux/fs.h, like was -done in llvm: - -https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 - -Reviewed-by: Erik Skultety -Signed-off-by: Cole Robinson ---- a/src/util/virfile.c -+++ b/src/util/virfile.c -@@ -71,7 +71,11 @@ - # endif - # include - # include --# include -+/* These come from linux/fs.h, but that header conflicts with -+ * sys/mount.h on glibc 2.36+ */ -+# define FS_IOC_GETFLAGS _IOR('f', 1, long) -+# define FS_IOC_SETFLAGS _IOW('f', 2, long) -+# define FS_NOCOW_FL 0x00800000 - #endif - - #if WITH_LIBATTR - -- cgit v1.2.3