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 ef994b27a86717e346451ebe6ea22c298adf7c7a..cefd258c1f52e5404f8efbe66a04b19e05753b56 100644 (file)
--- 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 d2843cabc9f30dbabd8a88b5f1f6aea35b248e47..850f9040e9d7c39b8abdb1375b95d8fa5eafdf26 100644 (file)
--- 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 (file)
index 0000000..7dd31ed
--- /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