From f7646ce4799e1c771e1ac0f9600abac9b59d6278 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jan 28 2025 14:25:19 +0000
Subject: Import openvswitch3.5-3.5.0-0.12 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch
index 6deafbc..dbfeb4e 100644
--- a/SOURCES/openvswitch-3.5.0.patch
+++ b/SOURCES/openvswitch-3.5.0.patch
@@ -1,3 +1,15 @@
+diff --git a/AUTHORS.rst b/AUTHORS.rst
+index 05c2fb7046..8454641758 100644
+--- a/AUTHORS.rst
++++ b/AUTHORS.rst
+@@ -312,6 +312,7 @@ Mark Kavanagh                      mark.b.kavanagh81@gmail.com
+ Mark Maglana                       mmaglana@gmail.com
+ Mark Michelson                     mmichels@redhat.com
+ Markos Chandras                    mchandras@suse.de
++Markus Linnala                     markus.linnala@gmail.com
+ Martin Casado                      casado@cs.stanford.edu
+ Martin Fong                        mwfong@csl.sri.com
+ Martin Kalcok                      martin.kalcok@canonical.com
 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
 index c9acc1e80e..a28554f674 100644
 --- a/Documentation/faq/releases.rst
@@ -2529,6 +2541,31 @@ index 57abd3a5b4..03a39337f5 100644
  
  Other options:
    -h, --help                  display this help message
+diff --git a/utilities/ovs-vsctl-bashcomp.bash b/utilities/ovs-vsctl-bashcomp.bash
+index c5ad24fb70..5313fa9d48 100644
+--- a/utilities/ovs-vsctl-bashcomp.bash
++++ b/utilities/ovs-vsctl-bashcomp.bash
+@@ -32,11 +32,15 @@ _ovs_vsctl () {
+ # A bar (|) character in an argument means thing before bar OR thing
+ # after bar; for example, del-port can take a port or an interface.
+ 
+-_OVS_VSCTL_COMMANDS="$(_ovs_vsctl --commands)"
+-
+-# This doesn't complete on short arguments, so it filters them out.
+-_OVS_VSCTL_OPTIONS="$(_ovs_vsctl --options | awk '/^--/ { print $0 }' \
+-                      | sed -e 's/\(.*\)=ARG/\1=/')"
++_OVS_VSCTL_COMMANDS=
++_OVS_VSCTL_OPTIONS=
++if command -v ovs-vsctl > /dev/null; then
++    _OVS_VSCTL_COMMANDS="$(_ovs_vsctl --commands)"
++
++    # This doesn't complete on short arguments, so it filters them out.
++    _OVS_VSCTL_OPTIONS="$(_ovs_vsctl --options | awk '/^--/ { print $0 }' \
++                          | sed -e 's/\(.*\)=ARG/\1=/')"
++fi
+ IFS=$SAVE_IFS
+ 
+ declare -A _OVS_VSCTL_PARSED_ARGS
 diff --git a/dpdk/VERSION b/dpdk/VERSION
 index 0a492611a0..9e2934aa34 100644
 --- a/dpdk/VERSION
diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index 6042568..4a76004 100644
--- a/SPECS/openvswitch3.5.spec
+++ b/SPECS/openvswitch3.5.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.5.0
-Release: 0.11%{?dist}
+Release: 0.12%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -773,6 +773,13 @@ exit 0
 %endif
 
 %changelog
+* Tue Jan 28 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.12
+- Merging upstream branch-3.5 [RH git: 4914e17078]
+    Commit list:
+    09095c6988 AUTHORS: Add Markus Linnala.
+    cb7a446902 utilities/bashcomp: Do not run ovs-vsctl when not possible.
+
+
 * Thu Jan 23 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.11
 - Merging upstream branch-3.5 [RH git: 8a2fa92ce8]
     Commit list: