diff --git a/0001-initrdinject-Use-full-option-versions-for-cpio.patch b/0001-initrdinject-Use-full-option-versions-for-cpio.patch deleted file mode 100644 index 3ce130c..0000000 --- a/0001-initrdinject-Use-full-option-versions-for-cpio.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Cole Robinson -Date: Tue, 2 Apr 2019 15:02:47 -0400 -Subject: [PATCH virt-manager] initrdinject: Use full option versions for cpio - -Makes it more self documenting IMO - -(cherry picked from commit 309840b9535b0e1965ed177b4558652faa256b36) ---- - virtinst/initrdinject.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/virtinst/initrdinject.py b/virtinst/initrdinject.py -index 78c18c28..9a09f20c 100644 ---- a/virtinst/initrdinject.py -+++ b/virtinst/initrdinject.py -@@ -30,7 +30,8 @@ def perform_initrd_injections(initrd, injections, scratchdir): - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - cwd=tempdir) -- cpio_proc = subprocess.Popen(['cpio', '-o', '--null', '-Hnewc', '--quiet'], -+ cpio_proc = subprocess.Popen(['cpio', '--create', '--null', '--quiet', -+ '--format=newc'], - stdin=find_proc.stdout, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, diff --git a/0002-initrdinject-Force-added-files-to-be-owned-as-root-b.patch b/0002-initrdinject-Force-added-files-to-be-owned-as-root-b.patch deleted file mode 100644 index 881c1de..0000000 --- a/0002-initrdinject-Force-added-files-to-be-owned-as-root-b.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Cole Robinson -Date: Wed, 3 Apr 2019 18:07:12 -0400 -Subject: [PATCH virt-manager] initrdinject: Force added files to be owned as - root (bz 1686464) - -systemd in fedora30 has some new security restriction about non-root -owned directories. Initrd inject would tickle this because the cpio -archive would cause the root dir in the initrd to be owned by the -uid that launched virt-install. - -Pass --owner=+0:+0 to cpio to force root ownership - -Suggested-by: James Szinger - -https://bugzilla.redhat.com/show_bug.cgi?id=1686464 -(cherry picked from commit c6b5f22fa61d87557b5fab23be080073d2f7906e) ---- - virtinst/initrdinject.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virtinst/initrdinject.py b/virtinst/initrdinject.py -index 9a09f20c..4032f9ba 100644 ---- a/virtinst/initrdinject.py -+++ b/virtinst/initrdinject.py -@@ -31,7 +31,7 @@ def perform_initrd_injections(initrd, injections, scratchdir): - stderr=subprocess.PIPE, - cwd=tempdir) - cpio_proc = subprocess.Popen(['cpio', '--create', '--null', '--quiet', -- '--format=newc'], -+ '--format=newc', '--owner=+0:+0'], - stdin=find_proc.stdout, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, diff --git a/sources b/sources index a953d6f..d46a244 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-manager-2.1.0.tar.gz) = 48590ff58246e13b73c7ab741ca854bfebae27fb90a891168db5d3fac1d066cce603f83b8d993e70e387624f911fc8503abe488e7992bc50f49d7e980aed5afb +SHA512 (virt-manager-2.2.0.tar.gz) = 09975f7628ee302687eb6572b5f35797b4710aaae60c17542ee9edd72c65e80e93d7bbc7a2050667a9280effdbab28272886ae155b3ba73c104153ae3c048d99 diff --git a/virt-manager.spec b/virt-manager.spec index d960a64..3b2a7df 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -8,6 +8,7 @@ # https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Python_bytecompilation %global __python %{__python3} +%bcond_with virtconvert %global with_guestfs 0 %global default_hvs "qemu,xen,lxc" @@ -16,8 +17,8 @@ # End local config Name: virt-manager -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.2.0 +Release: 1%{?dist} %global verrel %{version}-%{release} Summary: Desktop tool for managing virtual machines via libvirt @@ -26,10 +27,6 @@ BuildArch: noarch URL: https://virt-manager.org/ Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -# Fix --initrd-inject with f30 URLs (bz #1686464) -Patch0001: 0001-initrdinject-Use-full-option-versions-for-cpio.patch -Patch0002: 0002-initrdinject-Force-added-files-to-be-owned-as-root-b.patch - Requires: virt-manager-common = %{verrel} Requires: python3-gobject @@ -56,6 +53,9 @@ Requires: vte291 Recommends: (libvirt-daemon-kvm or libvirt-daemon-qemu) Recommends: libvirt-daemon-config-network +# Optional inspection of guests +Suggests: python3-libguestfs + BuildRequires: intltool BuildRequires: /usr/bin/pod2man BuildRequires: python3-devel @@ -96,8 +96,10 @@ Requires: libvirt-client Provides: virt-install Provides: virt-clone -Provides: virt-convert Provides: virt-xml +%if %{with virtconvert} +Provides: virt-convert +%endif %description -n virt-install Package includes several command line utilities, including virt-install @@ -108,10 +110,6 @@ machine). %prep %setup -q -# Fix --initrd-inject with f30 URLs (bz #1686464) -%patch0001 -p1 -%patch0002 -p1 - %build %if %{default_hvs} @@ -128,6 +126,11 @@ machine). install -O1 --root=%{buildroot} %find_lang %{name} +%if %{without virtconvert} +find %{buildroot} -name virt-convert\* -delete +rm -rf %{buildroot}/%{_datadir}/%{name}/virtconv +%endif + # Replace '#!/usr/bin/env python3' with '#!/usr/bin/python3' # The format is ideal for upstream, but not a distro. See: # https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython @@ -157,34 +160,71 @@ done %files common -f %{name}.lang %dir %{_datadir}/%{name} -%{_datadir}/%{name}/virtcli +%if %{with virtconvert} %{_datadir}/%{name}/virtconv +%endif %{_datadir}/%{name}/virtinst %files -n virt-install %{_mandir}/man1/virt-install.1* %{_mandir}/man1/virt-clone.1* -%{_mandir}/man1/virt-convert.1* %{_mandir}/man1/virt-xml.1* %{_datadir}/%{name}/virt-install %{_datadir}/%{name}/virt-clone -%{_datadir}/%{name}/virt-convert %{_datadir}/%{name}/virt-xml %{_datadir}/bash-completion/completions/virt-install %{_datadir}/bash-completion/completions/virt-clone -%{_datadir}/bash-completion/completions/virt-convert %{_datadir}/bash-completion/completions/virt-xml %{_bindir}/virt-install %{_bindir}/virt-clone -%{_bindir}/virt-convert %{_bindir}/virt-xml +%if %{with virtconvert} +%{_bindir}/virt-convert +%{_datadir}/bash-completion/completions/virt-convert +%{_datadir}/%{name}/virt-convert +%{_mandir}/man1/virt-convert.1* +%endif + %changelog +* Mon Jun 17 2019 Cole Robinson - 2.2.0-1 +- Rebased to version 2.2.0 +- libvirt XML viewing and editing UI for new and existing domain, pools, + volumes, networks +- virt-install: libosinfo --unattended support (Fabiano Fidêncio, Cole + Robinson) +- Improve CPU model security defaults (Pavel Hrdina) +- virt-install: new --install option. Ex: virt-install --install fedora29 +- virt-install: new --install kernel=,initrd= +- virt-install: --disk, --memory, --name defaults from libosinfo (Fabiano + Fidêncio, Cole Robinson) +- virt-install: add device suboption aliases which consistently match + libvirt XML naming +- virt-xml: new --start, --no-define options (Marc Hartmayer) +- virt-install: Add driver_queues argument to --controller (Vasudeva Kamath) +- RISC-V support (Andrea Bolognani) +- Device default improvements for non-x86 KVM (Andrea Bolognani) +- Redesigned 'New Network' wizard +- libguestfs inspection improvements (Pino Toscano) +- virt-install: Add support for xenbus controller (Jim Fehlig) +- cli: Add --disk wwn=,rawio= (Athina Plaskasoviti) +- cli: Add --memballoon autodeflate=,stats.period= (Athina Plaskasoviti) +- cli: Add --iothreads (Athina Plaskasoviti) +- cli: Add --numatune memory.placement (Athina Plaskasoviti) +- cli: Add --launchSecurity option (Erik Skultety) +- cli: Fill in --memorybacking options +- cli: --smartcard: support database= and certificate[0-9]*= +- cli: --sysinfo: Add chasis suboptions +- cli: --metadata: add genid= and genid_enable= +- cli: --vcpus: add vcpus.vcpu[0-9]* config +- cli: fill in all common char source options for --serial, --parellel, + --console, --channel, --smartcard, --rng, --redirdev + * Wed Apr 03 2019 Cole Robinson - 2.1.0-2 - Fix --initrd-inject with f30 URLs (bz #1686464)