From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 20 Sep 2010 14:03:04 +0000 (+0200)
Subject: Maemo: Register charon as D-BUS system service.
X-Git-Tag: 4.5.0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bce814190b5c5f057be4babf7589d389162da44;p=thirdparty%2Fstrongswan.git

Maemo: Register charon as D-BUS system service.

In order to be able to access this service via libosso, charon is
started with the run-standalone.sh script, which sets up the required
environment.
---

diff --git a/configure.in b/configure.in
index ef994b27a8..cefd258c1f 100644
--- a/configure.in
+++ b/configure.in
@@ -625,6 +625,11 @@ if test x$android = xtrue; then
 	AC_SUBST(DLLIB)
 fi
 
+if test x$maemo = xtrue; then
+	dbusservicedir="/usr/share/dbus-1/system-services"
+	AC_SUBST(dbusservicedir)
+fi
+
 if test x$nm = xtrue; then
 	PKG_CHECK_EXISTS([libnm-glib],
 		[PKG_CHECK_MODULES(nm, [NetworkManager gthread-2.0 libnm-glib libnm-glib-vpn])],
diff --git a/src/libcharon/plugins/maemo/Makefile.am b/src/libcharon/plugins/maemo/Makefile.am
index d2843cabc9..850f9040e9 100644
--- a/src/libcharon/plugins/maemo/Makefile.am
+++ b/src/libcharon/plugins/maemo/Makefile.am
@@ -15,3 +15,7 @@ libstrongswan_maemo_la_SOURCES = \
 
 libstrongswan_maemo_la_LDFLAGS = -module -avoid-version
 
+dbusservice_DATA = org.strongswan.charon.service
+
+EXTRA_DIST = $(dbusservice_DATA)
+
diff --git a/src/libcharon/plugins/maemo/org.strongswan.charon.service b/src/libcharon/plugins/maemo/org.strongswan.charon.service
new file mode 100644
index 0000000000..7dd31ed60e
--- /dev/null
+++ b/src/libcharon/plugins/maemo/org.strongswan.charon.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.strongswan.charon
+Exec=/usr/bin/run-standalone.sh /usr/libexec/ipsec/charon
+User=root