Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 23 insertions, 114 deletions

diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index d7021a844..c2878f406 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -4,12 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libnl
-PKG_VERSION:=		1.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		ae970ccd9144e132b68664f98e7ceeb1
+PKG_VERSION:=		2.0
+PKG_RELEASE:=		2
+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_NOPARALLEL:=	1
 
 PKG_SUBPKGS:=		LIBNL LIBNL_DEV
 PKGSD_LIBNL_DEV:=	header files for netlink library
@@ -17,16 +19,15 @@ 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}))
 
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBNL_DEV}+=	libnl-dev-install
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+libnl-install:
 	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-genl.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-cli.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-route.so* ${IDIR_LIBNL}/usr/lib
 
 libnl-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBNL_DEV}/usr/include
diff --git a/package/libnl/patches/patch-include_netlink-local_h b/package/libnl/patches/patch-include_netlink-local_h
deleted file mode 100644
index 02dc66130..000000000
--- a/package/libnl/patches/patch-include_netlink-local_h
+++ /dev/null
@@ -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))
diff --git a/package/libnl/patches/patch-include_netlink-types_h b/package/libnl/patches/patch-include_netlink-types_h
deleted file mode 100644
index 01d181e28..000000000
--- a/package/libnl/patches/patch-include_netlink-types_h
+++ /dev/null
@@ -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
diff --git a/package/libnl/patches/patch-include_netlink_genl_mngt_h b/package/libnl/patches/patch-include_netlink_genl_mngt_h
deleted file mode 100644
index 28ba36d23..000000000
--- a/package/libnl/patches/patch-include_netlink_genl_mngt_h
+++ /dev/null
@@ -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
diff --git a/package/libnl/patches/patch-lib_object_c b/package/libnl/patches/patch-lib_object_c
deleted file mode 100644
index 6d4ba6c8c..000000000
--- a/package/libnl/patches/patch-lib_object_c
+++ /dev/null
@@ -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);
diff --git a/package/libnl/patches/patch-ltmain_sh b/package/libnl/patches/patch-ltmain_sh
new file mode 100644
index 000000000..2058e0c78
--- /dev/null
+++ b/package/libnl/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- libnl-2.0.orig/ltmain.sh	2010-10-13 16:43:44.000000000 +0200
++++ libnl-2.0/ltmain.sh	2011-01-15 21:22:48.000000000 +0100
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
diff --git a/package/libnl/patches/patch-src_nl-list-caches_c b/package/libnl/patches/patch-src_nl-list-caches_c
deleted file mode 100644
index cb7c8986c..000000000
--- a/package/libnl/patches/patch-src_nl-list-caches_c
+++ /dev/null
@@ -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)
- {
diff --git a/package/libnl/patches/patch-src_utils_c b/package/libnl/patches/patch-src_utils_c
deleted file mode 100644
index 05da529a3..000000000
--- a/package/libnl/patches/patch-src_utils_c
+++ /dev/null
@@ -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[])
- {
diff --git a/package/libnl/patches/patch-src_utils_h b/package/libnl/patches/patch-src_utils_h
deleted file mode 100644
index e19e1e182..000000000
--- a/package/libnl/patches/patch-src_utils_h
+++ /dev/null
@@ -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>