[pkg-wpa-devel] r1636 - in /wpasupplicant/trunk/debian: changelog config/linux config/linux-udeb control patches/hostap_allow-linking-with-libnl-3.2.patch patches/series

Thu Dec 15 20:01:06 UTC 2011

Author: slh-guest
Date: Thu Dec 15 20:01:04 2011
New Revision: 1636

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1636
Log:
* WARNING: needs libnl3 >=3.2.3-1 (experimental)
  http://lists.debian.org/debian-devel/2011/12/msg00353.html
* add "hostap: Allow linking with libnl-3" from Ben Greear 
  <greearb at candelatech.com> to allow building against libnl3 3.2.
* switch build dependency from libnl3-dev to libnl-3-dev && libnl-genl-3-dev
  accordingly.

Added:
    wpasupplicant/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/config/linux
    wpasupplicant/trunk/debian/config/linux-udeb
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1636&op=diff
==============================================================================

--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Dec 15 20:01:04 2011
@@ -1,8 +1,16 @@
 wpasupplicant (0.7.3-6) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sat, 15 Oct 2011 00:07:49 +0200
+  * WARNING: needs libnl3 >=3.2.3-1 (experimental)
+    http://lists.debian.org/debian-devel/2011/12/msg00353.html
+
+  * add "hostap: Allow linking with libnl-3" from Ben Greear 
+    <greearb at candelatech.com> to allow building against libnl3 3.2.
+  * switch build dependency from libnl3-dev to libnl-3-dev && libnl-genl-3-dev
+    accordingly.
+
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Thu, 15 Dec 2011 20:59:08 +0100
 
 wpasupplicant (0.7.3-5) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/config/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/linux?rev=1636&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/linux (original)
+++ wpasupplicant/trunk/debian/config/linux Thu Dec 15 20:01:04 2011
@@ -1,7 +1,7 @@
 # Debian's wpa_supplicant build time configuration
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NL80211=y
-CONFIG_LIBNL20=y
+CONFIG_LIBNL32=y
 CONFIG_DRIVER_WIRED=y
 CONFIG_AP=y
 CONFIG_IEEE8021X_EAPOL=y

Modified: wpasupplicant/trunk/debian/config/linux-udeb
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/linux-udeb?rev=1636&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/linux-udeb (original)
+++ wpasupplicant/trunk/debian/config/linux-udeb Thu Dec 15 20:01:04 2011
@@ -1,7 +1,7 @@
 # Debian's wpa_supplicant build time configuration
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NL80211=y
-CONFIG_LIBNL20=y
+CONFIG_LIBNL32=y
 CONFIG_CTRL_IFACE=y
 CONFIG_BACKEND=file
 CONFIG_MAIN=main

Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1636&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Thu Dec 15 20:01:04 2011
@@ -12,7 +12,8 @@
  libdbus-1-dev,
  libncurses5-dev,
  libpcsclite-dev,
- libnl3-dev (>= 3.0-1.1) [linux-any],
+ libnl-3-dev [linux-any],
+ libnl-genl-3-dev [linux-any],
  libpcap-dev [kfreebsd-any],
  libbsd-dev [kfreebsd-any],
  pkg-config,

Added: wpasupplicant/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch?rev=1636&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch (added)
+++ wpasupplicant/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch Thu Dec 15 20:01:04 2011
@@ -1,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
+ 

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1636&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Dec 15 20:01:04 2011
@@ -5,3 +5,4 @@
 09_dbus_emit_change_events.patch
 12_wpa_gui_knotify_support.patch
 13_human_readable_signal.patch
+hostap_allow-linking-with-libnl-3.2.patch


