diff --git a/iproute.spec b/iproute.spec index e04735b..a29f415 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 3.10.0 -Release: 3%{?dist} +Release: 4%{?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.gz @@ -18,6 +18,7 @@ Patch6: iproute2-2.6.39-create-peer-veth-without-a-name.patch Patch7: iproute2-2.6.39-lnstat-dump-to-stdout.patch Patch8: iproute2-3.8.0-unused-result.patch Patch9: iproute2-3.10.0-xfrm-state-overflow.patch +Patch10: iproute2-3.10.0-lnstat-interval.patch License: GPLv2+ and Public Domain BuildRequires: bison BuildRequires: flex @@ -63,7 +64,6 @@ The libnetlink static library. %prep %setup -q -n %{name}2-%{version} %patch0 -p1 -sed -i "s/_VERSION_/%{version}/" man/man8/ss.8 %patch1 -p1 -b .kernel %patch2 -p1 -b .opt_flags %patch3 -p1 -b .ipproto @@ -73,6 +73,7 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8 %patch7 -p1 -b .lnstat-dump-to-stdout %patch8 -p1 -b .unused-result %patch9 -p1 -b .xfrm-state +%patch10 -p1 -b .lnstat-interval sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile %build @@ -172,6 +173,10 @@ done %{_includedir}/libnetlink.h %changelog +* Tue Aug 13 2013 Petr Šabata - 3.10.0-4 +- lnstat -i: Run indefinitely if the --count isn't specified (#977845) +- Switch to unversioned %%docdir + * Sat Aug 03 2013 Fedora Release Engineering - 3.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/iproute2-3.10.0-lnstat-interval.patch b/iproute2-3.10.0-lnstat-interval.patch new file mode 100644 index 0000000..9950183 --- /dev/null +++ b/iproute2-3.10.0-lnstat-interval.patch @@ -0,0 +1,29 @@ +diff --git a/misc/lnstat.c b/misc/lnstat.c +index dca10ad..2889e5e 100644 +--- a/misc/lnstat.c ++++ b/misc/lnstat.c +@@ -226,7 +226,7 @@ int main(int argc, char **argv) + MODE_NORMAL, + } mode = MODE_NORMAL; + +- unsigned long count = 1; ++ unsigned long count = 0; + static struct field_params fp; + int num_req_files = 0; + char *req_files[LNSTAT_MAX_FILES]; +@@ -336,13 +336,14 @@ int main(int argc, char **argv) + if (interval < 1 ) + interval=1; + +- for (i = 0; i < count; i++) { ++ for (i = 0; !count || i < count; ) { + if ((hdr > 1 && (! (i % 20))) || (hdr == 1 && i == 0)) + print_hdr(stdout, header); + lnstat_update(lnstat_files); + print_line(stdout, lnstat_files, &fp); + fflush(stdout); + sleep(interval); ++ if (!count) ++i; + } + } + diff --git a/man-pages.patch b/man-pages.patch index 9199e3e..94e5bc9 100644 --- a/man-pages.patch +++ b/man-pages.patch @@ -65,14 +65,3 @@ diff -up /dev/null iproute2-2.6.29/man/man8/ifcfg.8 + +.SH SEE ALSO +.BR ip-cref.dvi ---- iproute2-2.6.35/man/man8/ss.8 2010-08-04 19:45:59.000000000 +0200 -+++ iproute2-2.6.35/man/man8/ss.8.new 2010-10-11 14:47:06.084216018 +0200 -@@ -114,7 +114,7 @@ - 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), --.BR /usr/share/doc/iproute-doc/ss.html " (package iproute�doc)" -+.BR /usr/share/doc/iproute-doc-_VERSION_/ss.ps " (package iproute-doc)" - .SH AUTHOR - .I ss - was written by Alexey Kuznetosv, .