Rebuild for wireshark soname change rhbz#2031322

Now with missing patches

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

.abignore

@@ -0,0 +1,31 @@
+[suppress_function]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_function]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*

.gitignore

@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.gz
+libvirt-*.tar.xz

0001-build-support-explicitly-disabling-netcf.patch

@@ -0,0 +1,56 @@
+From: Laine Stump <laine@redhat.com>
+Date: Thu, 21 Jan 2021 16:01:06 -0500
+Subject: [PATCH] build: support explicitly disabling netcf
+
+placing "-Dnetcf=disabled" on the meson commandline was ignored,
+meaning that even with that option the build would get WITH_NETCF if
+the netcf-devel package was found - the only way to disable it was to
+uninstall netcf-devel.
+
+This patch adds the small bit of logic to check the netcf meson
+commandline option (in addition to whether netcf-devel is installed)
+before defining WITH_NETCF.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Neal Gompa <ngompa13@gmail.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 06169a115d46d8870a96d293c2faf6ea87e71020)
+---
+ meson.build | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index b5164f68ed..e9d6d9f82e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1155,8 +1155,10 @@ libm_dep = cc.find_library('m', required : false)
+ 
+ netcf_version = '0.1.8'
+ netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf'))
+-if netcf_dep.found()
+-  conf.set('WITH_NETCF', 1)
++if not get_option('netcf').disabled()
++  if netcf_dep.found()
++    conf.set('WITH_NETCF', 1)
++  endif
+ endif
+ 
+ have_gnu_gettext_tools = false
+@@ -1550,7 +1552,7 @@ elif get_option('driver_hyperv').enabled()
+   error('openwsman is required for the Hyper-V driver')
+ endif
+ 
+-if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or netcf_dep.found())
++if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or conf.has('WITH_NETCF'))
+   conf.set('WITH_INTERFACE', 1)
+ elif get_option('driver_interface').enabled()
+   error('Requested the Interface driver without netcf or udev and libvirtd support')
+@@ -2362,7 +2364,7 @@ libs_summary = {
+   'libssh': libssh_dep.found(),
+   'libssh2': libssh2_dep.found(),
+   'libutil': libutil_dep.found(),
+-  'netcf': netcf_dep.found(),
++  'netcf': conf.has('WITH_NETCF'),
+   'NLS': have_gnu_gettext_tools,
+   'numactl': numactl_dep.found(),
+   'openwsman': openwsman_dep.found(),

0001-qemu-support-virt-2.6-machine-type-on-arm.patch

@@ -1,165 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Fri, 8 Apr 2016 10:46:41 +0200
-Subject: [PATCH] qemu: support virt-2.6 machine type on arm
-
-Some places already check for "virt-" prefix as well as plain "virt".
-virQEMUCapsHasPCIMultiBus did not, resulting in multiple PCI devices
-having assigned the same unnumbered "pci" alias.
-
-Add a test for the "virt-2.6" machine type which also omits the
-<model type='virtio'/> in <interface>, to check if
-qemuDomainDefaultNetModel works too.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1325085
-(cherry picked from commit f06ca25d235433f9139cbfb3d5d9eae7409156b9)
----
- src/qemu/qemu_capabilities.c                       |  3 +-
- src/qemu/qemu_domain.c                             |  3 +-
- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 37 +++++++++++++++++
- ...ml2argv-aarch64-virt-2.6-virtio-pci-default.xml | 47 ++++++++++++++++++++++
- tests/qemuxml2argvtest.c                           |  6 +++
- 5 files changed, 94 insertions(+), 2 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 2823843..57e2056 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2172,7 +2172,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
-         /* If 'virt' supports PCI, it supports multibus.
-          * No extra conditions here for simplicity.
-          */
--        if (STREQ(def->os.machine, "virt"))
-+        if (STREQ(def->os.machine, "virt") ||
-+            STRPREFIX(def->os.machine, "virt-"))
-             return true;
-     }
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f38b0f3..d9d5041 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -1479,7 +1479,8 @@ qemuDomainDefaultNetModel(const virDomainDef *def,
-         if (STREQ(def->os.machine, "versatilepb"))
-             return "smc91c111";
- 
--        if (STREQ(def->os.machine, "virt"))
-+        if (STREQ(def->os.machine, "virt") ||
-+            STRPREFIX(def->os.machine, "virt-"))
-             return "virtio";
- 
-         /* Incomplete. vexpress (and a few others) use this, but not all
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-new file mode 100644
-index 0000000..93c181d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-@@ -0,0 +1,37 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-aarch64 \
-+-name aarch64test \
-+-S \
-+-M virt-2.6 \
-+-cpu cortex-a53 \
-+-m 1024 \
-+-smp 1 \
-+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-+-nographic \
-+-nodefconfig \
-+-nodefaults \
-+-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-+-boot c \
-+-kernel /aarch64.kernel \
-+-initrd /aarch64.initrd \
-+-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-+-dtb /aarch64.dtb \
-+-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
-+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-+-device virtio-serial-device,id=virtio-serial0 \
-+-usb \
-+-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-+-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-+-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-+-net user,vlan=0,name=hostnet0 \
-+-serial pty \
-+-chardev pty,id=charconsole1 \
-+-device virtconsole,chardev=charconsole1,id=console1 \
-+-device virtio-balloon-device,id=balloon0 \
-+-object rng-random,id=objrng0,filename=/dev/random \
-+-device virtio-rng-device,rng=objrng0,id=rng0
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-new file mode 100644
-index 0000000..e745101
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-@@ -0,0 +1,47 @@
-+<domain type="qemu">
-+  <name>aarch64test</name>
-+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-+  <memory>1048576</memory>
-+  <currentMemory>1048576</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch="aarch64" machine="virt-2.6">hvm</type>
-+    <kernel>/aarch64.kernel</kernel>
-+    <initrd>/aarch64.initrd</initrd>
-+    <dtb>/aarch64.dtb</dtb>
-+    <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
-+  </os>
-+  <features>
-+    <acpi/>
-+    <apic/>
-+    <pae/>
-+  </features>
-+  <cpu match='exact'>
-+    <model>cortex-a53</model>
-+  </cpu>
-+  <clock offset="utc"/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>restart</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+    <disk type='file' device='disk'>
-+      <source file='/aarch64.raw'/>
-+      <target dev='vda' bus='virtio'/>
-+    </disk>
-+    <interface type='user'>
-+      <mac address='52:54:00:09:a4:37'/>
-+    </interface>
-+    <console type='pty'/>
-+    <console type='pty'>
-+      <target type='virtio' port='0'/>
-+    </console>
-+    <memballoon model='virtio'/>
-+    <!--
-+      This actually doesn't work in practice because vexpress only has
-+      4 virtio slots available, rng makes 5 -->
-+    <rng model='virtio'>
-+      <backend model='random'>/dev/random</backend>
-+    </rng>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index e9b8d64..d1b9e98 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1661,6 +1661,12 @@ mymain(void)
-             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
-+    DO_TEST("aarch64-virt-2.6-virtio-pci-default",
-+            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-+            QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-+            QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
-     /* Example of using virtio-pci with no explicit PCI controller
-        but with manual PCI addresses */
-     DO_TEST("aarch64-virtio-pci-manual-addresses",

0002-build-cleanup-GCC-4.6-Wlogical-op-workaround.patch

@@ -1,114 +0,0 @@
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Sun, 10 Apr 2016 18:21:13 +0200
-Subject: [PATCH] build: cleanup GCC < 4.6 -Wlogical-op workaround
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 7fb81831fc497aa4a34fdfc036be9c9ae4401084)
----
- m4/virt-compile-warnings.m4 |  2 +-
- src/internal.h              | 10 ++++++++++
- src/util/virbuffer.c        | 11 +++--------
- src/util/virstring.c        |  9 +--------
- src/util/virsysinfo.c       | 13 ++-----------
- 5 files changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
-index 3dd0665..1b0a2cf 100644
---- a/m4/virt-compile-warnings.m4
-+++ b/m4/virt-compile-warnings.m4
-@@ -236,7 +236,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
- 
-     if test "$gl_cv_warn_c__Wlogical_op" = yes &&
-        test "$lv_cv_gcc_wlogical_op_broken" = yes; then
--      AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP], 1,
-+      AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1,
-        [Define to 1 if gcc -Wlogical-op reports false positives on strchr])
-     fi
- ])
-diff --git a/src/internal.h b/src/internal.h
-index db26fb0..35cc6d4 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -253,6 +253,16 @@
- #  define VIR_WARNINGS_RESET
- # endif
- 
-+/* Workaround bogus GCC < 4.6 that produces false -Wlogical-op warnings for
-+ * strchr(). Those old GCCs don't support push/pop. */
-+# if BROKEN_GCC_WLOGICALOP_STRCHR
-+#  define VIR_WARNINGS_NO_WLOGICALOP_STRCHR                \
-+    _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"")
-+# else
-+#  define VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-+# endif
-+
-+
- /*
-  * Use this when passing possibly-NULL strings to printf-a-likes.
-  */
-diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
-index 43cd1a7..d582e7d 100644
---- a/src/util/virbuffer.c
-+++ b/src/util/virbuffer.c
-@@ -417,14 +417,9 @@ virBufferVasprintf(virBufferPtr buf, const char *format, va_list argptr)
-     buf->use += count;
- }
- 
--/* Work around spurious strchr() diagnostics given by -Wlogical-op
-- * for gcc < 4.6.  Doing it via a local pragma keeps the damage
-- * smaller than disabling it on the package level.  Unfortunately, the
-- * affected GCCs don't allow diagnostic push/pop which would have
-- * further reduced the impact. */
--#if BROKEN_GCC_WLOGICALOP
--# pragma GCC diagnostic ignored "-Wlogical-op"
--#endif
-+
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-+
- 
- /**
-  * virBufferEscapeString:
-diff --git a/src/util/virstring.c b/src/util/virstring.c
-index 7ec42aa..2d7fbf3 100644
---- a/src/util/virstring.c
-+++ b/src/util/virstring.c
-@@ -989,14 +989,7 @@ virStringHasControlChars(const char *str)
- }
- 
- 
--/* Work around spurious strchr() diagnostics given by -Wlogical-op
-- * for gcc < 4.6.  Doing it via a local pragma keeps the damage
-- * smaller than disabling it on the package level.  Unfortunately, the
-- * affected GCCs don't allow diagnostic push/pop which would have
-- * further reduced the impact. */
--#if BROKEN_GCC_WLOGICALOP
--# pragma GCC diagnostic ignored "-Wlogical-op"
--#endif
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
- 
- 
- /**
-diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
-index 05d33a8..e8dbd4d 100644
---- a/src/util/virsysinfo.c
-+++ b/src/util/virsysinfo.c
-@@ -428,17 +428,8 @@ virSysinfoRead(void)
- 
- 
- #elif defined(__s390__) || defined(__s390x__)
--/*
--  we need to ignore warnings about strchr caused by -Wlogical-op
--  for some GCC versions.
--  Doing it via a local pragma keeps the damage smaller than
--  disabling it on the package level.
--  Unfortunately, the affected GCCs don't allow diagnostic push/pop
--  which would have further reduced the impact.
-- */
--# if BROKEN_GCC_WLOGICALOP
--#  pragma GCC diagnostic ignored "-Wlogical-op"
--# endif
-+
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
- 
- static char *
- virSysinfoParseDelimited(const char *base, const char *name, char **value,

0002-node_device_udev-Serialize-access-to-pci_get_strings.patch

@@ -0,0 +1,72 @@
+From: wangjian <wangjian161@huawei.com>
+Date: Fri, 26 Mar 2021 11:21:16 +0800
+Subject: [PATCH] node_device_udev: Serialize access to pci_get_strings)_
+
+Since the functions provided by libpciaccess are not thread-safe,
+when the udev-event and nodedev-init threads of libvirt call the
+pci_get_strings function provided by libpaciaccess at the same
+time the following can happen:
+
+nodedev-init thread:
+nodeStateInitializeEnumerate ->
+  udevEnumerateDevices->
+    udevProcessDeviceListEntry ->
+      udevAddOneDevice ->
+        udevGetDeviceDetails->
+          udevProcessPCI ->
+            udevTranslatePCIIds ->
+              pci_get_strings -> (libpciaccess)
+                find_device_name ->
+                  populate_vendor ->
+                    d = realloc( vend->devices, (vend->num_devices + 1), * sizeof( struct pci_device_leaf ) );
+                    vend->num_devices++;
+
+udev-event thread:
+udevEventHandleThread ->
+  udevHandleOneDevice ->
+    udevAddOneDevice->
+      udevGetDeviceDetails->
+        udevProcessPCI ->
+          udevTranslatePCIIds ->
+            pci_get_strings -> (libpciaccess)
+              find_device_name ->
+                populate_vendor ->
+                  d = realloc( vend->devices, (vend->num_devices + 1), * sizeof( struct pci_device_leaf ) );
+                  vend->num_devices++;
+
+Signed-off-by: WangJian <wangjian161@huawei.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 59788a5caea5f292c86e07a31ee2b853d68db87e)
+---
+ src/node_device/node_device_udev.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index 55a2731681..6f0defe908 100644
+--- a/src/node_device/node_device_udev.c
++++ b/src/node_device/node_device_udev.c
+@@ -328,6 +328,7 @@ udevGenerateDeviceName(struct udev_device *device,
+     return 0;
+ }
+ 
++static virMutex pciaccessMutex = VIR_MUTEX_INITIALIZER;
+ 
+ static int
+ udevTranslatePCIIds(unsigned int vendor,
+@@ -346,12 +347,14 @@ udevTranslatePCIIds(unsigned int vendor,
+     m.device_class_mask = 0;
+     m.match_data = 0;
+ 
+-    /* pci_get_strings returns void */
++    /* pci_get_strings returns void and unfortunately is not thread safe. */
++    virMutexLock(&pciaccessMutex);
+     pci_get_strings(&m,
+                     &device_name,
+                     &vendor_name,
+                     NULL,
+                     NULL);
++    virMutexUnlock(&pciaccessMutex);
+ 
+     *vendor_string = g_strdup(vendor_name);
+     *product_string = g_strdup(device_name);

0003-build-add-GCC-6.0-Wlogical-op-workaround.patch

@@ -1,172 +0,0 @@
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Sun, 10 Apr 2016 18:22:20 +0200
-Subject: [PATCH] build: add GCC 6.0 -Wlogical-op workaround
-
-fdstream.c: In function 'virFDStreamWrite':
-fdstream.c:390:29: error: logical 'or' of equal expressions [-Werror=logical-op]
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                            ^~
-
-Fedora rawhide now uses gcc 6.0 and there is a bug with -Wlogical-op
-producing false warnings.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
-
-Use GCC pragma push/pop and ignore -Wlogical-op for GCC that supports
-push/pop pragma and also has this bug.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d713a6b120904c488170e7920c482b2fade70ae1)
----
- m4/virt-compile-warnings.m4     | 20 ++++++++++++++++++++
- src/fdstream.c                  |  4 ++++
- src/internal.h                  | 12 ++++++++++++
- src/rpc/virnetsshsession.c      |  6 ++++++
- src/security/security_selinux.c |  2 ++
- 5 files changed, 44 insertions(+)
-
-diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
-index 1b0a2cf..eb689e2 100644
---- a/m4/virt-compile-warnings.m4
-+++ b/m4/virt-compile-warnings.m4
-@@ -117,6 +117,20 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
-         [lv_cv_gcc_wlogical_op_broken=yes])
-       CFLAGS="$save_CFLAGS"])
- 
-+    AC_CACHE_CHECK([whether gcc gives bogus warnings for -Wlogical-op],
-+      [lv_cv_gcc_wlogical_op_equal_expr_broken], [
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="-O2 -Wlogical-op -Werror"
-+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+          #define TEST1 1
-+          #define TEST2 TEST1
-+        ]], [[
-+          int test = 0;
-+          return test == TEST1 || test == TEST2;]])],
-+        [lv_cv_gcc_wlogical_op_equal_expr_broken=no],
-+        [lv_cv_gcc_wlogical_op_equal_expr_broken=yes])
-+        CFLAGS="$save_CFLAGS"])
-+
-     # We might fundamentally need some of these disabled forever, but
-     # ideally we'd turn many of them on
-     dontwarn="$dontwarn -Wfloat-equal"
-@@ -239,4 +253,10 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
-       AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1,
-        [Define to 1 if gcc -Wlogical-op reports false positives on strchr])
-     fi
-+
-+    if test "$gl_cv_warn_c__Wlogical_op" = yes &&
-+       test "$lv_cv_gcc_wlogical_op_equal_expr_broken" = yes; then
-+      AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1,
-+        [Define to 1 if gcc -Wlogical-op reports false positive 'or' equal expr])
-+    fi
- ])
-diff --git a/src/fdstream.c b/src/fdstream.c
-index a85cf9d..ef118b5 100644
---- a/src/fdstream.c
-+++ b/src/fdstream.c
-@@ -387,7 +387,9 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
-  retry:
-     ret = write(fdst->fd, bytes, nbytes);
-     if (ret < 0) {
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (errno == EAGAIN || errno == EWOULDBLOCK) {
-+        VIR_WARNINGS_RESET
-             ret = -2;
-         } else if (errno == EINTR) {
-             goto retry;
-@@ -437,7 +439,9 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes)
-  retry:
-     ret = read(fdst->fd, bytes, nbytes);
-     if (ret < 0) {
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (errno == EAGAIN || errno == EWOULDBLOCK) {
-+        VIR_WARNINGS_RESET
-             ret = -2;
-         } else if (errno == EINTR) {
-             goto retry;
-diff --git a/src/internal.h b/src/internal.h
-index 35cc6d4..926e990 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -245,11 +245,23 @@
-     _Pragma ("GCC diagnostic push")
- #  endif
- 
-+/* Workaround bogus GCC 6.0 for logical 'or' equal expression warnings.
-+ * (GCC bz 69602) */
-+#  if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR
-+#   define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR            \
-+     _Pragma ("GCC diagnostic push")                        \
-+     _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"")
-+#  else
-+#   define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR            \
-+     _Pragma ("GCC diagnostic push")
-+#  endif
-+
- #  define VIR_WARNINGS_RESET \
-     _Pragma ("GCC diagnostic pop")
- # else
- #  define VIR_WARNINGS_NO_CAST_ALIGN
- #  define VIR_WARNINGS_NO_PRINTF
-+#  define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- #  define VIR_WARNINGS_RESET
- # endif
- 
-diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
-index 406a831..e742175 100644
---- a/src/rpc/virnetsshsession.c
-+++ b/src/rpc/virnetsshsession.c
-@@ -545,9 +545,11 @@ virNetSSHAuthenticateAgent(virNetSSHSessionPtr sess,
-                                            agent_identity)))
-             return 0; /* key accepted */
- 
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED &&
-             ret != LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED &&
-             ret != LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) {
-+        VIR_WARNINGS_RESET
-             libssh2_session_last_error(sess->session, &errmsg, NULL, 0);
-             virReportError(VIR_ERR_AUTH_FAILED,
-                            _("failed to authenticate using SSH agent: %s"),
-@@ -605,9 +607,11 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess,
-                                                    priv->password)) == 0)
-         return 0; /* success */
- 
-+    VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-     if (priv->password ||
-         ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED ||
-         ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED) {
-+    VIR_WARNINGS_RESET
-         libssh2_session_last_error(sess->session, &errmsg, NULL, 0);
-         virReportError(VIR_ERR_AUTH_FAILED,
-                        _("authentication with private key '%s' "
-@@ -673,11 +677,13 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess,
-                          "has failed: %s"),
-                        priv->filename, errmsg);
- 
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED ||
-             ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED)
-             return 1;
-         else
-             return -1;
-+        VIR_WARNINGS_RESET
-     }
- 
-     return 0;
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 26d95d1..04760a1 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -911,8 +911,10 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon,
-          * hopefully sets one of the necessary SELinux virt_use_{nfs,usb,pci}
-          * boolean tunables to allow it ...
-          */
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (setfilecon_errno != EOPNOTSUPP && setfilecon_errno != ENOTSUP &&
-             setfilecon_errno != EROFS) {
-+        VIR_WARNINGS_RESET
-             virReportSystemError(setfilecon_errno,
-                                  _("unable to set security context '%s' on '%s'"),
-                                  tcon, path);

0003-virSetUIDGIDWithCaps-Don-t-drop-CAP_SETPCAP-right-aw.patch

@@ -0,0 +1,53 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 24 Jun 2021 16:58:09 +0200
+Subject: [PATCH] virSetUIDGIDWithCaps: Don't drop CAP_SETPCAP right away
+
+There are few cases where we execute a virCommand with all caps
+cleared (virCommandClearCaps()). For instance
+dnsmasqCapsRefreshInternal() does just that. This means, that
+after fork() and before exec() the virSetUIDGIDWithCaps() is
+called. But since the caller did not want to change anything,
+just drop capabilities, these are the values of arguments:
+
+  virSetUIDGIDWithCaps (uid=-1, gid=-1, groups=0x0, ngroups=0,
+                        capBits=0, clearExistingCaps=true)
+
+This means that indeed all capabilities will be dropped,
+including CAP_SETPCAP. But this capability controls whether
+capabilities can be set, IOW whether capng_apply() succeeds.
+
+There are two calls of capng_apply() in the function. The
+CAP_SETPCAP is dropped after the first call and thus the other
+call (capng_apply(CAPNG_SELECT_BOUNDS);) fails.
+
+The solution is to keep the capability for as long as needed
+(just like CAP_SETGID and CAP_SETUID) and drop it only at the
+very end (just like CAP_SETGID and CAP_SETUID).
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1949388
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
+(cherry picked from commit 438b50dda8a863fdc988e9ab612f097cc1626e8a)
+---
+ src/util/virutil.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/util/virutil.c b/src/util/virutil.c
+index a0cd0f1bcd..7ae23a7061 100644
+--- a/src/util/virutil.c
++++ b/src/util/virutil.c
+@@ -1202,12 +1202,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+     }
+ # ifdef PR_CAPBSET_DROP
+     /* If newer kernel, we need also need setpcap to change the bounding set */
+-    if ((capBits || need_setgid || need_setuid) &&
+-        !capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
++    if (!capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
+         need_setpcap = true;
+-    }
+-    if (need_setpcap)
+         capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SETPCAP);
++    }
+ # endif
+ 
+     /* Tell system we want to keep caps across uid change */

0004-security-fix-SELinux-label-generation-logic.patch

@@ -0,0 +1,51 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 28 Jun 2021 13:09:04 +0100
+Subject: [PATCH] security: fix SELinux label generation logic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A process can access a file if the set of MCS categories
+for the file is equal-to *or* a subset-of, the set of
+MCS categories for the process.
+
+If there are two VMs:
+
+  a) svirt_t:s0:c117
+  b) svirt_t:s0:c117,c720
+
+Then VM (b) is able to access files labelled for VM (a).
+
+IOW, we must discard case where the categories are equal
+because that is a subset of many other valid category pairs.
+
+Fixes: https://gitlab.com/libvirt/libvirt/-/issues/153
+CVE-2021-3631
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 15073504dbb624d3f6c911e85557019d3620fdb2)
+---
+ src/security/security_selinux.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index 2fc6ef2616..61a871ec3d 100644
+--- a/src/security/security_selinux.c
++++ b/src/security/security_selinux.c
+@@ -389,7 +389,15 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr,
+         VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin);
+ 
+         if (c1 == c2) {
+-            mcs = g_strdup_printf("%s:c%d", sens, catMin + c1);
++            /*
++             * A process can access a file if the set of MCS categories
++             * for the file is equal-to *or* a subset-of, the set of
++             * MCS categories for the process.
++             *
++             * IOW, we must discard case where the categories are equal
++             * because that is a subset of other category pairs.
++             */
++            continue;
+         } else {
+             if (c1 > c2) {
+                 int t = c1;

0005-virSetUIDGIDWithCaps-Set-bounding-capabilities-only-.patch

@@ -0,0 +1,43 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 22 Jul 2021 14:26:00 +0200
+Subject: [PATCH] virSetUIDGIDWithCaps: Set bounding capabilities only with
+ CAP_SETPCAP
+
+In one of my previous patches I've tried to postpone dropping
+CAP_SETPCAP until the very end because it's needed for
+capng_apply(). What I did not realize back then was that we might
+not have the capability to begin with. Because of unknown reasons
+capng_apply() pollutes logs only for CAPNG_SELECT_BOUNDS and not
+for CAPNG_SELECT_CAPS.
+
+Reproducer is really simple: run libvirtd as a regular user.
+During its initialization, libvirtd will spawn some binaries
+(dnsmasq, qemu-*, etc.) and while doing so it will try to drop
+capabilities.
+
+Anyway, let's call capng_apply(CAPNG_SELECT_BOUNDS) only if we
+have the CAP_SETPCAP (which is tracked in need_setpcap variable).
+
+Fixes: 438b50dda8a863fdc988e9ab612f097cc1626e8a
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1924218
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Cole Robinson <crobinso@redhat.com>
+(cherry picked from commit a2476f37a7789eb9315b77bb451f4754ef4ef15b)
+---
+ src/util/virutil.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virutil.c b/src/util/virutil.c
+index 7ae23a7061..333f99e91d 100644
+--- a/src/util/virutil.c
++++ b/src/util/virutil.c
+@@ -1269,7 +1269,8 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+      * do this if we failed to get the capability above, so ignore the
+      * return value.
+      */
+-    capng_apply(CAPNG_SELECT_BOUNDS);
++    if (!need_setpcap)
++        capng_apply(CAPNG_SELECT_BOUNDS);
+ 
+     /* Drop the caps that allow setuid/gid (unless they were requested) */
+     if (need_setgid)

0006-qemu_firmware-don-t-error-out-for-unknown-firmware-f.patch

@@ -0,0 +1,57 @@
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Mon, 10 May 2021 15:07:09 +0200
+Subject: [PATCH] qemu_firmware: don't error out for unknown firmware features
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When QEMU introduces new firmware features libvirt will fail until we
+list that feature in our code as well which doesn't sound right.
+
+We should simply ignore the new feature until we add a proper support
+for it.
+
+Reported-by: Laszlo Ersek <lersek@redhat.com>
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 61d95a1073833ec4323c1ef28e71e913c55aa7b9)
+---
+ src/qemu/qemu_firmware.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
+index 639cff7459..e602de22e3 100644
+--- a/src/qemu/qemu_firmware.c
++++ b/src/qemu/qemu_firmware.c
+@@ -573,6 +573,7 @@ qemuFirmwareFeatureParse(const char *path,
+     virJSONValuePtr featuresJSON;
+     g_autoptr(qemuFirmwareFeature) features = NULL;
+     size_t nfeatures;
++    size_t nparsed = 0;
+     size_t i;
+ 
+     if (!(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) {
+@@ -592,17 +593,16 @@ qemuFirmwareFeatureParse(const char *path,
+         int tmp;
+ 
+         if ((tmp = qemuFirmwareFeatureTypeFromString(tmpStr)) <= 0) {
+-            virReportError(VIR_ERR_INTERNAL_ERROR,
+-                           _("unknown feature %s"),
+-                           tmpStr);
+-            return -1;
++            VIR_DEBUG("ignoring unknown QEMU firmware feature '%s'", tmpStr);
++            continue;
+         }
+ 
+-        features[i] = tmp;
++        features[nparsed] = tmp;
++        nparsed++;
+     }
+ 
+     fw->features = g_steal_pointer(&features);
+-    fw->nfeatures = nfeatures;
++    fw->nfeatures = nparsed;
+     return 0;
+ }
+ 

0007-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch

@@ -0,0 +1,33 @@
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 21 Jul 2021 11:22:25 +0200
+Subject: [PATCH] storage_driver: Unlock object on ACL fail in
+ storagePoolLookupByTargetPath
+
+'virStoragePoolObjListSearch' returns a locked and refed object, thus we
+must release it on ACL permission failure.
+
+Fixes: 7aa0e8c0cb8
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984318
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 447f69dec47e1b0bd15ecd7cd49a9fd3b050fb87)
+---
+ src/storage/storage_driver.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
+index 16bc53aa46..2787c1671b 100644
+--- a/src/storage/storage_driver.c
++++ b/src/storage/storage_driver.c
+@@ -1739,8 +1739,10 @@ storagePoolLookupByTargetPath(virConnectPtr conn,
+                                            storagePoolLookupByTargetPathCallback,
+                                            cleanpath))) {
+         def = virStoragePoolObjGetDef(obj);
+-        if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0)
++        if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0) {
++            virStoragePoolObjEndAPI(&obj);
+             return NULL;
++        }
+ 
+         pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL);
+         virStoragePoolObjEndAPI(&obj);

0008-wireshark-Switch-to-tvb_bytes_to_str.patch

@@ -0,0 +1,81 @@
+From 7e299ba649b1288d529c7595c0e6060c9ae0ff2a Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 29 Nov 2021 09:57:49 +0100
+Subject: [PATCH 1/2] wireshark: Switch to tvb_bytes_to_str()
+
+When the dissector sees a byte sequence that is either an opaque
+data (xdr_opaque) or a byte sequence (xdr_bytes) it formats the
+bytes as a hex numbers using our own implementation. But
+wireshark already provides a function for it: tvb_bytes_to_str().
+NB, the reason why it returns a const string is so that callers
+don't try to free it - the string is allocated using an allocator
+which will decide when to free it.
+
+The wireshark formatter was introduced in wireshark commit of
+v1.99.2~479 and thus is present in the version we require at
+least (2.6.0).
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ tools/wireshark/src/packet-libvirt.c | 30 ++++++++--------------------
+ 1 file changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
+index f43919b05d..cb922b8070 100644
+--- a/tools/wireshark/src/packet-libvirt.c
++++ b/tools/wireshark/src/packet-libvirt.c
+@@ -158,24 +158,6 @@ dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+     }
+ }
+ 
+-static const gchar *
+-format_xdr_bytes(guint8 *bytes, guint32 length)
+-{
+-    gchar *buf;
+-    guint32 i;
+-
+-    if (length == 0)
+-        return "";
+-    buf = wmem_alloc(wmem_packet_scope(), length*2 + 1);
+-    for (i = 0; i < length; i++) {
+-        /* We know that buf has enough size to contain
+-           2 * length + '\0' characters. */
+-        g_snprintf(buf, 2*(length - i) + 1, "%02x", bytes[i]);
+-        buf += 2;
+-    }
+-    return buf - length*2;
+-}
+-
+ static gboolean
+ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+                    guint32 size)
+@@ -187,8 +169,10 @@ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+     val = g_malloc(size);
+     start = xdr_getpos(xdrs);
+     if ((rc = xdr_opaque(xdrs, (caddr_t)val, size))) {
+-        proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
+-                                          NULL, "%s", format_xdr_bytes(val, size));
++        gint len = xdr_getpos(xdrs) - start;
++        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
++
++        proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
+     } else {
+         proto_tree_add_item(tree, hf_libvirt_unknown, tvb, start, -1, ENC_NA);
+     }
+@@ -207,8 +191,10 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+ 
+     start = xdr_getpos(xdrs);
+     if (xdr_bytes(xdrs, (char **)&val, &length, maxlen)) {
+-        proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
+-                                          NULL, "%s", format_xdr_bytes(val, length));
++        gint len = xdr_getpos(xdrs) - start;
++        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
++
++        proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
+         /* Seems I can't call xdr_free() for this case.
+            It will raises SEGV by referencing out of bounds call stack */
+         free(val);
+-- 
+2.33.1
+

