gentoo auto-resync : 04:08:2022 - 02:04:17

3 files changed, 70 insertions, 1 deletions

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index e659aa86dce9..e1587ba6f564 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -9,6 +9,7 @@ AUX libvirt-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch 1337 BLAKE2B
 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.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch 2967 BLAKE2B d9df072a8fe5285c2a817e96ad2e7d5e855446bb4b80427a6366342f1a8a8621e9ffaf489692163f65f5974aee7010be7da1dd3849eb687661ad2daaf42df921 SHA512 7ad655dcf0b4cc7667f7baf40401535e03e437b5c1069f57ba95d4b05fb37fd4d8e875af00809d70da24e501ec601d34290a47603451de7aa6dde12eb0c89c60
+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
@@ -39,6 +40,6 @@ EBUILD libvirt-8.1.0.ebuild 8787 BLAKE2B c131f96900497a858c4f15ab9352f4ea339074a
 EBUILD libvirt-8.2.0.ebuild 8817 BLAKE2B 1f849e58e6fb66c5b732b16b4df83fb73ec36c75857803ebec17a23489f247ea61fa30fe3afc10b6ce22040ed5916e5f6106205c9c0d4fdce35a1305aa5ec30e SHA512 431c2a164bc956cb9b468aaa35534a1b4c532537340274d963bb4cd555288ccdca4369a3001133e87dd2d20eb6a93e9b14c9c34ecf3f0ea80ceadeb2211984d6
 EBUILD libvirt-8.3.0.ebuild 8948 BLAKE2B 4dffb4d34aafa8a4998ddc3ef9e26b18e5188f1c836ca75d68b75909bae70a9c52a9e03311b08e8e39ee498e243d2557e37f4024e376fc40565f55f778f3c3e7 SHA512 39568ef7a362fa13e7e9958246d02a919174f07381b44fe44134ecc6ef00a1ee81e836e3e12be391bba7e0510aa4651a6816aaaf2f5340f398dea54656e5b248
 EBUILD libvirt-8.4.0.ebuild 8953 BLAKE2B afa854c0c31cf705e401fb5733d52c3ac720c52c62dd7517ef79d791c8e93a71b5f2c1628a49ab9d6e314bdf343304aaf9cb79ec56a5b2cb99309055e7a785f8 SHA512 77c6cac11ece2fd8a01193ab1da4cfaa7ac6f7addc4500054f93a649faac4f119400056c79a835f56e29417fbaa683e7f4dc8b73d03585dadcf8926b6be22ade
-EBUILD libvirt-8.5.0.ebuild 8953 BLAKE2B afa854c0c31cf705e401fb5733d52c3ac720c52c62dd7517ef79d791c8e93a71b5f2c1628a49ab9d6e314bdf343304aaf9cb79ec56a5b2cb99309055e7a785f8 SHA512 77c6cac11ece2fd8a01193ab1da4cfaa7ac6f7addc4500054f93a649faac4f119400056c79a835f56e29417fbaa683e7f4dc8b73d03585dadcf8926b6be22ade
+EBUILD libvirt-8.5.0.ebuild 8997 BLAKE2B be5e5afc4b65e4a41a9b2e45766924506c441a2b9fb09e6030a7ae7b53a002d0a7a2211817b8d4231aa47de6a5a6aa5ce045e78a62c21de7c0f7878eaa303288 SHA512 79f6459febb08d1a7c4783c8b59ed384c4bfe64bcad9e00b9577e74c1bbc124aa89661a8ef255227e9af51b0dc71b599bec236ce19b28a6f9fe538792d31e651
 EBUILD libvirt-9999.ebuild 8948 BLAKE2B 4dffb4d34aafa8a4998ddc3ef9e26b18e5188f1c836ca75d68b75909bae70a9c52a9e03311b08e8e39ee498e243d2557e37f4024e376fc40565f55f778f3c3e7 SHA512 39568ef7a362fa13e7e9958246d02a919174f07381b44fe44134ecc6ef00a1ee81e836e3e12be391bba7e0510aa4651a6816aaaf2f5340f398dea54656e5b248
 MISC metadata.xml 3784 BLAKE2B 79ac58c142350e62e237e7245c40f4fd25d8e3c19d308440de66df8e6af46bd8847370fb1bf17dfd36e331fe50bd2114a6ebec7e40544fbd3bc049602e9a8657 SHA512 6a27d14d0b4345ccc2060c39af245673df10460d4844cb2732e82005804706e1c61192a0c26dfc04c3c4dc1225173fb8fb966e4197454433f6d7ed8d5601c84d
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
new file mode 100644
index 000000000000..e02c5ea44086
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-8.5.0-glibc-2.36.patch
@@ -0,0 +1,67 @@
+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 <crobinso@redhat.com>
+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 <eskultet@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+--- 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 <linux/unistd.h>
+ 
+-/* For MS_MOVE */
+-#include <linux/fs.h>
+-
+ #if WITH_CAPNG
+ # include <cap-ng.h>
+ #endif
+
+From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+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 <eskultet@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -71,7 +71,11 @@
+ # endif
+ # include <sys/ioctl.h>
+ # include <linux/cdrom.h>
+-# include <linux/fs.h>
++/* 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
+
diff --git a/app-emulation/libvirt/libvirt-8.5.0.ebuild b/app-emulation/libvirt/libvirt-8.5.0.ebuild
index 1ac6f7431bdb..f81dbc7d518b 100644
--- a/app-emulation/libvirt/libvirt-8.5.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.5.0.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-8.5.0-glibc-2.36.patch
 )
 
 pkg_setup() {