diff --git a/srcpkgs/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config index e4a7a964c43..44d4748282c 100644 --- a/srcpkgs/wpa_supplicant/files/config +++ b/srcpkgs/wpa_supplicant/files/config @@ -402,3 +402,5 @@ CONFIG_DELAYED_MIC_ERROR_REPORT=y #LIBS += -lbfd -liberty -lz #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz +# +CONFIG_LIBNL32=yes diff --git a/srcpkgs/wpa_supplicant/patches/hostap_allow-linking-with-libnl-3.2.patch b/srcpkgs/wpa_supplicant/patches/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 00000000000..1debd563852 --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/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(-) + +--- src/drivers/drivers.mak ++++ 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 diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 4e8257b1935..2ebce69fa5e 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,11 +1,13 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=0.7.3 -revision=7 +revision=8 build_wrksrc=$pkgname -distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz" +homepage="http://hostap.epitest.fi" +distfiles="$homepage/releases/$pkgname-$version.tar.gz" short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP " +license="GPL-2" checksum=d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 long_desc=" $pkgname is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with @@ -23,7 +25,7 @@ long_desc=" conf_files="/etc/${pkgname}.conf" systemd_services="${pkgname}.service on" -Add_dependency build libnl-devel +Add_dependency build libnl3-devel Add_dependency build openssl-devel Add_dependency build dbus-devel Add_dependency build readline-devel diff --git a/srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs b/srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs index 18b14a3c13e..949b8455148 100644 --- a/srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs +++ b/srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs @@ -1,7 +1,8 @@ libreadline.so.6 libc.so.6 libcrypto.so.1 -libnl.so.1 libssl.so.1 libdbus-1.so.3 libpthread.so.0 +libnl-3.so.200 +libnl-genl-3.so.200