forked from ports/contrib
openvswitch: 3.1.2 -> 3.2.0
This commit is contained in:
parent
6df2ae9541
commit
d84ba81237
GPG Key ID:
42F8B4E30B673606
@ -169,6 +169,7 @@ drwxr-xr-x root/root usr/share/openvswitch/python/ovs/db/
|
||||
-rw-r--r-- root/root usr/share/openvswitch/python/ovs/db/schema.py
|
||||
-rw-r--r-- root/root usr/share/openvswitch/python/ovs/db/types.py
|
||||
-rw-r--r-- root/root usr/share/openvswitch/python/ovs/dirs.py
|
||||
-rw-r--r-- root/root usr/share/openvswitch/python/ovs/dns_resolve.py
|
||||
-rw-r--r-- root/root usr/share/openvswitch/python/ovs/fatal_signal.py
|
||||
-rw-r--r-- root/root usr/share/openvswitch/python/ovs/fcntl_win.py
|
||||
drwxr-xr-x root/root usr/share/openvswitch/python/ovs/flow/
|
||||
@ -229,6 +230,7 @@ drwxr-xr-x root/root usr/share/openvswitch/scripts/
|
||||
drwxr-xr-x root/root usr/share/openvswitch/scripts/usdt/
|
||||
-rwxr-xr-x root/root usr/share/openvswitch/scripts/usdt/bridge_loop.bt
|
||||
-rwxr-xr-x root/root usr/share/openvswitch/scripts/usdt/dpif_nl_exec_monitor.py
|
||||
-rwxr-xr-x root/root usr/share/openvswitch/scripts/usdt/reval_monitor.py
|
||||
-rwxr-xr-x root/root usr/share/openvswitch/scripts/usdt/upcall_cost.py
|
||||
-rwxr-xr-x root/root usr/share/openvswitch/scripts/usdt/upcall_monitor.py
|
||||
-rw-r--r-- root/root usr/share/openvswitch/vswitch.ovsschema
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF34qKg2eJn2m0aT8oD+B/EwOB+wtiv9E9l66n6OQmwCPRhIBxqpgMaAwzd9rxqNv77YsLD4I++3KmglunYaxZiAg=
|
||||
SHA256 (Pkgfile) = df84daef541bbd6463a75a89f87b2febfaf496314d3d64103818302c002714e4
|
||||
SHA256 (.footprint) = 828f63fc2030f5e81a465e91e86c9bd3b3d56dcc96fcc5c87b1ccd2960935154
|
||||
SHA256 (openvswitch-3.1.2.tar.gz) = 7a6611f72608f526a118d4820c63a32a10450250a602463c4303abec49dc905e
|
||||
RWSagIOpLGJF3xsmGwK63In5jDSfYaEXxxrg69DtpjE6/YZs3eIV37JH0WXdHSR11AXQI7pau6hY1BtdTvemoCUvD5dMDIwF6gs=
|
||||
SHA256 (Pkgfile) = 3746de38731ba13912c35ef4a5122652d21f330f5c5b12d724e8371f32b7b306
|
||||
SHA256 (.footprint) = 8d304db8206f0df3f0a7b0fefdbbfb82cb07cba658d2fcbc4566524a9a5fb023
|
||||
SHA256 (openvswitch-3.2.0.tar.gz) = ce917e78cc0addff834af3c4f6b8d2d5071a407ecc553a71ad532d4e015914c4
|
||||
SHA256 (docs-1-Add-nowarn-region-option-to-tables.patch) = a8407f9055e0e33c4dbf06f8f963b9651769331afd57abb518a1cafb9c72846c
|
||||
SHA256 (docs-2-Run_tbl_preprocessor_in_manpage-check_rule.patch) = 4ef456b7fe5c1f1284e16385ac90bfaa97321fe496afda5a1e3819b4c58f4d8e
|
||||
SHA256 (lib-fatal-signal-Drop-logging-of-failed-dummy-backtr.patch) = 79de37eedebb35e958f8c0de58be5b15fe15df24620b94bf59c186d783b2558b
|
||||
SHA256 (ovsd) = 90db323a867d936c9f533c0f912fadc6f1708a8e37eefb1022ce6354adf391eb
|
||||
|
||||
@ -4,12 +4,21 @@
|
||||
# Depends on: python3-six
|
||||
|
||||
name=openvswitch
|
||||
version=3.1.2
|
||||
version=3.2.0
|
||||
release=1
|
||||
source=(http://openvswitch.org/releases/openvswitch-$version.tar.gz ovsd)
|
||||
source=(http://openvswitch.org/releases/openvswitch-$version.tar.gz
|
||||
docs-1-Add-nowarn-region-option-to-tables.patch
|
||||
docs-2-Run_tbl_preprocessor_in_manpage-check_rule.patch
|
||||
lib-fatal-signal-Drop-logging-of-failed-dummy-backtr.patch
|
||||
ovsd)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -Np1 -i $SRC/docs-1-Add-nowarn-region-option-to-tables.patch
|
||||
patch -Np1 -i $SRC/docs-2-Run_tbl_preprocessor_in_manpage-check_rule.patch
|
||||
patch -Np1 -i $SRC/lib-fatal-signal-Drop-logging-of-failed-dummy-backtr.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
|
||||
70
openvswitch/docs-1-Add-nowarn-region-option-to-tables.patch
Normal file
70
openvswitch/docs-1-Add-nowarn-region-option-to-tables.patch
Normal file
@ -0,0 +1,70 @@
|
||||
From 4deb986bdbdf49d7cd5189383782b70442680c36 Mon Sep 17 00:00:00 2001
|
||||
From: Frode Nordahl <frode.nordahl@canonical.com>
|
||||
Date: Mon, 21 Aug 2023 09:15:24 +0200
|
||||
Subject: [PATCH v3 1/2] 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>
|
||||
---
|
||||
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 efec59c25..6366bd446 100755
|
||||
--- a/build-aux/extract-ofp-fields
|
||||
+++ b/build-aux/extract-ofp-fields
|
||||
@@ -216,7 +216,7 @@ def field_to_xml(field_node, f, body, summary):
|
||||
""".PP
|
||||
\\fB%s Field\\fR
|
||||
.TS
|
||||
-tab(;);
|
||||
+tab(;),nowarn;
|
||||
l lx.
|
||||
"""
|
||||
% title
|
||||
@@ -317,7 +317,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",
|
||||
@@ -329,7 +329,7 @@ def group_xml_to_nroff(group_node, fields):
|
||||
|
||||
|
||||
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 bdd12f6a7..416ea0cf2 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
|
||||
\_ \_ \_ \_ \_
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
Description: [PATCH v2 5/5] docs: Run tbl preprocessor in manpage-check rule
|
||||
Date: Fri, 4 Aug 2023 18:25:33 +0100
|
||||
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)
|
||||
.
|
||||
Author: Colin Watson <cjwatson@ubuntu.com>
|
||||
Bug-Debian: https://bugs.debian.org/1042358
|
||||
Last-Update: 2023-08-07
|
||||
|
||||
Index: openvswitch/Makefile.am
|
||||
===================================================================
|
||||
--- openvswitch.orig/Makefile.am
|
||||
+++ openvswitch/Makefile.am
|
||||
@@ -367,7 +367,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; \
|
||||
@ -0,0 +1,41 @@
|
||||
From 2d9cee25d9f196759ef0a54bcb8635e462b9bb5f Mon Sep 17 00:00:00 2001
|
||||
From: Frode Nordahl <frode.nordahl@canonical.com>
|
||||
Date: Tue, 22 Aug 2023 10:31:49 +0200
|
||||
Subject: [PATCH] lib/fatal-signal: Drop logging of failed dummy backtrace.
|
||||
|
||||
Some systems may provide backtrace() in libc but for some reason
|
||||
not provide any frames when attempting to use it.
|
||||
|
||||
On those systems the fatal_signal_init() function currently logs
|
||||
this debug message: "Capturing of dummy backtrace has failed."
|
||||
|
||||
A consequence of this logging may be false negative test results.
|
||||
|
||||
Logging the fact that backtrace() does not work has limited value
|
||||
on a production system and I propose we drop it.
|
||||
|
||||
Fixes: 759a29dc2d97 ("backtrace: Extend the backtrace functionality.")
|
||||
Reported-at: https://launchpad.net/bugs/2032623
|
||||
Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com>
|
||||
---
|
||||
lib/fatal-signal.c | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
|
||||
index 77f0c87dd..953150074 100644
|
||||
--- a/lib/fatal-signal.c
|
||||
+++ b/lib/fatal-signal.c
|
||||
@@ -138,10 +138,6 @@ fatal_signal_init(void)
|
||||
|
||||
backtrace_capture(&dummy_bt);
|
||||
|
||||
- if (!dummy_bt.n_frames) {
|
||||
- VLOG_DBG("Capturing of dummy backtrace has failed.");
|
||||
- }
|
||||
-
|
||||
fatal_signal_create_wakeup_events();
|
||||
|
||||
#ifdef _WIN32
|
||||
--
|
||||
2.40.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user