From 8bc40918bb0c05b3824387960a0076affa0fe3786a71a6792f0c62c4ff0058db Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 29 Jul 2009 13:51:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=19 --- iproute2-2.6.25-iptunnel-fclose.diff | 18 ++ iproute2.changes | 6 + iproute2.spec | 275 +-------------------------- 3 files changed, 27 insertions(+), 272 deletions(-) create mode 100644 iproute2-2.6.25-iptunnel-fclose.diff diff --git a/iproute2-2.6.25-iptunnel-fclose.diff b/iproute2-2.6.25-iptunnel-fclose.diff new file mode 100644 index 0000000..7028ed5 --- /dev/null +++ b/iproute2-2.6.25-iptunnel-fclose.diff @@ -0,0 +1,18 @@ +--- ip/iptunnel.c 2009-07-28 13:28:59.000000000 +0200 ++++ ip/iptunnel.c 2009-07-28 13:29:29.000000000 +0200 +@@ -400,6 +400,7 @@ + if ((ptr = strchr(buf, ':')) == NULL || + (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) { + fprintf(stderr, "Wrong format of /proc/net/dev. Sorry.\n"); ++ fclose (fp); + return -1; + } + if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld", +@@ -438,6 +439,7 @@ + } + printf("\n"); + } ++ fclose (fp); + return 0; + } + diff --git a/iproute2.changes b/iproute2.changes index c23a8c1..f36ceb0 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 28 13:31:54 CEST 2009 - ms@suse.de + +- make sure do_tunnels_list proc file descriptor will be + closed after use or on proc read error (bnc #525834) + ------------------------------------------------------------------- Thu Feb 19 14:03:23 CET 2009 - ms@suse.de diff --git a/iproute2.spec b/iproute2.spec index a7a5470..bc73747 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -25,7 +25,7 @@ Group: Productivity/Networking/Routing Provides: iproute AutoReqProv: on Version: 2.6.25 -Release: 45 +Release: 46 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version.tar.bz2 @@ -43,6 +43,7 @@ Patch10: %name-2.6.25-warnings.diff Patch11: %name-2.6.25-hw-address-size.diff Patch12: %name-2.6.25-skbedit-memset.diff Patch13: %name-2.6.25-ss-inet6.diff +Patch14: %name-2.6.25-iptunnel-fclose.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnetlink-devel @@ -85,6 +86,7 @@ Authors: %patch11 -p1 %patch12 %patch13 +%patch14 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -135,274 +137,3 @@ rm -rf $RPM_BUILD_ROOT %_libdir/lib* %changelog -* Thu Feb 19 2009 ms@suse.de -- fixed ss utility to display inet6 addresses if requested - with -6 or -f inet6 (bnc #473156) -* Tue Jan 27 2009 ms@suse.de -- fixed a bug in which the memory for the tc_skbedit struct was - being used uninitialized to 0. This patch corrects the issue - by using a memset to 0 out the memory of the - structure (bnc #438950) -* Thu Dec 11 2008 agruen@suse.de -- Change max length of the MAC address from 16 bytes to 32 bytes - to accommodate infiniband (bnc#445014). -* Mon Oct 13 2008 ms@suse.de -- fixed compiler warnings (bnc #434714) -* Thu Sep 18 2008 hare@suse.de -- Add skbedit support for FCoE (FATE#303914) -- Add multiqueue support for FCoE (FATE#303914) -- Rename libnl to libnetlink-devel -- Fix IPPROTO_DCCP redefine -- rpmlint fixes -* Mon Jul 14 2008 ms@suse.de -- update to version 2.6.25 - * Fix off by one in nested attribute management. - * netem potential dist table overflow - * rto_min value display overflow - * Overhead calculation is now done in the kernel. - * libnetlink: don't spin forever on receive error - * Protocol field on tc_filter is required by the kernel, provide it - * Add missing prefix bit length for addrlabel - * Do not strip binaries with `install` - * In police, fix uninitialized "overhead" variable. - * lots of documentation fixes -* Fri Jul 11 2008 ms@suse.de -- fixed RTM_NEWLINK check for older kernels (bnc #407954) -* Mon Jun 30 2008 ms@suse.de -- fixed 'tc qdisc' segmentation fault (bnc #404755) -* Thu May 08 2008 ms@suse.de -- compile libnetlink with -fPIC (bnc #388021) -* Wed Apr 16 2008 schwab@suse.de -- Don't strip binaries. -* Thu Oct 25 2007 ms@suse.de -- update to version 2.6.23, fixed (#336488) - Reason for update: - * The macvlan module, which got added to the kernel in version - 2.6.23, needs the new "ip link add" feature - These patches add a rewritten version of Ben's macvlan driver, which - allows to create virtual ethernet devices. The underlying device is - put in promiscous mode and packets are demuxed based on MAC address. - It behaves similar to bridge devices in that packets are visible on - the real device before delivery to the macvlan driver. The driver - supports all features of the underlying device except VLAN - acceleration, this is currently very hard to support. I might look - into this in the future. - The main downside of this driver is that it adds another hook in - netif_receive_skb, unfortunately that is unavoidable. When not - compiled in the hook vanishes of course. - Usage is simple: - ip link add link eth0 type macvlan - Will create a macvlan0 device with a random MAC address on top of - eth0. No iproute patches are required. -* Tue Oct 16 2007 jdelvare@suse.de -- libnetlink.3 is now part of the upstream package, no need to - include our own copy. -* Wed Jul 11 2007 ms@suse.de -- update to version 2.6.22, fixed (#288551) - * Kim Woelders , various useful fixups: compilation - with old kernels, cross-compiling, "all" == "any" in prefix spec. - * Collected from my disk, cleaned and packed to directory iproute2/misc/ - several utilities: ss, nstat, ifstat, rtacct, arpd and module tcp_diag. - Writing some docs. me. - * prepared patchlet for pidentd to use tcp_diag. - * David Miller: 64bit (and even worse 64bit kernel/32 bit user :-) fixes - to above. tcp_diag is merged to main tree. - * Alexandr D. Kanevskiy : various flaws in ss - * Alexandr D. Kanevskiy : oops, more aggressive caching - of names opened old bugs: ip started to print garbage in some places. - * Robert Olsson, rt_cache_stat. Renamed to rtstat. - * An old bug in "ip maddr ls": reduntant empty lines in output. - Seeing this crap for ages but lucky match of desire/ability to repair - and a huff about this happened only today. :-) - * "Mr. James W. Laferriere" - doc: option to produce ps output for non-a4 and not only 2 pages/sheet. - * Jamal's patch for ingres qdisc. - * Bernd Eckenfels : deleted orphaned bogus #include - in include/utils.h. - * Julian Anastasov : uninitialized fields in nexthop - producing funny "dead" nexthops in multipath routes. - Stupid me, look at the first line in [010803]... Was it difficult to guess - this that time? People blame for several months. :-) - Special thanks to bert hubert who raised the issue in netdev. - Thanks and apologies to Terry Schmidt , - Ruben Puettmann , - Mark Ivens . - * willy tarreau : "make install" target. - * Tunable limit for sch_sfq. Patch to kernel activating this - is about to be submitted. Reminded by Adi Nugroho -* Fri Apr 20 2007 aj@suse.de -- Use texlive for building. -* Mon Apr 02 2007 rguenther@suse.de -- add bison and flex BuildRequires -* Thu Feb 08 2007 ms@suse.de -- fixed array size of name string in iptables.h (#243281) - array of size IPT_FUNCTION_MAXNAMELEN - 1 is referenced - at element IPT_FUNCTION_MAXNAMELEN - 1 which is outside the - array bounds -* Mon Jan 29 2007 ms@suse.de -- fixed wrong IPT_LIB_DIR value and replaced the code by a - dynamic check for the /usr/%%lib/iptables directory (#238886) -* Tue Nov 07 2006 ro@suse.de -- fix permissions for manpage -* Thu Jul 20 2006 ms@suse.de -- replaced static HZ define to dynamic: - [#]ifndef HZ - [#]define HZ sysconf(_SC_CLK_TCK) - [#]endif -* Fri May 26 2006 schwab@suse.de -- Fix crash while resolving addresses. -* Mon Apr 03 2006 hvogel@suse.de -- fix flex input file to use uppercase STR to avoid conflicts. - This prevented tc from being build [#162931] -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Tue Jan 17 2006 mrueckert@suse.de -- update to version 2.6.15-060110 -* Tue Nov 08 2005 mmj@suse.de -- update to version 051107 -* Mon Oct 24 2005 ro@suse.de -- fix filelist for libnlink -* Thu Oct 20 2005 mmj@suse.de -- update to version 051007 -- fix buffer overflow in iproute.c [#129415] (thanks Richard, Marcus) -- don't strip stuff -* Wed Aug 17 2005 cthiel@suse.de -- update to version 050816 [#105087] -* Sat Aug 06 2005 dmueller@suse.de -- add /bin/ip symlink (#102513) -* Wed Jun 15 2005 meissner@suse.de -- use RPM_OPT_FLAGS -* Mon May 09 2005 mmj@suse.de -- Update to 2.6.11-050330 -* Thu Feb 10 2005 ro@suse.de -- remove dropped tetex subpackages from nfb -* Fri Feb 04 2005 mmj@suse.de -- Update to 2.6.10-ss050124 -* Tue Dec 07 2004 mmj@suse.de -- Don't trust that the kernel and do our own family check [#48600] -* Sun Oct 24 2004 mmj@suse.de -- Clean up spec file a bit -- Update to new snapshot including even more of our patches -* Tue Oct 12 2004 mmj@suse.de -- Update to 2.6.9 including some of our patches -* Tue Aug 17 2004 mmj@suse.de -- Make ip print correct type when printing stats [#42589] -* Wed Apr 21 2004 mmj@suse.de -- Fix bufferoverflow in nstat [#39179] -* Fri Apr 16 2004 kukuk@suse.de -- Fix compiling with 2.6.5 kernel headers -- Remove backup files -* Wed Apr 14 2004 mmj@suse.de -- Don't remove buildroot before install -* Wed Mar 17 2004 mmj@suse.de -- No executables below /usr/include [#36342] -* Wed Mar 10 2004 mmj@suse.de -- Olaf Kirch fixed the kernel, so remove the fix for [#35288] -* Wed Mar 03 2004 ak@suse.de -- Fix hang in ip addr flush (#35288) -* Wed Jan 07 2004 mmj@suse.de -- ifstat should store it's history in /var/tmp not /tmp -* Mon Nov 10 2003 mmj@suse.de -- Add more man-pages [#32981] -* Wed Oct 15 2003 mmj@suse.de -- Don't build as root -* Mon Aug 11 2003 mmj@suse.de -- Add all the pdf documentation [#28637] -* Thu Jun 12 2003 kukuk@suse.de -- Fix filelist -* Wed Jun 04 2003 kukuk@suse.de -- Don't use include-glibc directory -- Fix arpd to compile with db4 -* Tue May 13 2003 mmj@suse.de -- Remove files we don't package -* Mon May 12 2003 mmj@suse.de -- Add glib-include from newer iputils, and change a kernel-include - to make it build -* Tue Feb 11 2003 ug@suse.de -- patch for HTB support applied since 2.4.20 supports it -* Fri Feb 07 2003 mmj@suse.de -- Make the man tar-ball not contain gzipped man-pages, it's already - compressed once. -- Apply patch from Andi Kleen for fragtimeout functionality -* Mon Nov 11 2002 ro@suse.de -- changed neededforbuild to -* Mon Nov 11 2002 ro@suse.de -- changed neededforbuild to -* Sun Oct 20 2002 mmj@suse.de -- Add manpages, thanks to ASPLinux [#21115] -* Wed Aug 21 2002 mmj@suse.de -- Added a patch to exit when regular user tries to flush routes or - addresses. [#16000] -* Sun Aug 18 2002 ro@suse.de -- added ghostscript-x11-packages to neededforbuild (for gs) -* Mon Apr 08 2002 postadal@suse.cz -- updated to ss020116 - * added several utilities several utilities: ss, nstat, ifstat, - rtacct, arpd and module tcp_diag -* Fri Feb 01 2002 ro@suse.de -- changed neededforbuild to -* Thu Jan 31 2002 ro@suse.de -- added libgimpprint to neededforbuild -* Tue Jan 29 2002 vinil@suse.cz -- /usr/lib -> %%_libdir -* Sun Jan 20 2002 vinil@suse.cz -- new version ss010824 -- spec file cleanup -* Mon Nov 19 2001 bjacke@suse.de -- move ip to /sbin -- add iproute2 config files to /etc/ -* Wed Oct 10 2001 stepan@suse.de -- fix compilation on ia64 -* Tue Sep 18 2001 pthomas@suse.de -- Correct spelling in libnetlink.3 -- Add both German and English descriptions for libnlink -* Mon Aug 27 2001 kukuk@suse.de -- Fix compiling on SPARC -* Tue Aug 21 2001 vinil@suse.cz -- new version ss010803 -- get rid of kernel 2.2 patches -* Thu Jul 26 2001 kukuk@suse.de -- add glib to needed for build -* Fri Jul 20 2001 kukuk@suse.de -- changed neededforbuild to -- changed neededforbuild to -- changed neededforbuild to -* Wed Jun 27 2001 ro@suse.de -- ETH_P_ECHO is apparently no longer defined -* Thu Mar 08 2001 uli@suse.de -- added xshared to neededforbuild -* Mon Mar 05 2001 kukuk@suse.de -- Remove bogus check for kernel header -* Fri Dec 01 2000 kukuk@suse.de -- Update to iproute2-2.2.4-now-ss001007 to fix compile problems - with new kernel and glibc -* Mon Aug 28 2000 ak@suse.de -- fix permissions -- fix advmss/mtu confusion between 2.2 and 2.4 (advmss now works with 2.2 - kernels and is always enabled) -- add a new subrpm for libnetlink -- add libnetlink man page -* Tue Jul 04 2000 mha@suse.de -- new version (2.2.4-now-ss000305) -- new README.SuSE -- use ps2pdf instead of pdflatex, because the latter produces - unusable pdf files for some reason -* Thu Jun 01 2000 vinil@suse.cz -- documentation enhancement -* Fri May 26 2000 vinil@suse.cz -- new version (ss000225) -- buildroot added -- sorted in group -* Thu Feb 17 2000 mha@suse.de -- new version (ss991023) -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu Jul 22 1999 mha@suse.de -- new version -- renamed package iproute->iproute2, because that's how the author - calls it -* Tue Jul 13 1999 ro@suse.de -- added psutils to neededforbuild -* Sun Jul 11 1999 mha@suse.de -- new package: iproute (tools for using the advanced routing options - in kernel 2.2)