Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=e822a027568991205e9de69c37a05e717690a08f
commit e822a027568991205e9de69c37a05e717690a08f Author: bouleetbil <bouleet...@frogdev.info> Date: Mon Mar 14 08:37:14 2011 +0100 wpa_supplicant-0.7.3-3-i686 *add networkmanager patch *disable CONFIG_CTRL_IFACE_DBUS_INTRO (break new dbus support) *NetworkManager Beta work \o/ diff --git a/source/base/wpa_supplicant/FrugalBuild b/source/base/wpa_supplicant/FrugalBuild index 45a015d..752ac5c 100644 --- a/source/base/wpa_supplicant/FrugalBuild +++ b/source/base/wpa_supplicant/FrugalBuild @@ -12,7 +12,7 @@ USE_DEBUG=${USE_DEBUG:-"y"} pkgname=wpa_supplicant pkgver=0.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="Linux WPA/WPA2/IEEE 802.1X Supplicant" url="http://hostap.epitest.fi/wpa_supplicant/" depends=('openssl>=1.0.0' 'libnl') @@ -25,9 +25,10 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url |grep -1 stable|sed -n 's/.*-\(.*\)\.t.*/\1/;3 p'" source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz \ - config) + config nm.diff) sha1sums=('ca51db8931fabf386352c87422f3e62fb44c3fe3' \ - 'afde5abc911f18cf7871df8cbf21735b35af4a03') + 'afde5abc911f18cf7871df8cbf21735b35af4a03' \ + 'f253705e39900dc6e65dd48f1a6fb23c465f8f0c') options=('scriptlet') if Fuse $USE_GUI; then @@ -40,7 +41,9 @@ fi build() { - Fcd $pkgname-$pkgver/$pkgname + Fcd + Fpatchall + cd $pkgname || Fdie Fsed /usr/local /usr Makefile cp $Fsrcdir/config .config if Fuse $USE_DEBUG; then @@ -49,7 +52,7 @@ build() if Fuse $USE_DBUS; then echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config - echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config + #echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config fi #enable some drivers echo "CONFIG_DRIVER_ATMEL=y" >> .config @@ -65,7 +68,8 @@ build() echo "CONFIG_DRIVER_WIRED=y" >> .config Fsed 'dynamic_eap_methods' '' Makefile - Fbuild + Fmake + Fmakeinstall if Fuse $USE_DBUS; then Fsed "/sbin" "/usr/sbin" $Fsrcdir/$pkgname-$pkgver/$pkgname/dbus/*.service Fmkdir etc/dbus-1/system.d diff --git a/source/base/wpa_supplicant/nm.diff b/source/base/wpa_supplicant/nm.diff new file mode 100644 index 0000000..c59e1cc --- /dev/null +++ b/source/base/wpa_supplicant/nm.diff @@ -0,0 +1,62 @@ +From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 +From: Dan Williams <d...@redhat.com> +Date: Fri, 17 Dec 2010 15:56:01 +0200 +Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes + +The supplicant was not emitting property changed events when the BSSs +property changed. + +Signed-off-by: Dan Williams <d...@redhat.com> +(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) +--- + wpa_supplicant/dbus/dbus_new.c | 6 ++++++ + wpa_supplicant/dbus/dbus_new.h | 1 + + 2 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c +index bdfbbac..c66640a 100644 +--- a/wpa_supplicant/dbus/dbus_new.c ++++ b/wpa_supplicant/dbus/dbus_new.c +@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, + wpas_dbus_getter_current_network; + prop = "CurrentNetwork"; + break; ++ case WPAS_DBUS_PROP_BSSS: ++ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; ++ prop = "BSSs"; ++ break; + default: + wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", + __func__, property); +@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, + } + + wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); ++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); + + return 0; + } +@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, + } + + wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); ++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); + + return 0; + +diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h +index 80ea98c..9cdefcb 100644 +--- a/wpa_supplicant/dbus/dbus_new.h ++++ b/wpa_supplicant/dbus/dbus_new.h +@@ -30,6 +30,7 @@ enum wpas_dbus_prop { + WPAS_DBUS_PROP_STATE, + WPAS_DBUS_PROP_CURRENT_BSS, + WPAS_DBUS_PROP_CURRENT_NETWORK, ++ WPAS_DBUS_PROP_BSSS, + }; + + enum wpas_dbus_bss_prop { +-- +1.7.4-rc1 + + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git