Hello community, here is the log from the commit of package iproute2 checked in at Fri Jul 13 17:49:44 CEST 2007. -------- --- iproute2/iproute2.changes 2007-04-20 09:40:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/iproute2/iproute2.changes 2007-07-12 12:07:25.545877000 +0200 @@ -1,0 +2,36 @@ +Wed Jul 11 16:26:49 CEST 2007 - ms@suse.de + +- update to version 2.6.22, fixed (#288551) + * Kim Woelders <kim@woelders.dk>, 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 <kad@blackcatlinux.com>: various flaws in ss + * Alexandr D. Kanevskiy <kad@blackcatlinux.com>: 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" <babydr@baby-dragons.com> + doc: option to produce ps output for non-a4 and not only 2 pages/sheet. + * Jamal's patch for ingres qdisc. + * Bernd Eckenfels <ecki@lina.inka.de>: deleted orphaned bogus #include + in include/utils.h. + * Julian Anastasov <ja@ssi.bg>: 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 <ahu@ds9a.nl> who raised the issue in netdev. + Thanks and apologies to Terry Schmidt <terry@nycwireless.net>, + Ruben Puettmann <ruben.puettmann@freenet-ag.de>, + Mark Ivens <mivens@clara.net>. + * willy tarreau <wtarreau@yahoo.fr>: "make install" target. + * Tunable limit for sch_sfq. Patch to kernel activating this + is about to be submitted. Reminded by Adi Nugroho <Adi@iNterNUX.co.id> + +------------------------------------------------------------------- Old: ---- iproute2-2.6.14-nostrip.diff iproute2-2.6.15-060110.dif iproute2-2.6.15-060110.tar.bz2 iproute2-2.6.15-flushcheckuid.diff iproute2-2.6.15-fragtimeout.diff iproute2-2.6.15-ipt-lib-dir.diff iproute2-2.6.15-pdfdoc.diff iproute2-tc-flex-fixes.patch New: ---- iproute2-2.6.22-070710.diff iproute2-2.6.22-070710.tar.bz2 iproute2-2.6.22-flushcheckuid.diff iproute2-2.6.22-fragtimeout.diff iproute2-2.6.22-nostrip.diff iproute2-2.6.22-pdfdoc.diff iproute2-tc-flex-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.f20200/_old 2007-07-13 17:47:53.000000000 +0200 +++ /var/tmp/diff_new_pack.f20200/_new 2007-07-13 17:47:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package iproute2 (Version 2.6.15) +# spec file for package iproute2 (Version 2.6.22) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,25 +12,24 @@ Name: iproute2 BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 glib libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel -%define dateversion 060110 -License: GNU General Public License (GPL) +%define dateversion 070710 +License: GPL v2 or later Group: Productivity/Networking/Routing Provides: iproute Autoreqprov: on -Version: 2.6.15 -Release: 63 +Version: 2.6.22 +Release: 1 Summary: Advanced Routing URL: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version-%dateversion.tar.bz2 Source1: libnetlink.3 -Patch0: %name-2.6.15-pdfdoc.diff -Patch1: %name-2.6.15-flushcheckuid.diff -Patch2: %name-2.6.15-fragtimeout.diff -Patch3: %name-2.6.14-nostrip.diff -Patch4: %name-tc-flex-fixes.patch +Patch0: %name-2.6.22-pdfdoc.diff +Patch1: %name-2.6.22-flushcheckuid.diff +Patch2: %name-2.6.22-fragtimeout.diff +Patch3: %name-2.6.22-nostrip.diff +Patch4: %name-tc-flex-fixes.diff Patch5: %name-resolve-address.diff -Patch6: %name-2.6.15-060110.dif -Patch7: %name-2.6.15-ipt-lib-dir.diff +Patch6: %name-2.6.22-070710.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnlink Summary: A Higher Level Interface to the Netlink Service @@ -65,7 +64,6 @@ %patch4 %patch5 %patch6 -%patch7 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -114,6 +112,39 @@ %_libdir/lib* %changelog +* Wed Jul 11 2007 - ms@suse.de +- update to version 2.6.22, fixed (#288551) + * Kim Woelders <kim@woelders.dk>, 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 <kad@blackcatlinux.com>: various flaws in ss + * Alexandr D. Kanevskiy <kad@blackcatlinux.com>: 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" <babydr@baby-dragons.com> + doc: option to produce ps output for non-a4 and not only 2 pages/sheet. + * Jamal's patch for ingres qdisc. + * Bernd Eckenfels <ecki@lina.inka.de>: deleted orphaned bogus #include + in include/utils.h. + * Julian Anastasov <ja@ssi.bg>: 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 <ahu@ds9a.nl> who raised the issue in netdev. + Thanks and apologies to Terry Schmidt <terry@nycwireless.net>, + Ruben Puettmann <ruben.puettmann@freenet-ag.de>, + Mark Ivens <mivens@clara.net>. + * willy tarreau <wtarreau@yahoo.fr>: "make install" target. + * Tunable limit for sch_sfq. Patch to kernel activating this + is about to be submitted. Reminded by Adi Nugroho <Adi@iNterNUX.co.id> * Fri Apr 20 2007 - aj@suse.de - Use texlive for building. * Mon Apr 02 2007 - rguenther@suse.de ++++++ iproute2-2.6.14-nostrip.diff -> iproute2-2.6.22-070710.diff ++++++ --- iproute2/iproute2-2.6.14-nostrip.diff 2007-02-08 13:59:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/iproute2/iproute2-2.6.22-070710.diff 2007-07-12 12:07:25.329951000 +0200 @@ -1,36 +1,24 @@ ---- iproute2-051007/ip/Makefile -+++ iproute2-051007/ip/Makefile -@@ -16,7 +16,7 @@ - rtmon: $(RTMONOBJ) $(LIBNETLINK) +--- lib/utils.c ++++ lib/utils.c 2007/07/12 09:05:56 +@@ -33,6 +33,10 @@ + + #include "utils.h" + ++#ifndef HZ ++#define HZ sysconf(_SC_CLK_TCK) ++#endif ++ + int get_integer(int *val, const char *arg, int base) + { + long res; +@@ -330,8 +334,8 @@ + + int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) + { +- const __u32 *a1 = a->data; +- const __u32 *a2 = b->data; ++ const __u32 *a1 = (__u32*)a->data; ++ const __u32 *a2 = (__u32*)b->data; + int words = bits >> 0x05; - install: all -- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) -+ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) - install -m 0755 $(SCRIPTS) $(DESTDIR)$(SBINDIR) - - clean: ---- iproute2-051007/misc/Makefile -+++ iproute2-051007/misc/Makefile -@@ -27,7 +27,7 @@ - lnstat: $(LNSTATOBJ) - - install: all -- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) -+ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) - ln -sf lnstat $(DESTDIR)$(SBINDIR)/rtstat - ln -sf lnstat $(DESTDIR)$(SBINDIR)/ctstat - ---- iproute2-051007/tc/Makefile -+++ iproute2-051007/tc/Makefile -@@ -70,9 +70,9 @@ - - install: all - mkdir -p $(DESTDIR)/usr/lib/tc -- install -m 0755 -s tc $(DESTDIR)$(SBINDIR) -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ -- do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \ -+ do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \ - done - - clean: + bits &= 0x1f; ++++++ iproute2-2.6.15-060110.tar.bz2 -> iproute2-2.6.22-070710.tar.bz2 ++++++ ++++ 11898 lines of diff (skipped) ++++++ iproute2-2.6.15-flushcheckuid.diff -> iproute2-2.6.22-flushcheckuid.diff ++++++ ++++++ iproute2-2.6.15-fragtimeout.diff -> iproute2-2.6.22-fragtimeout.diff ++++++ --- iproute2/iproute2-2.6.15-fragtimeout.diff 2007-02-08 13:59:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/iproute2/iproute2-2.6.22-fragtimeout.diff 2007-07-12 12:07:25.468873000 +0200 @@ -1,86 +1,58 @@ -Index: doc/ip-cref.tex -=================================================================== ---- doc/ip-cref.tex.orig -+++ doc/ip-cref.tex -@@ -1323,6 +1323,11 @@ +--- doc/ip-cref.tex ++++ doc/ip-cref.tex 2007/07/12 09:13:47 +@@ -1322,7 +1322,11 @@ + If it is not given, Linux uses the value selected with \verb|sysctl| variable \verb|net/ipv4/tcp_reordering|. - +\item \verb|fragtimeout NUMBER| -+ + +--- \threeonly How many seconds to wait before expiring IP fragments + from the destination of this route. If not specified Linux uses + the \verb|sysctl| variable \verb|net/ipv4/ip_frag_timeout|. \item \verb|nexthop NEXTHOP| -Index: ip/iproute.c -=================================================================== ---- ip/iproute.c.orig -+++ ip/iproute.c -@@ -37,7 +37,19 @@ - #ifndef RTAX_RTTVAR +--- ip/iproute.c ++++ ip/iproute.c 2007/07/12 09:47:17 +@@ -38,6 +38,14 @@ #define RTAX_RTTVAR RTAX_HOPS #endif -- -+#ifndef RTAX_ADVMSS -+#define RTAX_ADVMSS (RTAX_CWND+1) -+#endif -+#ifndef RTAX_REORDERING -+#define RTAX_REORDERING (RTAX_ADVMSS+1) -+#endif + +#ifndef RTAX_FRAG_TIMEOUT -+#define RTAX_FRAG_TIMEOUT (RTAX_REORDERING+1) ++#define RTAX_FRAG_TIMEOUT (RTAX_FEATURES+1) +#endif ++ +#if RTAX_MAX < RTAX_FRAG_TIMEOUT +#undef RTAX_MAX +#define RTAX_MAX RTAX_FRAG_TIMEOUT +#endif + static const char *mx_names[RTAX_MAX+1] = { + [RTAX_MTU] = "mtu", +@@ -51,6 +59,7 @@ + [RTAX_HOPLIMIT] = "hoplimit", + [RTAX_INITCWND] = "initcwnd", + [RTAX_FEATURES] = "features", ++ [RTAX_FRAG_TIMEOUT]="fragtimeout" + }; static void usage(void) __attribute__((noreturn)); -@@ -58,9 +70,9 @@ +@@ -71,9 +80,9 @@ fprintf(stderr, "INFO_SPEC := NH OPTIONS FLAGS [ nexthop NH ]...\n"); fprintf(stderr, "NH := [ via ADDRESS ] [ dev STRING ] [ weight NUMBER ] NHFLAGS\n"); fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n"); - fprintf(stderr, " [ rtt NUMBER ] [ rttvar NUMBER ]\n"); + fprintf(stderr, " [ rtt NUMBER ] [ rttvar NUMBER ] [ fragtimeout seconds]\n"); - fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ ssthresh NUMBER ]\n"); -- fprintf(stderr, " [ realms REALM ]\n"); -+ fprintf(stderr, " [ reordering NUMBER] [ realms REALM ]\n"); + fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n"); +- fprintf(stderr, " [ ssthresh NUMBER ] [ realms REALM ]\n"); ++ fprintf(stderr, " [ ssthresh NUMBER ] [ reordering NUMBER] [ realms REALM ]\n"); fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n"); fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n"); fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n"); -@@ -497,6 +509,7 @@ - "cwnd", - "advmss", - "reordering", -+ "fragtimeout", - }; - static int hz; - if (mxrta[i] == NULL) -@@ -764,16 +777,26 @@ +@@ -789,6 +798,14 @@ invarg(""reordering" value is invalid\n", *argv); rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord); #endif -- } else if (strcmp(*argv, "rtt") == 0) { -- unsigned rtt; -+#ifdef RTAX_REORDERING -+ } else if (matches(*argv, "reordering") == 0) { -+ unsigned reord; - NEXT_ARG(); - if (strcmp(*argv, "lock") == 0) { -- mxlock |= (1<<RTAX_RTT); -+ mxlock |= (1<<RTAX_REORDERING); - NEXT_ARG(); - } -- if (get_unsigned(&rtt, *argv, 0)) -- invarg(""rtt" value is invalid\n", *argv); -- rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT, rtt); -+ if (get_unsigned(&reord, *argv, 0)) -+ invarg(""reordering" value is invalid\n", *argv); -+ rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord); -+#endif +#ifdef RTAX_FRAG_TIMEOUT + } else if (strcmp(*argv, "fragtimeout") == 0) { + unsigned timeout; @@ -89,13 +61,11 @@ + invarg(""timeout" value is invalid\n", *argv); + rta_addattr32(mxrta, sizeof(mxbuf), RTAX_FRAG_TIMEOUT, timeout); +#endif - } else if (matches(*argv, "window") == 0) { - unsigned win; + } else if (strcmp(*argv, "rtt") == 0) { + unsigned rtt; NEXT_ARG(); -Index: man/man8/ip.8 -=================================================================== ---- man/man8/ip.8.orig -+++ man/man8/ip.8 +--- man/man8/ip.8 ++++ man/man8/ip.8 2007/07/12 09:26:54 @@ -1095,6 +1095,14 @@ .BR "net/ipv4/tcp_reordering" . ++++++ iproute2-2.6.14-nostrip.diff -> iproute2-2.6.22-nostrip.diff ++++++ ++++++ iproute2-2.6.15-pdfdoc.diff -> iproute2-2.6.22-pdfdoc.diff ++++++ ++++++ iproute2-tc-flex-fixes.diff ++++++ --- tc/emp_ematch.l +++ tc/emp_ematch.l 2007/07/12 09:53:11 @@ -63,7 +63,7 @@ %} -%x str +%x STR %option 8bit stack warn noyywrap prefix="ematch_" %% @@ -78,17 +78,17 @@ } strbuf_index = 0; - BEGIN(str); + BEGIN(STR); } -<str>" { +<STR>" { BEGIN(INITIAL); yylval.b = bstr_new(strbuf, strbuf_index); yylval.b->quoted = 1; return ATTRIBUTE; } -<str>\[0-7]{1,3} { /* octal escape sequence */ +<STR>\[0-7]{1,3} { /* octal escape sequence */ int res; sscanf(yytext + 1, "%o", &res); @@ -100,12 +100,12 @@ strbuf_append_char((unsigned char) res); } -<str>\[0-9]+ { /* catch wrong octal escape seq. */ +<STR>\[0-9]+ { /* catch wrong octal escape seq. */ fprintf(stderr, "error: invalid octale escape sequence\n"); return ERROR; } -<str>\x[0-9a-fA-F]{1,2} { +<STR>\x[0-9a-fA-F]{1,2} { int res; sscanf(yytext + 2, "%x", &res); @@ -118,16 +118,16 @@ strbuf_append_char((unsigned char) res); } -<str>\n strbuf_append_char('\n'); -<str>\r strbuf_append_char('\r'); -<str>\t strbuf_append_char('\t'); -<str>\v strbuf_append_char('\v'); -<str>\b strbuf_append_char('\b'); -<str>\f strbuf_append_char('\f'); -<str>\a strbuf_append_char('\a'); +<STR>\n strbuf_append_char('\n'); +<STR>\r strbuf_append_char('\r'); +<STR>\t strbuf_append_char('\t'); +<STR>\v strbuf_append_char('\v'); +<STR>\b strbuf_append_char('\b'); +<STR>\f strbuf_append_char('\f'); +<STR>\a strbuf_append_char('\a'); -<str>\(.|\n) strbuf_append_char(yytext[1]); -<str>[^\\n"]+ strbuf_append_charp(yytext); +<STR>\(.|\n) strbuf_append_char(yytext[1]); +<STR>[^\\n"]+ strbuf_append_charp(yytext); [aA][nN][dD] return AND; [oO][rR] return OR; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org