Update to 4.15, fix /bin/ss with no header flag

[iproute2.git] / debian / patches / 0005-tc-lexer-let-quotes-actually-start-strings.patch

diff --git a/debian/patches/0005-tc-lexer-let-quotes-actually-start-strings.patch b/debian/patches/0005-tc-lexer-let-quotes-actually-start-strings.patch
deleted file mode 100644 (file)
index cd2d6e1..0000000
--- a/debian/patches/0005-tc-lexer-let-quotes-actually-start-strings.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0df91939df1da6e72fd14ef2788984685e0aeff7 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Thu, 18 Jan 2018 10:26:12 +0100
-Subject: [PATCH iproute2] tc/lexer: let quotes actually start strings
-
-The lexer will go with the longest match, so previously
-the starting double quotes of a string would be swallowed by
-the [^ \t\r\n()]+ pattern leaving the user no way to
-actually use strings with escape sequences.
-Fix this by not allowing this case to start with double
-quotes.
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
----
-(Resent as separate thread)
- tc/emp_ematch.l | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tc/emp_ematch.l b/tc/emp_ematch.l
-index dc106759..d7a99304 100644
---- a/tc/emp_ematch.l
-+++ b/tc/emp_ematch.l
-@@ -137,7 +137,7 @@
- ")"                                   {
-                                               return yylval.i = *yytext;
-                                       }
--[^ \t\r\n()]+                         {
-+[^" \t\r\n()][^ \t\r\n()]*            {
-                                               yylval.b = bstr_alloc(yytext);
-                                               if (yylval.b == NULL)
-                                                       return ERROR;
--- 
-2.11.0
-