diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 10a2d8b..ac61739 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -76,7 +76,7 @@ index 000000000..f7e6215dd +pip3 install --disable-pip-version-check --user pyelftools +pip3 install --user 'meson==0.53.2' diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh -index 10021fddb..99850a943 100755 +index 10021fddb..8227a5748 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -9,9 +9,7 @@ EXTRA_OPTS="--enable-Werror" @@ -157,7 +157,7 @@ index 10021fddb..99850a943 100755 } function configure_ovs() -@@ -130,10 +79,7 @@ assert ovs.json.from_string('{\"a\": 42}') == {'a': 42}" +@@ -130,10 +79,11 @@ assert ovs.json.from_string('{\"a\": 42}') == {'a': 42}" fi if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then @@ -166,6 +166,10 @@ index 10021fddb..99850a943 100755 - fi - install_dpdk $DPDK_VER + install_dpdk ++fi ++ ++if [ "$STD" ]; then ++ CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -std=$STD" fi if [ "$CC" = "clang" ]; then @@ -210,7 +214,7 @@ index 952d96431..48931fa08 100644 memory: 4G diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index 82675b973..8e71b9533 100644 +index 82675b973..80c449336 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -3,12 +3,80 @@ name: Build and Test @@ -297,7 +301,27 @@ index 82675b973..8e71b9533 100644 ASAN: ${{ matrix.asan }} UBSAN: ${{ matrix.ubsan }} CC: ${{ matrix.compiler }} -@@ -104,25 +172,12 @@ jobs: +@@ -17,6 +85,7 @@ jobs: + LIBS: ${{ matrix.libs }} + M32: ${{ matrix.m32 }} + OPTS: ${{ matrix.opts }} ++ STD: ${{ matrix.std }} + TESTSUITE: ${{ matrix.testsuite }} + + name: linux ${{ join(matrix.*, ' ') }} +@@ -32,6 +101,11 @@ jobs: + - compiler: clang + opts: --disable-ssl + ++ - compiler: gcc ++ std: c99 ++ - compiler: clang ++ std: c99 ++ + - compiler: gcc + testsuite: test + - compiler: clang +@@ -104,25 +178,12 @@ jobs: with: python-version: '3.9' @@ -338,7 +362,7 @@ index b59b7634f..d13895655 100644 This action was added in Open vSwitch 2.14. diff --git a/Makefile.am b/Makefile.am -index e605187b8..df9c33dfe 100644 +index e605187b8..49d98d6b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,6 +75,8 @@ EXTRA_DIST = \ @@ -350,6 +374,15 @@ index e605187b8..df9c33dfe 100644 .ci/linux-build.sh \ .ci/linux-prepare.sh \ .ci/osx-build.sh \ +@@ -365,7 +367,7 @@ ALL_LOCAL += manpage-check + manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS) + @error=false; \ + for manpage in $?; do \ +- LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ ++ LANG=en_US.UTF-8 groff -t -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ + if grep warning: $@.tmp; then error=:; fi; \ + rm -f $@.tmp; \ + done; \ diff --git a/NEWS b/NEWS index 37a01dea5..8fbf7219d 100644 --- a/NEWS @@ -371,6 +404,37 @@ index 37a01dea5..8fbf7219d 100644 v3.1.0 - 16 Feb 2023 -------------------- - ovs-vswitchd now detects changes in CPU affinity and adjusts the number +diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields +index efec59c25..6366bd446 100755 +--- a/build-aux/extract-ofp-fields ++++ b/build-aux/extract-ofp-fields +@@ -216,7 +216,7 @@ def field_to_xml(field_node, f, body, summary): + """.PP + \\fB%s Field\\fR + .TS +-tab(;); ++tab(;),nowarn; + l lx. + """ + % title +@@ -317,7 +317,7 @@ def group_xml_to_nroff(group_node, fields): + '.SH "%s"\n' % build.nroff.text_to_nroff(title.upper() + " FIELDS"), + '.SS "Summary:"\n', + ".TS\n", +- "tab(;);\n", ++ "tab(;),nowarn;\n", + "l l l l l l l.\n", + "Name;Bytes;Mask;RW?;Prereqs;NXM/OXM Support\n", + "\_;\_;\_;\_;\_;\_\n", +@@ -329,7 +329,7 @@ def group_xml_to_nroff(group_node, fields): + + + def make_oxm_classes_xml(document): +- s = """tab(;); ++ s = """tab(;),nowarn; + l l l. + Prefix;Vendor;Class + \_;\_;\_ diff --git a/configure.ac b/configure.ac index 9bf896c01..48169c8fd 100644 --- a/configure.ac @@ -410,6 +474,27 @@ index a5ad222c4..b2f60255c 100644 openvswitch (3.1.0-1) unstable; urgency=low * New upstream version +diff --git a/include/openvswitch/compiler.h b/include/openvswitch/compiler.h +index cf009f826..52614a5ac 100644 +--- a/include/openvswitch/compiler.h ++++ b/include/openvswitch/compiler.h +@@ -37,6 +37,16 @@ + #define OVS_NO_RETURN + #endif + ++#ifndef typeof ++#define typeof __typeof__ ++#endif ++ ++#ifndef __cplusplus ++#ifndef asm ++#define asm __asm__ ++#endif ++#endif ++ + #if __GNUC__ && !__CHECKER__ + #define OVS_UNUSED __attribute__((__unused__)) + #define OVS_PRINTF_FORMAT(FMT, ARG1) __attribute__((__format__(printf, FMT, ARG1))) diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h index 045dce8f5..3b0220aaa 100644 --- a/include/openvswitch/meta-flow.h @@ -425,6 +510,19 @@ index 045dce8f5..3b0220aaa 100644 #ifdef __cplusplus } #endif +diff --git a/lib/automake.mk b/lib/automake.mk +index e64ee76ce..24b0ffefe 100644 +--- a/lib/automake.mk ++++ b/lib/automake.mk +@@ -451,7 +451,7 @@ lib_libsflow_la_SOURCES = \ + lib/sflow_poller.c \ + lib/sflow_receiver.c + lib_libsflow_la_CPPFLAGS = $(AM_CPPFLAGS) +-lib_libsflow_la_CFLAGS = $(AM_CFLAGS) ++lib_libsflow_la_CFLAGS = $(AM_CFLAGS) -D_BSD_SOURCE -D_DEFAULT_SOURCE + if HAVE_WNO_UNUSED + lib_libsflow_la_CFLAGS += -Wno-unused + endif diff --git a/lib/classifier.c b/lib/classifier.c index 0a89626cc..18dbfc83a 100644 --- a/lib/classifier.c @@ -1014,10 +1112,18 @@ index c576ae620..474344194 100644 + } +} diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml -index a1a20366d..bdd12f6a7 100644 +index a1a20366d..416ea0cf2 100644 --- a/lib/meta-flow.xml +++ b/lib/meta-flow.xml -@@ -4312,9 +4312,9 @@ r r c c c. +@@ -3517,6 +3517,7 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123) +

+ + ++nowarn; + r r r r r. + Criteria OpenFlow 1.0 OpenFlow 1.1 OpenFlow 1.2+ NXM + \_ \_ \_ \_ \_ +@@ -4312,9 +4313,9 @@ r r c c c. @@ -4678,6 +4784,18 @@ index ac5b0fd0c..b32341076 100644 return ovs.socket_util.get_exception_errno(e) return 0 +diff --git a/tests/.gitignore b/tests/.gitignore +index 83b1cb3b4..3a8c45975 100644 +--- a/tests/.gitignore ++++ b/tests/.gitignore +@@ -3,6 +3,7 @@ + /Makefile.in + /atconfig + /atlocal ++/clang-analyzer-results/ + /idltest.c + /idltest.h + /idltest.ovsidl diff --git a/tests/automake.mk b/tests/automake.mk index c8de3fe28..e39453cd1 100644 --- a/tests/automake.mk @@ -6114,6 +6232,66 @@ index b34a84775..40210f7fa 100644 +[ + AT_SKIP_IF([:]) +]) +diff --git a/tests/test-barrier.c b/tests/test-barrier.c +index 3bc5291cc..fb0ab0e69 100644 +--- a/tests/test-barrier.c ++++ b/tests/test-barrier.c +@@ -14,13 +14,13 @@ + * limitations under the License. + */ + +-#include +- + #include ++#undef NDEBUG ++#include + +-#include "ovs-thread.h" +-#include "ovs-rcu.h" + #include "ovstest.h" ++#include "ovs-rcu.h" ++#include "ovs-thread.h" + #include "random.h" + #include "util.h" + +diff --git a/tests/test-id-fpool.c b/tests/test-id-fpool.c +index 25275d9ae..27800aa9b 100644 +--- a/tests/test-id-fpool.c ++++ b/tests/test-id-fpool.c +@@ -14,12 +14,12 @@ + * limitations under the License. + */ + ++#include + #undef NDEBUG + #include + #include + #include +- +-#include ++#include + + #include "command-line.h" + #include "id-fpool.h" +diff --git a/tests/test-mpsc-queue.c b/tests/test-mpsc-queue.c +index a38bf9e6d..16aa804a0 100644 +--- a/tests/test-mpsc-queue.c ++++ b/tests/test-mpsc-queue.c +@@ -14,12 +14,12 @@ + * limitations under the License. + */ + ++#include + #undef NDEBUG + #include + #include + #include +- +-#include ++#include + + #include "command-line.h" + #include "guarded-list.h" diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 1bc5ac17a..c761822e6 100644 --- a/tests/test-ovsdb.c diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 3d92b0c..ac6fc6c 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 46%{?dist} +Release: 47%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -754,6 +754,18 @@ exit 0 %endif %changelog +* Wed Aug 23 2023 Open vSwitch CI - 3.1.0-47 +- Merging upstream branch-3.1 [RH git: 3e43c140d2] + Commit list: + 63445c3a98 docs: Run tbl preprocessor in manpage-check rule. + 7ed1fb9737 docs: Add `nowarn` region option to tables. + 9e38036d8a tests: Add clang-analyzer-results to gitignore. + cc1ad41178 ci: Add jobs to test -std=c99 builds. + 81b5e26fab tests: Fix order of includes in barrier/id-fpool/mpsc-queue tests. + 77e51ae91c sflow: Always enable _BSD_SOURCE. + 25a2f216c6 compiler.h: Don't use asm and typeof with non-GNU compilers. + + * Thu Aug 17 2023 Open vSwitch CI - 3.1.0-46 - Merging upstream branch-3.1 [RH git: 0eb500c766] Commit list: