* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/files/
@ 2016-01-03 16:19 Jory Pratt
0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2016-01-03 16:19 UTC (permalink / raw
To: gentoo-commits
commit: ad8a8ef884bc60409d3cbbb1256fb5395dc8087b
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 16:18:23 2016 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 16:18:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ad8a8ef8
iproute2 - add missing header for iptables_common.h when building with -iptables
.../files/iproute2-4.3.0-musl-noiptables.patch | 38 ++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/sys-apps/iproute2/files/iproute2-4.3.0-musl-noiptables.patch b/sys-apps/iproute2/files/iproute2-4.3.0-musl-noiptables.patch
new file mode 100644
index 0000000..ef91814
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.3.0-musl-noiptables.patch
@@ -0,0 +1,38 @@
+From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 19 Nov 2015 17:48:55 +0100
+Subject: [PATCH] Add missing <sys/types.h> include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The u_intXX_t types are defined in <sys/types.h>, so it should be
+included before using those types. Otherwise, with certain C
+libraries, the build fails with:
+
+In file included from ../include/iptables.h:4:0,
+ from m_ipt.c:18:
+../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’
+ #define __le32 u_int32_t
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ include/iptables_common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/iptables_common.h b/include/iptables_common.h
+index 9099667..2c27a4b 100644
+--- a/include/iptables_common.h
++++ b/include/iptables_common.h
+@@ -43,6 +43,8 @@ extern char *lib_dir;
+ extern void init_extensions(void);
+ #endif
+
++#include <sys/types.h>
++
+ #define __be32 u_int32_t
+ #define __le32 u_int32_t
+ #define __be16 u_int16_t
+--
+2.6.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/files/
@ 2017-02-21 20:36 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2017-02-21 20:36 UTC (permalink / raw
To: gentoo-commits
commit: 06d0d0fb677e457ac8ab79dc4cb275f76d0ff434
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Feb 21 20:34:40 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Feb 21 20:34:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=06d0d0fb
sys-apps/iproute2: clean up patch a bit
* Match the actual linux-headers as much as possible.
sys-apps/iproute2/files/iproute2-4.10.0-musl.patch | 149 +++++++++------------
1 file changed, 64 insertions(+), 85 deletions(-)
diff --git a/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch
index 0b60bef..bfab37d 100644
--- a/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch
+++ b/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch
@@ -1,6 +1,6 @@
diff -Naur iproute2-4.10.0.orig/bridge/link.c iproute2-4.10.0/bridge/link.c
---- iproute2-4.10.0.orig/bridge/link.c 2017-02-21 11:03:07.250296219 -0800
-+++ iproute2-4.10.0/bridge/link.c 2017-02-21 11:42:30.538120752 -0800
+--- iproute2-4.10.0.orig/bridge/link.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/bridge/link.c 2017-02-21 12:17:02.219298749 -0800
@@ -3,10 +3,10 @@
#include <stdlib.h>
#include <unistd.h>
@@ -13,20 +13,9 @@ diff -Naur iproute2-4.10.0.orig/bridge/link.c iproute2-4.10.0/bridge/link.c
#include <linux/if_bridge.h>
#include <string.h>
#include <stdbool.h>
-diff -Naur iproute2-4.10.0.orig/include/libiptc/ipt_kernel_headers.h iproute2-4.10.0/include/libiptc/ipt_kernel_headers.h
---- iproute2-4.10.0.orig/include/libiptc/ipt_kernel_headers.h 2017-02-21 11:03:07.252296243 -0800
-+++ iproute2-4.10.0/include/libiptc/ipt_kernel_headers.h 2017-02-21 11:03:17.451420794 -0800
-@@ -6,7 +6,6 @@
- #include <limits.h>
-
- #include <netinet/ip.h>
--#include <netinet/in.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
diff -Naur iproute2-4.10.0.orig/include/linux/if_bridge.h iproute2-4.10.0/include/linux/if_bridge.h
---- iproute2-4.10.0.orig/include/linux/if_bridge.h 2017-02-21 11:03:07.263296377 -0800
-+++ iproute2-4.10.0/include/linux/if_bridge.h 2017-02-21 11:03:27.903548436 -0800
+--- iproute2-4.10.0.orig/include/linux/if_bridge.h 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/include/linux/if_bridge.h 2017-02-21 12:28:42.531792431 -0800
@@ -15,7 +15,6 @@
#include <linux/types.h>
@@ -36,8 +25,8 @@ diff -Naur iproute2-4.10.0.orig/include/linux/if_bridge.h iproute2-4.10.0/includ
#define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward"
diff -Naur iproute2-4.10.0.orig/include/linux/if_tunnel.h iproute2-4.10.0/include/linux/if_tunnel.h
---- iproute2-4.10.0.orig/include/linux/if_tunnel.h 2017-02-21 11:03:07.260296341 -0800
-+++ iproute2-4.10.0/include/linux/if_tunnel.h 2017-02-21 11:03:38.648679655 -0800
+--- iproute2-4.10.0.orig/include/linux/if_tunnel.h 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/include/linux/if_tunnel.h 2017-02-21 12:26:13.871203393 -0800
@@ -2,9 +2,7 @@
#define _IF_TUNNEL_H_
@@ -49,20 +38,21 @@ diff -Naur iproute2-4.10.0.orig/include/linux/if_tunnel.h iproute2-4.10.0/includ
diff -Naur iproute2-4.10.0.orig/include/linux/l2tp.h iproute2-4.10.0/include/linux/l2tp.h
---- iproute2-4.10.0.orig/include/linux/l2tp.h 2017-02-21 11:03:07.259296328 -0800
-+++ iproute2-4.10.0/include/linux/l2tp.h 2017-02-21 11:04:48.101527812 -0800
-@@ -9,8 +9,6 @@
+--- iproute2-4.10.0.orig/include/linux/l2tp.h 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/include/linux/l2tp.h 2017-02-21 12:17:02.220298759 -0800
+@@ -9,8 +9,7 @@
#include <linux/types.h>
#include <linux/socket.h>
-#include <linux/in.h>
-#include <linux/in6.h>
++#include <netinet/in.h>
#define IPPROTO_L2TP 115
diff -Naur iproute2-4.10.0.orig/include/linux/netfilter.h iproute2-4.10.0/include/linux/netfilter.h
---- iproute2-4.10.0.orig/include/linux/netfilter.h 2017-02-21 11:03:07.257296304 -0800
-+++ iproute2-4.10.0/include/linux/netfilter.h 2017-02-21 11:03:48.968805684 -0800
+--- iproute2-4.10.0.orig/include/linux/netfilter.h 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/include/linux/netfilter.h 2017-02-21 12:30:04.969673613 -0800
@@ -4,8 +4,6 @@
#include <linux/types.h>
@@ -73,8 +63,8 @@ diff -Naur iproute2-4.10.0.orig/include/linux/netfilter.h iproute2-4.10.0/includ
/* Responses from hook functions. */
#define NF_DROP 0
diff -Naur iproute2-4.10.0.orig/include/linux/xfrm.h iproute2-4.10.0/include/linux/xfrm.h
---- iproute2-4.10.0.orig/include/linux/xfrm.h 2017-02-21 11:03:07.262296365 -0800
-+++ iproute2-4.10.0/include/linux/xfrm.h 2017-02-21 11:03:59.822938235 -0800
+--- iproute2-4.10.0.orig/include/linux/xfrm.h 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/include/linux/xfrm.h 2017-02-21 12:27:48.169211348 -0800
@@ -1,7 +1,6 @@
#ifndef _LINUX_XFRM_H
#define _LINUX_XFRM_H
@@ -83,20 +73,9 @@ diff -Naur iproute2-4.10.0.orig/include/linux/xfrm.h iproute2-4.10.0/include/lin
#include <linux/types.h>
/* All of the structures in this file may not change size as they are
-diff -Naur iproute2-4.10.0.orig/include/xtables.h iproute2-4.10.0/include/xtables.h
---- iproute2-4.10.0.orig/include/xtables.h 2017-02-21 11:03:07.268296438 -0800
-+++ iproute2-4.10.0/include/xtables.h 2017-02-21 11:04:14.113112746 -0800
-@@ -13,7 +13,6 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <netinet/in.h>
--#include <net/if.h>
- #include <linux/types.h>
- #include <linux/netfilter.h>
- #include <linux/netfilter/x_tables.h>
diff -Naur iproute2-4.10.0.orig/ip/ip6tunnel.c iproute2-4.10.0/ip/ip6tunnel.c
---- iproute2-4.10.0.orig/ip/ip6tunnel.c 2017-02-21 11:03:07.293296744 -0800
-+++ iproute2-4.10.0/ip/ip6tunnel.c 2017-02-21 11:25:56.151628761 -0800
+--- iproute2-4.10.0.orig/ip/ip6tunnel.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/ip6tunnel.c 2017-02-21 12:23:12.679266625 -0800
@@ -23,13 +23,13 @@
#include <string.h>
#include <stdlib.h>
@@ -114,8 +93,8 @@ diff -Naur iproute2-4.10.0.orig/ip/ip6tunnel.c iproute2-4.10.0/ip/ip6tunnel.c
#include <linux/ip6_tunnel.h>
diff -Naur iproute2-4.10.0.orig/ip/ipaddress.c iproute2-4.10.0/ip/ipaddress.c
---- iproute2-4.10.0.orig/ip/ipaddress.c 2017-02-21 11:03:07.291296719 -0800
-+++ iproute2-4.10.0/ip/ipaddress.c 2017-02-21 11:23:33.232950712 -0800
+--- iproute2-4.10.0.orig/ip/ipaddress.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/ipaddress.c 2017-02-21 12:17:02.221298770 -0800
@@ -16,18 +16,18 @@
#include <syslog.h>
#include <inttypes.h>
@@ -138,8 +117,8 @@ diff -Naur iproute2-4.10.0.orig/ip/ipaddress.c iproute2-4.10.0/ip/ipaddress.c
#include <linux/net_namespace.h>
diff -Naur iproute2-4.10.0.orig/ip/ipl2tp.c iproute2-4.10.0/ip/ipl2tp.c
---- iproute2-4.10.0.orig/ip/ipl2tp.c 2017-02-21 11:03:07.293296744 -0800
-+++ iproute2-4.10.0/ip/ipl2tp.c 2017-02-21 11:31:27.873494720 -0800
+--- iproute2-4.10.0.orig/ip/ipl2tp.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/ipl2tp.c 2017-02-21 12:17:02.222298781 -0800
@@ -19,8 +19,6 @@
#include <sys/socket.h>
#include <arpa/inet.h>
@@ -150,8 +129,8 @@ diff -Naur iproute2-4.10.0.orig/ip/ipl2tp.c iproute2-4.10.0/ip/ipl2tp.c
#include <linux/genetlink.h>
diff -Naur iproute2-4.10.0.orig/ip/ipmaddr.c iproute2-4.10.0/ip/ipmaddr.c
---- iproute2-4.10.0.orig/ip/ipmaddr.c 2017-02-21 11:03:07.290296707 -0800
-+++ iproute2-4.10.0/ip/ipmaddr.c 2017-02-21 11:28:36.392504858 -0800
+--- iproute2-4.10.0.orig/ip/ipmaddr.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/ipmaddr.c 2017-02-21 12:17:02.222298781 -0800
@@ -15,15 +15,13 @@
#include <unistd.h>
#include <syslog.h>
@@ -170,8 +149,8 @@ diff -Naur iproute2-4.10.0.orig/ip/ipmaddr.c iproute2-4.10.0/ip/ipmaddr.c
#include "rt_names.h"
diff -Naur iproute2-4.10.0.orig/ip/ipmroute.c iproute2-4.10.0/ip/ipmroute.c
---- iproute2-4.10.0.orig/ip/ipmroute.c 2017-02-21 11:03:07.290296707 -0800
-+++ iproute2-4.10.0/ip/ipmroute.c 2017-02-21 11:27:16.582572938 -0800
+--- iproute2-4.10.0.orig/ip/ipmroute.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/ipmroute.c 2017-02-21 12:17:02.223298792 -0800
@@ -22,9 +22,6 @@
#include <arpa/inet.h>
#include <string.h>
@@ -183,8 +162,8 @@ diff -Naur iproute2-4.10.0.orig/ip/ipmroute.c iproute2-4.10.0/ip/ipmroute.c
#include <rt_names.h>
diff -Naur iproute2-4.10.0.orig/ip/iprule.c iproute2-4.10.0/ip/iprule.c
---- iproute2-4.10.0.orig/ip/iprule.c 2017-02-21 11:03:07.287296670 -0800
-+++ iproute2-4.10.0/ip/iprule.c 2017-02-21 11:22:23.660130756 -0800
+--- iproute2-4.10.0.orig/ip/iprule.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/iprule.c 2017-02-21 12:17:02.223298792 -0800
@@ -15,12 +15,12 @@
#include <unistd.h>
#include <syslog.h>
@@ -200,8 +179,8 @@ diff -Naur iproute2-4.10.0.orig/ip/iprule.c iproute2-4.10.0/ip/iprule.c
#include <errno.h>
diff -Naur iproute2-4.10.0.orig/ip/iptoken.c iproute2-4.10.0/ip/iptoken.c
---- iproute2-4.10.0.orig/ip/iptoken.c 2017-02-21 11:03:07.288296683 -0800
-+++ iproute2-4.10.0/ip/iptoken.c 2017-02-21 11:29:24.307060858 -0800
+--- iproute2-4.10.0.orig/ip/iptoken.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/iptoken.c 2017-02-21 12:17:02.224298802 -0800
@@ -16,12 +16,12 @@
#include <syslog.h>
#include <fcntl.h>
@@ -217,8 +196,8 @@ diff -Naur iproute2-4.10.0.orig/ip/iptoken.c iproute2-4.10.0/ip/iptoken.c
#include "rt_names.h"
#include "utils.h"
diff -Naur iproute2-4.10.0.orig/ip/iptuntap.c iproute2-4.10.0/ip/iptuntap.c
---- iproute2-4.10.0.orig/ip/iptuntap.c 2017-02-21 11:03:07.293296744 -0800
-+++ iproute2-4.10.0/ip/iptuntap.c 2017-02-21 11:27:54.528018380 -0800
+--- iproute2-4.10.0.orig/ip/iptuntap.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/iptuntap.c 2017-02-21 12:17:02.224298802 -0800
@@ -14,11 +14,11 @@
#include <stdlib.h>
#include <string.h>
@@ -233,8 +212,8 @@ diff -Naur iproute2-4.10.0.orig/ip/iptuntap.c iproute2-4.10.0/ip/iptuntap.c
#include <pwd.h>
#include <grp.h>
diff -Naur iproute2-4.10.0.orig/ip/tcp_metrics.c iproute2-4.10.0/ip/tcp_metrics.c
---- iproute2-4.10.0.orig/ip/tcp_metrics.c 2017-02-21 11:03:07.294296756 -0800
-+++ iproute2-4.10.0/ip/tcp_metrics.c 2017-02-21 11:32:07.345952757 -0800
+--- iproute2-4.10.0.orig/ip/tcp_metrics.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/tcp_metrics.c 2017-02-21 12:17:02.224298802 -0800
@@ -17,7 +17,6 @@
#include <sys/socket.h>
#include <arpa/inet.h>
@@ -244,8 +223,8 @@ diff -Naur iproute2-4.10.0.orig/ip/tcp_metrics.c iproute2-4.10.0/ip/tcp_metrics.
#include <linux/genetlink.h>
#include <linux/tcp_metrics.h>
diff -Naur iproute2-4.10.0.orig/ip/tunnel.c iproute2-4.10.0/ip/tunnel.c
---- iproute2-4.10.0.orig/ip/tunnel.c 2017-02-21 11:03:07.293296744 -0800
-+++ iproute2-4.10.0/ip/tunnel.c 2017-02-21 11:25:12.085111465 -0800
+--- iproute2-4.10.0.orig/ip/tunnel.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/ip/tunnel.c 2017-02-21 12:22:52.571051688 -0800
@@ -26,11 +26,11 @@
#include <string.h>
#include <unistd.h>
@@ -260,8 +239,8 @@ diff -Naur iproute2-4.10.0.orig/ip/tunnel.c iproute2-4.10.0/ip/tunnel.c
#include <linux/if_tunnel.h>
diff -Naur iproute2-4.10.0.orig/lib/ll_addr.c iproute2-4.10.0/lib/ll_addr.c
---- iproute2-4.10.0.orig/lib/ll_addr.c 2017-02-21 11:03:07.271296475 -0800
-+++ iproute2-4.10.0/lib/ll_addr.c 2017-02-21 11:20:26.002744097 -0800
+--- iproute2-4.10.0.orig/lib/ll_addr.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/lib/ll_addr.c 2017-02-21 12:17:02.225298813 -0800
@@ -14,6 +14,7 @@
#include <unistd.h>
#include <syslog.h>
@@ -280,8 +259,8 @@ diff -Naur iproute2-4.10.0.orig/lib/ll_addr.c iproute2-4.10.0/lib/ll_addr.c
#include "rt_names.h"
diff -Naur iproute2-4.10.0.orig/lib/ll_proto.c iproute2-4.10.0/lib/ll_proto.c
---- iproute2-4.10.0.orig/lib/ll_proto.c 2017-02-21 11:03:07.272296487 -0800
-+++ iproute2-4.10.0/lib/ll_proto.c 2017-02-21 11:19:45.641268414 -0800
+--- iproute2-4.10.0.orig/lib/ll_proto.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/lib/ll_proto.c 2017-02-21 12:17:02.225298813 -0800
@@ -14,15 +14,15 @@
#include <unistd.h>
#include <syslog.h>
@@ -301,8 +280,8 @@ diff -Naur iproute2-4.10.0.orig/lib/ll_proto.c iproute2-4.10.0/lib/ll_proto.c
#include "utils.h"
diff -Naur iproute2-4.10.0.orig/lib/ll_types.c iproute2-4.10.0/lib/ll_types.c
---- iproute2-4.10.0.orig/lib/ll_types.c 2017-02-21 11:03:07.272296487 -0800
-+++ iproute2-4.10.0/lib/ll_types.c 2017-02-21 11:19:53.585362039 -0800
+--- iproute2-4.10.0.orig/lib/ll_types.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/lib/ll_types.c 2017-02-21 12:17:02.225298813 -0800
@@ -14,6 +14,7 @@
#include <unistd.h>
#include <syslog.h>
@@ -321,8 +300,8 @@ diff -Naur iproute2-4.10.0.orig/lib/ll_types.c iproute2-4.10.0/lib/ll_types.c
#include "rt_names.h"
diff -Naur iproute2-4.10.0.orig/lib/utils.c iproute2-4.10.0/lib/utils.c
---- iproute2-4.10.0.orig/lib/utils.c 2017-02-21 11:03:07.272296487 -0800
-+++ iproute2-4.10.0/lib/utils.c 2017-02-21 11:20:03.213475512 -0800
+--- iproute2-4.10.0.orig/lib/utils.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/lib/utils.c 2017-02-21 12:17:02.225298813 -0800
@@ -17,6 +17,7 @@
#include <syslog.h>
#include <fcntl.h>
@@ -340,8 +319,8 @@ diff -Naur iproute2-4.10.0.orig/lib/utils.c iproute2-4.10.0/lib/utils.c
#include <time.h>
#include <sys/time.h>
diff -Naur iproute2-4.10.0.orig/misc/arpd.c iproute2-4.10.0/misc/arpd.c
---- iproute2-4.10.0.orig/misc/arpd.c 2017-02-21 11:03:07.311296964 -0800
-+++ iproute2-4.10.0/misc/arpd.c 2017-02-21 11:51:14.089070684 -0800
+--- iproute2-4.10.0.orig/misc/arpd.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/misc/arpd.c 2017-02-21 12:17:02.226298824 -0800
@@ -18,18 +18,18 @@
#include <netdb.h>
#include <db_185.h>
@@ -366,8 +345,8 @@ diff -Naur iproute2-4.10.0.orig/misc/arpd.c iproute2-4.10.0/misc/arpd.c
#include <linux/if_packet.h>
#include <linux/filter.h>
diff -Naur iproute2-4.10.0.orig/misc/ifstat.c iproute2-4.10.0/misc/ifstat.c
---- iproute2-4.10.0.orig/misc/ifstat.c 2017-02-21 11:03:07.310296951 -0800
-+++ iproute2-4.10.0/misc/ifstat.c 2017-02-21 11:51:21.050149031 -0800
+--- iproute2-4.10.0.orig/misc/ifstat.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/misc/ifstat.c 2017-02-21 12:17:02.226298824 -0800
@@ -21,7 +21,7 @@
#include <sys/file.h>
#include <sys/socket.h>
@@ -378,8 +357,8 @@ diff -Naur iproute2-4.10.0.orig/misc/ifstat.c iproute2-4.10.0/misc/ifstat.c
#include <sys/stat.h>
#include <signal.h>
diff -Naur iproute2-4.10.0.orig/misc/nstat.c iproute2-4.10.0/misc/nstat.c
---- iproute2-4.10.0.orig/misc/nstat.c 2017-02-21 11:03:07.311296964 -0800
-+++ iproute2-4.10.0/misc/nstat.c 2017-02-21 11:51:27.410220614 -0800
+--- iproute2-4.10.0.orig/misc/nstat.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/misc/nstat.c 2017-02-21 12:17:02.227298835 -0800
@@ -21,7 +21,7 @@
#include <sys/file.h>
#include <sys/socket.h>
@@ -390,8 +369,8 @@ diff -Naur iproute2-4.10.0.orig/misc/nstat.c iproute2-4.10.0/misc/nstat.c
#include <sys/stat.h>
#include <signal.h>
diff -Naur iproute2-4.10.0.orig/misc/rtacct.c iproute2-4.10.0/misc/rtacct.c
---- iproute2-4.10.0.orig/misc/rtacct.c 2017-02-21 11:03:07.310296951 -0800
-+++ iproute2-4.10.0/misc/rtacct.c 2017-02-21 11:51:35.029306367 -0800
+--- iproute2-4.10.0.orig/misc/rtacct.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/misc/rtacct.c 2017-02-21 12:17:02.227298835 -0800
@@ -22,7 +22,7 @@
#include <sys/file.h>
#include <sys/socket.h>
@@ -402,8 +381,8 @@ diff -Naur iproute2-4.10.0.orig/misc/rtacct.c iproute2-4.10.0/misc/rtacct.c
#include <sys/stat.h>
#include <sys/mman.h>
diff -Naur iproute2-4.10.0.orig/misc/ss.c iproute2-4.10.0/misc/ss.c
---- iproute2-4.10.0.orig/misc/ss.c 2017-02-21 11:03:07.310296951 -0800
-+++ iproute2-4.10.0/misc/ss.c 2017-02-21 11:47:39.236637197 -0800
+--- iproute2-4.10.0.orig/misc/ss.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/misc/ss.c 2017-02-21 12:17:02.228298845 -0800
@@ -14,6 +14,7 @@
#include <unistd.h>
#include <syslog.h>
@@ -421,8 +400,8 @@ diff -Naur iproute2-4.10.0.orig/misc/ss.c iproute2-4.10.0/misc/ss.c
#include <linux/packet_diag.h>
#include <linux/netlink_diag.h>
diff -Naur iproute2-4.10.0.orig/tc/f_basic.c iproute2-4.10.0/tc/f_basic.c
---- iproute2-4.10.0.orig/tc/f_basic.c 2017-02-21 11:03:07.307296915 -0800
-+++ iproute2-4.10.0/tc/f_basic.c 2017-02-21 11:33:07.491644936 -0800
+--- iproute2-4.10.0.orig/tc/f_basic.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/tc/f_basic.c 2017-02-21 12:17:02.228298845 -0800
@@ -19,7 +19,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -432,8 +411,8 @@ diff -Naur iproute2-4.10.0.orig/tc/f_basic.c iproute2-4.10.0/tc/f_basic.c
#include "utils.h"
#include "tc_util.h"
diff -Naur iproute2-4.10.0.orig/tc/f_fw.c iproute2-4.10.0/tc/f_fw.c
---- iproute2-4.10.0.orig/tc/f_fw.c 2017-02-21 11:03:07.303296866 -0800
-+++ iproute2-4.10.0/tc/f_fw.c 2017-02-21 11:37:50.341899304 -0800
+--- iproute2-4.10.0.orig/tc/f_fw.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/tc/f_fw.c 2017-02-21 12:17:02.229298856 -0800
@@ -15,11 +15,11 @@
#include <unistd.h>
#include <syslog.h>
@@ -448,8 +427,8 @@ diff -Naur iproute2-4.10.0.orig/tc/f_fw.c iproute2-4.10.0/tc/f_fw.c
#include "tc_util.h"
diff -Naur iproute2-4.10.0.orig/tc/f_matchall.c iproute2-4.10.0/tc/f_matchall.c
---- iproute2-4.10.0.orig/tc/f_matchall.c 2017-02-21 11:03:07.306296902 -0800
-+++ iproute2-4.10.0/tc/f_matchall.c 2017-02-21 11:33:23.186825281 -0800
+--- iproute2-4.10.0.orig/tc/f_matchall.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/tc/f_matchall.c 2017-02-21 12:17:02.229298856 -0800
@@ -19,7 +19,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -459,8 +438,8 @@ diff -Naur iproute2-4.10.0.orig/tc/f_matchall.c iproute2-4.10.0/tc/f_matchall.c
#include "utils.h"
#include "tc_util.h"
diff -Naur iproute2-4.10.0.orig/tc/f_u32.c iproute2-4.10.0/tc/f_u32.c
---- iproute2-4.10.0.orig/tc/f_u32.c 2017-02-21 11:03:07.301296841 -0800
-+++ iproute2-4.10.0/tc/f_u32.c 2017-02-21 11:37:37.844754977 -0800
+--- iproute2-4.10.0.orig/tc/f_u32.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/tc/f_u32.c 2017-02-21 12:17:02.229298856 -0800
@@ -16,12 +16,12 @@
#include <unistd.h>
#include <syslog.h>
@@ -477,8 +456,8 @@ diff -Naur iproute2-4.10.0.orig/tc/f_u32.c iproute2-4.10.0/tc/f_u32.c
#include "utils.h"
#include "tc_util.h"
diff -Naur iproute2-4.10.0.orig/tc/m_ife.c iproute2-4.10.0/tc/m_ife.c
---- iproute2-4.10.0.orig/tc/m_ife.c 2017-02-21 11:03:07.302296854 -0800
-+++ iproute2-4.10.0/tc/m_ife.c 2017-02-21 11:41:30.971442081 -0800
+--- iproute2-4.10.0.orig/tc/m_ife.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/tc/m_ife.c 2017-02-21 12:17:02.230298867 -0800
@@ -17,9 +17,9 @@
#include <fcntl.h>
#include <sys/socket.h>
@@ -491,8 +470,8 @@ diff -Naur iproute2-4.10.0.orig/tc/m_ife.c iproute2-4.10.0/tc/m_ife.c
#include "rt_names.h"
#include "utils.h"
diff -Naur iproute2-4.10.0.orig/tc/m_xt.c iproute2-4.10.0/tc/m_xt.c
---- iproute2-4.10.0.orig/tc/m_xt.c 2017-02-21 11:03:07.302296854 -0800
-+++ iproute2-4.10.0/tc/m_xt.c 2017-02-21 11:39:51.918303374 -0800
+--- iproute2-4.10.0.orig/tc/m_xt.c 2017-02-20 08:47:52.000000000 -0800
++++ iproute2-4.10.0/tc/m_xt.c 2017-02-21 12:17:02.230298867 -0800
@@ -14,10 +14,9 @@
#include <sys/socket.h>
#include <netinet/in.h>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/files/
@ 2018-01-30 20:59 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2018-01-30 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 00671126e1e24f23a49e13915ed6636a64f7087b
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Jan 30 20:58:41 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Jan 30 20:58:41 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=00671126
sys-apps/iproute2: fix patch
sys-apps/iproute2/files/iproute2-4.15.0-musl.patch | 55 ++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
index bd15130..8c4a924 100644
--- a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
+++ b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
@@ -177,3 +177,58 @@ diff -Naur iproute2-4.15.0.orig/tc/f_flower.c iproute2-4.15.0/tc/f_flower.c
#include <linux/if_ether.h>
#include <linux/ip.h>
#include <linux/tc_act/tc_vlan.h>
+diff -Naur iproute2-4.15.0.orig/tc/m_mirred.c iproute2-4.15.0/tc/m_mirred.c
+--- iproute2-4.15.0.orig/tc/m_mirred.c 2018-01-30 12:22:46.377424243 -0800
++++ iproute2-4.15.0/tc/m_mirred.c 2018-01-30 12:57:12.620387241 -0800
+@@ -17,6 +17,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
++#include <net/if.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+diff -Naur iproute2-4.15.0.orig/tc/tc_class.c iproute2-4.15.0/tc/tc_class.c
+--- iproute2-4.15.0.orig/tc/tc_class.c 2018-01-30 12:22:46.369424244 -0800
++++ iproute2-4.15.0/tc/tc_class.c 2018-01-30 12:54:53.420389734 -0800
+@@ -15,6 +15,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
++#include <net/if.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+diff -Naur iproute2-4.15.0.orig/tc/tc_filter.c iproute2-4.15.0/tc/tc_filter.c
+--- iproute2-4.15.0.orig/tc/tc_filter.c 2018-01-30 12:22:46.368424244 -0800
++++ iproute2-4.15.0/tc/tc_filter.c 2018-01-30 12:56:02.186388502 -0800
+@@ -15,6 +15,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
++#include <net/if.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+diff -Naur iproute2-4.15.0.orig/tc/tc_qdisc.c iproute2-4.15.0/tc/tc_qdisc.c
+--- iproute2-4.15.0.orig/tc/tc_qdisc.c 2018-01-30 12:22:46.368424244 -0800
++++ iproute2-4.15.0/tc/tc_qdisc.c 2018-01-30 12:53:37.801391088 -0800
+@@ -15,6 +15,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
++#include <net/if.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+diff -Naur iproute2-4.15.0.orig/tc/tc_util.h iproute2-4.15.0/tc/tc_util.h
+--- iproute2-4.15.0.orig/tc/tc_util.h 2018-01-30 12:22:46.367424244 -0800
++++ iproute2-4.15.0/tc/tc_util.h 2018-01-30 12:51:24.463393476 -0800
+@@ -4,7 +4,6 @@
+
+ #define MAX_MSG 16384
+ #include <limits.h>
+-#include <linux/if.h>
+
+ #include <linux/pkt_sched.h>
+ #include <linux/pkt_cls.h>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-30 20:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-03 16:19 [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/files/ Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2017-02-21 20:36 Aric Belsito
2018-01-30 20:59 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox