oasis

commit: 199c705446c8cfcb8162356e41756a9de9bcba5c
parent 2f32b84cb259d95193f0eff42dc08b861df1ed68
Author: Michael Forney <mforney@mforney.org>
Date:   Thu,  4 Jun 2020 22:27:34 -0700

iproute2: Fix some warnings

Diffstat:
M
pkg/iproute2/gen.lua
3
++-
M
pkg/iproute2/patch/0010-ip-Fix-get_link_kind-when-linked-statically.patch
20
++++++++++++++------
A
pkg/iproute2/patch/0014-Prevent-redefinition-of-SIOCGSTAMP-and-SIOCGSTAMPNS.patch
39
+++++++++++++++++++++++++++++++++++++++
M
pkg/iproute2/ver
2
+-

4 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/pkg/iproute2/gen.lua b/pkg/iproute2/gen.lua
@@ -1,6 +1,7 @@
 cflags{
 	'-Wall', '-Wformat=2', '-Wmissing-declarations', '-Wmissing-prototypes',
-	'-Wold-style-definition', '-Wstrict-prototypes',
+	'-Wold-style-definition', '-Wstrict-prototypes', '-Wno-maybe-uninitialized',
+	'-Wno-cpp',  -- we don't have libmnl
 	'-D _GNU_SOURCE',
 	'-D HAVE_SETNS',
 	[[-D 'NETNS_RUN_DIR="/run/netns"']],
diff --git a/pkg/iproute2/patch/0010-ip-Fix-get_link_kind-when-linked-statically.patch b/pkg/iproute2/patch/0010-ip-Fix-get_link_kind-when-linked-statically.patch
@@ -1,17 +1,25 @@
-From 0c041b19587034bd0e0265eeae90cc033c55e658 Mon Sep 17 00:00:00 2001
+From 770cec2780c804cb65a8e6e4ded1d5ea4627c8f3 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 24 Jun 2019 16:03:55 -0700
 Subject: [PATCH] ip: Fix get_link_kind when linked statically
 
 ---
- ip/iplink.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 86 insertions(+), 9 deletions(-)
+ ip/iplink.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 86 insertions(+), 10 deletions(-)
 
 diff --git a/ip/iplink.c b/ip/iplink.c
-index edb88b02..5f5d81e1 100644
+index edb88b02..76207e63 100644
 --- a/ip/iplink.c
 +++ b/ip/iplink.c
-@@ -152,21 +152,98 @@ struct link_util *get_link_kind(const char *id)
+@@ -143,7 +143,6 @@ static int on_off(const char *msg, const char *realval)
+ 	return -1;
+ }
+ 
+-static void *BODY;		/* cached dlopen(NULL) handle */
+ static struct link_util *linkutil_list;
+ 
+ struct link_util *get_link_kind(const char *id)
+@@ -152,21 +151,98 @@ struct link_util *get_link_kind(const char *id)
  	char buf[256];
  	struct link_util *l;
  
@@ -120,5 +128,5 @@ index edb88b02..5f5d81e1 100644
  	snprintf(buf, sizeof(buf), "%s_link_util", id);
  	l = dlsym(dlh, buf);
 -- 
-2.25.0
+2.27.0
 
diff --git a/pkg/iproute2/patch/0014-Prevent-redefinition-of-SIOCGSTAMP-and-SIOCGSTAMPNS.patch b/pkg/iproute2/patch/0014-Prevent-redefinition-of-SIOCGSTAMP-and-SIOCGSTAMPNS.patch
@@ -0,0 +1,39 @@
+From d266a4f1050e083596723e25ce4ffb0be09ab162 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 4 Jun 2020 22:23:11 -0700
+Subject: [PATCH] Prevent redefinition of SIOCGSTAMP and SIOCGSTAMPNS
+
+---
+ include/uapi/linux/sockios.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/uapi/linux/sockios.h b/include/uapi/linux/sockios.h
+index 7d1bccbb..ef870187 100644
+--- a/include/uapi/linux/sockios.h
++++ b/include/uapi/linux/sockios.h
+@@ -39,14 +39,22 @@
+ 
+ #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
+ /* on 64-bit and x32, avoid the ?: operator */
++#ifndef SIOCGSTAMP
+ #define SIOCGSTAMP	SIOCGSTAMP_OLD
++#endif
++#ifndef SIOCGSTAMPNS
+ #define SIOCGSTAMPNS	SIOCGSTAMPNS_OLD
++#endif
+ #else
++#ifndef SIOCGSTAMP
+ #define SIOCGSTAMP	((sizeof(struct timeval))  == 8 ? \
+ 			 SIOCGSTAMP_OLD   : SIOCGSTAMP_NEW)
++#endif
++#ifndef SIOCGSTAMPNS
+ #define SIOCGSTAMPNS	((sizeof(struct timespec)) == 8 ? \
+ 			 SIOCGSTAMPNS_OLD : SIOCGSTAMPNS_NEW)
+ #endif
++#endif
+ 
+ /* Routing table calls. */
+ #define SIOCADDRT	0x890B		/* add routing table entry	*/
+-- 
+2.27.0
+
diff --git a/pkg/iproute2/ver b/pkg/iproute2/ver
@@ -1 +1 @@
-5.7.0 r0
+5.7.0 r1