From 8418b42dc8215df0ae79ee3cb9632bc48d0c3508 Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Sun, 12 Sep 2010 12:00:08 -0500
Subject: network/NetworkManager-openconnect: Fix dbus error

/etc/dbus-1/system.d/nm-openconnect-service.conf refers to a
user account that is not present on the system, and according
to testing feedback, this account is not necessary at all.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 .../NetworkManager-openconnect.SlackBuild                  |  5 ++++-
 .../nm-openconnect-service.conf.diff                       | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 network/NetworkManager-openconnect/nm-openconnect-service.conf.diff

(limited to 'network/NetworkManager-openconnect')

diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
index 6ccd635e71..5ce5888f7c 100644
--- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=NetworkManager-openconnect
 VERSION=${VERSION:-0.8.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Remove mention of an extraneous user account from the dbus config file
+patch -p1 < $CWD/nm-openconnect-service.conf.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/NetworkManager-openconnect/nm-openconnect-service.conf.diff b/network/NetworkManager-openconnect/nm-openconnect-service.conf.diff
new file mode 100644
index 0000000000..a604132b82
--- /dev/null
+++ b/network/NetworkManager-openconnect/nm-openconnect-service.conf.diff
@@ -0,0 +1,14 @@
+diff -Nur NetworkManager-openconnect-0.8.1.orig//nm-openconnect-service.conf NetworkManager-openconnect-0.8.1/nm-openconnect-service.conf
+--- NetworkManager-openconnect-0.8.1.orig//nm-openconnect-service.conf	2009-04-20 06:09:58.000000000 -0500
++++ NetworkManager-openconnect-0.8.1/nm-openconnect-service.conf	2010-09-12 11:57:41.100526093 -0500
+@@ -6,10 +6,6 @@
+ 		<allow own="org.freedesktop.NetworkManager.openconnect"/>
+ 		<allow send_destination="org.freedesktop.NetworkManager.openconnect"/>
+ 	</policy>
+-	<policy user="nm-openconnect">
+-		<allow own="org.freedesktop.NetworkManager.openconnect"/>
+-		<allow send_destination="org.freedesktop.NetworkManager.openconnect"/>
+-	</policy>
+ 	<policy context="default">
+ 		<deny own="org.freedesktop.NetworkManager.openconnect"/>
+ 		<deny send_destination="org.freedesktop.NetworkManager.openconnect"/>
-- 
cgit v1.2.3