summaryrefslogtreecommitdiff
path: root/package/iproute2
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-07-18 22:15:29 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-07-20 21:12:34 +0200
commit1a675e4d96897e9894654ff4acff3e510259e0c8 (patch)
tree06ce52c2cac939a8d059a689626e937168040aef /package/iproute2
parentbd2722a8ac4f4ec721a1c4b4613b7dd488b20099 (diff)
iproute2: update to 4.12.0
Diffstat (limited to 'package/iproute2')
-rw-r--r--package/iproute2/Makefile4
-rw-r--r--package/iproute2/patches/patch-include_iptables_common_h25
-rw-r--r--package/iproute2/patches/patch-include_linux_netfilter_h11
3 files changed, 2 insertions, 38 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 5482b525a..ab8883d26 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= iproute2
-PKG_VERSION:= 4.10.0
+PKG_VERSION:= 4.12.0
PKG_RELEASE:= 1
-PKG_HASH:= 22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8
+PKG_HASH:= 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d
PKG_DESCR:= routing control utility
PKG_SECTION:= net/route
PKG_BUILDDEP:= iptables libnl linux-atm
diff --git a/package/iproute2/patches/patch-include_iptables_common_h b/package/iproute2/patches/patch-include_iptables_common_h
deleted file mode 100644
index d0ca2c0a2..000000000
--- a/package/iproute2/patches/patch-include_iptables_common_h
+++ /dev/null
@@ -1,25 +0,0 @@
---- iproute2-3.12.0.orig/include/iptables_common.h 2013-11-23 02:10:33.000000000 +0100
-+++ iproute2-3.12.0/include/iptables_common.h 2014-04-05 05:21:46.946376336 +0200
-@@ -1,5 +1,8 @@
- #ifndef _IPTABLES_COMMON_H
- #define _IPTABLES_COMMON_H
-+
-+#include <stdint.h>
-+
- /* Shared definitions between ipv4 and ipv6. */
-
- enum exittype {
-@@ -43,9 +46,9 @@ extern char *lib_dir;
- extern void init_extensions(void);
- #endif
-
--#define __be32 u_int32_t
--#define __le32 u_int32_t
--#define __be16 u_int16_t
--#define __le16 u_int16_t
-+#define __be32 uint32_t
-+#define __le32 uint32_t
-+#define __be16 uint16_t
-+#define __le16 uint16_t
-
- #endif /*_IPTABLES_COMMON_H*/
diff --git a/package/iproute2/patches/patch-include_linux_netfilter_h b/package/iproute2/patches/patch-include_linux_netfilter_h
deleted file mode 100644
index 67dfe2eef..000000000
--- a/package/iproute2/patches/patch-include_linux_netfilter_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- iproute2-4.5.0.orig/include/linux/netfilter.h 2016-03-15 00:02:31.000000000 +0100
-+++ iproute2-4.5.0/include/linux/netfilter.h 2016-04-21 02:44:12.713804912 +0200
-@@ -4,8 +4,6 @@
- #include <linux/types.h>
-
- #include <linux/sysctl.h>
--#include <linux/in.h>
--#include <linux/in6.h>
-
- /* Responses from hook functions. */
- #define NF_DROP 0