Package: iw Version: 3.1-1 Severity: Important Dear maintainer,
The libnl3 package split our more libraries in seperate packages, making
this package FTBFS as it build-depends on libnl3-dev (now NBS).
Additionally, the upstream patch that includes support for libnl3 is
hardcoding -lnl-genl, which doesn't exist. Attached patch fixes the issues:
iw (3.1-2) UNRELEASED; urgency=low
* Build-Depend on libnl-genl-3-dev
* Update libnl3 support patch to the new layout of the libnl3 package
and use pkg-config to determine NLLIBS and CFLAGS.
-- Andreas Moog <am...@ubuntu.com> Sat, 24 Dec 2011 23:15:23 +0100
Thanks for considering this patch.
Cheers,
Andreas
diff -Nru iw-3.1/debian/changelog iw-3.1/debian/changelog
--- iw-3.1/debian/changelog 2011-09-10 00:51:03.000000000 +0200
+++ iw-3.1/debian/changelog 2011-12-24 23:23:05.000000000 +0100
@@ -1,3 +1,11 @@
+iw (3.1-2) UNRELEASED; urgency=low
+
+ * Build-Depend on libnl-genl-3-dev
+ * Update libnl3 support patch to the new layout of the libnl3 package
+ and use pkg-config to determine NLLIBS and CFLAGS. (LP: #908474)
+
+ -- Andreas Moog <am...@ubuntu.com> Sat, 24 Dec 2011 23:15:23 +0100
+
iw (3.1-1) unstable; urgency=low
* New upstream release.
diff -Nru iw-3.1/debian/control iw-3.1/debian/control
--- iw-3.1/debian/control 2011-09-10 00:51:03.000000000 +0200
+++ iw-3.1/debian/control 2011-12-24 23:20:20.000000000 +0100
@@ -6,7 +6,7 @@
Kel Modderman <k...@otaku42.de>,
Stefan Lippers-Hollmann <s....@gmx.de>
Build-Depends: debhelper (>= 7),
- libnl3-dev,
+ libnl-genl-3-dev,
pkg-config (>= 0.22)
Standards-Version: 3.9.2
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-wpa/iw/trunk/
diff -Nru iw-3.1/debian/patches/add-libnl-3.0-support.patch
iw-3.1/debian/patches/add-libnl-3.0-support.patch
--- iw-3.1/debian/patches/add-libnl-3.0-support.patch 2011-09-10
00:24:47.000000000 +0200
+++ iw-3.1/debian/patches/add-libnl-3.0-support.patch 2011-12-24
23:15:09.000000000 +0100
@@ -10,9 +10,11 @@
iw.h | 3 ++-
3 files changed, 15 insertions(+), 5 deletions(-)
---- a/Makefile
-+++ b/Makefile
-@@ -24,6 +24,7 @@ ALL = iw
+Index: iw-3.1/Makefile
+===================================================================
+--- iw-3.1.orig/Makefile 2011-12-24 23:11:27.557989747 +0100
++++ iw-3.1/Makefile 2011-12-24 23:15:04.013989578 +0100
+@@ -24,6 +24,7 @@
NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
@@ -20,20 +22,20 @@
ifeq ($(NL1FOUND),Y)
NLLIBNAME = libnl-1
-@@ -35,6 +36,12 @@ LIBS += -lnl-genl
+@@ -35,6 +36,12 @@
NLLIBNAME = libnl-2.0
endif
+ifeq ($(NL3FOUND),Y)
-+CFLAGS += -DCONFIG_LIBNL30
-+LIBS += -lnl-genl
-+NLLIBNAME = libnl-3.0
++CFLAGS += $(shell $(PKG_CONFIG) --cflags libnl-genl-3.0) -DCONFIG_LIBNL30
++LIBS += $(shell $(PKG_CONFIG) --libs libnl-genl-3.0)
++NLLIBNAME = libnl-genl-3.0
+endif
+
ifeq ($(NLLIBNAME),)
$(error Cannot find development files for any supported version of libnl)
endif
-@@ -53,6 +60,8 @@ endif
+@@ -53,6 +60,8 @@
all: version_check $(ALL)
version_check:
@@ -42,7 +44,7 @@
ifeq ($(NL2FOUND),Y)
else
ifeq ($(NL1FOUND),Y)
-@@ -60,6 +69,7 @@ else
+@@ -60,6 +69,7 @@
$(error No libnl found)
endif
endif
@@ -50,8 +52,10 @@
VERSION_OBJS := $(filter-out version.o, $(OBJS))
---- a/iw.c
-+++ b/iw.c
+Index: iw-3.1/iw.c
+===================================================================
+--- iw-3.1.orig/iw.c 2011-12-24 23:11:27.549989747 +0100
++++ iw-3.1/iw.c 2011-12-24 23:11:31.589989744 +0100
@@ -23,9 +23,8 @@
#include "nl80211.h"
#include "iw.h"
@@ -64,7 +68,7 @@
static inline struct nl_handle *nl_socket_alloc(void)
{
return nl_handle_alloc();
-@@ -45,7 +44,7 @@ static inline int __genl_ctrl_alloc_cach
+@@ -45,7 +44,7 @@
return 0;
}
#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
@@ -73,8 +77,10 @@
int iw_debug = 0;
---- a/iw.h
-+++ b/iw.h
+Index: iw-3.1/iw.h
+===================================================================
+--- iw-3.1.orig/iw.h 2011-12-24 23:11:27.537989747 +0100
++++ iw-3.1/iw.h 2011-12-24 23:11:31.589989744 +0100
@@ -11,7 +11,8 @@
#define ETH_ALEN 6
signature.asc
Description: OpenPGP digital signature
