From 2e3f7f0d784fabf43c5e130f670951206dd7cfc1 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Fri, 9 Jun 2017 23:53:49 -0500
Subject: libraries/libvirt: Fix VIRTGROUP in default polkit rules

This commit also adds the example polkit acl rules to the
package documentation.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 libraries/libvirt/libvirt.SlackBuild                 |  7 +++++--
 libraries/libvirt/use-virtgroup-in-polkit-rules.diff | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 libraries/libvirt/use-virtgroup-in-polkit-rules.diff

(limited to 'libraries')

diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild
index 03ac539487..12dac8bf95 100644
--- a/libraries/libvirt/libvirt.SlackBuild
+++ b/libraries/libvirt/libvirt.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=libvirt
 VERSION=${VERSION:-3.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -53,6 +53,9 @@ find -L . \
 # we have sysctld files in /etc/sysctl.d
 sed -i "s|(prefix)/lib/sysctl|(sysconfdir)/sysctl|" daemon/Makefile.in
 
+patch -p1 < $CWD/use-virtgroup-in-polkit-rules.diff
+sed -i -e "s,@VIRTGROUP@,$VIRTGROUP,g" daemon/libvirt.rules
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -103,7 +106,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING* INSTALL README NEWS TODO \
+  AUTHORS ChangeLog COPYING* INSTALL README NEWS TODO examples/polkit/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libvirt/use-virtgroup-in-polkit-rules.diff b/libraries/libvirt/use-virtgroup-in-polkit-rules.diff
new file mode 100644
index 0000000000..f4610f9a93
--- /dev/null
+++ b/libraries/libvirt/use-virtgroup-in-polkit-rules.diff
@@ -0,0 +1,15 @@
+diff -Nur libvirt-3.4.0.orig/daemon/libvirt.rules libvirt-3.4.0/daemon/libvirt.rules
+--- libvirt-3.4.0.orig/daemon/libvirt.rules	2015-05-23 07:56:12.046331092 -0500
++++ libvirt-3.4.0/daemon/libvirt.rules	2017-06-09 23:35:50.490172300 -0500
+@@ -1,9 +1,9 @@
+-// Allow any user in the 'libvirt' group to connect to system libvirtd
++// Allow any user in the '@VIRTGROUP@' group to connect to system libvirtd
+ // without entering a password.
+ 
+ polkit.addRule(function(action, subject) {
+     if (action.id == "org.libvirt.unix.manage" &&
+-        subject.isInGroup("libvirt")) {
++        subject.isInGroup("@VIRTGROUP@")) {
+         return polkit.Result.YES;
+     }
+ });
-- 
cgit v1.2.3