From 209fa91fba6cd9b79d8f4ab00f0b9944fac064f5 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Sep 28 2021 03:21:58 +0000
Subject: Import openvswitch2.13-2.13.0-127 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index 7527867..0ae820f 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -344,7 +344,7 @@ index 0000000000..b6447aba1b
 +set -ev
 +pip3 install --user --upgrade docutils
 diff --git a/.cirrus.yml b/.cirrus.yml
-index 1b32f55d65..358f2ba256 100644
+index 1b32f55d65..480fea2421 100644
 --- a/.cirrus.yml
 +++ b/.cirrus.yml
 @@ -2,21 +2,23 @@ freebsd_build_task:
@@ -356,7 +356,8 @@ index 1b32f55d65..358f2ba256 100644
 +      image_family: freebsd-12-2-snap
 +      image_family: freebsd-11-4-snap
      cpu: 4
-     memory: 8G
+-    memory: 8G
++    memory: 4G
  
    env:
 -    DEPENDENCIES: automake libtool gmake gcc wget openssl
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index 5e1c8b9..3845de6 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: 125%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 127%{?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
@@ -688,9 +688,11 @@ exit 0
 %doc LICENSE NOTICE README.rst NEWS rhel/README.RHEL.rst
 %ifarch %{dpdkarches}
 %doc %{dpdkdir}/README.DPDK-PMDS
+%attr(750,openvswitch,hugetlbfs) %verify(not owner group) /var/log/openvswitch
+%else
+%attr(750,openvswitch,openvswitch) %verify(not owner group) /var/log/openvswitch
 %endif
 /var/lib/openvswitch
-%attr(750,openvswitch,openvswitch) %verify(not owner group) /var/log/openvswitch
 %ghost %attr(755,root,root) %verify(not owner group) %{_rundir}/openvswitch
 %{_datadir}/openvswitch/bugtool-plugins/
 %{_datadir}/openvswitch/scripts/ovs-bugtool-*
@@ -710,6 +712,17 @@ exit 0
 %endif
 
 %changelog
+* Mon Sep 27 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-127
+- Merging upstream branch-2.13 [RH git: a117849d24]
+    Commit list:
+    e33aaf8bda cirrus: Reduce memory requirements for FreeBSD VMs.
+
+
+* Thu Sep 23 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.13.0-126
+- redhat: use hugetlbfs group for /var/log/openvswitch when dpdk is enabled [RH git: a32eb508f7] (#2007292)
+    Resolves: #2007292
+
+
 * Thu Sep 16 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-125
 - Merging upstream branch-2.13 [RH git: 215f08bbd8]
     Commit list: