commit c2df40d7ceb4930d49e0afb0ed97bf0bf0c8e1c5 Author: Juergen Daubert <jue@jue.li> Date: Fri Oct 23 19:31:33 2015 +0200 wpa_supplicant: add dbus support (FS#957) diff --git a/wpa_supplicant/.footprint b/wpa_supplicant/.footprint index 4e2d821..7c74b23 100644 --- a/wpa_supplicant/.footprint +++ b/wpa_supplicant/.footprint @@ -1,9 +1,12 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/wlan -lrwxrwxrwx root/root etc/wpa.conf -> wpa_supplicant.conf -rw------- root/root etc/wpa_supplicant.conf drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/etc/ +drwxr-xr-x root/root usr/etc/dbus-1/ +drwxr-xr-x root/root usr/etc/dbus-1/system.d/ +-rw-r--r-- root/root usr/etc/dbus-1/system.d/wpa_supplicant.conf drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/wpa_supplicant.conf.5.gz @@ -16,3 +19,7 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/wpa_cli -rwxr-xr-x root/root usr/sbin/wpa_passphrase -rwxr-xr-x root/root usr/sbin/wpa_supplicant +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/dbus-1/ +drwxr-xr-x root/root usr/share/dbus-1/system-services/ +-rw-r--r-- root/root usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index 91cac16..725ef7b 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -1,11 +1,11 @@ # Description: User space IEEE 802.1X/WPA supplicant (wireless client) # URL: http://hostap.epitest.fi/wpa_supplicant/ # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: openssl ncurses readline libnl +# Depends on: openssl readline libnl dbus name=wpa_supplicant version=2.5 -release=1 +release=2 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz wlan) @@ -15,21 +15,25 @@ build () { cp defconfig .config echo "CONFIG_READLINE=y CONFIG_LIBNL32=y + CONFIG_CTRL_IFACE_DBUS_NEW=y CFLAGS+=-I/usr/include/libnl3" >> .config - make + make BINDIR=/usr/sbin LIBDIR=/usr/lib install -d $PKG/{usr/sbin,usr/man/man{8,5},etc} install -m 0755 wpa_{cli,passphrase,supplicant} $PKG/usr/sbin install -m 0644 doc/docbook/wpa_{background,cli,passphrase,supplicant}.8 $PKG/usr/man/man8 install -m 0644 doc/docbook/wpa_supplicant.conf.5 $PKG/usr/man/man5 + # config echo -e "ctrl_interface=/var/run/wpa_supplicant\n" > $PKG/etc/wpa_supplicant.conf chmod 0600 $PKG/etc/wpa_supplicant.conf - - # symlink for compatibility with older releases - ln -s wpa_supplicant.conf $PKG/etc/wpa.conf # rc script install -D -m 0755 $SRC/wlan $PKG/etc/rc.d/wlan + + # dbus + install -d $PKG/usr/{share/dbus-1/system-services,etc/dbus-1/system.d} + install -m 0644 dbus/fi.w1.wpa_supplicant1.service $PKG/usr/share/dbus-1/system-services/ + install -m 0644 dbus/dbus-wpa_supplicant.conf $PKG/usr/etc/dbus-1/system.d/wpa_supplicant.conf }