diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 5d237e7..a181d58 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -10702,14 +10702,14 @@ index ddeb66bc9f..75072904cc 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.2.spec b/SPECS/openvswitch3.2.spec index 1326394..9b3f61a 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 83%{?dist} +Release: 84%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -761,6 +761,12 @@ exit 0 %endif %changelog +* Mon Jun 03 2024 Open vSwitch CI - 3.2.0-84 +- Merging upstream branch-3.2 [RH git: 2b0f80027c] + Commit list: + a06c735d54 tests: Fix non-portable plus match in python vlog test. + + * Fri May 31 2024 Open vSwitch CI - 3.2.0-83 - Merging upstream branch-3.2 [RH git: 6b1ae3a4ed] Commit list: