[pkg-wpa-devel] r1601 - in /iw/trunk/debian: changelog patches/add-libnl-3.0-support.patch patches/series

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Mon Aug 15 15:33:40 2011
New Revision: 1601

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1601
Log:
add libnl-3.0 support, thanks to Yegor Yefremov
<yegor_sub1 at visionsystems.de>, don't switch to libnl3 yet because of
#632790.

Added:
    iw/trunk/debian/patches/add-libnl-3.0-support.patch
Modified:
    iw/trunk/debian/changelog
    iw/trunk/debian/patches/series

Modified: iw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/changelog?rev=1601&op=diff
==============================================================================
--- iw/trunk/debian/changelog (original)
+++ iw/trunk/debian/changelog Mon Aug 15 15:33:40 2011
@@ -11,8 +11,11 @@
   * don't use git on the buildd (Closes: #557167).
   * update debian/copyright to DEP-5, r174.
   * use new anonscm URIs for alioth.
+  * add libnl-3.0 support, thanks to Yegor Yefremov
+    <yegor_sub1 at visionsystems.de>, don't switch to libnl3 yet because of
+    #632790.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon, 25 Jul 2011 15:53:28 +0200
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon, 15 Aug 2011 17:31:30 +0200
 
 iw (0.9.19-1) unstable; urgency=low
 

Added: iw/trunk/debian/patches/add-libnl-3.0-support.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/add-libnl-3.0-support.patch?rev=1601&op=file
==============================================================================
--- iw/trunk/debian/patches/add-libnl-3.0-support.patch (added)
+++ iw/trunk/debian/patches/add-libnl-3.0-support.patch Mon Aug 15 15:33:40 2011
@@ -1,0 +1,89 @@
+Date:	Thu, 21 Jul 2011 17:06:17 +0200
+From:	Yegor Yefremov <yegor_sub1 at visionsystems.de>
+Subject: [PATCH v2] iw: add libnl-3.0 support
+
+Signed-off-by: Yegor Yefremov <yegorslists at googlemail.com>
+---
+Changes from v1:
+- CONFIG_LIBNL30 added
+
+ Makefile |   10 ++++++++++
+ iw.c     |    7 +++----
+ iw.h     |    3 ++-
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -24,6 +24,7 @@ ALL = iw
+ 
+ NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
+ NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
++NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
+ 
+ ifeq ($(NL1FOUND),Y)
+ NLLIBNAME = libnl-1
+@@ -35,6 +36,12 @@ LIBS += -lnl-genl
+ NLLIBNAME = libnl-2.0
+ endif
+ 
++ifeq ($(NL3FOUND),Y)
++CFLAGS += -DCONFIG_LIBNL30
++LIBS += -lnl-genl
++NLLIBNAME = libnl-3.0
++endif
++
+ ifeq ($(NLLIBNAME),)
+ $(error Cannot find development files for any supported version of libnl)
+ endif
+@@ -53,6 +60,8 @@ endif
+ all: version_check $(ALL)
+ 
+ version_check:
++ifeq ($(NL3FOUND),Y)
++else
+ ifeq ($(NL2FOUND),Y)
+ else
+ ifeq ($(NL1FOUND),Y)
+@@ -60,6 +69,7 @@ else
+ 	$(error No libnl found)
+ endif
+ endif
++endif
+ 
+ 
+ VERSION_OBJS := $(filter-out version.o, $(OBJS))
+--- a/iw.c
++++ b/iw.c
+@@ -23,9 +23,8 @@
+ #include "nl80211.h"
+ #include "iw.h"
+ 
+-#ifndef CONFIG_LIBNL20
+-/* libnl 2.0 compatibility code */
+-
++/* libnl 1.x compatibility code */
++#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30)
+ static inline struct nl_handle *nl_socket_alloc(void)
+ {
+ 	return nl_handle_alloc();
+@@ -45,7 +44,7 @@ static inline int __genl_ctrl_alloc_cach
+ 	return 0;
+ }
+ #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
+-#endif /* CONFIG_LIBNL20 */
++#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */
+ 
+ int iw_debug = 0;
+ 
+--- a/iw.h
++++ b/iw.h
+@@ -11,7 +11,8 @@
+ 
+ #define ETH_ALEN 6
+ 
+-#ifndef CONFIG_LIBNL20
++/* libnl 1.x compatibility code */
++#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30)
+ #  define nl_sock nl_handle
+ #endif
+ 

Modified: iw/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/series?rev=1601&op=diff
==============================================================================
--- iw/trunk/debian/patches/series (original)
+++ iw/trunk/debian/patches/series Mon Aug 15 15:33:40 2011
@@ -1,1 +1,2 @@
 dont-use-git-on-the-buildd.patch
+add-libnl-3.0-support.patch