update to libnl 2.0

package/hostapd/files/hostapd.config

@@ -33,3 +33,4 @@ CONFIG_NO_VLAN=y
 # This can be used to reduce binary size at the cost of disabling a debugging
 # option.
 CONFIG_NO_DUMP_STATE=y
+CONFIG_LIBNL20=y

package/iw/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iw
-PKG_VERSION:=		0.9.19
+PKG_VERSION:=		0.9.21
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3b88743f9c6ce8a7e2f5fd7d18fdea42
+PKG_MD5SUM:=		726db5f1fd6bc316434414770513ef81
 PKG_DESCR:=		Tools for setting up WiFi cards via netlink (nl80211)
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libnl

package/iw/patches/patch-Makefile

@@ -1,15 +0,0 @@
---- iw-0.9.18.orig/Makefile	2009-11-20 17:35:56.000000000 +0100
-+++ iw-0.9.18/Makefile	2010-01-04 23:00:34.031210816 +0100
-@@ -86,10 +86,10 @@ check:
- install: iw iw.8.gz
- 	@$(NQ) ' INST iw'
- 	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
--	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw
-+	$(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(SBINDIR)
- 	@$(NQ) ' INST iw.8'
- 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/
--	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz
-+	$(Q)$(INSTALL) -m 644 iw.8.gz $(DESTDIR)$(MANDIR)/man8/
- 
- clean:
- 	$(Q)rm -f iw *.o *~ *.gz version.c *-stamp

package/iw/patches/patch-version_sh

@@ -1,5 +1,5 @@
---- iw-0.9.17.orig/version.sh	2009-08-26 11:41:41.000000000 +0200
-+++ iw-0.9.17/version.sh	2009-11-20 23:11:10.000000000 +0100
+--- iw-0.9.21.orig/version.sh	2010-09-24 17:44:07.000000000 +0200
++++ iw-0.9.21/version.sh	2011-01-09 22:41:17.000000000 +0100
 @@ -5,20 +5,6 @@ OUT="$1"
  
  echo '#include "iw.h"' > "$OUT"

package/libnl/Makefile

@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libnl
-PKG_VERSION:=		1.1
+PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ae970ccd9144e132b68664f98e7ceeb1
+PKG_MD5SUM:=		6aaf1e9802a17a7d702bb0638044ffa7
 PKG_DESCR:=		Netlink library
 PKG_SECTION:=		libs
-PKG_SITES:=		http://downloads.openwrt.org/sources/
+PKG_URL:=		http://www.infradead.org/~tgr/libnl/
+PKG_SITES:=		http://www.infradead.org/~tgr/libnl/files/
 
 PKG_SUBPKGS:=		LIBNL LIBNL_DEV
 PKGSD_LIBNL_DEV:=	header files for netlink library
@@ -17,10 +18,10 @@ PKGSC_LIBNL_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBNL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNL_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV}))
+$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNL_DEV,libnl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV}))
 
-post-install:
+libnl-install:
 	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib
 

package/libnl/patches/patch-include_netlink-local_h

@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-local.h	2009-05-29 00:17:59.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>
-@@ -337,7 +337,7 @@ static inline int nl_cb_call(struct nl_c
- }
- 
- #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
--#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#define __offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- 
- #define __init __attribute__ ((constructor))
- #define __exit __attribute__ ((destructor))

package/libnl/patches/patch-include_netlink-types_h

@@ -1,19 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnl-1.1.orig/include/netlink-types.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-types.h	2009-04-16 20:16:45.349364825 +0200
-@@ -95,15 +95,6 @@ struct nl_cache_mngr
- 
- struct nl_parser_param;
- 
--struct genl_info
--{
--	struct sockaddr_nl *	who;
--	struct nlmsghdr *	nlh;
--	struct genlmsghdr *	genlhdr;
--	void *			userhdr;
--	struct nlattr **	attrs;
--};
--
- #define LOOSE_FLAG_COMPARISON	1
- 
- #define NL_OBJ_MARK		1

