Merge pull request #3834 from ebfe/iproute2

iproute2: update to 4.5.0.
This commit is contained in:
Enno Boland 2016-03-15 23:12:43 +01:00
commit a06792758e
2 changed files with 2 additions and 27 deletions

View file

@ -1,20 +1,5 @@
Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
--- 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 @@
@ -56,13 +41,3 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
#include <sys/types.h>
#include <asm/types.h>
#include <resolv.h>
--- lib/rt_names.c.orig 2016-01-12 06:30:21.879347385 +0100
+++ lib/rt_names.c 2016-01-12 06:30:34.470474635 +0100
@@ -18,6 +18,7 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <dirent.h>
+#include <limits.h>
#include <asm/types.h>
#include <linux/rtnetlink.h>

View file

@ -1,6 +1,6 @@
# Template file for 'iproute2'
pkgname=iproute2
version=4.4.0
version=4.5.0
revision=1
hostmakedepends="pkg-config perl flex"
makedepends="libfl-devel libmnl-devel db-devel iptables-devel"
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.linux-foundation.org/en/Net:Iproute2"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
checksum=bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514
checksum=3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a
do_configure() {
./configure