From 28abae6f5e7b78e7dbb7a97eac242afae0d5dae4 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 30 2023 21:57:13 +0000
Subject: Import openvswitch3.1-3.1.0-57 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 1a2dfe7..15447cf 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -597,7 +597,7 @@ index ee5553f45..3e937910b 100755
          sys.exit(1)
      for line in s.splitlines():
 diff --git a/configure.ac b/configure.ac
-index 9bf896c01..48169c8fd 100644
+index 9bf896c01..f4fb551ae 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -609,6 +609,19 @@ index 9bf896c01..48169c8fd 100644
  AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.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/debian/changelog b/debian/changelog
 index a5ad222c4..b2f60255c 100644
 --- a/debian/changelog
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index ce7a6ec..84fc9a7 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 56%{?dist}
+Release: 57%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -757,6 +757,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 30 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-57
+- Merging upstream branch-3.1 [RH git: 595f8ae841]
+    Commit list:
+    7ab67cfba7 configure: Avoid deprecated AC_PROG_CC_C99 if possible.
+
+
 * Mon Aug 28 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-56
 - Merging upstream branch-3.1 [RH git: 7c51401b95]
     Commit list: