diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 0810fce..f858dcd 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -125512,14 +125512,14 @@ index b8ae7caa9b..b3f8c3417b 100644 +OVS_APP_EXIT_AND_WAIT([ovsdb-server])] +AT_CLEANUP diff --git a/tests/vlog.at b/tests/vlog.at -index 3e92e70a93..595d7e9cee 100644 +index 3e92e70a93..31afb66bac 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/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 0d034a4..05eae64 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 172%{?dist} +Release: 173%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -749,6 +749,12 @@ exit 0 %endif %changelog +* Mon Jun 03 2024 Open vSwitch CI - 2.17.0-173 +- Merging upstream branch-2.17 [RH git: 0ed95d4a07] + Commit list: + f924527d97 tests: Fix non-portable plus match in python vlog test. + + * Thu May 30 2024 Open vSwitch CI - 2.17.0-172 - Merging upstream branch-2.17 [RH git: 76bb1d3eb3] Commit list: