Remove the wpa_supplicant D-Bus scripts

diff --git a/.gitignore b/.gitignore
index c9a29fb..c3a0edf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,3 @@ src/connman.ver
 src/connman.service
 scripts/connman
 scripts/dhclient-script
-scripts/fi.epitest.hostap.WPASupplicant.service

diff --git a/configure.ac b/configure.ac
index 8abdd13..64196c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,5 @@ AC_SUBST(SQLITE_LIBS)
 
 AC_OUTPUT(Makefile include/Makefile src/Makefile doc/Makefile
                        test/Makefile plugins/Makefile scripts/Makefile
-                       scripts/fi.epitest.hostap.WPASupplicant.service
                        scripts/connman src/connman.service connman.pc)
                        

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b860d5b..1247398 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -3,15 +3,7 @@ initdir = $(sysconfdir)/init.d
 
 init_SCRIPTS = connman
 
-dbusdir = $(sysconfdir)/dbus-1/system.d
-
-dbus_DATA = fi.epitest.hostap.WPASupplicant.conf
-
-servicedir = $(datadir)/dbus-1/system-services
-
-service_DATA = fi.epitest.hostap.WPASupplicant.service
-
-DISTCLEANFILES = $(init_SCRIPTS) $(service_DATA)
+DISTCLEANFILES = $(init_SCRIPTS)
 
 scriptdir = $(libdir)/connman/scripts
 
@@ -23,6 +15,6 @@ dhclient_script_LDADD = @DBUS_LIBS@
 
 AM_CFLAGS = @DBUS_CFLAGS@
 
-EXTRA_DIST = $(script_DATA) $(dbus_DATA)
+EXTRA_DIST = $(script_DATA)
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/scripts/fi.epitest.hostap.WPASupplicant.conf b/scripts/fi.epitest.hostap.WPASupplicant.conf
deleted file mode 100644 (file)
index fa7afca..0000000
--- a/scripts/fi.epitest.hostap.WPASupplicant.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-       <policy user="root">
-               <allow own="fi.epitest.hostap.WPASupplicant"/>
-               <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
-               <allow send_interface="fi.epitest.hostap.WPASupplicant"/>
-       </policy>
-</busconfig>

diff --git a/scripts/fi.epitest.hostap.WPASupplicant.service.in b/scripts/fi.epitest.hostap.WPASupplicant.service.in
deleted file mode 100644 (file)
index cdd2a03..0000000
--- a/scripts/fi.epitest.hostap.WPASupplicant.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=fi.epitest.hostap.WPASupplicant
-Exec=@WPASUPPLICANT@ -u
-User=root