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

slh-guest at users.alioth.debian.org slh-guest at users.alioth.debian.org
Thu Dec 15 20:05:53 UTC 2011 

Author: slh-guest
Date: Thu Dec 15 20:05:53 2011
New Revision: 1637

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1637
Log:
* WARNING: needs libnl3 >=3.2.3-1 (experimental)
  http://lists.debian.org/debian-devel/2011/12/msg00353.html
* add myself to uploaders.
* 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 libnl-dev (libnl1) to libnl-3-dev && 
  libnl-genl-3-dev accordingly.
* restrict hostapd to linux-any for now, rather than letting it fail due to
  unmet build-dependencies on other kernels; adding support for kFreeBSD
  should be rather straight forward.

Added:
    hostapd/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch
Modified:
    hostapd/trunk/   (props changed)
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/config/linux
    hostapd/trunk/debian/control
    hostapd/trunk/debian/patches/series

Propchange: hostapd/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 15 20:05:53 2011
@@ -1,0 +1,1 @@
+.pc

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=1637&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Thu Dec 15 20:05:53 2011
@@ -1,9 +1,19 @@
-hostapd (1:0.7.3-3.1) UNRELEASED; urgency=low
-
-  * Non-maintainer upload.
+hostapd (1:0.7.3-4) UNRELEASED; urgency=low
+
   * NOT RELEASED YET
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon, 12 Dec 2011 01:47:00 +0100
+  * WARNING: needs libnl3 >=3.2.3-1 (experimental)
+    http://lists.debian.org/debian-devel/2011/12/msg00353.html
+
+  * add myself to uploaders.
+  * 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 libnl-dev (libnl1) to libnl-3-dev && 
+    libnl-genl-3-dev accordingly.
+  * restrict hostapd to linux-any for now, rather than letting it fail due to
+    unmet build-dependencies on other kernels; adding support for kFreeBSD
+    should be rather straight forward.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Thu, 15 Dec 2011 21:03:29 +0100
 
 hostapd (1:0.7.3-3) unstable; urgency=low
 

Modified: hostapd/trunk/debian/config/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/config/linux?rev=1637&op=diff
==============================================================================
--- hostapd/trunk/debian/config/linux (original)
+++ hostapd/trunk/debian/config/linux Thu Dec 15 20:05:53 2011
@@ -30,6 +30,8 @@
 #LIBNL=/usr/src/libnl
 #CFLAGS += -I$(LIBNL)/include
 #LIBS += -L$(LIBNL)/lib
+
+CONFIG_LIBNL32=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y

Modified: hostapd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/control?rev=1637&op=diff
==============================================================================
--- hostapd/trunk/debian/control (original)
+++ hostapd/trunk/debian/control Thu Dec 15 20:05:53 2011
@@ -4,17 +4,19 @@
 Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
 Uploaders: Faidon Liambotis <paravoid at debian.org>,
  Kel Modderman <kel at otaku42.de>,
- Jan Dittberner <jandd at debian.org>
+ Jan Dittberner <jandd at debian.org>,
+ Stefan Lippers-Hollmann <s.l-h at gmx.de>
 Build-Depends: debhelper (>= 7.3.7~),
  libssl-dev,
- libnl-dev (>= 1.1)
+ libnl-3-dev [linux-any],
+ libnl-genl-3-dev [linux-any]
 Standards-Version: 3.9.2
 Homepage: http://w1.fi/
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-wpa/hostapd/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-wpa/hostapd/trunk/
 
 Package: hostapd
-Architecture: any
+Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-13), initscripts (>= 2.88dsf-13.3)
 Description: user space IEEE 802.11 AP and IEEE 802.1X/WPA/WPA2/EAP Authenticator
  Originally, hostapd was an optional user space component for Host AP

Added: hostapd/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch?rev=1637&op=file
==============================================================================
--- hostapd/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch (added)
+++ hostapd/trunk/debian/patches/hostap_allow-linking-with-libnl-3.2.patch Thu Dec 15 20:05:53 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: hostapd/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/series?rev=1637&op=diff
==============================================================================
--- hostapd/trunk/debian/patches/series (original)
+++ hostapd/trunk/debian/patches/series Thu Dec 15 20:05:53 2011
@@ -1,0 +1,1 @@
+hostap_allow-linking-with-libnl-3.2.patch

More information about the Pkg-wpa-devel mailing list