- Remove unsupported settings in libvirtd.socket unit file when

systemd version < 214
  libvirtd-systemd-socket.patch
  bsc#933043
- spec: always apply Apparmor and netcontrol patches

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=465

libvirt.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jun  3 11:29:32 MDT 2015 - jfehlig@suse.com
+
+- Remove unsupported settings in libvirtd.socket unit file when
+  systemd version < 214
+  libvirtd-systemd-socket.patch
+  bsc#933043
+- spec: always apply Apparmor and netcontrol patches
+
 -------------------------------------------------------------------
 Tue Jun  2 09:27:22 MDT 2015 - jfehlig@suse.com
 

libvirt.spec

@@ -436,6 +436,8 @@ BuildRequires:  numad
 BuildRequires:  wireshark-devel
 %endif
 
+%global systemd_version %(pkg-config --modversion systemd)
+
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
@@ -460,12 +462,13 @@ Patch205:       support-managed-pci-xen-driver.patch
 Patch206:       systemd-service-xen.patch
 # Disable failing virCgroupGetPercpuStats unit test
 Patch207:       disable-virCgroupGetPercpuStats-test.patch
-%if %{with_apparmor}
+Patch208:       apparmor-no-mount.patch
-Patch250:       apparmor-no-mount.patch
+Patch209:       qemu-apparmor-screenshot.patch
-Patch251:       qemu-apparmor-screenshot.patch
+Patch210:       libvirt-suse-netcontrol.patch
-%endif
+# SocketUser and SocketGroup settings were added to systemd.socket in
-%if %{with_netcontrol}
+# version 214.  Patch the setting away in earlier systemd
-Patch300:       libvirt-suse-netcontrol.patch
+%if 0%{systemd_version} < 214
+Patch300:       libvirtd-systemd-socket.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -985,11 +988,10 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
 %patch205 -p1
 %patch206 -p1
 %patch207 -p1
-%if %{with_apparmor}
+%patch208 -p1
-%patch250 -p1
+%patch209 -p1
-%patch251 -p1
+%patch210 -p1
-%endif
+%if 0%{systemd_version} < 214
-%if %{with_netcontrol}
 %patch300 -p1
 %endif
 

libvirtd-systemd-socket.patch

@@ -0,0 +1,28 @@
+Remove unsupported systemd.socket settings
+
+The libvirtd.socket unit file contains SocketUser and SocketGroup
+settings that were introduced in systemd version 214.  Remove the
+setting to prevent unnecessary and confusing journal entries such
+as
+
+  Unknown lvalue 'SocketGroup' in section 'Socket'
+
+See bsc#933043
+
+Index: libvirt-1.2.16/daemon/libvirtd.socket.in
+===================================================================
+--- libvirt-1.2.16.orig/daemon/libvirtd.socket.in
++++ libvirt-1.2.16/daemon/libvirtd.socket.in
+@@ -2,10 +2,8 @@
+ ListenStream=@runstatedir@/libvirt/libvirt-sock
+ ListenStream=@runstatedir@/libvirt/libvirt-sock-ro
+ 
+-; The following settings must match libvirtd.conf file in order to
+-; work as expected because libvirtd can't change them later.
++; The following setting must match libvirtd.conf file in order to
++; work as expected because libvirtd can't change it later.
+ ; SocketMode=0777 is safe only if authentication on the socket is set
+ ; up.  For further information, please see the libvirtd.conf file.
+ SocketMode=0777
+-SocketUser=root
+-SocketGroup=root