summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/libnl/defs.h6
-rw-r--r--pkg/libnl/gen.rc10
-rw-r--r--pkg/libnl/patch/0001-Remove-redundant-linux-in6.h-include.patch24
m---------pkg/libnl/src0
4 files changed, 32 insertions, 8 deletions
diff --git a/pkg/libnl/defs.h b/pkg/libnl/defs.h
index 6c422830..0aa7b895 100644
--- a/pkg/libnl/defs.h
+++ b/pkg/libnl/defs.h
@@ -9,11 +9,11 @@
#define PACKAGE "libnl"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "libnl"
-#define PACKAGE_STRING "libnl 3.2.28"
+#define PACKAGE_STRING "libnl 3.2.29"
#define PACKAGE_TARNAME "libnl"
#define PACKAGE_URL "http://www.infradead.org/~tgr/libnl/"
-#define PACKAGE_VERSION "3.2.28"
-#define VERSION "3.2.28"
+#define PACKAGE_VERSION "3.2.29"
+#define VERSION "3.2.29"
/* #undef const */
#ifndef __cplusplus
/* #undef inline */
diff --git a/pkg/libnl/gen.rc b/pkg/libnl/gen.rc
index 35e846b8..3f6f1587 100644
--- a/pkg/libnl/gen.rc
+++ b/pkg/libnl/gen.rc
@@ -28,14 +28,14 @@ hdrs=include/netlink/^(\
)
for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
build '$outdir'/include/netlink/version.h sed '$srcdir'/include/netlink/version.h.in ; exprs=(\
- -e s,@PACKAGE_STRING@,'''libnl 3.2.27''',\
- -e s,@PACKAGE_VERSION@,3.2.27,\
+ -e s,@PACKAGE_STRING@,'''libnl 3.2.29''',\
+ -e s,@PACKAGE_VERSION@,3.2.29,\
-e s,@MAJ_VERSION@,3,\
-e s,@MIN_VERSION@,2,\
- -e s,@MIC_VERSION@,27,\
- -e s,@LT_CURRENT@,222,\
+ -e s,@MIC_VERSION@,29,\
+ -e s,@LT_CURRENT@,224,\
-e s,@LT_REVISION@,0,\
- -e s,@LT_AGE@,22,\
+ -e s,@LT_AGE@,24,\
) with expr $"exprs
hdrs=($hdrs include/netlink/version.h)
phony headers '$outdir'/$hdrs
diff --git a/pkg/libnl/patch/0001-Remove-redundant-linux-in6.h-include.patch b/pkg/libnl/patch/0001-Remove-redundant-linux-in6.h-include.patch
new file mode 100644
index 00000000..a0c3d8a6
--- /dev/null
+++ b/pkg/libnl/patch/0001-Remove-redundant-linux-in6.h-include.patch
@@ -0,0 +1,24 @@
+From c3556dfb4b2b6467e5d0b0468c2dac8b602ae733 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 1 Jan 2017 16:42:21 -0800
+Subject: [PATCH] Remove redundant linux/in6.h include
+
+---
+ include/linux-private/linux/ipv6.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h
+index e05e684..f16349d 100644
+--- a/include/linux-private/linux/ipv6.h
++++ b/include/linux-private/linux/ipv6.h
+@@ -2,7 +2,6 @@
+ #define _IPV6_H
+
+ #include <asm/byteorder.h>
+-#include <linux/in6.h>
+
+ /* The latest drafts declared increase in minimal mtu up to 1280. */
+
+--
+2.11.0
+
diff --git a/pkg/libnl/src b/pkg/libnl/src
-Subproject 656f381ccf58785319bb0236595c896125d33ed
+Subproject c560a37f193dd6d1ae9c4db94eafa8a69f84341