From 9c2ebc92f8f3f1e7b02e0724eab2bc4d9b5edfd0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 10:50:39 +0100 Subject: update to libnl 2.0 --- package/libnl/patches/patch-include_netlink-local_h | 20 -------------------- package/libnl/patches/patch-include_netlink-types_h | 19 ------------------- .../libnl/patches/patch-include_netlink_genl_mngt_h | 19 ------------------- package/libnl/patches/patch-lib_object_c | 12 ------------ package/libnl/patches/patch-src_nl-list-caches_c | 11 ----------- package/libnl/patches/patch-src_utils_c | 11 ----------- package/libnl/patches/patch-src_utils_h | 11 ----------- 7 files changed, 103 deletions(-) delete mode 100644 package/libnl/patches/patch-include_netlink-local_h delete mode 100644 package/libnl/patches/patch-include_netlink-types_h delete mode 100644 package/libnl/patches/patch-include_netlink_genl_mngt_h delete mode 100644 package/libnl/patches/patch-lib_object_c delete mode 100644 package/libnl/patches/patch-src_nl-list-caches_c delete mode 100644 package/libnl/patches/patch-src_utils_c delete mode 100644 package/libnl/patches/patch-src_utils_h (limited to 'package/libnl/patches') 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 - #include - #include -+#include - - #include - #include -@@ -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-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 - - 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 -+#include - - 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 - #include - --#include - #include - #include - #include -- cgit v1.2.3