libnl: update to 3.2.29, add patch from buildroot

3 files changed, 70 insertions, 0 deletions

diff --git a/package/libnl/patches/patch-configure_ac b/package/libnl/patches/patch-configure_ac
new file mode 100644
index 000000000..c480cb9ef
--- /dev/null
+++ b/package/libnl/patches/patch-configure_ac
@@ -0,0 +1,11 @@
+--- libnl-libnl3_2_29.orig/configure.ac	2016-12-30 15:57:01.000000000 +0100
++++ libnl-libnl3_2_29/configure.ac	2017-04-26 20:09:18.129932699 +0200
+@@ -126,6 +126,8 @@ fi
+ 
+ AC_CONFIG_SUBDIRS([doc])
+ 
++AC_CHECK_FUNCS([strerror_l])
++
+ AC_CONFIG_FILES([
+ Makefile
+ libnl-3.0.pc
diff --git a/package/libnl/patches/patch-lib_utils_c b/package/libnl/patches/patch-lib_utils_c
new file mode 100644
index 000000000..3e14d4739
--- /dev/null
+++ b/package/libnl/patches/patch-lib_utils_c
@@ -0,0 +1,34 @@
+--- libnl-libnl3_2_29.orig/lib/utils.c	2016-12-30 15:57:01.000000000 +0100
++++ libnl-libnl3_2_29/lib/utils.c	2017-04-26 20:09:18.137933191 +0200
+@@ -30,7 +30,9 @@
+ #include <netlink/utils.h>
+ #include <linux/socket.h>
+ #include <stdlib.h> /* exit() */
++#ifdef HAVE_STRERROR_L
+ #include <locale.h>
++#endif
+ 
+ /**
+  * Global variable indicating the desired level of debugging output.
+@@ -123,9 +125,10 @@ int __nl_read_num_str_file(const char *p
+ 
+ const char *nl_strerror_l(int err)
+ {
++	const char *buf;
++#ifdef HAVE_STRERROR_L
+ 	int errno_save = errno;
+ 	locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0);
+-	const char *buf;
+ 
+ 	if (loc == (locale_t)0) {
+ 		if (errno == ENOENT)
+@@ -140,6 +143,9 @@ const char *nl_strerror_l(int err)
+ 	}
+ 
+ 	errno = errno_save;
++#else
++	buf = strerror(err);
++#endif
+ 	return buf;
+ }
+ /** @endcond */
diff --git a/package/libnl/patches/patch-src_lib_utils_c b/package/libnl/patches/patch-src_lib_utils_c
new file mode 100644
index 000000000..6d75c3acf
--- /dev/null
+++ b/package/libnl/patches/patch-src_lib_utils_c
@@ -0,0 +1,25 @@
+--- libnl-libnl3_2_29.orig/src/lib/utils.c	2016-12-30 15:57:01.000000000 +0100
++++ libnl-libnl3_2_29/src/lib/utils.c	2017-04-26 20:09:18.149933980 +0200
+@@ -81,6 +81,7 @@ void nl_cli_fatal(int err, const char *f
+ 		fprintf(stderr, "\n");
+ 	} else {
+ 		char *buf;
++#ifdef HAVE_STRERROR_L
+ 		locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0);
+ 		if (loc == (locale_t)0) {
+ 			if (errno == ENOENT)
+@@ -91,9 +92,14 @@ void nl_cli_fatal(int err, const char *f
+ 		}
+ 		if (loc != (locale_t)0)
+ 			buf = strerror_l(err, loc);
++#else
++		buf = strerror(err);
++#endif
+ 		fprintf(stderr, "%s\n", buf);
++#ifdef HAVE_STRERROR_L
+ 		if (loc != (locale_t)0)
+ 			freelocale(loc);
++#endif
+ 	}
+ 
+ 	exit(abs(err));