Hello community, here is the log from the commit of package iproute2 checked in at Mon Apr 3 18:48:16 CEST 2006. -------- --- iproute2/iproute2.changes 2006-01-25 21:36:39.000000000 +0100 +++ iproute2/iproute2.changes 2006-04-03 18:21:43.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 18:20:29 CEST 2006 - hvogel@suse.de + +- fix flex input file to use uppercase STR to avoid conflicts. + This prevented tc from being build [#162931] + +------------------------------------------------------------------- New: ---- iproute2-tc-flex-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.SMohz2/_old 2006-04-03 18:47:59.000000000 +0200 +++ /var/tmp/diff_new_pack.SMohz2/_new 2006-04-03 18:47:59.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -18,8 +18,8 @@ Provides: iproute Autoreqprov: on Version: 2.6.15 -Release: 1 -Summary: Advanced routing +Release: 8 +Summary: Advanced Routing URL: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version-%dateversion.tar.bz2 Source1: libnetlink.3 @@ -27,6 +27,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnlink Summary: A Higher Level Interface to the Netlink Service @@ -41,7 +42,7 @@ %description This package provides the tools ip, tc, and rtmon needed to use the new -and advanced routing options of the Linux kernel. The SuSE Linux +and advanced routing options of the Linux kernel. The SUSE Linux distribution has used this package for network setup since SuSE Linux 8.0. @@ -58,6 +59,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -106,6 +108,9 @@ %_libdir/lib* %changelog -n iproute2 +* 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 ++++++ iproute2-tc-flex-fixes.patch ++++++ --- tc/emp_ematch.l +++ tc/emp_ematch.l @@ -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...