[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 2 commits: patches: Add backports
Andrea Bolognani (@abologna)
gitlab at salsa.debian.org
Mon Dec 12 21:58:25 GMT 2022
Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt
Commits:
145e4fe4 by Andrea Bolognani at 2022-12-09T15:49:31+01:00
patches: Add backports
Specifically
backport/docs-Fix-typo-in-virt-qemu-sev-validate-1.patch
backport/tools-Fix-interpreter-for-virt-qemu-sev-validate.patch
backport/tools-Fix-style-issues-in-virt-qemu-sev-validate.patch
which address a number of issues in virt-qemu-sev-validate.
- - - - -
409e40a9 by Andrea Bolognani at 2022-12-09T15:49:50+01:00
libvirt-clients-qemu: New binary package
This contains a couple of QEMU-specific tools.
Besides the fact that they're only intended to work against a
single hypervisor driver, another big motivation for them to
be in a separate binary package is that they, unlike existing
tools such as virsh, are written in Python and as such require
both Python and the Python bindings for libvirt to be
installed in order to work.
- - - - -
8 changed files:
- debian/control
- + debian/libvirt-clients-qemu.docs
- + debian/libvirt-clients-qemu.install
- debian/not-installed
- + debian/patches/backport/docs-Fix-typo-in-virt-qemu-sev-validate-1.patch
- + debian/patches/backport/tools-Fix-interpreter-for-virt-qemu-sev-validate.patch
- + debian/patches/backport/tools-Fix-style-issues-in-virt-qemu-sev-validate.patch
- debian/patches/series
Changes:
=====================================
debian/control
=====================================
@@ -76,6 +76,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Suggests:
+ libvirt-clients-qemu (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
libvirt-login-shell (= ${binary:Version}),
Breaks:
@@ -91,6 +92,21 @@ Description: Programs for the libvirt library
.
This package contains the libvirt shell virsh and other client binaries..
+Package: libvirt-clients-qemu
+Section: admin
+Architecture: all
+Depends:
+ python3-libvirt,
+ python3:any,
+ ${misc:Depends},
+Description: Programs for the libvirt library (QEMU specific)
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This package contains the QEMU-specific client binaries.
+
Package: libvirt-login-shell
Section: admin
Architecture: alpha amd64 arm64 armel armhf hppa i386 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
=====================================
debian/libvirt-clients-qemu.docs
=====================================
@@ -0,0 +1 @@
+usr/share/doc/libvirt/NEWS
=====================================
debian/libvirt-clients-qemu.install
=====================================
@@ -0,0 +1,4 @@
+usr/bin/virt-qemu-qmp-proxy
+usr/bin/virt-qemu-sev-validate
+usr/share/man/man1/virt-qemu-qmp-proxy.1
+usr/share/man/man1/virt-qemu-sev-validate.1
=====================================
debian/not-installed
=====================================
@@ -1,9 +1,3 @@
-# Ignore these until we introduce a new binary package for them
-usr/bin/virt-qemu-qmp-proxy
-usr/bin/virt-qemu-sev-validate
-usr/share/man/man1/virt-qemu-qmp-proxy.1
-usr/share/man/man1/virt-qemu-sev-validate.1
-
# Drop these once we start shipping split daemons
etc/apparmor.d/usr.sbin.virtqemud
etc/apparmor.d/usr.sbin.virtxend
=====================================
debian/patches/backport/docs-Fix-typo-in-virt-qemu-sev-validate-1.patch
=====================================
@@ -0,0 +1,29 @@
+From: Andrea Bolognani <abologna at redhat.com>
+Date: Thu, 8 Dec 2022 16:55:32 +0100
+Subject: docs: Fix typo in virt-qemu-sev-validate(1)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Spotted by Lintian (typo-in-manual-page tag).
+
+Signed-off-by: Andrea Bolognani <abologna at redhat.com>
+Reviewed-by: Ján Tomko <jtomko at redhat.com>
+(cherry picked from commit a417571628704b38a31ecd07f0971a6ade986f75)
+---
+ docs/manpages/virt-qemu-sev-validate.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/manpages/virt-qemu-sev-validate.rst b/docs/manpages/virt-qemu-sev-validate.rst
+index f5f9286..fcbe84b 100644
+--- a/docs/manpages/virt-qemu-sev-validate.rst
++++ b/docs/manpages/virt-qemu-sev-validate.rst
+@@ -556,7 +556,7 @@ on the virtualization host. In that scenario the only three command
+ line parameters required are for the TIK, TEK and libvirt domain
+ name. It should be able to automatically determine all the other
+ information required. If it still reports a failure, this points
+-very strongly to the TIK/TEK pair not maching the configured
++very strongly to the TIK/TEK pair not matching the configured
+ DH certificate and session blob.
+
+ The ``--debug`` flag will display hashes and/or hex dumps for various
=====================================
debian/patches/backport/tools-Fix-interpreter-for-virt-qemu-sev-validate.patch
=====================================
@@ -0,0 +1,27 @@
+From: Andrea Bolognani <abologna at redhat.com>
+Date: Thu, 8 Dec 2022 16:57:23 +0100
+Subject: tools: Fix interpreter for virt-qemu-sev-validate
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Go through env(1) instead of hardcoding the path to the Python
+interpreter, as we already do for all other Python scripts.
+
+Signed-off-by: Andrea Bolognani <abologna at redhat.com>
+Reviewed-by: Ján Tomko <jtomko at redhat.com>
+(cherry picked from commit f6a19d7264bb26df8108805d3f28d71d7a597342)
+---
+ tools/virt-qemu-sev-validate | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/virt-qemu-sev-validate b/tools/virt-qemu-sev-validate
+index 712a4e4..46a92aa 100755
+--- a/tools/virt-qemu-sev-validate
++++ b/tools/virt-qemu-sev-validate
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+ #
+ # SPDX-License-Identifier: LGPL-2.1-or-later
+ #
=====================================
debian/patches/backport/tools-Fix-style-issues-in-virt-qemu-sev-validate.patch
=====================================
@@ -0,0 +1,49 @@
+From: Andrea Bolognani <abologna at redhat.com>
+Date: Thu, 8 Dec 2022 18:00:13 +0100
+Subject: tools: Fix style issues in virt-qemu-sev-validate
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+The script had an incorrect interpreter line until commit
+f6a19d7264bb, so the flake8 check would not realize it needed
+to pick it up and these issues, some of which were present it
+the very first version that was committed, were not being
+reported.
+
+Signed-off-by: Andrea Bolognani <abologna at redhat.com>
+Reviewed-by: Ján Tomko <jtomko at redhat.com>
+(cherry picked from commit 6c4f5af9a07883ab3873884b8a44005a3e6d04e1)
+---
+ tools/virt-qemu-sev-validate | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tools/virt-qemu-sev-validate b/tools/virt-qemu-sev-validate
+index 46a92aa..3d8b292 100755
+--- a/tools/virt-qemu-sev-validate
++++ b/tools/virt-qemu-sev-validate
+@@ -849,7 +849,7 @@ class ConfidentialVM(abc.ABC):
+ secret64 = b64encode(secret_table_ciphertext).decode('utf8')
+ log.debug("Header: %s (%d bytes)", header64, len(header))
+ log.debug("Secret: %s (%d bytes)",
+- secret64, len(secret_table_ciphertext))
++ secret64, len(secret_table_ciphertext))
+
+ return header64, secret64
+
+@@ -955,7 +955,7 @@ class LibvirtConfidentialVM(ConfidentialVM):
+ self.dom = self.conn.lookupByName(id_name_uuid)
+
+ log.debug("VM: id=%d name=%s uuid=%s",
+- self.dom.ID(), self.dom.name(), self.dom.UUIDString())
++ self.dom.ID(), self.dom.name(), self.dom.UUIDString())
+
+ if not self.dom.isActive():
+ raise InvalidStateException(
+@@ -1331,5 +1331,6 @@ def main():
+ print("ERROR: %s" % e, file=sys.stderr)
+ sys.exit(6)
+
++
+ if __name__ == "__main__":
+ main()
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,6 @@
+backport/docs-Fix-typo-in-virt-qemu-sev-validate-1.patch
+backport/tools-Fix-interpreter-for-virt-qemu-sev-validate.patch
+backport/tools-Fix-style-issues-in-virt-qemu-sev-validate.patch
forward/Skip-vircgrouptest.patch
forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/4e5d7b6b0b6f4a82a3d16d21221b39ec047b8b71...409e40a9e1cdcafa3e721f8f60ebdbc795723124
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/4e5d7b6b0b6f4a82a3d16d21221b39ec047b8b71...409e40a9e1cdcafa3e721f8f60ebdbc795723124
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20221212/950e8187/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list