From: Marcin Krol Date: Wed, 24 Jan 2018 13:15:39 +0000 (+0000) Subject: - updated to 4.0.0, partial PLD merge, wireshark disabled for now X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f08e2de848020f421ff12e52ee56c58506abe1f6;p=packages%2Flibvirt.git - updated to 4.0.0, partial PLD merge, wireshark disabled for now --- diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index ec0df5a..e4781d2 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-3.2.0.orig/src/qemu/qemu_command.c libvirt-3.2.0/src/qemu/qemu_command.c ---- libvirt-3.2.0.orig/src/qemu/qemu_command.c 2017-04-11 12:49:12.761295272 +0000 -+++ libvirt-3.2.0/src/qemu/qemu_command.c 2017-04-11 12:49:28.389296387 +0000 -@@ -7815,6 +7815,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD +diff -urp libvirt-4.0.0.orig/src/qemu/qemu_command.c libvirt-4.0.0/src/qemu/qemu_command.c +--- libvirt-4.0.0.orig/src/qemu/qemu_command.c 2018-01-24 12:03:25.563517453 +0000 ++++ libvirt-4.0.0/src/qemu/qemu_command.c 2018-01-24 12:03:45.990516235 +0000 +@@ -8091,6 +8091,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,10 +12,10 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu_command.c libvirt-3.2.0/src/qemu/qemu } virCommandAddArg(cmd, "-vnc"); -diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf ---- libvirt-3.2.0.orig/src/qemu/qemu.conf 2017-04-11 12:49:12.764295272 +0000 -+++ libvirt-3.2.0/src/qemu/qemu.conf 2017-04-11 12:49:28.389296387 +0000 -@@ -125,6 +125,15 @@ +diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf +--- libvirt-4.0.0.orig/src/qemu/qemu.conf 2018-01-24 12:03:25.566517453 +0000 ++++ libvirt-4.0.0/src/qemu/qemu.conf 2018-01-24 12:03:45.991516235 +0000 +@@ -135,6 +135,15 @@ #vnc_sasl = 1 @@ -31,10 +31,10 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/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-3.2.0.orig/src/qemu/qemu_conf.c libvirt-3.2.0/src/qemu/qemu_conf.c ---- libvirt-3.2.0.orig/src/qemu/qemu_conf.c 2017-04-11 12:49:12.762295272 +0000 -+++ libvirt-3.2.0/src/qemu/qemu_conf.c 2017-04-11 12:49:28.390296387 +0000 -@@ -496,6 +496,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD +diff -urp libvirt-4.0.0.orig/src/qemu/qemu_conf.c libvirt-4.0.0/src/qemu/qemu_conf.c +--- libvirt-4.0.0.orig/src/qemu/qemu_conf.c 2018-01-24 12:03:25.564517453 +0000 ++++ libvirt-4.0.0/src/qemu/qemu_conf.c 2018-01-24 12:03:45.991516235 +0000 +@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD goto cleanup; if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0) goto cleanup; @@ -43,10 +43,10 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu_conf.c libvirt-3.2.0/src/qemu/qemu_co if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0) -diff -urp libvirt-3.2.0.orig/src/qemu/qemu_conf.h libvirt-3.2.0/src/qemu/qemu_conf.h ---- libvirt-3.2.0.orig/src/qemu/qemu_conf.h 2017-04-11 12:49:12.762295272 +0000 -+++ libvirt-3.2.0/src/qemu/qemu_conf.h 2017-04-11 12:49:28.390296387 +0000 -@@ -119,6 +119,7 @@ struct _virQEMUDriverConfig { +diff -urp libvirt-4.0.0.orig/src/qemu/qemu_conf.h libvirt-4.0.0/src/qemu/qemu_conf.h +--- libvirt-4.0.0.orig/src/qemu/qemu_conf.h 2018-01-24 12:03:25.564517453 +0000 ++++ libvirt-4.0.0/src/qemu/qemu_conf.h 2018-01-24 12:03:45.991516235 +0000 +@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig { bool vncTLS; bool vncTLSx509verify; bool vncSASL; diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 570cb17..8fbad42 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -diff -urp libvirt-3.2.0.orig/daemon/libvirtd.conf libvirt-3.2.0/daemon/libvirtd.conf ---- libvirt-3.2.0.orig/daemon/libvirtd.conf 2017-02-24 14:48:08.985914076 +0000 -+++ libvirt-3.2.0/daemon/libvirtd.conf 2017-04-11 12:46:54.195285389 +0000 +diff -urp libvirt-4.0.0.orig/daemon/libvirtd.conf libvirt-4.0.0/daemon/libvirtd.conf +--- libvirt-4.0.0.orig/daemon/libvirtd.conf 2018-01-24 11:43:38.147588228 +0000 ++++ libvirt-4.0.0/daemon/libvirtd.conf 2018-01-24 11:44:02.010586806 +0000 @@ -123,7 +123,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -19,10 +19,10 @@ diff -urp libvirt-3.2.0.orig/daemon/libvirtd.conf libvirt-3.2.0/daemon/libvirtd. #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-3.2.0.orig/daemon/Makefile.am libvirt-3.2.0/daemon/Makefile.am ---- libvirt-3.2.0.orig/daemon/Makefile.am 2016-11-30 12:57:30.326292858 +0000 -+++ libvirt-3.2.0/daemon/Makefile.am 2017-04-11 12:43:19.499270077 +0000 -@@ -532,13 +532,13 @@ POD2MAN = pod2man -c "Virtualization Sup +diff -urp libvirt-4.0.0.orig/daemon/Makefile.am libvirt-4.0.0/daemon/Makefile.am +--- libvirt-4.0.0.orig/daemon/Makefile.am 2018-01-24 11:43:38.146588228 +0000 ++++ libvirt-4.0.0/daemon/Makefile.am 2018-01-24 11:44:02.010586806 +0000 +@@ -477,13 +477,13 @@ POD2MAN = pod2man -c "Virtualization Sup # the WITH_LIBVIRTD conditional if WITH_SASL install-data-sasl: @@ -40,10 +40,10 @@ diff -urp libvirt-3.2.0.orig/daemon/Makefile.am libvirt-3.2.0/daemon/Makefile.am else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -diff -urp libvirt-3.2.0.orig/daemon/Makefile.in libvirt-3.2.0/daemon/Makefile.in ---- libvirt-3.2.0.orig/daemon/Makefile.in 2017-04-02 14:57:47.028717494 +0000 -+++ libvirt-3.2.0/daemon/Makefile.in 2017-04-11 12:43:19.500270077 +0000 -@@ -2934,13 +2934,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/ +diff -urp libvirt-4.0.0.orig/daemon/Makefile.in libvirt-4.0.0/daemon/Makefile.in +--- libvirt-4.0.0.orig/daemon/Makefile.in 2018-01-24 11:43:38.146588228 +0000 ++++ libvirt-4.0.0/daemon/Makefile.in 2018-01-24 11:44:02.010586806 +0000 +@@ -2941,13 +2941,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-3.2.0.orig/daemon/Makefile.in libvirt-3.2.0/daemon/Makefile.in @WITH_SASL_FALSE@install-data-sasl: @WITH_SASL_FALSE@uninstall-data-sasl: -diff -urp libvirt-3.2.0.orig/docs/auth.html libvirt-3.2.0/docs/auth.html ---- libvirt-3.2.0.orig/docs/auth.html 2017-03-28 07:02:00.525629157 +0000 -+++ libvirt-3.2.0/docs/auth.html 2017-04-11 12:47:17.292287037 +0000 -@@ -265,7 +265,7 @@ to turn on SASL auth in these listeners. +diff -urp libvirt-4.0.0.orig/docs/auth.html libvirt-4.0.0/docs/auth.html +--- libvirt-4.0.0.orig/docs/auth.html 2018-01-24 11:43:38.029588235 +0000 ++++ libvirt-4.0.0/docs/auth.html 2018-01-24 11:44:02.011586806 +0000 +@@ -338,7 +338,7 @@ to turn on SASL auth in these listeners.

Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a config change is rquired to enable plain password auth. This is done by @@ -73,9 +73,9 @@ diff -urp libvirt-3.2.0.orig/docs/auth.html libvirt-3.2.0/docs/auth.html parameter to scram-sha-1.

-diff -urp libvirt-3.2.0.orig/docs/auth.html.in libvirt-3.2.0/docs/auth.html.in ---- libvirt-3.2.0.orig/docs/auth.html.in 2017-03-24 11:48:12.048612800 +0000 -+++ libvirt-3.2.0/docs/auth.html.in 2017-04-11 12:47:14.492286837 +0000 +diff -urp libvirt-4.0.0.orig/docs/auth.html.in libvirt-4.0.0/docs/auth.html.in +--- libvirt-4.0.0.orig/docs/auth.html.in 2018-01-24 11:43:38.033588235 +0000 ++++ libvirt-4.0.0/docs/auth.html.in 2018-01-24 11:44:02.011586806 +0000 @@ -267,7 +267,7 @@ to turn on SASL auth in these listeners.

Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a @@ -85,10 +85,10 @@ diff -urp libvirt-3.2.0.orig/docs/auth.html.in libvirt-3.2.0/docs/auth.html.in parameter to scram-sha-1.

-diff -urp libvirt-3.2.0.orig/libvirt.spec libvirt-3.2.0/libvirt.spec ---- libvirt-3.2.0.orig/libvirt.spec 2017-04-02 14:58:24.226088535 +0000 -+++ libvirt-3.2.0/libvirt.spec 2017-04-11 12:43:19.501270077 +0000 -@@ -1988,7 +1988,7 @@ exit 0 +diff -urp libvirt-4.0.0.orig/libvirt.spec libvirt-4.0.0/libvirt.spec +--- libvirt-4.0.0.orig/libvirt.spec 2018-01-24 11:43:38.090588232 +0000 ++++ libvirt-4.0.0/libvirt.spec 2018-01-24 11:44:02.011586806 +0000 +@@ -2106,7 +2106,7 @@ exit 0 %{_datadir}/libvirt/test-screenshot.png @@ -97,10 +97,10 @@ diff -urp libvirt-3.2.0.orig/libvirt.spec libvirt-3.2.0/libvirt.spec %files admin %{_mandir}/man1/virt-admin.1* -diff -urp libvirt-3.2.0.orig/libvirt.spec.in libvirt-3.2.0/libvirt.spec.in ---- libvirt-3.2.0.orig/libvirt.spec.in 2017-04-02 14:53:27.904098953 +0000 -+++ libvirt-3.2.0/libvirt.spec.in 2017-04-11 12:43:19.501270077 +0000 -@@ -1988,7 +1988,7 @@ exit 0 +diff -urp libvirt-4.0.0.orig/libvirt.spec.in libvirt-4.0.0/libvirt.spec.in +--- libvirt-4.0.0.orig/libvirt.spec.in 2018-01-24 11:43:38.089588232 +0000 ++++ libvirt-4.0.0/libvirt.spec.in 2018-01-24 11:44:02.011586806 +0000 +@@ -2106,7 +2106,7 @@ exit 0 %{_datadir}/libvirt/test-screenshot.png @@ -109,10 +109,10 @@ diff -urp libvirt-3.2.0.orig/libvirt.spec.in libvirt-3.2.0/libvirt.spec.in %files admin %{_mandir}/man1/virt-admin.1* -diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf ---- libvirt-3.2.0.orig/src/qemu/qemu.conf 2017-03-28 06:58:37.453915260 +0000 -+++ libvirt-3.2.0/src/qemu/qemu.conf 2017-04-11 12:47:07.132286312 +0000 -@@ -119,18 +119,18 @@ +diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf +--- libvirt-4.0.0.orig/src/qemu/qemu.conf 2018-01-24 11:43:38.123588230 +0000 ++++ libvirt-4.0.0/src/qemu/qemu.conf 2018-01-24 11:44:02.012586806 +0000 +@@ -129,18 +129,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -134,7 +134,7 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf # QEMU implements an extension for providing audio over a VNC connection, -@@ -194,17 +194,17 @@ +@@ -205,17 +205,17 @@ # Enable use of SASL encryption on the SPICE server. This requires # a SPICE client which supports the SASL protocol extension. # @@ -155,9 +155,9 @@ diff -urp libvirt-3.2.0.orig/src/qemu/qemu.conf libvirt-3.2.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -diff -urp libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.2.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-03-28 06:58:37.467915094 +0000 -+++ libvirt-3.2.0/src/qemu/test_libvirtd_qemu.aug.in 2017-04-11 12:43:19.502270077 +0000 +diff -urp libvirt-4.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.0.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-4.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-01-24 11:43:38.123588230 +0000 ++++ libvirt-4.0.0/src/qemu/test_libvirtd_qemu.aug.in 2018-01-24 11:44:02.012586806 +0000 @@ -12,7 +12,7 @@ module Test_libvirtd_qemu = { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -176,9 +176,9 @@ diff -urp libvirt-3.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.2.0/sr { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args ---- libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-02-16 14:25:07.637706478 +0000 -+++ libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2017-04-11 12:43:19.502270077 +0000 +diff -urp libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args +--- libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-24 11:43:39.724588134 +0000 ++++ libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-24 11:57:36.684538248 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -186,11 +186,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args ---- libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-02-16 14:25:07.637706478 +0000 -+++ libvirt-3.2.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2017-04-11 12:43:19.502270077 +0000 +diff -urp libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-tls.args +--- libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-24 11:43:39.724588134 +0000 ++++ libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-24 11:57:57.508537006 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -198,11 +198,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args ---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-07-27 12:39:35.395705103 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-04-11 12:43:19.502270077 +0000 +diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.args +--- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-24 11:43:39.747588133 +0000 ++++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-24 11:58:03.869536627 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -210,11 +210,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice- -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=spice \ - /usr/bin/qemu \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args ---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-07-27 12:39:35.396705092 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2017-04-11 12:43:19.502270077 +0000 +diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args +--- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-24 11:43:39.747588133 +0000 ++++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-24 11:58:00.876536806 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -222,11 +222,11 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args ---- libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-07-27 12:39:35.396705092 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2017-04-11 12:43:19.502270077 +0000 +diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.args +--- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-24 11:43:39.747588133 +0000 ++++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-24 11:58:06.308536482 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -234,12 +234,12 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl -SASL_CONF_PATH=/root/.sasl2 \ +SASL_CONF_PATH=/root/.sasl \ QEMU_AUDIO_DRV=none \ - /usr/bin/qemu \ + /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxml2argvtest.c ---- libvirt-3.2.0.orig/tests/qemuxml2argvtest.c 2017-03-28 06:58:37.491914811 +0000 -+++ libvirt-3.2.0/tests/qemuxml2argvtest.c 2017-04-11 12:43:19.503270077 +0000 -@@ -1032,7 +1032,7 @@ mymain(void) +diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvtest.c libvirt-4.0.0/tests/qemuxml2argvtest.c +--- libvirt-4.0.0.orig/tests/qemuxml2argvtest.c 2018-01-24 11:43:38.900588183 +0000 ++++ libvirt-4.0.0/tests/qemuxml2argvtest.c 2018-01-24 11:44:07.107586502 +0000 +@@ -1092,7 +1092,7 @@ mymain(void) driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -248,7 +248,7 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxm DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1056,7 +1056,7 @@ mymain(void) +@@ -1116,7 +1116,7 @@ mymain(void) DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->spiceSASL = 1; @@ -257,9 +257,9 @@ diff -urp libvirt-3.2.0.orig/tests/qemuxml2argvtest.c libvirt-3.2.0/tests/qemuxm DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); -diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.2.0/tests/virconfdata/libvirtd.conf ---- libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf 2016-04-26 02:20:09.322242995 +0000 -+++ libvirt-3.2.0/tests/virconfdata/libvirtd.conf 2017-04-11 12:47:00.916285869 +0000 +diff -urp libvirt-4.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.0.0/tests/virconfdata/libvirtd.conf +--- libvirt-4.0.0.orig/tests/virconfdata/libvirtd.conf 2018-01-24 11:43:38.873588185 +0000 ++++ libvirt-4.0.0/tests/virconfdata/libvirtd.conf 2018-01-24 11:44:07.107586502 +0000 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # @@ -278,9 +278,9 @@ diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.2.0/tests auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-3.2.0.orig/tests/virconfdata/libvirtd.out libvirt-3.2.0/tests/virconfdata/libvirtd.out ---- libvirt-3.2.0.orig/tests/virconfdata/libvirtd.out 2016-04-26 02:20:09.322242995 +0000 -+++ libvirt-3.2.0/tests/virconfdata/libvirtd.out 2017-04-11 12:46:58.300285682 +0000 +diff -urp libvirt-4.0.0.orig/tests/virconfdata/libvirtd.out libvirt-4.0.0/tests/virconfdata/libvirtd.out +--- libvirt-4.0.0.orig/tests/virconfdata/libvirtd.out 2018-01-24 11:43:38.873588185 +0000 ++++ libvirt-4.0.0/tests/virconfdata/libvirtd.out 2018-01-24 11:44:07.108586502 +0000 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch index 3f2acd4..60d80cf 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am ---- libvirt-3.0.0.orig/daemon/Makefile.am 2017-02-11 16:03:23.470360384 +0000 -+++ libvirt-3.0.0/daemon/Makefile.am 2017-02-11 16:03:38.597360214 +0000 -@@ -402,13 +402,11 @@ if WITH_SYSCTL +diff -urp libvirt-4.0.0.orig/daemon/Makefile.am libvirt-4.0.0/daemon/Makefile.am +--- libvirt-4.0.0.orig/daemon/Makefile.am 2018-01-24 12:20:41.759455691 +0000 ++++ libvirt-4.0.0/daemon/Makefile.am 2018-01-24 12:21:41.897452106 +0000 +@@ -347,13 +347,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 d6da636..c9514fd 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-3.2.0.orig/src/util/virutil.c libvirt-3.2.0/src/util/virutil.c ---- libvirt-3.2.0.orig/src/util/virutil.c 2017-04-11 12:49:51.826298058 +0000 -+++ libvirt-3.2.0/src/util/virutil.c 2017-04-11 12:50:11.805299483 +0000 -@@ -1585,7 +1585,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi +diff -urp libvirt-4.0.0.orig/src/util/virutil.c libvirt-4.0.0/src/util/virutil.c +--- libvirt-4.0.0.orig/src/util/virutil.c 2018-01-24 12:11:07.300489931 +0000 ++++ libvirt-4.0.0/src/util/virutil.c 2018-01-24 12:12:20.303485580 +0000 +@@ -1596,7 +1596,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi void virWaitForDevices(void) { # ifdef UDEVADM diff --git a/libvirt.spec b/libvirt.spec index d7dd13e..2836083 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1,28 +1,32 @@ # TODO: -# - wireshark-dissector -# - pldize virtlockd.init +# - parallels-sdk >= 7.0.22? +# - virtuozzo storage? # # Conditional build: -%bcond_without ceph # RADOS BD (Ceph) storage support +# - virtualization %bcond_without esx # VMware ESX support -%bcond_without glusterfs # GlusterFS storage support %bcond_without hyperv # Hyper-V support %bcond_without libxl # libxenlight support %bcond_without lxc # LXC support -%bcond_without netcf # host interfaces support %bcond_without openvz # OpenVZ support %bcond_without phyp # PHYP support -%bcond_without polkit # PolicyKit support %bcond_without qemu # Qemu support -%bcond_without sanlock # sanlock storage lock manager -%bcond_without systemtap # systemtap/dtrace probes %bcond_without uml # UML support %bcond_without vbox # VirtualBox support %bcond_without vmware # VMware Workstation/Player support %bcond_without xenapi # Xen API (Citrix XenServer) support %bcond_without xen # Xen support +# - storage +%bcond_without ceph # RADOS BD (Ceph) storage support +%bcond_without glusterfs # GlusterFS storage support +# - storage locking +%bcond_without sanlock # sanlock storage lock manager +# - other +%bcond_without netcf # host interfaces support +%bcond_without polkit # PolicyKit support +%bcond_without systemtap # systemtap/dtrace probes +%bcond_with wireshark # wireshark dissector module %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,12 +43,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 3.2.0 +Version: 4.0.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: 389030d5961d7a0a1c720abbec0b9b78 +# Source0-md5: ff0dbdd8ec4ac1277588dfe3b245d0e9 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init @@ -55,20 +59,24 @@ Patch3: bashisms.patch Patch4: %{name}-guests.init.patch Patch5: %{name}-sysctl-dir.patch URL: http://www.libvirt.org/ +BuildRequires: acl-devel +BuildRequires: attr-devel BuildRequires: audit-libs-devel BuildRequires: augeas-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: avahi-devel >= 0.6.0 +BuildRequires: bash-completion >= 2.0 %{?with_ceph:BuildRequires: ceph-devel} BuildRequires: curl-devel >= 7.18.0 BuildRequires: cyrus-sasl-devel BuildRequires: dbus-devel >= 1.0.0 BuildRequires: device-mapper-devel >= 1.0.0 BuildRequires: gawk +BuildRequires: gcc >= 6:4.4 BuildRequires: gettext-tools >= 0.17 %{?with_glusterfs:BuildRequires: glusterfs-devel >= 3.4.1} -BuildRequires: gnutls-devel >= 1.0.25 +BuildRequires: gnutls-devel >= 2.2.0 BuildRequires: libapparmor-devel BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcap-ng-devel >= 0.4.0 @@ -76,7 +84,8 @@ BuildRequires: libfuse-devel >= 2.8.6 BuildRequires: libgcrypt-devel BuildRequires: libnl-devel >= 3.2 BuildRequires: libpcap-devel >= 1.0.0 -BuildRequires: libselinux-devel >= 2.0.82 +BuildRequires: libselinux-devel >= 2.5 +BuildRequires: libssh-devel >= 0.7 BuildRequires: libssh2-devel >= 1.3 BuildRequires: libtool %{?with_xenapi:BuildRequires: libxenserver-devel} @@ -85,7 +94,6 @@ BuildRequires: libxslt-devel BuildRequires: ncurses-devel %{?with_netcf:BuildRequires: netcf-devel >= 0.2.0} BuildRequires: numactl-devel -%{?with_ldap:BuildRequires: openldap-devel} %{?with_hyperv:BuildRequires: openwsman-devel >= 2.2.3} BuildRequires: parted-devel >= 1.8.0 BuildRequires: pkgconfig @@ -95,8 +103,10 @@ BuildRequires: readline-devel BuildRequires: rpmbuild(macros) >= 1.627 %{?with_sanlock:BuildRequires: sanlock-devel >= 0.8} %{?with_systemtap:BuildRequires: systemtap-sdt-devel} -BuildRequires: udev-devel >= 1:145 +BuildRequires: udev-devel >= 1:218 +%{?with_wireshark:BuildRequires: wireshark-devel >= 1.11.3} %{?with_xen:BuildRequires: xen-devel >= 4.2} +%{?with_libxl:BuildRequires: xen-devel >= 4.4} # For disk driver BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0 BuildRequires: yajl-devel @@ -105,7 +115,8 @@ Requires: device-mapper >= 1.0.0 Requires: libcap-ng >= 0.4.0 Requires: libnl >= 3.2 Requires: libpcap >= 1.0.0 -Requires: libselinux >= 2.0.82 +Requires: libselinux >= 2.5 +Requires: libssh >= 0.7 Requires: libssh2 >= 1.3 Requires: libxml2 >= 1:2.6.0 %{?with_hyperv:Requires: openwsman-libs >= 2.2.3} @@ -144,6 +155,17 @@ wirtualizacji. Ten pakiet zawiera podstawowe biblioteki oraz plik konfiguracyjny. +%package -n bash-completion-%{name} +Summary: bash-completion for libvirt +Group: Applications/Shells +Requires: bash-completion +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif + +%description -n bash-completion-%{name} +This package provides bash-completion for libvirt. + %package devel Summary: Development files for programs using libvirt Summary(pl.UTF-8): Pliki programistyczne do programów wykorzystujących libvirt @@ -153,13 +175,13 @@ Requires: audit-libs-devel Requires: curl-devel >= 7.18.0 Requires: dbus-devel >= 1.0.0 Requires: device-mapper-devel >= 1.0.0 -Requires: gnutls-devel >= 1.0.25 +Requires: gnutls-devel >= 2.2.0 Requires: libapparmor-devel Requires: libcap-ng-devel >= 0.4.0 Requires: libgcrypt-devel Requires: libnl-devel >= 3.2 Requires: libpcap-devel >= 1.0.0 -Requires: libselinux-devel >= 2.0.82 +Requires: libselinux-devel >= 2.5 Requires: libxml2-devel >= 1:2.6.0 Requires: numactl-devel %{?with_hyperv:Requires: openwsman-devel >= 2.2.3} @@ -222,11 +244,10 @@ 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: udev-libs >= 1:218 Requires: util-linux Requires: virtual(module-tools) Requires: xorg-lib-libpciaccess >= 0.10.0 @@ -249,6 +270,7 @@ Suggests: parted >= 1.8.0 Suggests: polkit >= 0.93 #Suggests: radvd Suggests: scrub +#Suggests: sheepdog Provides: libvirt(hypervisor) %description daemon @@ -261,13 +283,39 @@ Demon działający po stronie serwera wymagany do zarządzania funkcjami wirtualizacji nowych wersji Linuksa. Wymaga podpakietu specyficznego dla hipernadzorcy. +%package daemon-storage-gluster +Summary: Storage driver plugin for GlusterFS +Summary(pl.UTF-8): Wtyczka składowania danych wykorzystująca GlusterFS +Group: Libraries +Requires: %{name}-daemon = %{version}-%{release} +Requires: glusterfs-libs >= 3.4.1 + +%description daemon-storage-gluster +Storage driver plugin for GlusterFS. + +%description daemon-storage-gluster -l pl.UTF-8 +Wtyczka składowania danych wykorzystująca system plików GlusterFS. + +%package daemon-storage-rbd +Summary: Storage driver plugin for Ceph RADOS Block Device +Summary(pl.UTF-8): Wtyczka składowania danych wykorzystująca urządzenie blokowe RADOS (Ceph) +Group: Libraries +Requires: %{name}-daemon = %{version}-%{release} + +%description daemon-storage-rbd +Storage driver plugin for Ceph RADOS Block Device. + +%description daemon-storage-rbd -l pl.UTF-8 +Wtyczka składowania danych wykorzystująca urządzenie blokowe RADOS +(system plików Ceph). + %package daemon-libxl Summary: Server side driver required to run XEN guests (xenlight) Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości XEN (xenlight) Group: Libraries Requires: %{name}-daemon = %{version}-%{release} Requires: /usr/sbin/qcow-create -Requires: xen +Requires: xen >= 4.4 Provides: libvirt(hypervisor) %description daemon-libxl @@ -353,7 +401,7 @@ Summary(pl.UTF-8): Narzędzia klienckie do biblioteki libvirt Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: gettext >= 0.18.1.1-6 -Requires: gnutls >= 1.0.25 +Requires: gnutls >= 2.2.0 Requires: netcat-openbsd Requires: rc-scripts Requires(post,preun): /sbin/chkconfig @@ -404,6 +452,18 @@ systemtap/dtrace probes for libvirt. %description -n systemtap-libvirt -l pl.UTF-8 Sondy systemtap/dtrace dla libvirt. +%package -n wireshark-libvirt +Summary: Wireshark dissector module for libvirt packets +Summary(pl.UTF-8): Moduł sekcji Wiresharka do pakietów libvirt +Group: Libraries +Requires: wireshark >= 1.11.3 + +%description -n wireshark-libvirt +Wireshark dissector module for libvirt packets. + +%description -n wireshark-libvirt -l pl.UTF-8 +Moduł sekcji Wiresharka do pakietów libvirt. + %prep %setup -q %patch0 -p1 @@ -453,8 +513,12 @@ Sondy systemtap/dtrace dla libvirt. OVSVSCTL=/usr/bin/ovs-vsctl \ NUMAD=/usr/bin/numad \ SHEEPDOGCLI=/usr/sbin/collie \ + ZFS=/usr/sbin/zfs \ + ZPOOL=/usr/sbin/zpool \ --disable-silent-rules \ %{?with_static_libs:--enable-static} \ + --with-bash-completion \ + --with-bash-completions-dir=/etc/bash_completion.d \ --with-html-dir=%{_gtkdocdir} \ --with-html-subdir=%{name} \ --with-init-script=redhat \ @@ -499,6 +563,7 @@ Sondy systemtap/dtrace dla libvirt. %{__with_without vbox vbox %{_libdir}/VirtualBox} \ --with-virtualport \ %{__with_without vmware} \ + %{!?with_wireshark:--without-wireshark-dissector} \ %{__with_without xen} \ %{__with_without xenapi} \ --with-yajl \ @@ -522,11 +587,17 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \ %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la \ + %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a} %if %{with sanlock} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \ %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a} %endif +%if %{with wireshark} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la \ + %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \ +%endif %find_lang %{name} @@ -567,11 +638,9 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc ChangeLog README TODO NEWS +%doc AUTHORS ChangeLog NEWS README.md %dir %{_sysconfdir}/libvirt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf -%attr(755,root,root) %{_libdir}/libnss_libvirt.so.? -%attr(755,root,root) %{_libdir}/libnss_libvirt_guest.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.*.*.* @@ -583,9 +652,16 @@ fi %attr(755,root,root) %{_libdir}/libvirt-qemu.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libvirt-qemu.so.0 +# NSS modules +%attr(755,root,root) %{_libdir}/libnss_libvirt.so.2 +%attr(755,root,root) %{_libdir}/libnss_libvirt_guest.so.2 + %dir %{_libdir}/libvirt %dir %{_datadir}/libvirt -%{_datadir}/libvirt/test-screenshot.png + +%files -n bash-completion-%{name} +%defattr(644,root,root,755) +/etc/bash_completion.d/vsh %files devel %defattr(644,root,root,755) @@ -600,6 +676,8 @@ fi %{_pkgconfigdir}/libvirt-admin.pc %{?with_lxc:%{_pkgconfigdir}/libvirt-lxc.pc} %{_pkgconfigdir}/libvirt-qemu.pc +%{_mandir}/man7/virkeycode-*.7* +%{_mandir}/man7/virkeyname-*.7* %files static %defattr(644,root,root,755) @@ -607,22 +685,12 @@ fi %{_libdir}/libvirt-admin.a %{?with_lxc:%{_libdir}/libvirt-lxc.a} %{_libdir}/libvirt-qemu.a -%dir %{_libdir}/libvirt/storage-backend -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.a -%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.a %if %{with sanlock} %files lock-sanlock %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/virt-sanlock-cleanup -%attr(755,root,root) %{_libdir}/libvirt_sanlock_helper +%attr(755,root,root) %{_libexecdir}/libvirt_sanlock_helper %attr(755,root,root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug @@ -637,9 +705,9 @@ fi %dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu %dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks %dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt-admin.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlockd.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt-admin.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlogd.conf %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/default.xml %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml @@ -653,9 +721,9 @@ fi %attr(754,root,root) /etc/rc.d/init.d/virtlogd %config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-libvirtd.conf %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd -%attr(755,root,root) %{_libdir}/libvirt_iohelper -%attr(755,root,root) %{_libdir}/libvirt_parthelper -%attr(755,root,root) %{_libdir}/virt-aa-helper +%attr(755,root,root) %{_libexecdir}/libvirt_iohelper +%attr(755,root,root) %{_libexecdir}/libvirt_parthelper +%attr(755,root,root) %{_libexecdir}/virt-aa-helper %attr(755,root,root) %{_sbindir}/libvirtd %attr(755,root,root) %{_sbindir}/virtlockd %attr(755,root,root) %{_sbindir}/virtlogd @@ -700,13 +768,25 @@ fi %dir %{_libdir}/libvirt/storage-backend %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so -%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so +# mpath requires libdevmapper, but libvirt itself requires it too %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so -%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so +%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so + +%if %{with glusterfs} +%files daemon-storage-gluster +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so +%endif + +%if %{with ceph} +%files daemon-storage-rbd +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so +%endif %if %{with libxl} %files daemon-libxl @@ -733,7 +813,7 @@ fi %attr(700,root,root) %dir /var/log/libvirt/lxc %{_datadir}/augeas/lenses/libvirtd_lxc.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug -%attr(755,root,root) %{_libdir}/libvirt_lxc +%attr(755,root,root) %{_libexecdir}/libvirt_lxc %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so %endif @@ -804,6 +884,8 @@ fi %{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng %{_datadir}/libvirt/schemas/storagevol.rng +# for test driver (built into libvirt) +%{_datadir}/libvirt/test-screenshot.png %files utils %defattr(644,root,root,755) @@ -815,3 +897,9 @@ fi %{_datadir}/systemtap/tapset/libvirt_probes.stp %{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp %endif + +%if %{with wireshark} +%files -n wireshark-libvirt +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/wireshark/plugins/*/libvirt.so +%endif