diff --git a/iproute.spec b/iproute.spec index c88085e..9cceb1e 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 2.6.39 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/%{name}2 Source0: http://devresources.linuxfoundation.org/dev/iproute2/download/%{name}2-%{version}.tar.gz @@ -20,6 +20,7 @@ Patch8: iproute2-2.6.35-print-route.patch Patch9: iproute2-print-route-u32.patch Patch10: iproute2-2.6.39-create-peer-veth-without-a-name.patch Patch11: iproute2-2.6.39-xtables6.patch +Patch12: iproute2-2.6.39-lnstat-dump-to-stdout.patch License: GPLv2+ and Public Domain BuildRequires: tex(latex) tex(dvips) linuxdoc-tools @@ -64,6 +65,7 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8 %patch9 -p1 -b .print-route-u32 %patch10 -p1 -b .peer-veth-without-name %patch11 -p1 -b .xtables6 +%patch12 -p1 -b .lnstat-dump-to-stdout %build export LIBDIR=/%{_libdir} @@ -185,6 +187,9 @@ done %{_includedir}/libnetlink.h %changelog +* Wed Sep 07 2011 Petr Sabata - 2.6.39-4 +- lnstat should dump (-d) to stdout instead of stderr (#736332) + * Tue Jul 26 2011 Petr Sabata - 2.6.39-3 - Rebuild for xtables7 diff --git a/iproute2-2.6.39-lnstat-dump-to-stdout.patch b/iproute2-2.6.39-lnstat-dump-to-stdout.patch new file mode 100644 index 0000000..a5b7b62 --- /dev/null +++ b/iproute2-2.6.39-lnstat-dump-to-stdout.patch @@ -0,0 +1,13 @@ +diff --git a/misc/lnstat.c b/misc/lnstat.c +index 32ab6a4..431bfc7 100644 +--- a/misc/lnstat.c ++++ b/misc/lnstat.c +@@ -322,7 +322,7 @@ int main(int argc, char **argv) + int i; + struct table_hdr *header; + case MODE_DUMP: +- lnstat_dump(stderr, lnstat_files); ++ lnstat_dump(stdout, lnstat_files); + break; + case MODE_NORMAL: +