iproute2: fix on musl.

This commit is contained in:
Christian Neukirchen 2015-09-14 16:35:36 +02:00
parent b781b12846
commit ccefaf1ff9
2 changed files with 40 additions and 14 deletions

View File

@ -1,7 +1,22 @@
Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
--- include/linux/if_bridge.h.orig 2014-12-28 06:08:02.569567949 +0100
+++ include/linux/if_bridge.h 2014-12-28 06:08:34.736569384 +0100
--- include/libiptc/ipt_kernel_headers.h 2015-09-01 01:31:15.000000000 +0200
+++ include/libiptc/ipt_kernel_headers.h 2015-09-14 16:27:41.185174892 +0200
@@ -15,12 +15,10 @@
#else /* libc5 */
#include <sys/socket.h>
#include <linux/ip.h>
-#include <linux/in.h>
#include <linux/if.h>
#include <linux/icmp.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/types.h>
-#include <linux/in6.h>
#endif
#endif
--- include/linux/if_bridge.h 2015-09-01 01:31:15.000000000 +0200
+++ include/linux/if_bridge.h 2015-09-14 16:23:24.472434012 +0200
@@ -15,7 +15,6 @@
#include <linux/types.h>
@ -10,18 +25,19 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
#define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward"
--- include/utils.h.orig 2015-03-17 16:22:53.526187290 +0100
+++ include/utils.h 2015-03-17 16:23:57.390030763 +0100
@@ -1,6 +1,7 @@
#ifndef __UTILS_H__
#define __UTILS_H__ 1
--- include/linux/netfilter.h 2015-09-01 01:31:15.000000000 +0200
+++ include/linux/netfilter.h 2015-09-14 16:27:34.928205553 +0200
@@ -4,8 +4,6 @@
#include <linux/types.h>
+#include <sys/param.h> /* MAXPATHLEN */
#include <sys/types.h>
#include <asm/types.h>
#include <resolv.h>
--- include/linux/xfrm.h.orig 2015-06-28 07:46:32.607697856 +0200
+++ include/linux/xfrm.h 2015-06-28 07:46:37.263753313 +0200
#include <linux/sysctl.h>
-#include <linux/in.h>
-#include <linux/in6.h>
/* Responses from hook functions. */
#define NF_DROP 0
--- include/linux/xfrm.h 2015-09-01 01:31:15.000000000 +0200
+++ include/linux/xfrm.h 2015-09-14 16:23:24.473434008 +0200
@@ -1,7 +1,6 @@
#ifndef _LINUX_XFRM_H
#define _LINUX_XFRM_H
@ -30,3 +46,13 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
#include <linux/types.h>
/* All of the structures in this file may not change size as they are
--- include/utils.h 2015-09-01 01:31:15.000000000 +0200
+++ include/utils.h 2015-09-14 16:23:24.472434012 +0200
@@ -1,6 +1,7 @@
#ifndef __UTILS_H__
#define __UTILS_H__ 1
+#include <sys/param.h> /* MAXPATHLEN */
#include <sys/types.h>
#include <asm/types.h>
#include <resolv.h>

View File

@ -1,7 +1,7 @@
# Template file for 'iproute2'
pkgname=iproute2
version=4.2.0
revision=1
revision=2
build_pie=yes
hostmakedepends="pkg-config perl flex"
makedepends="libfl-devel libmnl-devel db-devel iptables-devel"