diff --git a/libvirt.spec b/libvirt.spec index d942a34..7a45c3c 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -13,7 +13,7 @@ # Default to skipping autoreconf. Distros can change just this one line # (or provide a command-line override) if they backport any patches that # touch configure.ac or Makefile.am. -%{!?enable_autotools:%define enable_autotools 0} +%{!?enable_autotools:%define enable_autotools 1} # A client only build will create a libvirt.so only containing # the generic RPC driver, and test driver and no libvirtd @@ -371,7 +371,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 1.2.13.1 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -382,6 +382,19 @@ URL: http://libvirt.org/ %endif Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz +# lxc network fixes (bz #1225591, bz #1225593, bz #1225594) +Patch0001: 0001-build-provide-virNetDevSysfsFile-on-non-Linux.patch +Patch0002: 0002-Introduce-virnetdevtest.patch +Patch0003: 0003-Cleanup-sys-class-net-usage.patch +Patch0004: 0004-lxc-move-wireless-PHYs-to-a-network-namespace.patch +Patch0005: 0005-tests-Add-virnetdevtestdata-to-EXTRA_DIST.patch +Patch0006: 0006-lxc-don-t-up-the-veth-interfaces-unless-explicitly-a.patch +Patch0007: 0007-interface-don-t-error-out-if-a-bond-has-no-interface.patch +Patch0008: 0008-virnetdev-fix-moving-of-802.11-phys.patch + +# polkit: Allow password-less access for 'libvirt' group (bz #957300) +Patch0101: 0101-polkit-Allow-password-less-access-for-libvirt-group.patch + %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} %if %{with_network} @@ -1628,9 +1641,9 @@ then fi %if %{with_libvirtd} +%pre daemon %if ! %{with_driver_modules} %if %{with_qemu} -%pre daemon %if 0%{?fedora} || 0%{?rhel} >= 6 # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see @@ -1644,11 +1657,21 @@ if ! getent passwd qemu >/dev/null; then useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu fi fi -exit 0 %endif %endif %endif + %if %{with_polkit} + %if 0%{?fedora} || 0%{?rhel} >= 6 +# 'libvirt' group is just to allow password-less polkit access to +# libvirtd. The uid number is irrelevant, so we use dynamic allocation +# described at the above link. +getent group libvirt >/dev/null || groupadd -r libvirt + %endif + %endif + +exit 0 + %post daemon %if %{with_systemd} @@ -1922,6 +1945,7 @@ exit 0 %if 0%{?fedora} || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy +%{_datadir}/polkit-1/rules.d/50-libvirt.rules %else %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif @@ -2280,6 +2304,10 @@ exit 0 %doc examples/systemtap %changelog +* Fri Jun 05 2015 Cole Robinson - 1.2.13.1-2 +- lxc network fixes (bz #1225591, bz #1225593, bz #1225594) +- polkit: Allow password-less access for 'libvirt' group (bz #957300) + * Tue Apr 28 2015 Cole Robinson - 1.2.13.1-1 - Rebased to version 1.2.13.1 - Fix getVersion() after installing qemu (bz #1000116)