From f2bc4a017305cfd1d63315e288e150293b0b49e3 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 31 2023 01:09:12 +0000
Subject: Import openvswitch2.17-2.17.0-121 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index 8167d7f..fc7cc38 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -839,7 +839,7 @@ index ee5553f456..3e937910be 100755
          sys.exit(1)
      for line in s.splitlines():
 diff --git a/configure.ac b/configure.ac
-index 4e9bcce272..134106f54a 100644
+index 4e9bcce272..81ba565992 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -851,6 +851,19 @@ index 4e9bcce272..134106f54a 100644
  AC_CONFIG_SRCDIR([datapath/datapath.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
+@@ -21,7 +21,11 @@ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_TESTDIR([tests])
+ AM_INIT_AUTOMAKE([tar-pax])
+ 
+-AC_PROG_CC_C99
++# AC_PROG_CC doesn't try enabling C99 in autoconf 2.69 and below, but
++# AC_PROG_CC_C99 is deprecated in newer ones.  In autoconf 2.70+ both
++# will try enabling features up to C11.
++m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_C99])
++
+ AM_PROG_CC_C_O
+ AC_PROG_CXX
+ AC_PROG_CPP
 diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c
 index 70ac0a0e56..e3eb05d659 100644
 --- a/datapath-windows/ovsext/Actions.c
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index a01e615..324396f 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: 120%{?dist}
+Release: 121%{?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
+* Wed Aug 30 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-121
+- Merging upstream branch-2.17 [RH git: f9dc5dbd23]
+    Commit list:
+    586e73dacf configure: Avoid deprecated AC_PROG_CC_C99 if possible.
+
+
 * Mon Aug 28 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-120
 - Merging upstream branch-2.17 [RH git: ef93dc708f]
     Commit list: