Jan Engelhardt 2015-02-22 11:47:38 +00:00 committed by Git OBS Bridge
parent f112700643
commit c5c46b1d7e
9 changed files with 94 additions and 12 deletions

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5a182154abd0749b1df7d1649115a32c65f559951477396203b1f514dbff1df
size 448396

BIN
iproute2-3.19.0.tar.sign Normal file

Binary file not shown.

3
iproute2-3.19.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c1615b93df49dac44563d7b57fd7b0
size 455004

View File

@ -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 Wed Jan 7 09:11:03 UTC 2015 - jengelh@inai.de

View File

@ -17,9 +17,9 @@
Name: iproute2-doc Name: iproute2-doc
Version: 3.18 Version: 3.19
Release: 0 Release: 0
%define rversion 3.18.0 %define rversion 3.19.0
Summary: Documentation to iproute2 Summary: Documentation to iproute2
License: GPL-2.0+ License: GPL-2.0+
Group: Documentation/Other Group: Documentation/Other

View File

@ -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 Wed Jan 7 09:11:03 UTC 2015 - jengelh@inai.de

View File

@ -17,9 +17,9 @@
Name: iproute2 Name: iproute2
Version: 3.18 Version: 3.19
Release: 0 Release: 0
%define rversion 3.18.0 %define rversion 3.19.0
Summary: Linux network configuration utilities Summary: Linux network configuration utilities
License: GPL-2.0 License: GPL-2.0
Group: Productivity/Networking/Routing Group: Productivity/Networking/Routing
@ -36,6 +36,7 @@ Patch1: iproute2-dirs.diff
Patch2: iproute2-HZ.diff Patch2: iproute2-HZ.diff
Patch3: revert-pdf-creation.diff Patch3: revert-pdf-creation.diff
Patch4: revert-bison-fix.diff Patch4: revert-bison-fix.diff
Patch5: kernel_xfrm6_raw.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel BuildRequires: db-devel
@ -53,12 +54,14 @@ BuildRequires: libxtables-devel >= 1.4.11
%endif %endif
%endif %endif
Provides: iproute = %version-%release Provides: iproute = %version-%release
Provides: %name(xfrm6_raw) = %version-%release
%description %description
This package provides the tools ip, tc, and rtmon needed to use the new iproute2 is a collection of user-space utilities to set up networking
and advanced routing options of the Linux kernel. The SUSE Linux under Linux from the command-line. It can inspect and configure,
distribution has used this package for network setup since SuSE Linux among other things: interface paramters, IP addresses, routing,
8.0. tunnels, bridges, packet transformations (IPsec, etc.), and Quality
of Service.
%package -n libnetlink-devel %package -n libnetlink-devel
Summary: A Higher Level Interface to the Netlink Service Summary: A Higher Level Interface to the Netlink Service
@ -67,7 +70,7 @@ Group: Development/Libraries/C and C++
Provides: libnetlink = %version-%release Provides: libnetlink = %version-%release
%description -n libnetlink-devel %description -n libnetlink-devel
libnetlink provides a higher level interface to rtnetlink(7). libnetlink provides a higher-level interface to rtnetlink(7).
%prep %prep
%setup -qn %name-%rversion %setup -qn %name-%rversion
@ -78,6 +81,7 @@ libnetlink provides a higher level interface to rtnetlink(7).
%if 0%{?sles_version} == 11 %if 0%{?sles_version} == 11
%patch -P 4 -p1 %patch -P 4 -p1
%endif %endif
%patch -P 5 -p1
find . -name *.orig -delete find . -name *.orig -delete
%build %build

51
kernel_xfrm6_raw.patch Normal file
View File

@ -0,0 +1,51 @@
From: Jan Engelhardt <jengelh@inai.de>
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");