diff --git a/iproute.spec b/iproute.spec index fcf86a5..1f79c3e 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 4.0.0 -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 @@ -58,15 +58,6 @@ Patch6: iproute2-3.19.0-lnstat-stdout.patch # https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=e7e2913fe44780edf6a7c45123577a522f7adbb4 Patch7: iproute2-3.19.0-lnstat-interval.patch -# tc: add -OK option -# -# http://thread.gmane.org/gmane.linux.network/284101 -# -# Rejected by upstream. -# -# TODO: Retry upstreaming and decide whether it's needed in Fedora. -Patch8: iproute2-4.0.0-tc-ok.patch - License: GPLv2+ and Public Domain BuildRequires: bison BuildRequires: flex @@ -116,7 +107,6 @@ The libnetlink static library. %patch4 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %build export CFLAGS="%{optflags}" @@ -221,6 +211,9 @@ done %{_includedir}/libnetlink.h %changelog +* Wed May 13 2015 Pavel Šimerda - 4.0.0-3 +- remove patch rejected by upstream + * Mon May 11 2015 Pavel Šimerda - 4.0.0-2 - Remove patch rejected by upstream diff --git a/iproute2-4.0.0-tc-ok.patch b/iproute2-4.0.0-tc-ok.patch deleted file mode 100644 index 495a329..0000000 --- a/iproute2-4.0.0-tc-ok.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 3c4b5a852d5bb9070c7fb4428aa50f2e3e1f6e1b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 19 Sep 2013 11:25:49 +0200 -Subject: [PATCH] Confirm success for each tc -batch command -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If `tc -force -batch' is fed by a controlling program from a pipe, -it's not possible to recognize when a command has been processes -successfully. - -This patch adds an optional `-OK' option to the tc(8) tool, so `tc --force -OK -batch' will print "OK\n" to standard output on each -successfully completed tc command. - -Signed-off-by: Petr Písař ---- - man/man8/tc.8 | 8 +++++++- - tc/tc.c | 8 +++++++- - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/man/man8/tc.8 b/man/man8/tc.8 -index e0acfeb..583eae2 100644 ---- a/man/man8/tc.8 -+++ b/man/man8/tc.8 -@@ -49,7 +49,7 @@ DEV - .P - .ti 8 - .IR OPTIONS " := {" --\fB[ -force ] -b\fR[\fIatch\fR] \fB[ filename ] \fR| -+\fB[ -force ] [ -OK ] -b\fR[\fIatch\fR] \fB[ filename ] \fR| - \fB[ \fB-n\fR[\fIetns\fR] name \fB] \fR| - \fB[ \fB-nm \fR| \fB-nam\fR[\fIes\fR] \fB] \fR| - \fB[ \fR{ \fB-cf \fR| \fB-c\fR[\fIonf\fR] \fR} \fB[ filename ] \fB] \fR} -@@ -440,6 +440,12 @@ First failure will cause termination of tc. - .RS 4 - Shows classes as ASCII graph with stats info under each class. - -+.TP -+.BR "\-OK" -+in batch mode, print -+.B OK -+and a new line on standard output after each successfully interpreted command. -+ - .SH HISTORY - .B tc - was written by Alexey N. Kuznetsov and added in Linux 2.2. -diff --git a/tc/tc.c b/tc/tc.c -index 9b50e74..b43bb47 100644 ---- a/tc/tc.c -+++ b/tc/tc.c -@@ -39,6 +39,7 @@ int batch_mode = 0; - int resolve_hosts = 0; - int use_iec = 0; - int force = 0; -+int ok = 0; - bool use_names = false; - - static char *conf_file; -@@ -183,7 +184,7 @@ noexist: - static void usage(void) - { - fprintf(stderr, "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n" -- " tc [-force] -batch filename\n" -+ " tc [-force] [-OK] -batch filename\n" - "where OBJECT := { qdisc | class | filter | action | monitor }\n" - " OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -p[retty] | -b[atch] [filename] | " - "-n[etns] name |\n" -@@ -251,6 +252,9 @@ static int batch(const char *name) - ret = 1; - if (!force) - break; -+ } else if (ok) { -+ printf("OK\n"); -+ fflush(stdout); - } - } - if (line) -@@ -288,6 +292,8 @@ int main(int argc, char **argv) - return 0; - } else if (matches(argv[1], "-force") == 0) { - ++force; -+ } else if (matches(argv[1], "-OK") == 0) { -+ ++ok; - } else if (matches(argv[1], "-batch") == 0) { - argc--; argv++; - if (argc <= 1) --- -1.8.3.1 -