diff --git a/0007-fix-inclusion-og-clang-header-by-gcc-14.patch b/0007-fix-inclusion-og-clang-header-by-gcc-14.patch new file mode 100644 index 0000000000000000000000000000000000000000..ee86842267d745b0b8ee19274e19a2f8f5281420 --- /dev/null +++ b/0007-fix-inclusion-og-clang-header-by-gcc-14.patch @@ -0,0 +1,16 @@ +diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h +index 8fdce0c..62ee4e0 100644 +--- a/lib/ovs-atomic.h ++++ b/lib/ovs-atomic.h +@@ -329,7 +329,7 @@ + #if __CHECKER__ + /* sparse doesn't understand some GCC extensions we use. */ + #include "ovs-atomic-pthreads.h" +- #elif __has_extension(c_atomic) ++ #elif __clang__ && __has_extension(c_atomic) + #include "ovs-atomic-clang.h" + #elif HAVE_ATOMIC && __cplusplus >= 201103L + #include "ovs-atomic-c++.h" +-- +2.13.0 + diff --git a/openvswitch.spec b/openvswitch.spec index 186b65f9241eb234e978dc01a288d0a80f87623a..469ae607e862daeefddf3a706107326207f03200 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global _hardened_build 1 %define _rundir /run @@ -30,6 +30,7 @@ Patch5: 0001-fix-CVE-2023-3966.patch #https://github.com/openvswitch/ovs/commit/e235a421fbdb0c70176e8a3bef13bf7e2056cbc1 Patch6: 0006-fix-CVE-2023-5366.patch +Patch7: 0007-fix-inclusion-og-clang-header-by-gcc-14.patch BuildRequires: gcc gcc-c++ make autoconf automake libtool BuildRequires: systemd-rpm-macros openssl openssl-devel desktop-file-utils @@ -520,6 +521,9 @@ fi %doc NOTICE README.rst NEWS %changelog +* Tue Oct 21 2025 Yihao Yan - 2.17.6-5 +- fix inclusion og clang header by gcc 14 + * Tue Jun 25 2024 wangce - 2.17.6-4 - fix:fix for CVE-2023-5366