aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-04-23 09:21:57 +0000
committerJonas Gorski <jogo@openwrt.org>2013-04-23 09:21:57 +0000
commitd1d01636b340035fb67fbfa09bb4a7790285c1f4 (patch)
tree14bd18e95c44f5de815cc30db08057af8e7133a8 /package/libs
parent49799d344da6a497c0931fec535ad4a07ca054c8 (diff)
downloadupstream-d1d01636b340035fb67fbfa09bb4a7790285c1f4.tar.gz
upstream-d1d01636b340035fb67fbfa09bb4a7790285c1f4.tar.bz2
upstream-d1d01636b340035fb67fbfa09bb4a7790285c1f4.zip
libnl: update to 3.2.21
Signed-off-by: Russell Senior <russell@personaltelco.net> SVN-Revision: 36394
Diffstat (limited to 'package/libs')
-rw-r--r--package/libs/libnl/Makefile16
-rw-r--r--package/libs/libnl/patches/110-offsetof.patch12
-rw-r--r--package/libs/libnl/patches/160-update_includes_for_iw.patch34
3 files changed, 8 insertions, 54 deletions
diff --git a/package/libs/libnl/Makefile b/package/libs/libnl/Makefile
index 13756995fd..5488065c44 100644
--- a/package/libs/libnl/Makefile
+++ b/package/libs/libnl/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libnl
-PKG_VERSION:=2.0
+PKG_VERSION:=3.2.21
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.infradead.org/~tgr/libnl/files/
-PKG_MD5SUM:=6aaf1e9802a17a7d702bb0638044ffa7
+PKG_MD5SUM:=6fe7136558a9071e70673dcda38545b3
include $(INCLUDE_DIR)/package.mk
@@ -21,6 +21,7 @@ define Package/libnl
SECTION:=libs
CATEGORY:=Libraries
TITLE:=netlink socket library
+ DEPENDS:=+libpthread
URL:=http://people.suug.ch/~tgr/libnl/
endef
@@ -46,11 +47,10 @@ endef
define Package/libnl/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-route.so.* $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-genl.so.* $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-nf.so.* $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-route.so.* $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-route-3.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-genl-3.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-nf-3.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-3.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libnl))
diff --git a/package/libs/libnl/patches/110-offsetof.patch b/package/libs/libnl/patches/110-offsetof.patch
deleted file mode 100644
index fa944a9c4b..0000000000
--- a/package/libs/libnl/patches/110-offsetof.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/netlink-local.h
-+++ b/include/netlink-local.h
-@@ -337,7 +337,9 @@ static inline int nl_cb_call(struct nl_c
- }
-
- #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
-+#ifndef offsetof
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
-
- #define __init __attribute__ ((constructor))
- #define __exit __attribute__ ((destructor))
diff --git a/package/libs/libnl/patches/160-update_includes_for_iw.patch b/package/libs/libnl/patches/160-update_includes_for_iw.patch
deleted file mode 100644
index ad36dab4ba..0000000000
--- a/package/libs/libnl/patches/160-update_includes_for_iw.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/include/linux/genetlink.h
-+++ b/include/linux/genetlink.h
-@@ -39,6 +39,9 @@ enum {
- CTRL_CMD_NEWOPS,
- CTRL_CMD_DELOPS,
- CTRL_CMD_GETOPS,
-+ CTRL_CMD_NEWMCAST_GRP,
-+ CTRL_CMD_DELMCAST_GRP,
-+ CTRL_CMD_GETMCAST_GRP, /* unused */
- __CTRL_CMD_MAX,
- };
-
-@@ -52,6 +55,7 @@ enum {
- CTRL_ATTR_HDRSIZE,
- CTRL_ATTR_MAXATTR,
- CTRL_ATTR_OPS,
-+ CTRL_ATTR_MCAST_GROUPS,
- __CTRL_ATTR_MAX,
- };
-
-@@ -66,4 +70,13 @@ enum {
-
- #define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
-
-+enum {
-+ CTRL_ATTR_MCAST_GRP_UNSPEC,
-+ CTRL_ATTR_MCAST_GRP_NAME,
-+ CTRL_ATTR_MCAST_GRP_ID,
-+ __CTRL_ATTR_MCAST_GRP_MAX,
-+};
-+
-+#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
-+
- #endif /* __LINUX_GENERIC_NETLINK_H */