0009-wireshark-Drop-needless-comment-in-dissect_xdr_bytes.patch

@@ -0,0 +1,33 @@
+From 010613cfd8dae6d85602a84c5c95b2d441e1b3d1 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 29 Nov 2021 10:20:05 +0100
+Subject: [PATCH 2/2] wireshark: Drop needless comment in dissect_xdr_bytes()
+
+In the dissect_xdr_bytes() there's a comment that the string
+allocated by xdr_bytes() can't be freed using xdr_free(). Well,
+that is expected because xdr_bytes() used plain calloc() AND the
+string is not an XDR struct but plain 'char *' type. Passing it
+to xdr_free() must result in weird things happening.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ tools/wireshark/src/packet-libvirt.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
+index cb922b8070..eeacbcdf0e 100644
+--- a/tools/wireshark/src/packet-libvirt.c
++++ b/tools/wireshark/src/packet-libvirt.c
+@@ -195,8 +195,6 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+         const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
+ 
+         proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
+-        /* Seems I can't call xdr_free() for this case.
+-           It will raises SEGV by referencing out of bounds call stack */
+         free(val);
+         return TRUE;
+     } else {
+-- 
+2.33.1
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libvirt
-# $Id$
-NAME := libvirt
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-698e0949a41a2b669dbe374759aaa64b  libvirt-1.3.3.tar.gz
+SHA512 (libvirt-7.0.0.tar.xz) = dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343