package/libnl/patches/patch-include_netlink_genl_mngt_h

@@ -1,19 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnl-1.1.orig/include/netlink/genl/mngt.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink/genl/mngt.h	2009-04-16 20:16:45.343843731 +0200
-@@ -22,6 +22,15 @@ extern "C" {
- 
- struct nl_cache_ops;
- 
-+struct genl_info
-+{
-+        struct sockaddr_nl *    who;
-+        struct nlmsghdr *       nlh;
-+	struct genlmsghdr *     genlhdr;
-+	void *                  userhdr;
-+	struct nlattr **        attrs;
-+};
-+
- /**
-  * @ingroup genl_mngt
-  * Generic Netlink Command

package/libnl/patches/patch-lib_object_c

@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnl-1.1.orig/lib/object.c	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/lib/object.c	2009-05-28 23:20:00.925639994 +0200
-@@ -96,7 +96,7 @@ struct nl_object *nl_object_clone(struct
- {
- 	struct nl_object *new;
- 	struct nl_object_ops *ops = obj_ops(obj);
--	int doff = offsetof(struct nl_derived_object, data);
-+	int doff = __offsetof(struct nl_derived_object, data);
- 	int size;
- 
- 	new = nl_object_alloc(ops);

package/libnl/patches/patch-src_nl-list-caches_c

@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnl-1.1.orig/src/nl-list-caches.c	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/src/nl-list-caches.c	2009-04-16 20:16:45.349364825 +0200
-@@ -10,6 +10,7 @@
-  */
- 
- #include "utils.h"
-+#include <netlink-local.h>
- 
- static void print_usage(void)
- {

package/libnl/patches/patch-src_utils_c

@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnl-1.1.orig/src/utils.c	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/src/utils.c	2009-04-16 20:16:45.349364825 +0200
-@@ -12,6 +12,7 @@
- #include "utils.h"
- 
- #include <stdlib.h>
-+#include <stdarg.h>
- 
- int nltool_init(int argc, char *argv[])
- {

package/libnl/patches/patch-src_utils_h

@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libnl-1.1.orig/src/utils.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/src/utils.h	2009-04-16 20:16:45.353364776 +0200
-@@ -22,7 +22,6 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- 
--#include <netlink-local.h>
- #include <netlink/netlink.h>
- #include <netlink/utils.h>
- #include <netlink/addr.h>

package/wpa_supplicant/Makefile

@@ -4,13 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		wpa_supplicant
-PKG_VERSION:=		0.7.2
+PKG_VERSION:=		0.7.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0e2cb7e4c35667351d8b7ec28c783e6a
+PKG_MD5SUM:=		f516f191384a9a546e3f5145c08addda
 PKG_DESCR:=		WPA Supplicant with support for WPA and WPA2
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libnl
 PKG_BUILDDEP:=		libnl
+PKG_URL:=		http://hostap.epitest.fi/wpa_supplicant/
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
 PKG_DFLT_WPA_SUPPLICANT:=	y if ADK_TARGET_SYSTEM_IBM_X40
@@ -38,7 +39,7 @@ MAKE_FLAGS+=		CPPFLAGS='${TCPPFLAGS}' \
 			KERNEL=${LINUX_DIR}
 
 do-configure:
-	${CP} files/config ${WRKBUILD}/.config
+	${CP} ./files/config ${WRKBUILD}/.config
 ifneq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},)
 	${SED} "s#openssl#gnutls#" ${WRKBUILD}/.config
 endif

package/wpa_supplicant/files/config

@@ -3,6 +3,7 @@ CONFIG_DRIVER_NL80211=y
 CONFIG_DRIVER_WEXT=y
 #CONFIG_IEEE8021X_EAPOL=y
 CONFIG_CTRL_IFACE=y
+CONFIG_LIBNL20=y
 
 # default
 CONFIG_EAP_PSK=y