Merge ~rafaeldtinoco/ubuntu/+source/iproute2:lp1831775-cosmic-sru-iproute2 into ubuntu/+source/iproute2:ubuntu/cosmic-devel

[Rafael David Tinoco]

30ff12d... by Rafael David Tinoco on 2019-06-06

Add: debian/patches/ss-review-ssfilter.patch

Fixed issue with ss and ssfilter where ssfilter rejects single
expressions if enclosed in braces (LP: #1831775)

Signed-off-by: Rafael David Tinoco <email address hidden>

26ced4f... by Rafael David Tinoco on 2019-06-06

updated changelog for 4.18.0-1ubuntu2.18.10.1

Signed-off-by: Rafael David Tinoco <email address hidden>

[Andreas Hasenack (ahasenack)]

- range-diff shows the change is the same as for disco
- manual testing also ok
- version ok for sru

+1

Will sponsor once the eoan upload has migrated.

review: Approve

[Andreas Hasenack (ahasenack)]

This migrated already. It wasn't auto-closed because I forgot to switch the MP status to "approved".

[Christian Ehrhardt  (paelzer)]

The latest in Cosmic&Disco still is https://launchpad.net/ubuntu/+source/iproute2/4.18.0-1ubuntu2
=> Not merged

[Christian Ehrhardt  (paelzer)]

Cosmic was set to Won't Fix in the bug, for Cosmic being out of primary support almost now.

Unmerged commits

26ced4f... by Rafael David Tinoco on 2019-06-06

updated changelog for 4.18.0-1ubuntu2.18.10.1

Signed-off-by: Rafael David Tinoco <email address hidden>

30ff12d... by Rafael David Tinoco on 2019-06-06

Add: debian/patches/ss-review-ssfilter.patch

Fixed issue with ss and ssfilter where ssfilter rejects single
expressions if enclosed in braces (LP: #1831775)

Signed-off-by: Rafael David Tinoco <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 9673707..555936d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+iproute2 (4.18.0-1ubuntu2.19.04.1) disco; urgency=medium
+
+  * d/p/ss-review-ssfilter.patch: fixed issue with ss and ssfilter
+    where ssfilter rejects single expressions if enclosed in
+    braces (LP: #1831775)
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 05 Jun 2019 21:26:00 -0300
+
 iproute2 (4.18.0-1ubuntu2) cosmic; urgency=low
 
   * d/p/1006-ubuntu-iprule-fix-output.patch
diff --git a/debian/patches/series b/debian/patches/series
index 5aa32c6..cd6393b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@
 1002-ubuntu-poc-fan-driver-vxlan.patch
 1005-ubuntu-fix-testsuite-kenv.patch
 1006-ubuntu-iprule-fix-output.patch
+
+ss-review-ssfilter.patch
diff --git a/debian/patches/ss-review-ssfilter.patch b/debian/patches/ss-review-ssfilter.patch
new file mode 100644
index 0000000..749b114
--- /dev/null
+++ b/debian/patches/ss-review-ssfilter.patch
@@ -0,0 +1,128 @@
+Description: ss: Review ssfilter
+
+The original problem was ssfilter rejecting single expressions if
+enclosed in braces, such as:
+
+| sport = 22 or ( dport = 22 )
+
+This is fixed by allowing 'expr' to be an 'exprlist' enclosed in braces.
+The no longer required recursion in 'exprlist' being an 'exprlist'
+enclosed in braces is dropped.
+
+In addition to that, a few other things are changed:
+
+* Remove pointless 'null' prefix in 'appled' before 'exprlist'.
+* For simple equals matches, '=' operator was required for ports but not
+  allowed for hosts. Make this consistent by making '=' operator
+  optional in both cases.
+
+Reported-by: Samuel Mannehed <[e-mail]>
+Fixes: b2038cc0b2403 ("ssfilter: Eliminate shift/reduce conflicts")
+Signed-off-by: Phil Sutter <[e-mail]>
+Signed-off-by: Stephen Hemminger <[e-mail]>
+
+Origin: upstream, https://github.com/shemminger/iproute2/commit/38d209ecf2ae
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1831775
+---
+ misc/ssfilter.y | 36 +++++++++++++++++++++---------------
+ 1 file changed, 21 insertions(+), 15 deletions(-)
+
+diff --git a/misc/ssfilter.y b/misc/ssfilter.y
+index 88d4229a..0413ddda 100644
+--- a/misc/ssfilter.y
++++ b/misc/ssfilter.y
+@@ -42,24 +42,22 @@ static void yyerror(char *s)
+ %nonassoc '!'
+ 
+ %%
+-applet: null exprlist
++applet: exprlist
+         {
+-                *yy_ret = $2;
+-                $$ = $2;
++                *yy_ret = $1;
++                $$ = $1;
+         }
+         | null
+         ;
++
+ null:   /* NOTHING */ { $$ = NULL; }
+         ;
++
+ exprlist: expr
+         | '!' expr
+         {
+                 $$ = alloc_node(SSF_NOT, $2);
+         }
+-        | '(' exprlist ')'
+-        {
+-                $$ = $2;
+-        }
+         | exprlist '|' expr
+         {
+                 $$ = alloc_node(SSF_OR, $1);
+@@ -77,13 +75,21 @@ exprlist: expr
+         }
+         ;
+ 
+-expr:	DCOND HOSTCOND
++eq:	'='
++	| /* nothing */
++	;
++
++expr:	'(' exprlist ')'
++	{
++		$$ = $2;
++	}
++	| DCOND eq HOSTCOND
+         {
+-		$$ = alloc_node(SSF_DCOND, $2);
++		$$ = alloc_node(SSF_DCOND, $3);
+         }
+-        | SCOND HOSTCOND
++        | SCOND eq HOSTCOND
+         {
+-		$$ = alloc_node(SSF_SCOND, $2);
++		$$ = alloc_node(SSF_SCOND, $3);
+         }
+         | DPORT GEQ HOSTCOND
+         {
+@@ -101,7 +107,7 @@ expr:	DCOND HOSTCOND
+         {
+                 $$ = alloc_node(SSF_NOT, alloc_node(SSF_D_GE, $3));
+         }
+-        | DPORT '=' HOSTCOND
++        | DPORT eq HOSTCOND
+         {
+ 		$$ = alloc_node(SSF_DCOND, $3);
+         }
+@@ -126,7 +132,7 @@ expr:	DCOND HOSTCOND
+         {
+                 $$ = alloc_node(SSF_NOT, alloc_node(SSF_S_GE, $3));
+         }
+-        | SPORT '=' HOSTCOND
++        | SPORT eq HOSTCOND
+         {
+ 		$$ = alloc_node(SSF_SCOND, $3);
+         }
+@@ -134,7 +140,7 @@ expr:	DCOND HOSTCOND
+         {
+ 		$$ = alloc_node(SSF_NOT, alloc_node(SSF_SCOND, $3));
+         }
+-        | DEVNAME '=' DEVCOND
++        | DEVNAME eq DEVCOND
+         {
+ 		$$ = alloc_node(SSF_DEVCOND, $3);
+         }
+@@ -142,7 +148,7 @@ expr:	DCOND HOSTCOND
+         {
+ 		$$ = alloc_node(SSF_NOT, alloc_node(SSF_DEVCOND, $3));
+         }
+-        | FWMARK '=' MARKMASK
++        | FWMARK eq MARKMASK
+         {
+                 $$ = alloc_node(SSF_MARKMASK, $3);
+         }
+-- 
+2.20.1
+