gentoo resync : 30.06.2018

2 files changed, 87 insertions, 153 deletions

diff --git a/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch b/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch
deleted file mode 100644
index c4d24ec020b1..000000000000
--- a/app-emulation/libvirt/files/libvirt-4.1.0-unbreak_my_bridge.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-[PATCH] conf: avoid reporting errors when network driver is disabled
-
-In previous releases all these methods were a no-op if the network
-driver is disabled. These helper methods are called unconditionally for
-all types of network interface, so must be no-ops if missing. Other code
-will already generate an error if the network driver is disabled and a
-NIC with type=network is used.
-
-Signed-off-by: Daniel P. Berrangé <berrange redhat com>
----
- src/conf/domain_conf.c | 23 +++++++++--------------
- 1 file changed, 9 insertions(+), 14 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index c8d051fa9f..79d6bd378e 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -28979,10 +28979,13 @@ int
- virDomainNetAllocateActualDevice(virDomainDefPtr dom,
-                                  virDomainNetDefPtr iface)
- {
-+    /* Just silently ignore if network driver isn't present. If something
-+     * has tried to use a NIC with type=network, other code will already
-+     * cause an error. This ensures type=bridge doesn't break when
-+     * network driver is compiled out.
-+     */
-     if (!netAllocate) {
--        virReportError(VIR_ERR_NO_SUPPORT, "%s",
--                       _("Network device allocation not available"));
--        return -1;
-+        return 0;
-     }
- 
-     return netAllocate(dom, iface);
-@@ -28993,8 +28996,6 @@ virDomainNetNotifyActualDevice(virDomainDefPtr dom,
-                                virDomainNetDefPtr iface)
- {
-     if (!netNotify) {
--        virReportError(VIR_ERR_NO_SUPPORT, "%s",
--                       _("Network device notification not available"));
-         return;
-     }
- 
-@@ -29007,9 +29008,7 @@ virDomainNetReleaseActualDevice(virDomainDefPtr dom,
-                                 virDomainNetDefPtr iface)
- {
-     if (!netRelease) {
--        virReportError(VIR_ERR_NO_SUPPORT, "%s",
--                       _("Network device release not available"));
--        return -1;
-+        return 0;
-     }
- 
-     return netRelease(dom, iface);
-@@ -29020,9 +29019,7 @@ virDomainNetBandwidthChangeAllowed(virDomainNetDefPtr iface,
-                                    virNetDevBandwidthPtr newBandwidth)
- {
-     if (!netBandwidthChangeAllowed) {
--        virReportError(VIR_ERR_NO_SUPPORT, "%s",
--                       _("Network device bandwidth change query not available"));
--        return -1;
-+        return 0;
-     }
- 
-     return netBandwidthChangeAllowed(iface, newBandwidth);
-@@ -29033,9 +29030,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface,
-                             virNetDevBandwidthPtr newBandwidth)
- {
-     if (!netBandwidthUpdate) {
--        virReportError(VIR_ERR_NO_SUPPORT, "%s",
--                       _("Network device bandwidth update not available"));
--        return -1;
-+        return 0;
-     }
- 
-     return netBandwidthUpdate(iface, newBandwidth);
--- 
-2.14.3
diff --git a/app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch
index 2c8339a8b519..3e430cba1d2f 100644
--- a/app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch
+++ b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch
@@ -1,17 +1,34 @@
+From a365e2d5b4af1ab2be743773412fe265579a9a0b Mon Sep 17 00:00:00 2001
+Message-Id: <a365e2d5b4af1ab2be743773412fe265579a9a0b.1529989118.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 26 Jun 2018 06:51:06 +0200
+Subject: [PATCH] gentoo: do not use sysconf
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/Makefile.am                  | 29 ++++++-----------------------
+ src/locking/virtlockd.service.in |  3 +--
+ src/logging/virtlogd.service.in  |  3 +--
+ src/remote/libvirtd.service.in   |  3 +--
+ tools/Makefile.am                | 17 ++++-------------
+ tools/libvirt-guests.service.in  |  2 +-
+ tools/libvirt-guests.sysconf     |  7 +++++++
+ 7 files changed, 21 insertions(+), 43 deletions(-)
+
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 3bf2da5..6b3f37a 100644
+index db8c8ebd1a..63d7a9ca46 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2165,23 +2165,6 @@ EXTRA_DIST += \
- 	$(SYSCONF_FILES) \
- 	$(NULL)
+@@ -757,23 +757,6 @@ endif WITH_SETUID_RPC_CLIENT
+ 
+ EXTRA_DIST += $(SYSCONF_FILES)
  
 -install-sysconfig:
 -	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
 -	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
 -	do \
 -	  tgt=`basename $$f`; \
--	  $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf \
+-	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
 -	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
 -	done
 -
@@ -23,11 +40,11 @@ index 3bf2da5..6b3f37a 100644
 -	done
 -	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
 -
- SYSVINIT_FILES_IN = \
+ SYSVINIT_FILES_IN += \
  	locking/virtlockd.init.in \
- 	logging/virtlogd.init.in \
-@@ -2268,14 +2251,14 @@ uninstall-polkit::
- endif ! WITH_POLKIT
+ 	$(NULL)
+@@ -814,14 +797,14 @@ uninstall-logrotate:
+ endif ! WITH_LIBVIRTD
  
  if LIBVIRT_INIT_SCRIPT_RED_HAT
 -install-init:: $(SYSVINIT_FILES) install-sysconfig
@@ -43,8 +60,43 @@ index 3bf2da5..6b3f37a 100644
  	rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%)
  	rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
  
+@@ -859,14 +842,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
+ 
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
++install-systemd: $(SYSTEMD_UNIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	for f in $(SYSTEMD_UNIT_FILES); \
+ 	do \
+ 	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
+ 	done
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+ else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
+@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
+ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_UPSTART
+ 
+-install-upstart: install-sysconfig
++install-upstart:
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
+ 	      $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
+ 	done
+ 
+-uninstall-upstart: uninstall-sysconfig
++uninstall-upstart:
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+ 	  tgt=`basename $$f` ; \
 diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index 3c9d587..2449b20 100644
+index 3c9d587032..2449b201d9 100644
 --- a/src/locking/virtlockd.service.in
 +++ b/src/locking/virtlockd.service.in
 @@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
@@ -58,7 +110,7 @@ index 3c9d587..2449b20 100644
  # Loosing the locks is a really bad thing that will
  # cause the machine to be fenced (rebooted), so make
 diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
-index 3d9ae36..4373619 100644
+index 3d9ae36150..43736191d5 100644
 --- a/src/logging/virtlogd.service.in
 +++ b/src/logging/virtlogd.service.in
 @@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
@@ -72,10 +124,10 @@ index 3d9ae36..4373619 100644
  # Loosing the logs is a really bad thing that will
  # cause the machine to be fenced (rebooted), so make
 diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 769702e..1830c72 100644
+index 7f689e08a8..239beeced9 100644
 --- a/src/remote/libvirtd.service.in
 +++ b/src/remote/libvirtd.service.in
-@@ -21,8 +21,7 @@ Documentation=https://libvirt.org
+@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
  
  [Service]
  Type=notify
@@ -86,7 +138,7 @@ index 769702e..1830c72 100644
  KillMode=process
  Restart=on-failure
 diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 85e640b..99b9fa1 100644
+index 1452d984a0..cef08741cb 100644
 --- a/tools/Makefile.am
 +++ b/tools/Makefile.am
 @@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \
@@ -116,8 +168,23 @@ index 85e640b..99b9fa1 100644
  else ! LIBVIRT_INIT_SCRIPT_RED_HAT
  install-init:
  uninstall-init:
+@@ -391,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+ 
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
++install-systemd: libvirt-guests.service libvirt-guests.sh
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	$(INSTALL_DATA) libvirt-guests.service \
+ 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
+ 
 diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index 491ca62..f0f417b 100644
+index 491ca62138..f0f417bffb 100644
 --- a/tools/libvirt-guests.service.in
 +++ b/tools/libvirt-guests.service.in
 @@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
@@ -130,7 +197,7 @@ index 491ca62..f0f417b 100644
  # out the code
  ExecStart=@libexecdir@/libvirt-guests.sh start
 diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
-index 08204ca..2da172b 100644
+index 669b046507..45b0b9ea46 100644
 --- a/tools/libvirt-guests.sysconf
 +++ b/tools/libvirt-guests.sysconf
 @@ -1,3 +1,10 @@
@@ -142,63 +209,8 @@ index 08204ca..2da172b 100644
 +
 +
  # URIs to check for running guests
- # example: URIS='default xen:/// vbox+tcp://host/system lxc:///'
+ # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
  #URIS=default
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b3f37a..48e7133 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2417,14 +2417,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
- BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
- DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
- 
--install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
-+install-systemd: $(SYSTEMD_UNIT_FILES)
- 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
- 	for f in $(SYSTEMD_UNIT_FILES); \
- 	do \
- 	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
- 	done
- 
--uninstall-systemd: uninstall-sysconfig
-+uninstall-systemd:
- 	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
- 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
- else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
-@@ -2496,7 +2496,7 @@ EXTRA_DIST += $(UPSTART_FILES)
- if WITH_LIBVIRTD
- if LIBVIRT_INIT_SCRIPT_UPSTART
- 
--install-upstart: install-sysconfig
-+install-upstart:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
- 	for f in $(UPSTART_FILES:%.upstart=%); \
- 	do \
-@@ -2505,7 +2505,7 @@ install-upstart: install-sysconfig
- 	      $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
- 	done
- 
--uninstall-upstart: uninstall-sysconfig
-+uninstall-upstart:
- 	for f in $(UPSTART_FILES:%.upstart=%); \
- 	do \
- 	  tgt=`basename $$f` ; \
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 99b9fa1..37e037c 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -382,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in
- SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
- 
- if LIBVIRT_INIT_SCRIPT_SYSTEMD
--install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
-+install-systemd: libvirt-guests.service libvirt-guests.sh
- 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
- 	$(INSTALL_DATA) libvirt-guests.service \
- 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
- 
--uninstall-systemd: uninstall-sysconfig
-+uninstall-systemd:
- 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
- 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
- 
+-- 
+2.16.4
+