[arch-commits] Commit in wpa_supplicant/trunk (3 files)

[Jan Steffens]

    Date: Thursday, February 9, 2012 @ 13:07:47
  Author: heftig
Revision: 149714

libnl3

Added:
  wpa_supplicant/trunk/hostap_allow-linking-with-libnl-3.2.patch
Modified:
  wpa_supplicant/trunk/PKGBUILD
  wpa_supplicant/trunk/config

-------------------------------------------+
 PKGBUILD                                  |   14 ++++++---
 config                                    |    2 +
 hostap_allow-linking-with-libnl-3.2.patch |   42 ++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-09 17:56:54 UTC (rev 149713)
+++ PKGBUILD	2012-02-09 18:07:47 UTC (rev 149714)
@@ -3,7 +3,7 @@
 
 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 @@
 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

Modified: config
===================================================================
--- config	2012-02-09 17:56:54 UTC (rev 149713)
+++ config	2012-02-09 18:07:47 UTC (rev 149714)
@@ -402,3 +402,5 @@
 #LIBS += -lbfd -liberty -lz
 #LIBS_p += -lbfd -liberty -lz
 #LIBS_c += -lbfd -liberty -lz
+
+CONFIG_LIBNL32=y

Added: hostap_allow-linking-with-libnl-3.2.patch
===================================================================
--- hostap_allow-linking-with-libnl-3.2.patch	                        (rev 0)
+++ hostap_allow-linking-with-libnl-3.2.patch	2012-02-09 18:07:47 UTC (rev 149714)
@@ -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 at 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 at candelatech.com>
+rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h at 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
+