From 51b9dba9e669c259a0463233a0c043029319f86c Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 13 Oct 2017 01:22:14 -0700
Subject: libnl: Update to 3.4.0

---
 pkg/libnl/defs.h  | 19 ++++++++++++++-----
 pkg/libnl/gen.lua | 13 ++++++-------
 pkg/libnl/rev     |  2 +-
 pkg/libnl/src     |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'pkg')

diff --git a/pkg/libnl/defs.h b/pkg/libnl/defs.h
index efd3a934..c875a919 100644
--- a/pkg/libnl/defs.h
+++ b/pkg/libnl/defs.h
@@ -1,18 +1,27 @@
-#include <config-posix.h>
-
 /* #undef DISABLE_PTHREADS */
+#define HAVE_DLFCN_H 1
+#define HAVE_INTTYPES_H 1
 #define HAVE_LIBPTHREAD 1
 #define HAVE_MEMORY_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRERROR_L 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_UNISTD_H 1
 #define LT_OBJDIR ".libs/"
 #define NL_DEBUG 1
 #define PACKAGE "libnl"
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME "libnl"
-#define PACKAGE_STRING "libnl 3.3.0"
+#define PACKAGE_STRING "libnl 3.4.0"
 #define PACKAGE_TARNAME "libnl"
 #define PACKAGE_URL "http://www.infradead.org/~tgr/libnl/"
-#define PACKAGE_VERSION "3.3.0"
-#define VERSION "3.3.0"
+#define PACKAGE_VERSION "3.4.0"
+#define STDC_HEADERS 1
+#define VERSION "3.4.0"
 /* #undef const */
 #ifndef __cplusplus
 /* #undef inline */
diff --git a/pkg/libnl/gen.lua b/pkg/libnl/gen.lua
index 2fdd5363..f0aeb71e 100644
--- a/pkg/libnl/gen.lua
+++ b/pkg/libnl/gen.lua
@@ -1,7 +1,6 @@
 cflags{
 	'-D _GNU_SOURCE',
 	[[-D 'SYSCONFDIR="/etc/libnl"']],
-	'-I include',
 	'-I $dir',
 	'-I $outdir/include',
 	'-I $srcdir/include',
@@ -10,14 +9,14 @@ cflags{
 
 build('sed', '$outdir/include/netlink/version.h', '$srcdir/include/netlink/version.h.in', {
 	expr={
-		'-e s,@PACKAGE_STRING@,\'libnl 3.3.0\',',
-		'-e s,@PACKAGE_VERSION@,3.3.0,',
+		'-e s,@PACKAGE_STRING@,\'libnl 3.4.0\',',
+		'-e s,@PACKAGE_VERSION@,3.4.0,',
 		'-e s,@MAJ_VERSION@,3,',
-		'-e s,@MIN_VERSION@,3,',
+		'-e s,@MIN_VERSION@,4,',
 		'-e s,@MIC_VERSION@,0,',
-		'-e s,@LT_CURRENT@,225,',
+		'-e s,@LT_CURRENT@,226,',
 		'-e s,@LT_REVISION@,0,',
-		'-e s,@LT_AGE@,25,',
+		'-e s,@LT_AGE@,26,',
 	},
 })
 
@@ -53,7 +52,7 @@ pkg.hdrs = {
 lib('libnl-3.a', [[lib/(
 	addr.c attr.c cache.c cache_mngr.c cache_mngt.c data.c
 	error.c handlers.c msg.c nl.c object.c socket.c utils.c
-	version.c hash.c hashtable.c
+	version.c hash.c hashtable.c mpls.c
 )]], {'$dir/headers'})
 
 lib('libnl-genl-3.a', 'lib/genl/(ctrl.c family.c genl.c mngt.c)', {'$dir/headers'})
diff --git a/pkg/libnl/rev b/pkg/libnl/rev
index 00750edc..b8626c4c 100644
--- a/pkg/libnl/rev
+++ b/pkg/libnl/rev
@@ -1 +1 @@
-3
+4
diff --git a/pkg/libnl/src b/pkg/libnl/src
index 2e0c4ade..3fe3454b 160000
--- a/pkg/libnl/src
+++ b/pkg/libnl/src
@@ -1 +1 @@
-Subproject commit 2e0c4ade6763589bd6a3099386e4435f0aaf2473
+Subproject commit 3fe3454b0228a6c9729ce9ffebf62bda85fd87ab
-- 
cgit v1.2.3