diff --git a/base/musl/pkg/iproute2/musl-fixes.patch b/base/musl/pkg/iproute2/musl-fixes.patch new file mode 100644 index 000000000..8aaa9b569 --- /dev/null +++ b/base/musl/pkg/iproute2/musl-fixes.patch @@ -0,0 +1,14 @@ +http://git.alpinelinux.org/cgit/aports/plain/main/iproute2/musl-fixes.patch + +Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. + +--- a/include/linux/if_bridge.h.orig 2014-12-28 06:08:02.569567949 +0100 ++++ b/include/linux/if_bridge.h 2014-12-28 06:08:34.736569384 +0100 +@@ -15,7 +15,6 @@ + + #include + #include +-#include + + #define SYSFS_BRIDGE_ATTR "bridge" + #define SYSFS_BRIDGE_FDB "brforward" diff --git a/network/iproute2/0001-include-sys-param.h.patch b/network/iproute2/0001-include-sys-param.h.patch index f1072f815..3566da636 100644 --- a/network/iproute2/0001-include-sys-param.h.patch +++ b/network/iproute2/0001-include-sys-param.h.patch @@ -43,3 +43,14 @@ detected when build in a musl libc based environment #include "utils.h" #include "tc_util.h" +--- ./lib/namespace.c.orig 2015-02-11 00:14:32.000000000 +0100 ++++ ./lib/namespace.c 2015-02-12 18:07:33.139248199 +0100 +@@ -9,7 +9,7 @@ + + #include + #include +- ++#include + #include "utils.h" + #include "namespace.h" + diff --git a/network/iproute2/0002-include-limits.h.patch b/network/iproute2/0002-include-limits.h.patch deleted file mode 100644 index c448f2aa6..000000000 --- a/network/iproute2/0002-include-limits.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../iproute2/0002-include-limits.h.patch -# Copyright (C) 2013 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -include limits.h to get ULONG_MAX declared - ------------------------------------------------------------------------------- -fdb.c: In function 'fdb_modify': -fdb.c:242:30: error: 'ULONG_MAX' undeclared (first use in this function) -fdb.c:242:30: note: each undeclared identifier is reported only once for each function it appears in ------------------------------------------------------------------------------- - -detected when building in a musl based environment - ---- ./bridge/fdb.c.orig 2013-08-29 02:03:20.878642825 +0200 -+++ ./bridge/fdb.c 2013-08-29 02:04:09.963752113 +0200 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "libnetlink.h" - #include "br_common.h" diff --git a/network/iproute2/iproute2.desc b/network/iproute2/iproute2.desc index 4dbfdf709..dfbc27732 100644 --- a/network/iproute2/iproute2.desc +++ b/network/iproute2/iproute2.desc @@ -36,8 +36,7 @@ [L] GPL [S] Stable -[V] 3.10.0 +[V] 3.19.0 [P] X -?---5---9 190.000 -[D] 2492299454 iproute2-3.10.0.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/net/iproute2/ -#[D] 2230047247 iproute2-2.6.35.tar.bz2 http://devresources.linuxfoundation.org/dev/iproute2/download/ +[D] 2558578723 iproute2-3.19.0.tar.xz ftp://ftp.kernel.org/pub/linux/utils/net/iproute2/