gentoo auto-resync : 16:12:2023 - 14:53:46

3 files changed, 149 insertions, 1 deletions

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 959ebefc9026..864526e5ef69 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,3 +1,4 @@
+AUX openvswitch-2.17.6-groff-1.23.0.patch 5162 BLAKE2B 3c6a097c25f4a1f9935a540ffbdb6af58d5d0abafac3d9493adfcaf97c1f2842dd0ad3adb4cb5bb9546ee7bd543853e62c90cabcc847920ba772ea5f68b38a16 SHA512 f7e80c1f8b03fef59c868bc7a7e9a4025c868ff71224fbd7c84ae84c657b3de3966bfd60613e71392c431e3057546075bb7c6245da0c1f0320929940603622f4
 AUX openvswitch.tmpfiles 36 BLAKE2B b6e77e158bfa3ec2f67d66d449e1461ff13fb067d8d51084538938cf139d65406644e910663cb9297881eec10e87b3bf7ba15cf50e20a2d1e112c8f72f1f9b78 SHA512 8e9e0b8ba6fbd0a06eec91b985fd46a338823cd46b41521539627a57a9fbd5051be3875a24cc455742c08c006f91382b5e211e7c51f60bccb7f0b9dd2c55a280
 AUX ovs-vswitchd-r1 428 BLAKE2B 202cf0694cb26e8a302b8a8e347f203ecfb0be5152841aa28a775f1e53a611296ef00f2197b3a91fc113993ef8e327991503484d852ad023e7e426b4aaa85018 SHA512 c41b31a856f66fa140781831f38635c696440bb93a816576256c4cdf71b872e573d742d29b9f494336735fd384d34722ba3304fa97d3c76fc82c2f6db869a233
 AUX ovs-vswitchd-r3.service 896 BLAKE2B fac3e8964d317a2b914242a07ac70ddcef3ec6ac27d18abba5eed0e1be612d0c9cabcc25bc1c40f7d81be4584df8c87f94830282c6656d5f24c4f4aec18c5138 SHA512 be3396ae2e0f2dec4c97f81d518396505e3b80966cba5c73ee422bc81afb3a40cb3e2d101920de404821fb51d166cdbdf96c458b277334b32b732dda26fb9fee
@@ -7,5 +8,5 @@ AUX ovsdb-server-r3.service 809 BLAKE2B 5af3f3bc600cacc7c10d67760d314ceb8dbeba0f
 AUX ovsdb-server_conf2 580 BLAKE2B dfd1ece1fe4799439c097cf87175b6d6b331fce4a920cb7690d22c1410e7cce65a3c439d23b47fa1b1650b03eaf3ea1bb4e6f7d6a7e692b28403421461bc7dba SHA512 f9fed3b7cbad344e4e1e5abcaf117bbb56375122f84604781212f4b42f9853feb687fd5e33792f4221bdf48c1df4a9ca9e22e57f3dba50ba6ba6fddb31b10a06
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8
-EBUILD openvswitch-2.17.6.ebuild 5200 BLAKE2B 23d730f45e70314e3ec48ef26f3a606675b97d744840c4c697a623f72de1c4711d89f83fedefe5f43309eb9e8caee47fd74c4d1d3f87aea607fe2d0f0f44ddc6 SHA512 1a416eec26b3b582acaf6efe87c49f33f031675f6d2fdbba95025db5f37af5173885f28e07c39b45781a1cef94839732c264d25062c4c2ffd6f416e7c1a6639e
+EBUILD openvswitch-2.17.6.ebuild 5254 BLAKE2B d91724b1cdd6c725e40fc5aed4519bae5577dd5e50a94dbb03139474f4eaf175cd1329aa77ccaad8d17ef8b42657d6cd06d19165887774c134a1c1ac7d35ae77 SHA512 be9dd188b26af02632693288e58541a85c6d650633a2f77a32eb6c6b3e61d0f2c399de5b5c68f549344eba7bf6a7b35d5aedd2a63c89b94b636c44756605c152
 MISC metadata.xml 539 BLAKE2B c6a7e8b9ffb18bd32be27bb2ba301b4b8872a0c17eec6b110f89562d261614ca9bc1a5d89350ac05b6dc26d7536fd7aa1920326c7f55a0ecb4693bfc99986810 SHA512 d731202dfe79480263006596d7da8349a6831e05d75d5ebc9cce28818d02d5a52e81b350f5afb06279e91e5dc700763fb2975b28aad15bc3a0ea72b6264eba71
diff --git a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch
new file mode 100644
index 000000000000..3035005ae52e
--- /dev/null
+++ b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch
@@ -0,0 +1,145 @@
+https://bugs.gentoo.org/910196
+https://github.com/openvswitch/ovs/commit/a45b3afbf82e1c1702d25a5097a25c45923c6fae
+https://github.com/openvswitch/ovs/commit/6929485d318e08c11e8e98f7847d5cefcb36c21c
+https://github.com/openvswitch/ovs/commit/93412e00e7a1f61c5eb4771d150bdbf504ff59aa
+
+From a45b3afbf82e1c1702d25a5097a25c45923c6fae Mon Sep 17 00:00:00 2001
+From: gordonwwang <gordonwwang@tencent.com>
+Date: Thu, 17 Aug 2023 11:04:39 +0800
+Subject: [PATCH] ovs.tmac: Fix troff warning in versions above groff-1.23.
+
+When the compilation dependency is groff-1.23, the following message is
+displayed in the compilation log, and the compilation fails:
+
+  troff:vswitchd/ovs-vswitchd.8:1298: warning: cannot select font 'CW'
+  make[1]: *** [Makefile:6761: manpage-check] Error 1
+
+CW font was removed and and now groff warns about non-existent font:
+ https://git.savannah.gnu.org/cgit/groff.git/commit/?id=d75ea8b2e283e37bd560e821fa4597065f36725f)
+
+Fix that by replacing CW with CR.  CW supposed to be an alias of CR
+anyway.
+
+Submitted-at: https://github.com/openvswitch/ovs/pull/416
+Co-authored-by: Xiaojie Chen <jackchanx@163.com>
+Signed-off-by: Xiaojie Chen <jackchanx@163.com>
+Signed-off-by: gordonwwang <gordonwwang@tencent.com>
+Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
+---
+ lib/ovs.tmac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ovs.tmac b/lib/ovs.tmac
+index 5f8f20afa4a..97b6fa3df76 100644
+--- a/lib/ovs.tmac
++++ b/lib/ovs.tmac
+@@ -175,7 +175,7 @@
+ .  nr mE \\n(.f
+ .  nf
+ .  nh
+-.  ft CW
++.  ft CR
+ ..
+ .
+ .
+
+From 6929485d318e08c11e8e98f7847d5cefcb36c21c Mon Sep 17 00:00:00 2001
+From: Frode Nordahl <frode.nordahl@canonical.com>
+Date: Mon, 21 Aug 2023 15:53:33 +0200
+Subject: [PATCH] docs: Add `nowarn` region option to tables.
+
+Starting with groff 1.23.0 a warning is produced if the tbl
+preprocessor is not run.  A side effect of enabling it is that
+new warnings on table formatting is printed.
+
+As requested during the review [0] of a series [1] attempting to
+address this, this patch makes use of the `nowarn` region option
+as opposed to attempting to change the formatting.
+
+0: https://patchwork.ozlabs.org/project/openvswitch/patch/ZM00Wfa80rOb2oCA@riva.ucam.org/#3164177
+1: https://patchwork.ozlabs.org/project/openvswitch/list/?series=367378&state=*
+
+Reported-by: Lucas Nussbaum <lucas@debian.org>
+Reported-at: https://bugs.debian.org/1042358
+Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com>
+Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
+---
+ build-aux/extract-ofp-fields | 6 +++---
+ lib/meta-flow.xml            | 1 +
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
+index 8766995d9ab..7a9788be968 100755
+--- a/build-aux/extract-ofp-fields
++++ b/build-aux/extract-ofp-fields
+@@ -578,7 +578,7 @@ def field_to_xml(field_node, f, body, summary):
+     body += [""".PP
+ \\fB%s Field\\fR
+ .TS
+-tab(;);
++tab(;),nowarn;
+ l lx.
+ """ % title]
+ 
+@@ -655,7 +655,7 @@ def group_xml_to_nroff(group_node, fields):
+         '.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']
+@@ -665,7 +665,7 @@ def group_xml_to_nroff(group_node, fields):
+     return ''.join(content)
+ 
+ def make_oxm_classes_xml(document):
+-    s = '''tab(;);
++    s = '''tab(;),nowarn;
+ l l l.
+ Prefix;Vendor;Class
+ \_;\_;\_
+diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml
+index ff81fddc5e7..fe80ee930d0 100644
+--- a/lib/meta-flow.xml
++++ b/lib/meta-flow.xml
+@@ -3517,6 +3517,7 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123)
+     </p>
+ 
+     <tbl>
++nowarn;
+ r r r r r.
+ Criteria        OpenFlow 1.0    OpenFlow 1.1    OpenFlow 1.2+   NXM
+ \_      \_      \_      \_      \_
+From 93412e00e7a1f61c5eb4771d150bdbf504ff59aa Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Mon, 21 Aug 2023 15:53:34 +0200
+Subject: [PATCH] docs: Run tbl preprocessor in manpage-check rule.
+
+If we omit this, groff 1.23.0 warns:
+
+  tbl preprocessor failed, or it or soelim was not run; table(s) likely
+  not rendered (TE macro called with TW register undefined)
+
+Reported-by: Lucas Nussbaum <lucas@debian.org>
+Reported-at: https://bugs.debian.org/1042358
+Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
+Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cb8076433e8..2a41e63ad90 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -368,7 +368,7 @@ ALL_LOCAL += manpage-check
+ 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; \
+
diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild
index 9116398edd39..d45a3a68e714 100644
--- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.17.6.ebuild
@@ -36,8 +36,10 @@ BDEPEND="virtual/pkgconfig
 	$(python_gen_cond_dep '
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	')"
+
 PATCHES=(
 	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+	"${FILESDIR}/openvswitch-2.17.6-groff-1.23.0.patch"
 )
 
 CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"