Update to 3.2.0

4 files changed, 68 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d23df91b0326..0e43a6a6d318 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openvswitch-dpdk
 	pkgdesc = Production Quality, Multilayer Open Virtual Switch, with DPDK feature
-	pkgver = 3.1.2
+	pkgver = 3.2.0
 	pkgrel = 1
 	url = http://openvswitch.org
 	install = openvswitch.install
@@ -13,11 +13,15 @@ pkgbase = openvswitch-dpdk
 	optdepends = python-six
 	provides = openvswitch
 	options = debug
-	source = http://openvswitch.org/releases/openvswitch-3.1.2.tar.gz
+	source = http://openvswitch.org/releases/openvswitch-3.2.0.tar.gz
+	source = docs-add-nowarn-region-option-to-tables.patch
+	source = docs-run-tbl-preprocessor-in-manpage-check-rule.patch
 	source = openvswitch.tmpfiles
 	source = ovsdb-server.service
 	source = ovs-vswitchd.service
-	sha256sums = 7a6611f72608f526a118d4820c63a32a10450250a602463c4303abec49dc905e
+	sha256sums = ce917e78cc0addff834af3c4f6b8d2d5071a407ecc553a71ad532d4e015914c4
+	sha256sums = bc7d115c1843b95fe3a8036d30c9e06e0971812ced3893c1dfc0cb3f494083ba
+	sha256sums = 3170b2f8cf05c8aba2de3325394d30de6720c7d186fc4fac66257edddcd6fa55
 	sha256sums = e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9
 	sha256sums = fa2412b81c77921418131a4f6fd38956f50ffcc7b908ec91f94d3607a05d060b
 	sha256sums = 412a8d9a2d71f61b915d5e29c0ba44baae7770f564d885f99460b27a4cf1d398
diff --git a/PKGBUILD b/PKGBUILD
index b8af4c0a0394..8fdb032f273e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Yuji Hagiwara <yuuzi41 at gmail dot com>
 
 pkgname=openvswitch-dpdk
-pkgver=3.1.2
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Production Quality, Multilayer Open Virtual Switch, with DPDK feature"
 url="http://openvswitch.org"
@@ -9,6 +9,8 @@ license=('APACHE')
 arch=(x86_64)
 install=openvswitch.install
 source=("http://openvswitch.org/releases/openvswitch-$pkgver.tar.gz"
+	docs-add-nowarn-region-option-to-tables.patch
+	docs-run-tbl-preprocessor-in-manpage-check-rule.patch
 	openvswitch.tmpfiles
 	ovsdb-server.service
 	ovs-vswitchd.service)
@@ -17,13 +19,17 @@ makedepends=('python-six')
 optdepends=('python-six')
 provides=('openvswitch')
 options=('debug')
-sha256sums=('7a6611f72608f526a118d4820c63a32a10450250a602463c4303abec49dc905e'
+sha256sums=('ce917e78cc0addff834af3c4f6b8d2d5071a407ecc553a71ad532d4e015914c4'
+            'bc7d115c1843b95fe3a8036d30c9e06e0971812ced3893c1dfc0cb3f494083ba'
+            '3170b2f8cf05c8aba2de3325394d30de6720c7d186fc4fac66257edddcd6fa55'
             'e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9'
             'fa2412b81c77921418131a4f6fd38956f50ffcc7b908ec91f94d3607a05d060b'
             '412a8d9a2d71f61b915d5e29c0ba44baae7770f564d885f99460b27a4cf1d398')
 
 prepare() {
   cd "$srcdir/openvswitch-$pkgver"
+  patch -Np1 -i "${srcdir}/docs-add-nowarn-region-option-to-tables.patch"
+  patch -Np1 -i "${srcdir}/docs-run-tbl-preprocessor-in-manpage-check-rule.patch"
   sed -i \
     -e 's|$(sysconfdir)/bash_completion.d|/usr/share/bash-completion/completions|g' \
     Makefile.am
diff --git a/docs-add-nowarn-region-option-to-tables.patch b/docs-add-nowarn-region-option-to-tables.patch
new file mode 100644
index 000000000000..036d4f4c201c
--- /dev/null
+++ b/docs-add-nowarn-region-option-to-tables.patch
@@ -0,0 +1,41 @@
+diff --unified --recursive --text a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
+--- a/build-aux/extract-ofp-fields	2023-08-17 22:20:35.945594275 +0900
++++ b/build-aux/extract-ofp-fields	2023-08-25 01:30:42.474131376 +0900
+@@ -216,7 +216,7 @@
+         """.PP
+ \\fB%s Field\\fR
+ .TS
+-tab(;);
++tab(;),nowarn;
+ l lx.
+ """
+         % title
+@@ -317,7 +317,7 @@
+         '.SH "%s"\n' % build.nroff.text_to_nroff(title.upper() + " FIELDS"),
+         '.SS "Summary:"\n',
+         ".TS\n",
+-        "tab(;);\n",
++        "tab(;),nowarn;\n",
+         "l l l l l l l.\n",
+         "Name;Bytes;Mask;RW?;Prereqs;NXM/OXM Support\n",
+         "\_;\_;\_;\_;\_;\_\n",
+@@ -329,7 +329,7 @@
+ 
+ 
+ def make_oxm_classes_xml(document):
+-    s = """tab(;);
++    s = """tab(;),nowarn;
+ l l l.
+ Prefix;Vendor;Class
+ \_;\_;\_
+diff --unified --recursive --text a/lib/meta-flow.xml b/lib/meta-flow.xml
+--- a/lib/meta-flow.xml	2023-08-17 22:20:35.980594302 +0900
++++ b/lib/meta-flow.xml	2023-08-25 01:31:20.529699053 +0900
+@@ -3517,6 +3517,7 @@
+     </p>
+ 
+     <tbl>
++nowarn;
+ r r r r r.
+ Criteria        OpenFlow 1.0    OpenFlow 1.1    OpenFlow 1.2+   NXM
+ \_      \_      \_      \_      \_
diff --git a/docs-run-tbl-preprocessor-in-manpage-check-rule.patch b/docs-run-tbl-preprocessor-in-manpage-check-rule.patch
new file mode 100644
index 000000000000..3241cc483fd5
--- /dev/null
+++ b/docs-run-tbl-preprocessor-in-manpage-check-rule.patch
@@ -0,0 +1,12 @@
+diff --unified --recursive --text a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2023-08-25 01:32:42.738925930 +0900
++++ b/Makefile.am	2023-08-25 01:33:40.470787962 +0900
+@@ -368,7 +368,7 @@
+ manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
+ 	@error=false; \
+ 	for manpage in $?; do \
+-	  LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \
++	  LANG=en_US.UTF-8 groff -t -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \
+ 	  if grep warning: $@.tmp; then error=:; fi; \
+ 	  rm -f $@.tmp; \
+ 	done; \