From 535bbcdd91585856234b3764d1662513eeb36cb7 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 4 Aug 2022 15:57:34 -0400 Subject: [PATCH] Use upstreamed 'glibc fix' commits Signed-off-by: Cole Robinson --- ...lxc-containter-fix-build-with-glibc-2.36.patch | 3 ++- 0002-virfile-Fix-build-with-glibc-2.36.patch | 15 +++++++++------ libvirt.spec | 5 ++++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/0001-lxc-containter-fix-build-with-glibc-2.36.patch b/0001-lxc-containter-fix-build-with-glibc-2.36.patch index 8aa1c16..4e78977 100644 --- a/0001-lxc-containter-fix-build-with-glibc-2.36.patch +++ b/0001-lxc-containter-fix-build-with-glibc-2.36.patch @@ -1,4 +1,4 @@ -From de63f9ca622e25df97ca926d7e409d074499fcf6 Mon Sep 17 00:00:00 2001 +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 @@ -13,6 +13,7 @@ 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 --- src/lxc/lxc_container.c | 3 --- diff --git a/0002-virfile-Fix-build-with-glibc-2.36.patch b/0002-virfile-Fix-build-with-glibc-2.36.patch index 8e11716..40fcbc7 100644 --- a/0002-virfile-Fix-build-with-glibc-2.36.patch +++ b/0002-virfile-Fix-build-with-glibc-2.36.patch @@ -1,4 +1,4 @@ -From 3b6a3cfd76832efd504bb3e868675e0f27e16c3a Mon Sep 17 00:00:00 2001 +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 @@ -15,22 +15,25 @@ done in llvm: https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 +Reviewed-by: Erik Skultety Signed-off-by: Cole Robinson --- - src/util/virfile.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + src/util/virfile.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c -index 99da058db3..65d6d2a701 100644 +index 99da058db3..ce541b8946 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c -@@ -71,7 +71,9 @@ +@@ -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 _IOR('f', 2, long) ++# define FS_IOC_SETFLAGS _IOW('f', 2, long) +# define FS_NOCOW_FL 0x00800000 #endif diff --git a/libvirt.spec b/libvirt.spec index d9a99e4..f4937e7 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -231,7 +231,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 8.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -2131,6 +2131,9 @@ exit 0 %changelog +* Thu Aug 04 2022 Cole Robinson - 8.6.0-2 +- Use upstream 'glibc fix' commits + * Mon Aug 01 2022 Cole Robinson - 8.6.0-1 - Update to version 8.6.0