Bug#1021176: bullseye-pu: package openvswitch/2.15.0+ds1-2+deb11u1
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
It appears that the command ovs-dpctl-top was wrongly patched
in the Bullseye version of OVS. Removing the wrong hunks fixes it.
[ Reason ]
The bug is due to me, who patched all to make OVS working under
Python 3. The rest of the patch is correct, BTW.
[ Impact ]
Calling ovs-dpctl-top just fails.
[ Tests ]
We tested reverting the wrong hunks, and it fixed it for us.
[ Risks ]
No other part of OVS are affected, and there's unit tests in OVS,
so risks are really minimum. Also, this is only a userland debug
tool, so nothing critical to a functionning OVS.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
Only removing the 3 wrong hunks of the py3-compat.patch.
Please approve the upload before the next Bullseye point release.
Cheers,
Thomas Goirand (zigo)
diff -Nru openvswitch-2.15.0+ds1/debian/changelog openvswitch-2.15.0+ds1/debian/changelog
--- openvswitch-2.15.0+ds1/debian/changelog 2022-01-03 13:53:38.000000000 +0100
+++ openvswitch-2.15.0+ds1/debian/changelog 2022-10-03 12:59:27.000000000 +0200
@@ -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 -Nru openvswitch-2.15.0+ds1/debian/patches/py3-compat.patch openvswitch-2.15.0+ds1/debian/patches/py3-compat.patch
--- openvswitch-2.15.0+ds1/debian/patches/py3-compat.patch 2022-01-03 13:53:38.000000000 +0100
+++ openvswitch-2.15.0+ds1/debian/patches/py3-compat.patch 2022-10-03 12:59:27.000000000 +0200
@@ -147,33 +147,6 @@
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
Reply to: