Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vagrant-libvirt for openSUSE:Factory
checked in at 2022-05-05 23:06:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vagrant-libvirt (Old)
and /work/SRC/openSUSE:Factory/.vagrant-libvirt.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant-libvirt"
Thu May 5 23:06:55 2022 rev:20 rq:975072 version:0.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/vagrant-libvirt/vagrant-libvirt.changes
2022-05-03 21:18:57.396997561 +0200
+++
/work/SRC/openSUSE:Factory/.vagrant-libvirt.new.1538/vagrant-libvirt.changes
2022-05-05 23:07:31.049641493 +0200
@@ -1,0 +2,26 @@
+Thu May 5 06:21:51 UTC 2022 - Dan ??erm??k <[email protected]>
+
+- New upstream release 0.8.2
+- Add patch:
+ * 0001-Replace-tabs-with-spaces-in-domain_all_settings.xml.patch
(https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1489)
+
+# Changelog
+
+## [0.8.2](https://github.com/vagrant-libvirt/vagrant-libvirt/tree/0.8.2)
(2022-05-04)
+
+[Full
Changelog](https://github.com/vagrant-libvirt/vagrant-libvirt/compare/0.8.1...0.8.2)
+
+**Closed issues:**
+
+- Network configuration overwrites values set during provisioning since
version 0.8.0
[\#1479](https://github.com/vagrant-libvirt/vagrant-libvirt/issues/1479)
+- Bringing up all boxes in multi-box configuration fails with Ruby 3.1
[\#1445](https://github.com/vagrant-libvirt/vagrant-libvirt/issues/1445)
+
+**Merged pull requests:**
+
+- unrestrict fog-core version to ~\> 2
[\#1487](https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1487)
([dcermak](https://github.com/dcermak))
+- Update steps in the addtional notes
[\#1486](https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1486)
([r0x0d](https://github.com/r0x0d))
+- Use require for HandleBox, SyncedFolders, WaitForCommunicator
[\#1485](https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1485)
([tserong](https://github.com/tserong))
+- Ensure provisioner runs when performing a reload
[\#1484](https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1484)
([twouters](https://github.com/twouters))
+- Guest PCI address options for passthrough devices
[\#1481](https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1481)
([jamie01](https://github.com/jamie01))
+
+-------------------------------------------------------------------
Old:
----
vagrant-libvirt-0.8.1.gem
New:
----
0001-Replace-tabs-with-spaces-in-domain_all_settings.xml.patch
vagrant-libvirt-0.8.2.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vagrant-libvirt.spec ++++++
--- /var/tmp/diff_new_pack.o2iPBN/_old 2022-05-05 23:07:31.609642192 +0200
+++ /var/tmp/diff_new_pack.o2iPBN/_new 2022-05-05 23:07:31.617642202 +0200
@@ -21,7 +21,7 @@
%global rb_ruby_suffix %rb_default_ruby_suffix
Name: vagrant-libvirt
-Version: 0.8.1
+Version: 0.8.2
Release: 0
%define mod_name vagrant-libvirt
%define mod_full_name %{mod_name}-%{version}
@@ -79,6 +79,8 @@
URL: https://github.com/vagrant-libvirt/vagrant-libvirt
Source: https://rubygems.org/gems/%{mod_full_name}.gem
+# https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1489
+Patch0: 0001-Replace-tabs-with-spaces-in-domain_all_settings.xml.patch
Summary: Vagrant provider for libvirt
License: MIT
@@ -98,12 +100,7 @@
%prep
%gem_unpack
-# remove dropped or unneeded dependencies
-sed -i '/simplecov/d' %{mod_full_name}.gemspec
-
-# this is essentially
https://github.com/vagrant-libvirt/vagrant-libvirt/pull/1487
-# FIXME: drop this on the next upstream release
-sed -i 's/\["~> 2.1"\]/\[">= 2"\]/' %{mod_full_name}.gemspec
+%patch0 -p1
%build
%gem_build
++++++ 0001-Replace-tabs-with-spaces-in-domain_all_settings.xml.patch ++++++
>From 1ee0cffab20f91ff556827382c0f2e8c1a579372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]>
Date: Thu, 5 May 2022 09:22:21 +0200
Subject: [PATCH] Replace tabs with spaces in domain_all_settings.xml
The xml renderer stopped rendering tabs and now uses spaces instead, which made
the test fail.
---
spec/unit/templates/domain_all_settings.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/spec/unit/templates/domain_all_settings.xml
b/spec/unit/templates/domain_all_settings.xml
index eaa033a..cac4b50 100644
--- a/spec/unit/templates/domain_all_settings.xml
+++ b/spec/unit/templates/domain_all_settings.xml
@@ -112,12 +112,12 @@
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
- <address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/>
+ <address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/>
</source>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
- <address domain='0x0002' bus='0x04' slot='0x00' function='0x0'/>
+ <address domain='0x0002' bus='0x04' slot='0x00' function='0x0'/>
</source>
<address type='pci' domain='0x0000' bus='0x01' slot='0x01'
function='0x0'/>
</hostdev>
--
2.35.1
++++++ vagrant-libvirt-0.8.1.gem -> vagrant-libvirt-0.8.2.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2022-04-21 17:58:49.000000000 +0200
+++ new/README.md 2022-05-05 01:13:44.000000000 +0200
@@ -353,11 +353,11 @@
cd SRPMS
# common commands (make sure to adjust verison accordingly)
-rpm2cpio libssh-0.9.0-5.fc30.src.rpm | cpio -imdV
-tar xf libssh-0.9.0.tar.xz
+rpm2cpio libssh-0.9.4-1c8s.src.rpm | cpio -imdV
+tar xf libssh-0.9.4.tar.xz
mkdir build
cd build
-cmake ../libssh-0.9.0 -DOPENSSL_ROOT_DIR=/opt/vagrant/embedded/
+cmake ../libssh-0.9.4 -DOPENSSL_ROOT_DIR=/opt/vagrant/embedded/
make
sudo cp lib/libssh* /opt/vagrant/embedded/lib64
```
@@ -376,18 +376,21 @@
# centos 8 stream, doesn't provide source RPMs, so you need to download like so
git clone https://git.centos.org/centos-git-common
+# make get_sources.sh executable as it is needed in krb5
+chmod +x centos-git-common/get_sources.sh
# centos-git-common needs its tools in PATH
export PATH=$(readlink -f ./centos-git-common):$PATH
git clone https://git.centos.org/rpms/krb5
cd krb5
git checkout imports/c8s/krb5-1.18.2-8.el8
+get_sources.sh
into_srpm.sh -d c8s
cd SRPMS
# common commands (make sure to adjust verison accordingly)
-rpm2cpio krb5-1.18-1.fc32.src.rpm | cpio -imdV
-tar xf krb5-1.18.tar.gz
-cd krb5-1.18/src
+rpm2cpio krb5-1.18.2-8c8s.src.rpm | cpio -imdV
+tar xf krb5-1.18.2.tar.gz
+cd krb5-1.18.2/src
./configure
make
sudo cp -P lib/crypto/libk5crypto.* /opt/vagrant/embedded/lib64/
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/vagrant-libvirt/action.rb
new/lib/vagrant-libvirt/action.rb
--- old/lib/vagrant-libvirt/action.rb 2022-04-21 17:58:49.000000000 +0200
+++ new/lib/vagrant-libvirt/action.rb 2022-05-05 01:13:44.000000000 +0200
@@ -48,15 +48,12 @@
autoload :TimedProvision, action_root.join('timed_provision')
autoload :WaitTillUp, action_root.join('wait_till_up')
- autoload :HandleBox, 'vagrant/action/builtin/handle_box'
autoload :Package, 'vagrant/action/general/package'
autoload :PackageSetupFiles, 'vagrant/action/general/package_setup_files'
autoload :PackageSetupFolders,
'vagrant/action/general/package_setup_folders'
autoload :ProvisionerCleanup,
'vagrant/action/builtin/provisioner_cleanup'
autoload :SSHRun, 'vagrant/action/builtin/ssh_run'
autoload :SyncedFolderCleanup,
'vagrant/action/builtin/synced_folder_cleanup'
- autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
- autoload :WaitForCommunicator,
'vagrant/action/builtin/wait_for_communicator'
# Include the built-in & general modules so we can use them as top-level
things.
include Vagrant::Action::Builtin
@@ -93,6 +90,7 @@
b2.use SetupComplete
else
b2.use HandleStoragePool
+ require 'vagrant/action/builtin/handle_box'
b2.use HandleBox
b2.use HandleBoxImage
b2.use CreateDomainVolume
@@ -144,6 +142,7 @@
# VM is not running or suspended.
b3.use PrepareNFSValidIds
b3.use SyncedFolderCleanup
+ require 'vagrant/action/builtin/synced_folders'
b3.use SyncedFolders
b3.use PrepareNFSSettings
b3.use ShareFolders
@@ -156,6 +155,7 @@
# Machine should gain IP address when comming up,
# so wait for dhcp lease and store IP into machines data_dir.
b3.use WaitTillUp
+ require 'vagrant/action/builtin/wait_for_communicator'
b3.use WaitForCommunicator, [:running]
b3.use ForwardPorts
@@ -213,6 +213,7 @@
end
b2.use ConfigValidate
+ b2.use Provision
b2.use action_halt
b2.use action_start
end
@@ -353,6 +354,7 @@
b3.use CreateNetworks
b3.use ResumeDomain
b3.use Provision
+ require 'vagrant/action/builtin/wait_for_communicator'
b3.use WaitForCommunicator, [:running]
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/vagrant-libvirt/config.rb
new/lib/vagrant-libvirt/config.rb
--- old/lib/vagrant-libvirt/config.rb 2022-04-21 17:58:50.000000000 +0200
+++ new/lib/vagrant-libvirt/config.rb 2022-05-05 01:13:44.000000000 +0200
@@ -528,10 +528,14 @@
pci_domain = options[:domain]
end
- @pcis.push(domain: pci_domain,
- bus: options[:bus],
- slot: options[:slot],
- function: options[:function])
+ @pcis.push(domain: pci_domain,
+ bus: options[:bus],
+ slot: options[:slot],
+ function: options[:function],
+ guest_domain: options[:guest_domain],
+ guest_bus: options[:guest_bus],
+ guest_slot: options[:guest_slot],
+ guest_function: options[:guest_function])
end
def watchdog(options = {})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/vagrant-libvirt/templates/domain.xml.erb
new/lib/vagrant-libvirt/templates/domain.xml.erb
--- old/lib/vagrant-libvirt/templates/domain.xml.erb 2022-04-21
17:58:50.000000000 +0200
+++ new/lib/vagrant-libvirt/templates/domain.xml.erb 2022-05-05
01:13:44.000000000 +0200
@@ -230,15 +230,20 @@
<backend model='random'>/dev/random</backend>
</rng>
<%- end -%>
-<%- @pcis.each do |pci| -%>
+<%-
+ @pcis.each do |pci|
+ pci = pci.reject { |k,v| v.nil? }
+ guest_prefix = "guest_"
+ pci_host = pci.select { |k,_| !k.to_s.start_with?(guest_prefix) }
+ pci_guest = pci.select { |k,_| k.to_s.start_with?(guest_prefix) }
+-%>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
- <address <%= pci.select { |k,_| [:domain, :bus, :slot,
:function].include? k }
- .reject { |k,v| v.nil? }
- .map { |k,v| "#{k.to_s}='#{v}'" }
- .join(' ')
- -%>/>
+ <address <%= pci_host.map { |k,v| "#{k.to_s}='#{v}'" } .join(' ') -%>/>
</source>
+ <%- if !pci_guest.empty? -%>
+ <address type='pci' <%= pci_guest.map { |k,v|
"#{k.to_s[guest_prefix.length..-1]}='#{v}'" } .join(' ') -%>/>
+ <%- end -%>
</hostdev>
<%- end -%>
<%- @usbs.each do |usb| -%>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/vagrant-libvirt/version
new/lib/vagrant-libvirt/version
--- old/lib/vagrant-libvirt/version 2022-04-21 17:58:50.000000000 +0200
+++ new/lib/vagrant-libvirt/version 2022-05-05 01:13:44.000000000 +0200
@@ -1 +1 @@
-0.8.1
+0.8.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2022-04-21 17:58:49.000000000 +0200
+++ new/metadata 2022-05-05 01:13:44.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: vagrant-libvirt
version: !ruby/object:Gem::Version
- version: 0.8.1
+ version: 0.8.2
platform: ruby
authors:
- Lukas Stanek
@@ -11,7 +11,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rspec-core
@@ -75,14 +75,14 @@
requirements:
- - "~>"
- !ruby/object:Gem::Version
- version: '2.1'
+ version: '2'
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - "~>"
- !ruby/object:Gem::Version
- version: '2.1'
+ version: '2'
- !ruby/object:Gem::Dependency
name: rexml
requirement: !ruby/object:Gem::Requirement
@@ -326,10 +326,10 @@
- spec/unit/action/forward_ports_spec.rb
- spec/unit/templates/tpm/version_1.2.xml
- spec/unit/templates/tpm/version_2.0.xml
-- spec/unit/templates/domain_all_settings.xml
- spec/unit/templates/domain_cpu_mode_passthrough.xml
- spec/unit/templates/domain_custom_cpu_model.xml
- spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_all_settings.xml
- spec/unit/templates/domain_spec.rb
- spec/unit/util/byte_number_spec.rb
- spec/unit/util/resolvers_spec.rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/unit/templates/domain_all_settings.xml
new/spec/unit/templates/domain_all_settings.xml
--- old/spec/unit/templates/domain_all_settings.xml 2022-04-21
17:58:50.000000000 +0200
+++ new/spec/unit/templates/domain_all_settings.xml 2022-05-05
01:13:44.000000000 +0200
@@ -107,7 +107,7 @@
</rng>
<hostdev mode='subsystem' type='pci' managed='yes'>
<source>
- <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
+ <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
</source>
</hostdev>
<hostdev mode='subsystem' type='pci' managed='yes'>
@@ -115,6 +115,12 @@
<address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/>
</source>
</hostdev>
+ <hostdev mode='subsystem' type='pci' managed='yes'>
+ <source>
+ <address domain='0x0002' bus='0x04' slot='0x00' function='0x0'/>
+ </source>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x01'
function='0x0'/>
+ </hostdev>
<hostdev mode='subsystem' type='usb'>
<source startupPolicy='mandatory'>
<vendor id='0x1234'/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec/unit/templates/domain_spec.rb
new/spec/unit/templates/domain_spec.rb
--- old/spec/unit/templates/domain_spec.rb 2022-04-21 17:58:50.000000000
+0200
+++ new/spec/unit/templates/domain_spec.rb 2022-05-05 01:13:44.000000000
+0200
@@ -92,6 +92,7 @@
domain.serial(:type => 'file', :source => {:path =>
'/var/log/vm_consoles/machine.log'})
domain.pci(bus: '0x06', slot: '0x12', function: '0x5')
domain.pci(domain: '0x0001', bus: '0x03', slot: '0x00', function: '0x0')
+ domain.pci(domain: '0x0002', bus: '0x04', slot: '0x00', function: '0x0',
guest_domain: '0x0000', guest_bus: '0x01', guest_slot: '0x01', guest_function:
'0x0')
domain.usb_controller(model: 'nec-xhci', ports: '4')
domain.usb(bus: '1', device: '2', vendor: '0x1234', product: '0xabcd')
domain.redirdev(type: 'tcp', host: 'localhost', port: '4000')
