iproute-4.14.1-3

- Add upstream suggested backports.
- Make use of %%autosetup macro.
This commit is contained in:
Phil Sutter 2017-12-11 17:12:56 +01:00
parent 73be52ab68
commit 314af1dda2
2 changed files with 20 additions and 9 deletions

View File

@ -1,4 +1,4 @@
From 2332a21bd43ca69ad38a30109881867b9c5c2ea0 Mon Sep 17 00:00:00 2001
From 34f2e1640c6d6a051116478011eb58f995a24076 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Fri, 17 Mar 2017 22:47:27 +0100
Subject: [PATCH] Documentation fixes
@ -11,16 +11,16 @@ Subject: [PATCH] Documentation fixes
diff --git a/man/man8/cbq.8 b/man/man8/cbq.8
new file mode 100644
index 00000000..bef35201
index 0000000000000..bef35201f4eab
--- /dev/null
+++ b/man/man8/cbq.8
@@ -0,0 +1 @@
+.so man8/tc-cbq.8
diff --git a/man/man8/ss.8 b/man/man8/ss.8
index 4ef11523..3898bdbd 100644
index 8565ccb4814aa..5a85bee6a4b7a 100644
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -142,7 +142,7 @@ Read filter information from FILE.
@@ -319,7 +319,7 @@ Read filter information from FILE.
Each line of FILE is interpreted like single command line option. If FILE is - stdin is used.
.TP
.B FILTER := [ state STATE-FILTER ] [ EXPRESSION ]
@ -29,7 +29,7 @@ index 4ef11523..3898bdbd 100644
.SH STATE-FILTER
@@ -197,7 +197,7 @@ Find all local processes connected to X server.
@@ -374,7 +374,7 @@ Find all local processes connected to X server.
List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers.
.SH SEE ALSO
.BR ip (8),
@ -39,5 +39,5 @@ index 4ef11523..3898bdbd 100644
.BR RFC " 793 "
- https://tools.ietf.org/rfc/rfc793.txt (TCP states)
--
2.11.0
2.13.1

View File

@ -2,7 +2,7 @@
Summary: Advanced IP routing and network device configuration tools
Name: iproute
Version: 4.14.1
Release: 2%{?dist}
Release: 3%{?dist}
Group: Applications/System
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
@ -15,6 +15,14 @@ Source2: avpkt
# - Drop reference to Debian from ss.8 man page.
# - We ship ss.ps instead of ss.html.
Patch1: 0001-Documentation-fixes.patch
# Suggested backports by Fixes: tag.
Patch2: 0002-tc-move-action-cookie-print-out-of-the-stats-if.patch
Patch3: 0003-tc-remove-action-cookie-len-from-printout.patch
Patch4: 0004-link_gre6-Detect-invalid-encaplimit-values.patch
Patch5: 0005-man-tc-csum.8-Fix-inconsistency-in-example-descripti.patch
Patch6: 0006-tc-util-Don-t-call-NEXT_ARG_FWD-in-__parse_action_co.patch
Patch7: 0007-ss-remove-duplicate-assignment.patch
Patch8: 0008-tc-bash-completion-add-missing-classid-keyword.patch
License: GPLv2+ and Public Domain
BuildRequires: bison
@ -74,8 +82,7 @@ Provides: iproute-static = %{version}-%{release}
The libnetlink static library.
%prep
%setup -q -n %{name}2-%{version}
%patch1 -p1
%autosetup -p1 -n %{name}2-%{version}
%build
export CFLAGS="%{optflags}"
@ -160,6 +167,10 @@ rm -rf '%{buildroot}%{_docdir}'
%{_includedir}/iproute2/bpf_elf.h
%changelog
* Mon Dec 11 2017 Phil Sutter <psutter@redhat.com> - 4.14.1-3
- Add upstream suggested backports.
- Make use of %%autosetup macro.
* Wed Nov 15 2017 Phil Sutter <psutter@redhat.com> - 4.14.1-2
- Drop unused build dependencies