From 92ce5b1f5b97053806b37f2ad3174207e5b5893a Mon Sep 17 00:00:00 2001 From: piernov Date: Mon, 5 Mar 2012 20:33:33 +0100 Subject: wpa_supplicant ajout patch libnl 3.2 --- wpa_supplicant/.md5sum.i686 | 3 +- wpa_supplicant/.md5sum.x86_64 | 3 +- wpa_supplicant/Pkgfile | 7 ++-- wpa_supplicant/config | 1 + .../hostap_allow-linking-with-libnl-3.2.patch | 41 ++++++++++++++++++++++ 5 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch (limited to 'wpa_supplicant') diff --git a/wpa_supplicant/.md5sum.i686 b/wpa_supplicant/.md5sum.i686 index 376e8c546..84582aadb 100644 --- a/wpa_supplicant/.md5sum.i686 +++ b/wpa_supplicant/.md5sum.i686 @@ -1,6 +1,7 @@ 51f2a016daddf7f2a70f39b4194a05c5 WEP232.patch 6973ebe2c2c7b44c938737971c7bd641 bss-changed-prop-notify.patch -1a6c0717fa5f9a07fa0b48e46b393d05 config +2a936c34f5f9c7e5264e3299699acb4f config 398a05a0c957073500a571bac154cb05 dbus-null-error.patch 0518c80f93dd601e923a3fed72d14b99 dbus-service-file-args.patch +d0b1e55e44ea45f1661be563d02ab493 hostap_allow-linking-with-libnl-3.2.patch f516f191384a9a546e3f5145c08addda wpa_supplicant-0.7.3.tar.gz diff --git a/wpa_supplicant/.md5sum.x86_64 b/wpa_supplicant/.md5sum.x86_64 index 376e8c546..84582aadb 100644 --- a/wpa_supplicant/.md5sum.x86_64 +++ b/wpa_supplicant/.md5sum.x86_64 @@ -1,6 +1,7 @@ 51f2a016daddf7f2a70f39b4194a05c5 WEP232.patch 6973ebe2c2c7b44c938737971c7bd641 bss-changed-prop-notify.patch -1a6c0717fa5f9a07fa0b48e46b393d05 config +2a936c34f5f9c7e5264e3299699acb4f config 398a05a0c957073500a571bac154cb05 dbus-null-error.patch 0518c80f93dd601e923a3fed72d14b99 dbus-service-file-args.patch +d0b1e55e44ea45f1661be563d02ab493 hostap_allow-linking-with-libnl-3.2.patch f516f191384a9a546e3f5145c08addda wpa_supplicant-0.7.3.tar.gz diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index 6722e182f..8f969bb36 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -7,14 +7,14 @@ name=wpa_supplicant version=0.7.3 -release=1 -madwifi_ver=0.9.4 +release=2 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz \ config dbus-service-file-args.patch dbus-null-error.patch WEP232.patch - bss-changed-prop-notify.patch) + bss-changed-prop-notify.patch + hostap_allow-linking-with-libnl-3.2.patch) build() { cd $name-$version @@ -22,6 +22,7 @@ build() { patch -p1 < $SRC/dbus-service-file-args.patch patch -p1 < $SRC/dbus-null-error.patch patch -p1 < $SRC/WEP232.patch + patch -p1 < $SRC/hostap_allow-linking-with-libnl-3.2.patch cd $name perl -pi -e '$_ = "# $_" if /^\s*network\s*=\s*{/ .. /^\s*}/' wpa_supplicant.conf diff --git a/wpa_supplicant/config b/wpa_supplicant/config index f093117d1..80bf6cb4b 100644 --- a/wpa_supplicant/config +++ b/wpa_supplicant/config @@ -40,3 +40,4 @@ CONFIG_CTRL_IFACE=y CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_BGSCAN_SIMPLE=y +CONFIG_LIBNL32=y diff --git a/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..9111f6c42 --- /dev/null +++ b/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,41 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear + +I needed this patch to compile against the latest +libnl code. I added this to my config file: + +CONFIG_LIBNL32=y + +Signed-hostap: Ben Greear +rediffed against 0.7.3 by Stefan Lippers-Hollmann + +--- +:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak + src/drivers/drivers.mak | 21 ++++++++++++++------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +--- a/src/drivers/drivers.mak ++++ b/src/drivers/drivers.mak +@@ -31,11 +31,18 @@ NEED_SME=y + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++ifdef CONFIG_LIBNL32 ++ DRV_LIBS += -lnl-3 ++ DRV_LIBS += -lnl-genl-3 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -I/usr/include/libnl3/ ++else ++ DRV_LIBS += -lnl + +-ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl +-DRV_CFLAGS += -DCONFIG_LIBNL20 ++ ifdef CONFIG_LIBNL20 ++ DRV_LIBS += -lnl-genl ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ endif + endif + endif -- cgit v1.2.3-54-g00ecf