app-emulation/libvirt: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/7698

diff --git a/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
deleted file mode 100644 (file)
index 47010c4..0000000
--- a/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index be1b5a9..5ce0e1e 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -385,9 +385,7 @@ uninstall-logrotate:
-       rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
- 
- install-sysconfig:
--      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
--      $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
--        $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-+
- uninstall-sysconfig:
-       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-       rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
-diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index 608221c..63708f4 100644
---- a/daemon/libvirtd.service.in
-+++ b/daemon/libvirtd.service.in
-@@ -12,8 +12,7 @@ Documentation=http://libvirt.org
- 
- [Service]
- Type=notify
--EnvironmentFile=-/etc/sysconfig/libvirtd
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
-+ExecStart=@sbindir@/libvirtd
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
- Restart=on-failure
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7219f7c..c474a23 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2473,11 +2473,6 @@ EXTRA_DIST += \
-       logging/virtlogd.sysconf
- 
- install-sysconfig:
--      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
--      $(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \
--        $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
--      $(INSTALL_DATA) $(srcdir)/logging/virtlogd.sysconf \
--        $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
- 
- uninstall-sysconfig:
-       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index 57089b0..ace0c83 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8)
- Documentation=http://libvirt.org
- 
- [Service]
--EnvironmentFile=-/etc/sysconfig/virtlockd
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
-+ExecStart=@sbindir@/virtlockd
- ExecReload=/bin/kill -USR1 $MAINPID
- # 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 a264d3a..b467884 100644
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -5,8 +5,7 @@ Documentation=man:virtlogd(8)
- Documentation=http://libvirt.org
- 
- [Service]
--EnvironmentFile=-/etc/sysconfig/virtlogd
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
-+ExecStart=@sbindir@/virtlogd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the logs is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 9180564..e72d5f4 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -293,7 +293,7 @@ uninstall-local: uninstall-init uninstall-systemd
- install-sysconfig:
-       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-       $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
--        $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-+        $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf
- 
- uninstall-sysconfig:
-       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index c31f663..71cb79d 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
- Documentation=http://libvirt.org
- 
- [Service]
--EnvironmentFile=-/etc/sysconfig/libvirt-guests
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
- # Hack just call traditional service until we factor
- # out the code
- ExecStart=@libexecdir@/libvirt-guests.sh start
-diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
-index 2770056..accd4f5 100644
---- a/tools/libvirt-guests.sysconf
-+++ b/tools/libvirt-guests.sysconf
-@@ -1,3 +1,10 @@
-+#
-+# Warning: This configuration file is only sourced by the systemd
-+# libvirt-guests.service unit. The coresponding openrc facility is in
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
-+#
-+
-+
- # URIs to check for running guests
- # example: URIS='default xen:/// vbox+tcp://host/system lxc:///'
- #URIS=default

diff --git a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch b/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch
deleted file mode 100644 (file)
index adeff5c..0000000
--- a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-get major/minor macros by using AC_HEADER_MAJOR
-
-https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html#AC_HEADER_MAJOR
-
-https://bugs.gentoo.org/579960
-diff --git a/configure.ac b/configure.ac
-index 93d347c..1e7ee51 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -282,2 +282,5 @@ AC_CHECK_SIZEOF([long])
- 
-+dnl detect system-specific headers for major()/minor()
-+AC_HEADER_MAJOR
-+
- dnl Availability of various common functions (non-fatal if missing),
-diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
-index bd2eeb6..74b2487 100644
---- a/src/conf/domain_audit.c
-+++ b/src/conf/domain_audit.c
-@@ -28,2 +28,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "domain_audit.h"
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
-index 76bef82..49c0648 100644
---- a/src/lxc/lxc_controller.c
-+++ b/src/lxc/lxc_controller.c
-@@ -48,2 +48,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "virerror.h"
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 3c6c839..983cd21 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -38,2 +38,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "virerror.h"
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 38398fd..4b45458 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -31,2 +31,10 @@
- #endif
-+
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include <fcntl.h>
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index bb9604a..9840a9e 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -68,2 +68,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "c-ctype.h"

diff --git a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
deleted file mode 100644 (file)
index 65894ed..0000000
--- a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://www.redhat.com/archives/libvir-list/2018-January/msg00903.html
-https://www.redhat.com/archives/libvir-list/2018-January/msg00904.html
-
-diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
-index e216d9076..e3b8234b4 100644
---- a/tools/virsh-completer.c
-+++ b/tools/virsh-completer.c
-@@ -45,18 +45,11 @@ virshDomainNameCompleter(vshControl *ctl,
- 
-     virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE |
-                   VIR_CONNECT_LIST_DOMAINS_INACTIVE |
-+                  VIR_CONNECT_LIST_DOMAINS_OTHER |
-+                  VIR_CONNECT_LIST_DOMAINS_PAUSED |
-                   VIR_CONNECT_LIST_DOMAINS_PERSISTENT |
--                  VIR_CONNECT_LIST_DOMAINS_TRANSIENT |
-                   VIR_CONNECT_LIST_DOMAINS_RUNNING |
--                  VIR_CONNECT_LIST_DOMAINS_PAUSED |
--                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF |
--                  VIR_CONNECT_LIST_DOMAINS_OTHER |
--                  VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE |
--                  VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE |
--                  VIR_CONNECT_LIST_DOMAINS_AUTOSTART |
--                  VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART |
--                  VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT |
--                  VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT,
-+                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF,
-                   NULL);
- 
-     if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 0f329d6d7..5a0e0c1b2 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -1037,7 +1037,7 @@ static const vshCmdInfo info_autostart[] = {
- };
- 
- static const vshCmdOptDef opts_autostart[] = {
--    VIRSH_COMMON_OPT_DOMAIN_FULL(0),
-+    VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_PERSISTENT),
-     {.name = "disable",
-      .type = VSH_OT_BOOL,
-      .help = N_("disable autostarting")