diff --git a/iproute2-3.18.0.tar.sign b/iproute2-3.18.0.tar.sign deleted file mode 100644 index 4e1502a..0000000 Binary files a/iproute2-3.18.0.tar.sign and /dev/null differ diff --git a/iproute2-3.18.0.tar.xz b/iproute2-3.18.0.tar.xz deleted file mode 100644 index 188721e..0000000 --- a/iproute2-3.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5a182154abd0749b1df7d1649115a32c65f559951477396203b1f514dbff1df -size 448396 diff --git a/iproute2-3.19.0.tar.sign b/iproute2-3.19.0.tar.sign new file mode 100644 index 0000000..324308b Binary files /dev/null and b/iproute2-3.19.0.tar.sign differ diff --git a/iproute2-3.19.0.tar.xz b/iproute2-3.19.0.tar.xz new file mode 100644 index 0000000..8edc9e4 --- /dev/null +++ b/iproute2-3.19.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c1615b93df49dac44563d7b57fd7b0 +size 455004 diff --git a/iproute2-doc.changes b/iproute2-doc.changes index 2149fe3..9e01a11 100644 --- a/iproute2-doc.changes +++ b/iproute2-doc.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Feb 22 11:39:04 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 3.19 +* ip link: Add support for remote checksum offload to IP tunnels +* can: Add support for CAN FD non-ISO feature +* ss: Filter inet dgram sockets with established state by default +* ip link: Fix crash on older kernels when showing VF devices +* ss: Unify packet stats output from netlink and proc +* ss: Unify unix stats output from netlink and proc +* tc class: Show classes as ASCII graph +* ip link: Add ipvlan support to the iproute2/ip util + ------------------------------------------------------------------- Wed Jan 7 09:11:03 UTC 2015 - jengelh@inai.de diff --git a/iproute2-doc.spec b/iproute2-doc.spec index 9245fea..bd986cb 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -17,9 +17,9 @@ Name: iproute2-doc -Version: 3.18 +Version: 3.19 Release: 0 -%define rversion 3.18.0 +%define rversion 3.19.0 Summary: Documentation to iproute2 License: GPL-2.0+ Group: Documentation/Other diff --git a/iproute2.changes b/iproute2.changes index 2149fe3..067498f 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Feb 22 11:39:04 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 3.19 +* ip link: Add support for remote checksum offload to IP tunnels +* can: Add support for CAN FD non-ISO feature +* ss: Filter inet dgram sockets with established state by default +* ip link: Fix crash on older kernels when showing VF devices +* ss: Unify packet stats output from netlink and proc +* ss: Unify unix stats output from netlink and proc +* tc class: Show classes as ASCII graph +* ip link: Add ipvlan support to the iproute2/ip util +- Add kernel_xfrm6_raw.patch to recognize more XFRM types + ------------------------------------------------------------------- Wed Jan 7 09:11:03 UTC 2015 - jengelh@inai.de diff --git a/iproute2.spec b/iproute2.spec index ff85b26..d724192 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,9 +17,9 @@ Name: iproute2 -Version: 3.18 +Version: 3.19 Release: 0 -%define rversion 3.18.0 +%define rversion 3.19.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -36,6 +36,7 @@ Patch1: iproute2-dirs.diff Patch2: iproute2-HZ.diff Patch3: revert-pdf-creation.diff Patch4: revert-bison-fix.diff +Patch5: kernel_xfrm6_raw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -53,12 +54,14 @@ BuildRequires: libxtables-devel >= 1.4.11 %endif %endif Provides: iproute = %version-%release +Provides: %name(xfrm6_raw) = %version-%release %description -This package provides the tools ip, tc, and rtmon needed to use the new -and advanced routing options of the Linux kernel. The SUSE Linux -distribution has used this package for network setup since SuSE Linux -8.0. +iproute2 is a collection of user-space utilities to set up networking +under Linux from the command-line. It can inspect and configure, +among other things: interface paramters, IP addresses, routing, +tunnels, bridges, packet transformations (IPsec, etc.), and Quality +of Service. %package -n libnetlink-devel Summary: A Higher Level Interface to the Netlink Service @@ -67,7 +70,7 @@ Group: Development/Libraries/C and C++ Provides: libnetlink = %version-%release %description -n libnetlink-devel -libnetlink provides a higher level interface to rtnetlink(7). +libnetlink provides a higher-level interface to rtnetlink(7). %prep %setup -qn %name-%rversion @@ -78,6 +81,7 @@ libnetlink provides a higher level interface to rtnetlink(7). %if 0%{?sles_version} == 11 %patch -P 4 -p1 %endif +%patch -P 5 -p1 find . -name *.orig -delete %build diff --git a/kernel_xfrm6_raw.patch b/kernel_xfrm6_raw.patch new file mode 100644 index 0000000..4491684 --- /dev/null +++ b/kernel_xfrm6_raw.patch @@ -0,0 +1,51 @@ +From: Jan Engelhardt +Date: 2015-01-21 22:57:10.562539816 +0100 + +xfrm: support displaying transformations used for Mobile IPv6 + +Patch taken from mip6d-ng c397c3b4a16bb2e31a86f6c5e344a1278d1577c5 +and included in openSUSE so as to facilitate mip6d-ng. + +--- + ip/ipxfrm.c | 2 +- + ip/xfrm_policy.c | 1 + + ip/xfrm_state.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +Index: iproute2-3.18.0/ip/ipxfrm.c +=================================================================== +--- iproute2-3.18.0.orig/ip/ipxfrm.c ++++ iproute2-3.18.0/ip/ipxfrm.c +@@ -115,7 +115,7 @@ struct typeent { + static const struct typeent xfrmproto_types[]= { + { "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "comp", IPPROTO_COMP }, + { "route2", IPPROTO_ROUTING }, { "hao", IPPROTO_DSTOPTS }, +- { "ipsec-any", IPSEC_PROTO_ANY }, ++ { "ipsec-any", IPSEC_PROTO_ANY }, { "ipv6", IPPROTO_IPV6 }, + { NULL, -1 } + }; + +Index: iproute2-3.18.0/ip/xfrm_policy.c +=================================================================== +--- iproute2-3.18.0.orig/ip/xfrm_policy.c ++++ iproute2-3.18.0/ip/xfrm_policy.c +@@ -93,6 +93,7 @@ static void usage(void) + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP)); ++ fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_IPV6)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING)); + fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS)); + fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n"); +Index: iproute2-3.18.0/ip/xfrm_state.c +=================================================================== +--- iproute2-3.18.0.orig/ip/xfrm_state.c ++++ iproute2-3.18.0/ip/xfrm_state.c +@@ -73,6 +73,7 @@ static void usage(void) + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP)); ++ fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_IPV6)); + fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING)); + fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS)); + fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n");