From c517094042b601b91b79b1b25345a82ecf19fed8 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: May 11 2021 23:22:16 +0000
Subject: Import openvswitch2.13-2.13.0-109 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index f15d52f..6adc863 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -344,10 +344,10 @@ index 0000000000..b6447aba1b
 +set -ev
 +pip3 install --user --upgrade docutils
 diff --git a/.cirrus.yml b/.cirrus.yml
-index 1b32f55d65..2caf36b85c 100644
+index 1b32f55d65..358f2ba256 100644
 --- a/.cirrus.yml
 +++ b/.cirrus.yml
-@@ -2,8 +2,8 @@ freebsd_build_task:
+@@ -2,21 +2,23 @@ freebsd_build_task:
  
    freebsd_instance:
      matrix:
@@ -358,20 +358,29 @@ index 1b32f55d65..2caf36b85c 100644
      cpu: 4
      memory: 8G
  
-@@ -16,6 +16,7 @@ freebsd_build_task:
+   env:
+-    DEPENDENCIES: automake libtool gmake gcc wget openssl
+-                  python3 py37-openssl py37-sphinx
++    DEPENDENCIES: automake libtool gmake gcc wget openssl python3
++    PY_DEPS:      sphinx|openssl
+     matrix:
+       COMPILER: gcc
+       COMPILER: clang
  
    prepare_script:
      - sysctl -w kern.coredump=0
 +    - pkg update -f
      - pkg install -y ${DEPENDENCIES}
++        $(pkg search -xq "^py3[0-9]+-(${PY_DEPS})-[0-9]+" | xargs)
  
    configure_script:
+     - ./boot.sh
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
 new file mode 100644
-index 0000000000..8849659979
+index 0000000000..c1b88264c2
 --- /dev/null
 +++ b/.github/workflows/build-and-test.yml
-@@ -0,0 +1,205 @@
+@@ -0,0 +1,211 @@
 +name: Build and Test
 +
 +on: [push, pull_request]
@@ -486,6 +495,12 @@ index 0000000000..8849659979
 +    - name: checkout
 +      uses: actions/checkout@v2
 +
++    - name: fix up /etc/hosts
++      # https://github.com/actions/virtual-environments/issues/3353
++      run:  |
++        cat /etc/hosts
++        sudo sed -i "/don't remove this line/d" /etc/hosts || true
++
 +    - name: create ci signature file for the dpdk cache key
 +      if:   matrix.dpdk != '' || matrix.dpdk_shared != ''
 +      # This will collect most of DPDK related lines, so hash will be different
@@ -613,6 +628,26 @@ index fe3935fca2..4c8772f63a 100644
  Ziyou Wang                      ziyouw@vmware.com
  ankur dwivedi                   ankurengg2003@gmail.com
  chen zhang                      3zhangchen9211@gmail.com
+diff --git a/Documentation/automake.mk b/Documentation/automake.mk
+index 22976a3cd6..f46ec988a3 100644
+--- a/Documentation/automake.mk
++++ b/Documentation/automake.mk
+@@ -217,8 +217,13 @@ install-man-rst: docs-check
+ 	    $(extract_stem_and_section); \
+ 	    echo " $(MKDIR_P) '$(DESTDIR)'\"$$mandir\""; \
+ 	    $(MKDIR_P) '$(DESTDIR)'"$$mandir"; \
+-	    echo " $(INSTALL_DATA) $(SPHINXBUILDDIR)/man/$$stem.$$section '$(DESTDIR)'\"$$mandir/$$stem.$$section\""; \
+-	    $(INSTALL_DATA) $(SPHINXBUILDDIR)/man/$$stem.$$section '$(DESTDIR)'"$$mandir/$$stem.$$section"; \
++	    if test -f $(SPHINXBUILDDIR)/man/$$stem.$$section; then \
++	        filepath=$(SPHINXBUILDDIR)/man/$$stem.$$section; \
++	    else \
++	        filepath=$(SPHINXBUILDDIR)/man/$$section/$$stem.$$section; \
++	    fi; \
++	    echo " $(INSTALL_DATA) $$filepath '$(DESTDIR)'\"$$mandir/$$stem.$$section\""; \
++	    $(INSTALL_DATA) $$filepath '$(DESTDIR)'"$$mandir/$$stem.$$section"; \
+ 	done
+ else
+ install-man-rst:
 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
 index 6702c58a2b..4a0dcac495 100644
 --- a/Documentation/faq/releases.rst
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index 48b0519..d0cbf2b 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 108%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 109%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -710,6 +710,10 @@ exit 0
 %endif
 
 %changelog
+* Tue May 11 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-109
+- Merging upstream branch-2.13
+  [132c26ba2023095d0b74cc5f63a808b10ddfbe65]
+
 * Mon May 10 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.13.0-108
 - Merging upstream branch-2.13
   [d2edacdddd238483f35fc29edac5b42ace8e94a8]