From 5362742718a035681452094c18259125ad56676e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 20 Aug 2016 10:35:42 +0000 Subject: [PATCH] - updated to 2.1.0 --- bashisms.patch | 20 ++-- libvirt-guests.init.patch | 6 +- libvirt-qemu-acl.patch | 43 +++---- libvirt-sasl.patch | 217 ++++++++++++++++++----------------- libvirt-sysctl-dir.patch | 8 +- libvirt-udevadm-settle.patch | 8 +- libvirt-xend.patch | 48 -------- libvirt.spec | 43 ++++--- 8 files changed, 172 insertions(+), 221 deletions(-) delete mode 100644 libvirt-xend.patch diff --git a/bashisms.patch b/bashisms.patch index 6956bdc..68ef878 100644 --- a/bashisms.patch +++ b/bashisms.patch @@ -1,18 +1,18 @@ -diff -urp libvirt-1.3.2.orig/tools/libvirt-guests.sh.in libvirt-1.3.2/tools/libvirt-guests.sh.in ---- libvirt-1.3.2.orig/tools/libvirt-guests.sh.in 2015-05-23 12:56:12.000000000 +0000 -+++ libvirt-1.3.2/tools/libvirt-guests.sh.in 2016-03-18 12:43:31.898768000 +0000 +diff -urp libvirt-2.1.0.orig/src/locking/virtlockd.init.in libvirt-2.1.0/src/locking/virtlockd.init.in +--- libvirt-2.1.0.orig/src/locking/virtlockd.init.in 2016-08-20 10:27:48.111554000 +0000 ++++ libvirt-2.1.0/src/locking/virtlockd.init.in 2016-08-20 10:28:19.098554000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash - # Copyright (C) 2011-2014 Red Hat, Inc. - # -diff -urp libvirt-1.3.2.orig/src/locking/virtlockd.init.in libvirt-1.3.2/src/locking/virtlockd.init.in ---- libvirt-1.3.2.orig/src/locking/virtlockd.init.in 2016-01-12 00:12:06.000000000 +0000 -+++ libvirt-1.3.2/src/locking/virtlockd.init.in 2016-03-18 12:35:57.135768000 +0000 + # the following is the LSB init header see + # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html +diff -urp libvirt-2.1.0.orig/tools/libvirt-guests.sh.in libvirt-2.1.0/tools/libvirt-guests.sh.in +--- libvirt-2.1.0.orig/tools/libvirt-guests.sh.in 2016-08-20 10:27:48.167554000 +0000 ++++ libvirt-2.1.0/tools/libvirt-guests.sh.in 2016-08-20 10:28:19.097554000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash - # the following is the LSB init header see - # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html + # Copyright (C) 2011-2014 Red Hat, Inc. + # diff --git a/libvirt-guests.init.patch b/libvirt-guests.init.patch index 1ed5514..84e90ce 100644 --- a/libvirt-guests.init.patch +++ b/libvirt-guests.init.patch @@ -1,6 +1,6 @@ -diff -urp libvirt-1.3.2.orig/tools/libvirt-guests.init.in libvirt-1.3.2/tools/libvirt-guests.init.in ---- libvirt-1.3.2.orig/tools/libvirt-guests.init.in 2016-01-12 00:12:07.000000000 +0000 -+++ libvirt-1.3.2/tools/libvirt-guests.init.in 2016-03-18 12:49:39.288768000 +0000 +diff -urp libvirt-2.1.0.orig/tools/libvirt-guests.init.in libvirt-2.1.0/tools/libvirt-guests.init.in +--- libvirt-2.1.0.orig/tools/libvirt-guests.init.in 2016-08-20 10:28:36.230554000 +0000 ++++ libvirt-2.1.0/tools/libvirt-guests.init.in 2016-08-20 10:29:22.215554000 +0000 @@ -28,3 +28,6 @@ # diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index 346926c..e2de6e5 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu_command.c ---- libvirt-1.3.3.orig/src/qemu/qemu_command.c 2016-04-14 10:17:35.131170000 +0000 -+++ libvirt-1.3.3/src/qemu/qemu_command.c 2016-04-14 10:30:12.861170000 +0000 -@@ -7336,6 +7336,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD +diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c +--- libvirt-2.1.0.orig/src/qemu/qemu_command.c 2016-08-20 10:12:37.332554000 +0000 ++++ libvirt-2.1.0/src/qemu/qemu_command.c 2016-08-20 10:13:30.288554000 +0000 +@@ -7519,6 +7519,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,9 +12,9 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu } virCommandAddArg(cmd, "-vnc"); -diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf ---- libvirt-1.3.3.orig/src/qemu/qemu.conf 2016-04-14 10:17:35.131170000 +0000 -+++ libvirt-1.3.3/src/qemu/qemu.conf 2016-04-14 10:18:01.034170000 +0000 +diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf +--- libvirt-2.1.0.orig/src/qemu/qemu.conf 2016-08-20 10:12:37.337554000 +0000 ++++ libvirt-2.1.0/src/qemu/qemu.conf 2016-08-20 10:13:30.289554000 +0000 @@ -80,6 +80,15 @@ #vnc_sasl = 1 @@ -31,21 +31,22 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf # The default SASL configuration file is located in /etc/sasl/ # When running libvirtd unprivileged, it may be desirable to # override the configs in this location. Set this parameter to -diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.c libvirt-1.3.3/src/qemu/qemu_conf.c ---- libvirt-1.3.3.orig/src/qemu/qemu_conf.c 2016-04-14 10:17:35.130170000 +0000 -+++ libvirt-1.3.3/src/qemu/qemu_conf.c 2016-04-14 10:18:01.034170000 +0000 -@@ -536,6 +536,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD - GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir); - GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio); - GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio); -+ GET_VALUE_LONG("vnc_acl", cfg->vncACL); +diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c +--- libvirt-2.1.0.orig/src/qemu/qemu_conf.c 2016-08-20 10:12:37.334554000 +0000 ++++ libvirt-2.1.0/src/qemu/qemu_conf.c 2016-08-20 10:15:22.160554000 +0000 +@@ -425,6 +425,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD + goto cleanup; + if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0) + goto cleanup; ++ if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0) ++ goto cleanup; - p = virConfGetValue(conf, "security_driver"); - if (p && p->type == VIR_CONF_LIST) { -diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.h libvirt-1.3.3/src/qemu/qemu_conf.h ---- libvirt-1.3.3.orig/src/qemu/qemu_conf.h 2016-04-14 10:17:35.130170000 +0000 -+++ libvirt-1.3.3/src/qemu/qemu_conf.h 2016-04-14 10:18:01.035170000 +0000 -@@ -112,6 +112,7 @@ struct _virQEMUDriverConfig { + + if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0) +diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h +--- libvirt-2.1.0.orig/src/qemu/qemu_conf.h 2016-08-20 10:12:37.334554000 +0000 ++++ libvirt-2.1.0/src/qemu/qemu_conf.h 2016-08-20 10:13:30.294554000 +0000 +@@ -113,6 +113,7 @@ struct _virQEMUDriverConfig { bool vncTLS; bool vncTLSx509verify; bool vncSASL; diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 7823a60..474acdb 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd.conf ---- libvirt-1.3.3.orig/daemon/libvirtd.conf 2016-04-14 10:15:59.438170000 +0000 -+++ libvirt-1.3.3/daemon/libvirtd.conf 2016-04-14 10:16:21.849170000 +0000 -@@ -128,7 +128,7 @@ +diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd.conf +--- libvirt-2.1.0.orig/daemon/libvirtd.conf 2016-08-20 10:07:32.043554000 +0000 ++++ libvirt-2.1.0/daemon/libvirtd.conf 2016-08-20 10:07:47.074554000 +0000 +@@ -123,7 +123,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -10,7 +10,7 @@ diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd. # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -159,7 +159,7 @@ +@@ -154,7 +154,7 @@ # If you don't enable SASL, then all TCP traffic is cleartext. # Don't do this outside of a dev/test scenario. For real world # use, always enable SASL and use the GSSAPI or DIGEST-MD5 @@ -19,10 +19,10 @@ diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd. #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-1.3.3.orig/daemon/Makefile.am libvirt-1.3.3/daemon/Makefile.am ---- libvirt-1.3.3.orig/daemon/Makefile.am 2016-04-14 10:15:59.438170000 +0000 -+++ libvirt-1.3.3/daemon/Makefile.am 2016-04-14 10:16:21.849170000 +0000 -@@ -521,13 +521,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in +diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am +--- libvirt-2.1.0.orig/daemon/Makefile.am 2016-08-20 10:07:32.040554000 +0000 ++++ libvirt-2.1.0/daemon/Makefile.am 2016-08-20 10:07:47.074554000 +0000 +@@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup # the WITH_LIBVIRTD conditional if WITH_SASL install-data-sasl: @@ -40,10 +40,10 @@ diff -urp libvirt-1.3.3.orig/daemon/Makefile.am libvirt-1.3.3/daemon/Makefile.am else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -diff -urp libvirt-1.3.3.orig/daemon/Makefile.in libvirt-1.3.3/daemon/Makefile.in ---- libvirt-1.3.3.orig/daemon/Makefile.in 2016-04-14 10:15:59.436170000 +0000 -+++ libvirt-1.3.3/daemon/Makefile.in 2016-04-14 10:16:21.852170000 +0000 -@@ -2832,13 +2832,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in +diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in +--- libvirt-2.1.0.orig/daemon/Makefile.in 2016-08-20 10:07:32.040554000 +0000 ++++ libvirt-2.1.0/daemon/Makefile.in 2016-08-20 10:07:47.076554000 +0000 +@@ -2842,13 +2842,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/ # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional @WITH_SASL_TRUE@install-data-sasl: @@ -61,10 +61,10 @@ diff -urp libvirt-1.3.3.orig/daemon/Makefile.in libvirt-1.3.3/daemon/Makefile.in @WITH_SASL_FALSE@install-data-sasl: @WITH_SASL_FALSE@uninstall-data-sasl: -diff -urp libvirt-1.3.3.orig/docs/auth.html libvirt-1.3.3/docs/auth.html ---- libvirt-1.3.3.orig/docs/auth.html 2016-04-14 10:15:59.421170000 +0000 -+++ libvirt-1.3.3/docs/auth.html 2016-04-14 10:16:21.852170000 +0000 -@@ -404,7 +404,7 @@ again: +diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/docs/auth.html +--- libvirt-2.1.0.orig/docs/auth.html 2016-08-20 10:07:32.082554000 +0000 ++++ libvirt-2.1.0/docs/auth.html 2016-08-20 10:07:47.076554000 +0000 +@@ -415,7 +415,7 @@ again: The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. The SASL mechanism configured by default is DIGEST-MD5, which provides a basic username+password style authentication. To enable Kerberos single-sign-on instead, @@ -73,10 +73,10 @@ diff -urp libvirt-1.3.3.orig/docs/auth.html libvirt-1.3.3/docs/auth.html The mech_list parameter must first be changed to gssapi instead of the default digest-md5, and keytab should be set to /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX -diff -urp libvirt-1.3.3.orig/docs/auth.html.in libvirt-1.3.3/docs/auth.html.in ---- libvirt-1.3.3.orig/docs/auth.html.in 2016-04-14 10:15:59.414170000 +0000 -+++ libvirt-1.3.3/docs/auth.html.in 2016-04-14 10:16:21.853170000 +0000 -@@ -234,7 +234,7 @@ again: +diff -urp libvirt-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/docs/auth.html.in +--- libvirt-2.1.0.orig/docs/auth.html.in 2016-08-20 10:07:32.100554000 +0000 ++++ libvirt-2.1.0/docs/auth.html.in 2016-08-20 10:07:47.077554000 +0000 +@@ -246,7 +246,7 @@ again: The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. The SASL mechanism configured by default is DIGEST-MD5, which provides a basic username+password style authentication. To enable Kerberos single-sign-on instead, @@ -85,33 +85,33 @@ diff -urp libvirt-1.3.3.orig/docs/auth.html.in libvirt-1.3.3/docs/auth.html.in The mech_list parameter must first be changed to gssapi instead of the default digest-md5, and keytab should be set to /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX -diff -urp libvirt-1.3.3.orig/libvirt.spec libvirt-1.3.3/libvirt.spec ---- libvirt-1.3.3.orig/libvirt.spec 2016-04-14 10:15:59.436170000 +0000 -+++ libvirt-1.3.3/libvirt.spec 2016-04-14 10:16:21.860170000 +0000 -@@ -2332,7 +2332,7 @@ exit 0 - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ +diff -urp libvirt-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec +--- libvirt-2.1.0.orig/libvirt.spec 2016-08-20 10:07:31.917554000 +0000 ++++ libvirt-2.1.0/libvirt.spec 2016-08-20 10:08:58.351554000 +0000 +@@ -1827,7 +1827,7 @@ exit 0 + %{_datadir}/libvirt/cpu_map.xml + %{_datadir}/libvirt/libvirtLogo.png - %if %{with_sasl} -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - %if %{with_wireshark} -diff -urp libvirt-1.3.3.orig/libvirt.spec.in libvirt-1.3.3/libvirt.spec.in ---- libvirt-1.3.3.orig/libvirt.spec.in 2016-04-14 10:16:00.591170000 +0000 -+++ libvirt-1.3.3/libvirt.spec.in 2016-04-14 10:16:21.872170000 +0000 -@@ -2332,7 +2332,7 @@ exit 0 - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ + %files admin + %{_mandir}/man1/virt-admin.1* +diff -urp libvirt-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in +--- libvirt-2.1.0.orig/libvirt.spec.in 2016-08-20 10:07:31.915554000 +0000 ++++ libvirt-2.1.0/libvirt.spec.in 2016-08-20 10:09:09.031554000 +0000 +@@ -1827,7 +1827,7 @@ exit 0 + %{_datadir}/libvirt/cpu_map.xml + %{_datadir}/libvirt/libvirtLogo.png - %if %{with_sasl} -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - %if %{with_wireshark} -diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf ---- libvirt-1.3.3.orig/src/qemu/qemu.conf 2016-04-14 10:16:00.616170000 +0000 -+++ libvirt-1.3.3/src/qemu/qemu.conf 2016-04-14 10:16:21.872170000 +0000 + %files admin + %{_mandir}/man1/virt-admin.1* +diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf +--- libvirt-2.1.0.orig/src/qemu/qemu.conf 2016-08-20 10:07:31.997554000 +0000 ++++ libvirt-2.1.0/src/qemu/qemu.conf 2016-08-20 10:07:47.087554000 +0000 @@ -74,18 +74,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -134,7 +134,7 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf # QEMU implements an extension for providing audio over a VNC connection, -@@ -143,17 +143,17 @@ +@@ -154,17 +154,17 @@ # Enable use of SASL encryption on the SPICE server. This requires # a SPICE client which supports the SASL protocol extension. # @@ -155,10 +155,10 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf # By default, if no graphical front end is configured, libvirt will disable -diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-04-14 10:16:00.617170000 +0000 -+++ libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in 2016-04-14 10:16:21.872170000 +0000 -@@ -9,14 +9,14 @@ module Test_libvirtd_qemu = +diff -urp libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:07:31.997554000 +0000 ++++ libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:09:46.009554000 +0000 +@@ -9,7 +9,7 @@ module Test_libvirtd_qemu = { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } { "vnc_sasl" = "1" } @@ -167,7 +167,8 @@ diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/sr { "vnc_allow_host_audio" = "0" } { "spice_listen" = "0.0.0.0" } { "spice_tls" = "1" } - { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } +@@ -17,7 +17,7 @@ module Test_libvirtd_qemu = + { "spice_auto_unix_socket" = "1" } { "spice_password" = "XYZ12345" } { "spice_sasl" = "1" } -{ "spice_sasl_dir" = "/some/directory/sasl2" } @@ -175,51 +176,9 @@ diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/sr { "nographics_allow_host_audio" = "1" } { "remote_display_port_min" = "5900" } { "remote_display_port_max" = "65535" } -diff -urp libvirt-1.3.3.orig/tests/confdata/libvirtd.conf libvirt-1.3.3/tests/confdata/libvirtd.conf ---- libvirt-1.3.3.orig/tests/confdata/libvirtd.conf 2016-04-14 10:16:00.575170000 +0000 -+++ libvirt-1.3.3/tests/confdata/libvirtd.conf 2016-04-14 10:16:21.872170000 +0000 -@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" - # the network providing auth (eg, TLS/x509 certificates) - # - # - sasl: use SASL infrastructure. The actual auth scheme is then --# controlled from /etc/sasl2/libvirt.conf. For the TCP -+# controlled from /etc/sasl/libvirt.conf. For the TCP - # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. - # For non-TCP or TLS sockets, any scheme is allowed. - # -@@ -139,7 +139,7 @@ auth_unix_rw = "none" - # If you don't enable SASL, then all TCP traffic is cleartext. - # Don't do this outside of a dev/test scenario. For real world - # use, always enable SASL and use the GSSAPI or DIGEST-MD5 --# mechanism in /etc/sasl2/libvirt.conf -+# mechanism in /etc/sasl/libvirt.conf - auth_tcp = "sasl" - - # Change the authentication scheme for TLS sockets. -diff -urp libvirt-1.3.3.orig/tests/confdata/libvirtd.out libvirt-1.3.3/tests/confdata/libvirtd.out ---- libvirt-1.3.3.orig/tests/confdata/libvirtd.out 2016-04-14 10:16:00.575170000 +0000 -+++ libvirt-1.3.3/tests/confdata/libvirtd.out 2016-04-14 10:16:21.872170000 +0000 -@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" - # the network providing auth (eg, TLS/x509 certificates) - # - # - sasl: use SASL infrastructure. The actual auth scheme is then --# controlled from /etc/sasl2/libvirt.conf. For the TCP -+# controlled from /etc/sasl/libvirt.conf. For the TCP - # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. - # For non-TCP or TLS sockets, any scheme is allowed. - # -@@ -116,7 +116,7 @@ auth_unix_rw = "none" - # If you don't enable SASL, then all TCP traffic is cleartext. - # Don't do this outside of a dev/test scenario. For real world - # use, always enable SASL and use the GSSAPI or DIGEST-MD5 --# mechanism in /etc/sasl2/libvirt.conf -+# mechanism in /etc/sasl/libvirt.conf - auth_tcp = "sasl" - # Change the authentication scheme for TLS sockets. - # -diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args ---- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-04-14 10:15:59.729170000 +0000 -+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-04-14 10:16:21.873170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args +--- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:32.590554000 +0000 ++++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:48.739554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -229,9 +188,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args ---- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-04-14 10:15:59.730170000 +0000 -+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-04-14 10:16:21.873170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args +--- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:32.591554000 +0000 ++++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:48.739554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -241,9 +200,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args ---- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-04-14 10:15:59.691170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-04-14 10:16:21.873170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:32.622554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:48.740554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -253,9 +212,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice- QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args ---- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-04-14 10:15:59.692170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-04-14 10:16:21.874170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:32.623554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:48.740554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -265,9 +224,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args ---- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-04-14 10:15:59.672170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-04-14 10:16:21.874170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:32.623554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:48.740554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -277,10 +236,10 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxml2argvtest.c ---- libvirt-1.3.3.orig/tests/qemuxml2argvtest.c 2016-04-14 10:15:59.666170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvtest.c 2016-04-14 10:16:21.875170000 +0000 -@@ -897,7 +897,7 @@ mymain(void) +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxml2argvtest.c +--- libvirt-2.1.0.orig/tests/qemuxml2argvtest.c 2016-08-20 10:07:32.132554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvtest.c 2016-08-20 10:07:48.741554000 +0000 +@@ -929,7 +929,7 @@ mymain(void) driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -289,7 +248,7 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxm DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -919,7 +919,7 @@ mymain(void) +@@ -953,7 +953,7 @@ mymain(void) DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE); driver.config->spiceSASL = 1; @@ -298,3 +257,45 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxm DO_TEST("graphics-spice-sasl", QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, +diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests/virconfdata/libvirtd.conf +--- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf 2016-08-20 10:07:33.070554000 +0000 ++++ libvirt-2.1.0/tests/virconfdata/libvirtd.conf 2016-08-20 10:09:58.088554000 +0000 +@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" + # the network providing auth (eg, TLS/x509 certificates) + # + # - sasl: use SASL infrastructure. The actual auth scheme is then +-# controlled from /etc/sasl2/libvirt.conf. For the TCP ++# controlled from /etc/sasl/libvirt.conf. For the TCP + # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. + # For non-TCP or TLS sockets, any scheme is allowed. + # +@@ -139,7 +139,7 @@ auth_unix_rw = "none" + # If you don't enable SASL, then all TCP traffic is cleartext. + # Don't do this outside of a dev/test scenario. For real world + # use, always enable SASL and use the GSSAPI or DIGEST-MD5 +-# mechanism in /etc/sasl2/libvirt.conf ++# mechanism in /etc/sasl/libvirt.conf + auth_tcp = "sasl" + + # Change the authentication scheme for TLS sockets. +diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out libvirt-2.1.0/tests/virconfdata/libvirtd.out +--- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out 2016-08-20 10:07:33.070554000 +0000 ++++ libvirt-2.1.0/tests/virconfdata/libvirtd.out 2016-08-20 10:10:07.948554000 +0000 +@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" + # the network providing auth (eg, TLS/x509 certificates) + # + # - sasl: use SASL infrastructure. The actual auth scheme is then +-# controlled from /etc/sasl2/libvirt.conf. For the TCP ++# controlled from /etc/sasl/libvirt.conf. For the TCP + # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. + # For non-TCP or TLS sockets, any scheme is allowed. + # +@@ -116,7 +116,7 @@ auth_unix_rw = "none" + # If you don't enable SASL, then all TCP traffic is cleartext. + # Don't do this outside of a dev/test scenario. For real world + # use, always enable SASL and use the GSSAPI or DIGEST-MD5 +-# mechanism in /etc/sasl2/libvirt.conf ++# mechanism in /etc/sasl/libvirt.conf + auth_tcp = "sasl" + # Change the authentication scheme for TLS sockets. + # diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch index 42df9c9..f82dc80 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-1.3.2.orig/daemon/Makefile.am libvirt-1.3.2/daemon/Makefile.am ---- libvirt-1.3.2.orig/daemon/Makefile.am 2016-03-18 06:57:24.000000000 +0000 -+++ libvirt-1.3.2/daemon/Makefile.am 2016-03-18 12:50:49.382768000 +0000 -@@ -397,13 +397,11 @@ if WITH_SYSCTL +diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am +--- libvirt-2.1.0.orig/daemon/Makefile.am 2016-08-20 10:29:38.054554000 +0000 ++++ libvirt-2.1.0/daemon/Makefile.am 2016-08-20 10:31:14.932554000 +0000 +@@ -401,13 +401,11 @@ if WITH_SYSCTL # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on # /usr/lib/sysctl.d/ even when libdir is /usr/lib64 install-sysctl: diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch index ce4f100..809fa7b 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-1.3.3.orig/src/util/virutil.c libvirt-1.3.3/src/util/virutil.c ---- libvirt-1.3.3.orig/src/util/virutil.c 2016-04-14 10:31:32.419170000 +0000 -+++ libvirt-1.3.3/src/util/virutil.c 2016-04-14 10:31:45.518170000 +0000 -@@ -1535,7 +1535,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi +diff -urp libvirt-2.1.0.orig/src/util/virutil.c libvirt-2.1.0/src/util/virutil.c +--- libvirt-2.1.0.orig/src/util/virutil.c 2016-08-20 10:22:17.303554000 +0000 ++++ libvirt-2.1.0/src/util/virutil.c 2016-08-20 10:26:45.761554000 +0000 +@@ -1586,7 +1586,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi void virFileWaitForDevices(void) { # ifdef UDEVADM diff --git a/libvirt-xend.patch b/libvirt-xend.patch deleted file mode 100644 index dcbb0b3..0000000 --- a/libvirt-xend.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urp libvirt-1.3.2.orig/src/libxl/libxl_driver.c libvirt-1.3.2/src/libxl/libxl_driver.c ---- libvirt-1.3.2.orig/src/libxl/libxl_driver.c 2016-02-26 09:14:56.000000000 +0000 -+++ libvirt-1.3.2/src/libxl/libxl_driver.c 2016-03-18 12:34:43.118768000 +0000 -@@ -477,7 +477,7 @@ libxlDriverShouldLoad(bool privileged) - if (virFileExists("/usr/sbin/xend")) { - virCommandPtr cmd; - -- cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); -+ cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL); - if (virCommandRun(cmd, NULL) == 0) { - VIR_INFO("Legacy xen tool stack seems to be in use, disabling " - "libxenlight driver."); -diff -urp libvirt-1.3.2.orig/src/xen/xen_driver.c libvirt-1.3.2/src/xen/xen_driver.c ---- libvirt-1.3.2.orig/src/xen/xen_driver.c 2016-02-16 14:25:07.000000000 +0000 -+++ libvirt-1.3.2/src/xen/xen_driver.c 2016-03-18 12:34:43.115768000 +0000 -@@ -308,7 +308,7 @@ xenUnifiedXendProbe(void) - if (virFileExists("/usr/sbin/xend")) { - virCommandPtr cmd; - -- cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); -+ cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL); - if (virCommandRun(cmd, NULL) == 0) - ret = true; - virCommandFree(cmd); -diff -urp libvirt-1.3.2.orig/tests/reconnect.c libvirt-1.3.2/tests/reconnect.c ---- libvirt-1.3.2.orig/tests/reconnect.c 2015-01-23 11:46:24.000000000 +0000 -+++ libvirt-1.3.2/tests/reconnect.c 2016-03-18 12:34:43.119768000 +0000 -@@ -24,7 +24,7 @@ mymain(void) - uname(&ut); - if (strstr(ut.release, "xen") == NULL) - return EXIT_AM_SKIP; -- cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); -+ cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL); - if (virCommandRun(cmd, NULL) < 0) { - virCommandFree(cmd); - return EXIT_AM_SKIP; -diff -urp libvirt-1.3.2.orig/tests/statstest.c libvirt-1.3.2/tests/statstest.c ---- libvirt-1.3.2.orig/tests/statstest.c 2015-04-28 01:15:40.000000000 +0000 -+++ libvirt-1.3.2/tests/statstest.c 2016-03-18 12:34:43.119768000 +0000 -@@ -48,7 +48,7 @@ mymain(void) - uname(&ut); - if (strstr(ut.release, "xen") == NULL) - return EXIT_AM_SKIP; -- cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); -+ cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL); - if (virCommandRun(cmd, NULL) < 0) { - virCommandFree(cmd); - return EXIT_AM_SKIP; diff --git a/libvirt.spec b/libvirt.spec index b9bd489..21dcb6c 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1,6 +1,5 @@ # TODO: # - wireshark-dissector -# - seems that lxc patch is not needed anymore, verify that before removing # - pldize virtlockd.init # # Conditional build: @@ -23,6 +22,7 @@ %bcond_without xenapi # Xen API (Citrix XenServer) support %bcond_without xen # Xen support %bcond_without static_libs # static libraries build +%bcond_without ldap # don't require openldap-devel # qemu available only on x86 and ppc %ifnarch %{ix86} %{x8664} ppc @@ -39,20 +39,19 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 1.3.3 +Version: 2.1.0 Release: 1 License: LGPL v2.1+ Group: Libraries -Source0: ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz -# Source0-md5: 698e0949a41a2b669dbe374759aaa64b +Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz +# Source0-md5: fd1c054a8b59235e877efb728de79386 Source1: %{name}.init Patch0: %{name}-sasl.patch -Patch2: %{name}-qemu-acl.patch -Patch3: %{name}-xend.patch -Patch5: %{name}-udevadm-settle.patch -Patch7: bashisms.patch -Patch8: %{name}-guests.init.patch -Patch9: %{name}-sysctl-dir.patch +Patch1: %{name}-qemu-acl.patch +Patch2: %{name}-udevadm-settle.patch +Patch3: bashisms.patch +Patch4: %{name}-guests.init.patch +Patch5: %{name}-sysctl-dir.patch URL: http://www.libvirt.org/ BuildRequires: audit-libs-devel BuildRequires: augeas-devel @@ -84,17 +83,16 @@ BuildRequires: libxslt-devel BuildRequires: ncurses-devel %{?with_netcf:BuildRequires: netcf-devel >= 0.2.0} BuildRequires: numactl-devel -BuildRequires: openldap-devel +%{?with_ldap:BuildRequires: openldap-devel} %{?with_hyperv:BuildRequires: openwsman-devel >= 2.2.3} BuildRequires: parted-devel >= 1.8.0 BuildRequires: pkgconfig -BuildRequires: polkit +%{?with_polkit:BuildRequires: polkit} %{?with_polkit:BuildRequires: polkit-devel >= 0.90} BuildRequires: readline-devel BuildRequires: rpmbuild(macros) >= 1.627 %{?with_sanlock:BuildRequires: sanlock-devel >= 0.8} %{?with_systemtap:BuildRequires: systemtap-sdt-devel} -BuildRequires: sheepdog BuildRequires: udev-devel >= 1:145 %{?with_xen:BuildRequires: xen-devel >= 4.2} # For disk driver @@ -222,10 +220,9 @@ Requires: iproute2 Requires: libblkid >= 2.17 %{?with_netcf:Requires: netcf >= 0.2.0} Requires: parted-libs >= 1.8.0 +Requires: rc-scripts # Needed for probing the power management features of the host. Requires: pm-utils -Requires: rc-scripts -Requires: sheepdog Requires: udev-libs >= 1:145 Requires: util-linux Requires: virtual(module-tools) @@ -249,6 +246,7 @@ Suggests: parted >= 1.8.0 Suggests: polkit >= 0.93 #Suggests: radvd Suggests: scrub +#Suggests: sheepdog Provides: libvirt(hypervisor) %description daemon @@ -337,7 +335,6 @@ Group: Libraries Requires: %{name}-daemon = %{version}-%{release} Requires: /usr/sbin/qcow-create Requires: xen -Requires: xen-xend Provides: libvirt(hypervisor) %description daemon-xen @@ -376,7 +373,7 @@ Requires: %{name}-daemon = %{version}-%{release} %{?with_libxl:Requires: %{name}-daemon-libxl = %{version}-%{release}} Requires: %{name}-daemon-lxc = %{version}-%{release} Requires: %{name}-daemon-qemu = %{version}-%{release} -Requires: %{name}-daemon-uml = %{version}-%{release} +%{?with_uml:Requires: %{name}-daemon-uml = %{version}-%{release}} Requires: %{name}-daemon-xen = %{version}-%{release} %description utils @@ -408,12 +405,11 @@ Sondy systemtap/dtrace dla libvirt. %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch5 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build %{__libtoolize} @@ -454,7 +450,7 @@ Sondy systemtap/dtrace dla libvirt. SCRUB=/usr/bin/scrub \ OVSVSCTL=/usr/bin/ovs-vsctl \ NUMAD=/usr/bin/numad \ - COLLIE=/usr/sbin/collie \ + SHEEPDOGCLI=/usr/sbin/collie \ --disable-silent-rules \ %{?with_static_libs:--enable-static} \ --with-html-dir=%{_gtkdocdir} \ @@ -562,7 +558,7 @@ fi %doc ChangeLog README TODO NEWS %dir %{_sysconfdir}/libvirt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf -%attr(755,root,root) %{_libdir}/libnss_libvirt.so.2 +%attr(755,root,root) %{_libdir}/libnss_libvirt.so.? %attr(755,root,root) %{_libdir}/libvirt.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libvirt.so.0 %attr(755,root,root) %{_libdir}/libvirt-admin.so.*.*.* @@ -588,6 +584,7 @@ fi %{_gtkdocdir}/%{name} %{_includedir}/%{name} %{_pkgconfigdir}/libvirt.pc +%{_pkgconfigdir}/libvirt-admin.pc %{?with_lxc:%{_pkgconfigdir}/libvirt-lxc.pc} %{_pkgconfigdir}/libvirt-qemu.pc @@ -674,7 +671,7 @@ fi %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so -%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so +%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so} %dir %{_libdir}/libvirt/lock-driver %attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so -- 2.37.3