app-emulation/libvirt-9999: Rebase a patch

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
index f4850f6ae63c50a72d0454afbf59c9061274d44f..2ffffe492db3c02ea4cd630dec7a26961d67042a 100644 (file)
--- a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
+++ b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
@@ -1,5 +1,5 @@
-From eee203f582af1f96e7a9451d447079cf49f47495 Mon Sep 17 00:00:00 2001
-Message-Id: <eee203f582af1f96e7a9451d447079cf49f47495.1565963722.git.mprivozn@redhat.com>
+From e387be8671d0de88632d063e2ecd2c12eb1b2fdf Mon Sep 17 00:00:00 2001
+Message-Id: <e387be8671d0de88632d063e2ecd2c12eb1b2fdf.1567522968.git.mprivozn@redhat.com>
 From: Michal Privoznik <mprivozn@redhat.com>
 Date: Sat, 16 Mar 2019 12:33:00 +0100
 Subject: [PATCH] gentoo: do not use sysconf
@@ -16,10 +16,10 @@ Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
  7 files changed, 15 insertions(+), 37 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 3ae4b87abb..69729d15b4 100644
+index f5093b9c90..e2ebc51c87 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -666,23 +666,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
+@@ -672,23 +672,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
  
  EXTRA_DIST += $(SYSCONF_FILES)
  
@@ -43,7 +43,7 @@ index 3ae4b87abb..69729d15b4 100644
  LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
  
  EXTRA_DIST += $(LOGROTATE_FILES_IN)
-@@ -740,14 +723,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+@@ -746,14 +729,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
  BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
  DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
  
@@ -89,20 +89,16 @@ index daff48e67d..43736191d5 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 4c5b28b478..032ea940fa 100644
+index 9c8c54a2ef..a042280cef 100644
 --- a/src/remote/libvirtd.service.in
 +++ b/src/remote/libvirtd.service.in
-@@ -22,12 +22,11 @@ Documentation=https://libvirt.org
+@@ -25,8 +25,7 @@ Documentation=https://libvirt.org
  
  [Service]
  Type=notify
 -EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
- # libvirtd.service is set to run on boot so that autostart of
- # VMs can be performed. We don't want it to stick around if
- # unused though, so we set a timeout. The socket activation
- # then ensures it gets started again if anything needs it
--ExecStart=@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS
-+ExecStart=@sbindir@/libvirtd --timeout 120
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
  ExecReload=/bin/kill -HUP $MAINPID
  KillMode=process
  Restart=on-failure