From 3e2c9d0936d3e84fbe8ce4ff48148a4f3d26ab50 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Jun 03 2024 19:18:12 +0000 Subject: Import openvswitch3.3-3.3.0-24 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index be218de..6f74add 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -4162,14 +4162,14 @@ index 282651ac73..9d539ee6f6 100644 AT_DATA([flows.txt], [dnl diff --git a/tests/vlog.at b/tests/vlog.at -index 785014956e..efe91479a6 100644 +index 785014956e..2768c07400 100644 --- a/tests/vlog.at +++ b/tests/vlog.at @@ -8,6 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \ AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \ -e 's/File ".*", line [[0-9]][[0-9]]*,/File , line ,/' \ -+-e '/\^\+/d' \ ++-e '/\^/d' \ stderr_log], [0], [dnl 0 | module_0 | EMER | emergency 1 | module_0 | ERR | error diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 471a507..9ddbb7a 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.0 -Release: 23%{?dist} +Release: 24%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -767,6 +767,12 @@ exit 0 %endif %changelog +* Mon Jun 03 2024 Open vSwitch CI - 3.3.0-24 +- Merging upstream branch-3.3 [RH git: 0a6f4082a3] + Commit list: + 79608c4fdd tests: Fix non-portable plus match in python vlog test. + + * Fri May 31 2024 Open vSwitch CI - 3.3.0-23 - Merging upstream branch-3.3 [RH git: bc25876bb0] Commit list: