Fix ovs-dpctl-top by removing 3 wrong hunks in py3-compat.patch.

diff --git a/debian/changelog b/debian/changelog
index 2be49d5387ab548d6c6022b40c5763e262f3f120..b9f5afb50a4e14c78474ee54a60188ff4adda59e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openvswitch (2.15.0+ds1-2+deb11u2) bullseye; urgency=medium
+
+  * Fix ovs-dpctl-top by removing 3 wrong hunks in py3-compat.patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 03 Oct 2022 12:59:27 +0200
+
 openvswitch (2.15.0+ds1-2+deb11u1) bullseye; urgency=medium
 
   * CVE-2021-36980: use-after-free in decode_NXAST_RAW_ENCAPAdd. Add upstream

diff --git a/debian/patches/py3-compat.patch b/debian/patches/py3-compat.patch
index 343f23bcb4c68d55031dd2663b968abb2eda4e6b..d00f9fbedbefbfdb17479bd8adbc3e872d068202 100644 (file)
--- a/debian/patches/py3-compat.patch
+++ b/debian/patches/py3-compat.patch
@@ -147,33 +147,6 @@ Signed-off-by: James Page <james.page@ubuntu.com>
  import sys
  import os
  try:
-@@ -419,7 +421,7 @@ def flow_line_iter(line):
-             rc.append(element)
-             element = ""
-         else:
--            element += ch
-+            element += str(ch)
- 
-     if (paren_count):
-         raise ValueError(line)
-@@ -468,7 +470,7 @@ def flow_line_split(line):
- 
-     """
- 
--    results = re.split(', ', line)
-+    results = re.split(b', ', line)
- 
-     (field, stats, action) = (results[0], results[1:-1], results[-1])
- 
-@@ -963,7 +965,7 @@ class FlowDB:
-         if not isinstance(line, str):
-            line = str(line)
- 
--        line = line.rstrip("\n")
-+        line = line.rstrip(b"\n")
-         (fields, stats, _) = flow_line_split(line)
- 
-         try:
 --- a/utilities/ovs-l3ping.in
 +++ b/utilities/ovs-l3ping.in
 @@ -18,8 +18,10 @@ opening holes in the firewall for the XM