diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-24 23:15:21 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-24 23:15:21 +0000 |
| commit | 299e917c17619f800f0c21cf43209065b608223f (patch) | |
| tree | e175a7bbdb5d933670f10b09f1cc52ece45ced87 /core/wpa_supplicant | |
| parent | d466ef49f224a9347fe0375eac8126725e10a0a4 (diff) | |
Fri Feb 24 23:15:21 UTC 2012
Diffstat (limited to 'core/wpa_supplicant')
| -rw-r--r-- | core/wpa_supplicant/PKGBUILD | 16 | ||||
| -rw-r--r-- | core/wpa_supplicant/config | 2 | ||||
| -rw-r--r-- | core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch | 42 |
3 files changed, 54 insertions, 6 deletions
diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index 493dbf5f3..b8f264e29 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142217 2011-11-06 10:21:29Z thomas $ +# $Id: PKGBUILD 150896 2012-02-23 13:54:14Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=0.7.3 -pkgrel=4 +pkgrel=5 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') @@ -13,13 +13,17 @@ license=('GPL') groups=('base') backup=('etc/wpa_supplicant.conf') source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz - config dbus.patch) + config dbus.patch hostap_allow-linking-with-libnl-3.2.patch) sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' - '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d' - '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a') + 'd00f306e53c22cc0d7352a0d4ed701fd77b9ff20e3a2422d81ac1fddcc11dff4' + '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a' + 'ac805bf6e5aaec733dfc2c333417e519239cd58663a6e1cb34a54fd0f2bcc3c5') build() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" + + cd ${pkgname} # Required by NetworkManager 0.8.995 patch -Np2 -i "$srcdir/dbus.patch" cp "${srcdir}/config" ./.config diff --git a/core/wpa_supplicant/config b/core/wpa_supplicant/config index 192e338f2..eef35d045 100644 --- a/core/wpa_supplicant/config +++ b/core/wpa_supplicant/config @@ -402,3 +402,5 @@ CONFIG_DEBUG_FILE=y #LIBS += -lbfd -liberty -lz #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz + +CONFIG_LIBNL32=y diff --git a/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..8e7cd9a97 --- /dev/null +++ b/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,42 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear <greearb@candelatech.com> + +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 <greearb@candelatech.com> +rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> + +--- +: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 + |