[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/

2023-12-16 Thread Sam James 
commit: 3d6ce657536c2d79e5c348dbbb5da358dfb95aa6
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 11:56:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 16 11:58:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6ce657

net-misc/openvswitch: fix build w/ groff-1.23.0

Closes: https://bugs.gentoo.org/910196
Signed-off-by: Sam James  gentoo.org>

 .../files/openvswitch-2.17.6-groff-1.23.0.patch| 145 +
 net-misc/openvswitch/openvswitch-2.17.6.ebuild |   2 +
 2 files changed, 147 insertions(+)

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 ..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 
+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 
+Signed-off-by: Xiaojie Chen 
+Signed-off-by: gordonwwang 
+Signed-off-by: Ilya Maximets 
+---
+ 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 
+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/zm00wfa80rob2...@riva.ucam.org/#3164177
+1: https://patchwork.ozlabs.org/project/openvswitch/list/?series=367378=*
+
+Reported-by: Lucas Nussbaum 
+Reported-at: https://bugs.debian.org/1042358
+Signed-off-by: Frode Nordahl 
+Signed-off-by: Ilya Maximets 
+---
+ 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)
+ 
+ 
+ 
++nowarn;
+ r r r r r.
+ CriteriaOpenFlow 1.0OpenFlow 1.1OpenFlow 1.2+   NXM
+ \_  \_  \_  \_  \_
+From 93412e00e7a1f61c5eb4771d150bdbf504ff59aa Mon Sep 17 00:00:00 2001
+From: Colin Watson 
+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;

[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/

2023-05-06 Thread Matthew Thode 
commit: 0a3a711dce02952f2c9386834e180979e7e78c85
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat May  6 16:32:28 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat May  6 16:32:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3a711d

net-misc/openvswitch: switch all runtime dirs to /run

Signed-off-by: Matthew Thode  gentoo.org>

 net-misc/openvswitch/files/openvswitch.tmpfiles| 2 +-
 net-misc/openvswitch/files/ovs-vswitchd-r1 | 4 ++--
 net-misc/openvswitch/files/ovs-vswitchd-r3.service | 4 ++--
 net-misc/openvswitch/files/ovs-vswitchd.confd-r2   | 2 +-
 net-misc/openvswitch/files/ovsdb-server-r1 | 4 ++--
 net-misc/openvswitch/files/ovsdb-server-r3.service | 2 +-
 net-misc/openvswitch/files/ovsdb-server_conf2  | 2 +-
 net-misc/openvswitch/openvswitch-2.17.6.ebuild | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/net-misc/openvswitch/files/openvswitch.tmpfiles 
b/net-misc/openvswitch/files/openvswitch.tmpfiles
index 58c583ee4747..f99f19f89fb2 100644
--- a/net-misc/openvswitch/files/openvswitch.tmpfiles
+++ b/net-misc/openvswitch/files/openvswitch.tmpfiles
@@ -1 +1 @@
-d /var/run/openvswitch 0770 root root -
+d /run/openvswitch 0770 root root -

diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r1 
b/net-misc/openvswitch/files/ovs-vswitchd-r1
index bc5602a60030..f7da8e846789 100644
--- a/net-misc/openvswitch/files/ovs-vswitchd-r1
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r1
@@ -10,12 +10,12 @@ command_args="
 --detach
 --monitor
 ${OPTIONS} ${DATABASE}"
-pidfile="/var/run/openvswitch/ovs-vswitchd.pid"
+pidfile="/run/openvswitch/ovs-vswitchd.pid"
 
 depend() {
use ovsdb-server logger
 }
 
 start_pre() {
-   checkpath -d "/var/run/openvswitch" -m 0750
+   checkpath -d "/run/openvswitch" -m 0750
 }

diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r3.service 
b/net-misc/openvswitch/files/ovs-vswitchd-r3.service
index 165ea3bfbf81..8f157cfdd870 100644
--- a/net-misc/openvswitch/files/ovs-vswitchd-r3.service
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r3.service
@@ -6,12 +6,12 @@ Before=network.target network.service
 Requires=ovsdb-server.service
 After=ovsdb-server.service network-pre.target systemd-udev-settle.service
 ReloadPropagatedFrom=ovsdb-server.service
-AssertPathIsReadWrite=/var/run/openvswitch/db.sock
+AssertPathIsReadWrite=/run/openvswitch/db.sock
 
 [Service]
 Type=forking
 Restart=on-failure
-Environment=HOME=/var/run/openvswitch
+Environment=HOME=/run/openvswitch
 EnvironmentFile=-/etc/conf.d/ovs-vswitchd
 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
   --no-ovsdb-server --no-monitor --system-id=random \

diff --git a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 
b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2
index eb4b6c2f2831..6f383500fe7a 100644
--- a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2
+++ b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2
@@ -1,5 +1,5 @@
 # Connection string for the configuration database (usually a unix socket)
-DATABASE="unix:/var/run/openvswitch/db.sock"
+DATABASE="unix:/run/openvswitch/db.sock"
 
 # Additional options
 OPTIONS="--mlockall"

diff --git a/net-misc/openvswitch/files/ovsdb-server-r1 
b/net-misc/openvswitch/files/ovsdb-server-r1
index f7360adbb4c8..5fc2716d91d5 100644
--- a/net-misc/openvswitch/files/ovsdb-server-r1
+++ b/net-misc/openvswitch/files/ovsdb-server-r1
@@ -22,7 +22,7 @@ command_args="
 ${bootstrap_ca_cert}
 ${DATABASE}
 ${OPTIONS}"
-pidfile="/var/run/openvswitch/ovsdb-server.pid"
+pidfile="/run/openvswitch/ovsdb-server.pid"
 
 depend() {
need localmount
@@ -30,5 +30,5 @@ depend() {
 }
 
 start_pre() {
-   checkpath -d "/var/run/openvswitch" -m 0750
+   checkpath -d "/run/openvswitch" -m 0750
 }

diff --git a/net-misc/openvswitch/files/ovsdb-server-r3.service 
b/net-misc/openvswitch/files/ovsdb-server-r3.service
index a1d308478daa..8b779964ee06 100644
--- a/net-misc/openvswitch/files/ovsdb-server-r3.service
+++ b/net-misc/openvswitch/files/ovsdb-server-r3.service
@@ -9,7 +9,7 @@ Wants=ovs-delete-transient-ports.service
 Type=forking
 Restart=on-failure
 EnvironmentFile=-/etc/conf.d/ovsdb-server
-ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch 
/var/log/openvswitch
+ExecStartPre=/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch
 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
   --no-ovs-vswitchd --no-monitor --system-id=random \
   --ovs-user=${OVS_USER_ID} \

diff --git a/net-misc/openvswitch/files/ovsdb-server_conf2 
b/net-misc/openvswitch/files/ovsdb-server_conf2
index 07eca5e6c9f7..0ffb63c21ccd 100644
--- a/net-misc/openvswitch/files/ovsdb-server_conf2
+++ b/net-misc/openvswitch/files/ovsdb-server_conf2
@@ -1,5 +1,5 @@
 # Socket for bringing the server up
-DB_SOCKET="/var/run/openvswitch/db.sock"
+DB_SOCKET="/run/openvswitch/db.sock"
 
 # Remote sockets are defined in the database by

[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/

2019-06-03 Thread Matthew Thode 
commit: 9bf6443396a2c0cc12843670c920fc7ff7cb979b
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jun  3 14:49:48 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Jun  3 14:50:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf64433

net-misc/openvswitch: fix building on newer kernels

Fixes: https://bugs.gentoo.org/687186

Package-Manager: Portage-2.3.66, Repoman-2.3.13
Signed-off-by: Matthew Thode  gentoo.org>

 ...nntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 ++
 ...-2.11.1.ebuild => openvswitch-2.11.1-r1.ebuild} |  5 ++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git 
a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
 
b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
new file mode 100644
index 000..1f77ab54b0a
--- /dev/null
+++ 
b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
@@ -0,0 +1,46 @@
+From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
+From: Yousong Zhou 
+Date: Fri, 3 May 2019 15:03:24 +
+Subject: [PATCH 5/5] datapath: conntrack: fix include for
+ IP6_DEFRAG_CONNTRACK_IN
+
+The enum definition is now inside include/net/ipv6_frag.h since upstream commit
+70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was
+backported to stable trees (4.9, 4.14, 4.19) only these days.
+
+The error message
+
+ CC [M]  
/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o
+   
/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:
 In function 'handle_fragments':
+   
/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8:
 error: variable 'user' has initializer but incomplete type
+  enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+   ^~~~
+   
/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32:
 error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did 
you mean 'IP_DEFRAG_CONNTRACK_IN'?
+  enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+   ^~~
+   IP_DEFRAG_CONNTRACK_IN
+   
/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32:
 note: each undeclared identifier is reported only once for each function it 
appears in
+   
/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25:
 error: storage size of 'user' isn't known
+  enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+^~~~
+   
/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25:
 warning: unused variable 'user' [-Wunused-variable]
+   scripts/Makefile.build:326: recipe for target 
'/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o'
 failed
+
+Reference: 
https://github.com/openwrt/packages/issues/8548#issuecomment-488871090
+Signed-off-by: Yousong Zhou 
+---
+ datapath/conntrack.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/datapath/conntrack.c b/datapath/conntrack.c
+index a7dc9e0c3..69bda5a9c 100644
+--- a/datapath/conntrack.c
 b/datapath/conntrack.c
+@@ -31,6 +31,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #ifdef CONFIG_NF_NAT_NEEDED
+ #include 

diff --git a/net-misc/openvswitch/openvswitch-2.11.1.ebuild 
b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
similarity index 96%
rename from net-misc/openvswitch/openvswitch-2.11.1.ebuild
rename to net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
index a36bb2cdaa1..f2304f6ae35 100644
--- a/net-misc/openvswitch/openvswitch-2.11.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND}
sys-apps/util-linux[caps]
virtual/pkgconfig"
 
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+PATCHES="
+   ${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch
+   
${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
+"
 
 CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS

[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/

2018-12-19 Thread Matthew Thode 
commit: 7750fade80482bf075e56f4eabd52423c314fe69
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Dec 19 21:06:12 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Dec 19 21:06:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7750fade

net-misc/openvswitch: 2.10.1 bump

Closes: https://bugs.gentoo.org/673438
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Matthew Thode  gentoo.org>

 net-misc/openvswitch/Manifest  |  1 +
 ...s-vswitchd2.service => ovs-vswitchd-r2.service} |  0
 ...s-vswitchd2.service => ovs-vswitchd-r3.service} |  6 +++---
 net-misc/openvswitch/files/ovs-vswitchd.confd-r2   |  7 +++
 ...sdb-server2.service => ovsdb-server-r2.service} |  0
 ...sdb-server2.service => ovsdb-server-r3.service} |  6 ++
 net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild  |  4 ++--
 ...-2.10.0-r1.ebuild => openvswitch-2.10.1.ebuild} | 24 ++
 8 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index f4195ba8e11..3df07d1580f 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,2 +1,3 @@
 DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B 
a04e6e823a40e9a3a2d2ffd79a881b1f1e206a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2
 SHA512 
f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216
+DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 
0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3
 SHA512 
3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B 
b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1
 SHA512 
b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7

diff --git a/net-misc/openvswitch/files/ovs-vswitchd2.service 
b/net-misc/openvswitch/files/ovs-vswitchd-r2.service
similarity index 100%
copy from net-misc/openvswitch/files/ovs-vswitchd2.service
copy to net-misc/openvswitch/files/ovs-vswitchd-r2.service

diff --git a/net-misc/openvswitch/files/ovs-vswitchd2.service 
b/net-misc/openvswitch/files/ovs-vswitchd-r3.service
similarity index 83%
rename from net-misc/openvswitch/files/ovs-vswitchd2.service
rename to net-misc/openvswitch/files/ovs-vswitchd-r3.service
index 3092fdaaa66..165ea3bfbf8 100644
--- a/net-misc/openvswitch/files/ovs-vswitchd2.service
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r3.service
@@ -12,14 +12,14 @@ AssertPathIsReadWrite=/var/run/openvswitch/db.sock
 Type=forking
 Restart=on-failure
 Environment=HOME=/var/run/openvswitch
-EnvironmentFile=-/run/openvswitch/useropts
 EnvironmentFile=-/etc/conf.d/ovs-vswitchd
 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
   --no-ovsdb-server --no-monitor --system-id=random \
-  ${OVSUSER} start $OPTIONS
+  --ovs-user=${OVS_USER_ID} start $OPTIONS
 ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop
 ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \
-  --no-monitor --system-id=random ${OVSUSER} restart $OPTIONS
+  --no-monitor --system-id=random --ovs-user=${OVS_USER_ID} \
+  restart $OPTIONS
 TimeoutSec=300
 
 [Install]

diff --git a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 
b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2
new file mode 100644
index 000..eb4b6c2f283
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2
@@ -0,0 +1,7 @@
+# Connection string for the configuration database (usually a unix socket)
+DATABASE="unix:/var/run/openvswitch/db.sock"
+
+# Additional options
+OPTIONS="--mlockall"
+
+OVS_USER_ID="root:root"

diff --git a/net-misc/openvswitch/files/ovsdb-server2.service 
b/net-misc/openvswitch/files/ovsdb-server-r2.service
similarity index 100%
copy from net-misc/openvswitch/files/ovsdb-server2.service
copy to net-misc/openvswitch/files/ovsdb-server-r2.service

diff --git a/net-misc/openvswitch/files/ovsdb-server2.service 
b/net-misc/openvswitch/files/ovsdb-server-r3.service
similarity index 72%
rename from net-misc/openvswitch/files/ovsdb-server2.service
rename to net-misc/openvswitch/files/ovsdb-server-r3.service
index 5ff6f904466..a1d308478da 100644
--- a/net-misc/openvswitch/files/ovsdb-server2.service
+++ b/net-misc/openvswitch/files/ovsdb-server-r3.service
@@ -10,15 +10,13 @@ Type=forking
 Restart=on-failure
 EnvironmentFile=-/etc/conf.d/ovsdb-server
 ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch 
/var/log/openvswitch
-ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ 
"$${OVS_USER_ID/:*/}" !=

[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/

2017-04-21 Thread Matt Thode 
commit: 3ebea21b30582a7b11f1e17717b106ea0c660ec6
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Apr 21 19:32:45 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Apr 21 19:32:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ebea21b

net-misc/openvswitch: 2.7.0-r2 fixing bug 614520

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/openvswitch/files/doc-fix.patch |  16 +++
 net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild | 151 +++
 2 files changed, 167 insertions(+)

diff --git a/net-misc/openvswitch/files/doc-fix.patch 
b/net-misc/openvswitch/files/doc-fix.patch
new file mode 100644
index 000..1d6df01147e
--- /dev/null
+++ b/net-misc/openvswitch/files/doc-fix.patch
@@ -0,0 +1,16 @@
+We might want to backport this if there are any releases with the Sphinx
+docs present.
+---
+ Documentation/conf.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Documentation/conf.py b/Documentation/conf.py
+index 49514ec..97f402e 100644
+--- a/Documentation/conf.py
 b/Documentation/conf.py
+@@ -145,8 +145,6 @@ linkcheck_anchors = False
+ #
+ if use_ovs_theme:
+ html_theme = 'ovs'
+-else:
+-html_theme = 'default'

diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild 
b/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild
new file mode 100644
index 000..4bcf09a7a4f
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org;
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz;
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+
+RDEPEND="
+   || (
+   >=sys-apps/openrc-0.10.5
+   sys-apps/systemd
+   )
+   ssl? ( dev-libs/openssl:0= )
+   ${PYTHON_DEPS}
+   ~dev-python/ovs-${PV}[${PYTHON_USEDEP}]
+   dev-python/twisted[conch,${PYTHON_USEDEP}]
+   dev-python/zope-interface[${PYTHON_USEDEP}]
+   debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch 
${FILESDIR}/doc-fix.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 
~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+   if use modules ; then
+   CONFIG_CHECK+=" ~!OPENVSWITCH"
+   kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required 
for userspace modules"
+   kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 
required for userspace modules"
+   linux-mod_pkg_setup
+   else
+   CONFIG_CHECK+=" ~OPENVSWITCH"
+   linux-info_pkg_setup
+   fi
+}
+
+src_prepare() {
+   # Never build kernelmodules, doing this manually
+   sed -i \
+   -e '/^SUBDIRS/d' \
+   datapath/Makefile.in || die "sed failed"
+   eautoreconf
+   default
+}
+
+src_configure() {
+   set_arch_to_kernel
+   # monitor is statically enabled for bug 596206
+   use monitor || export ovs_cv_python="no"
+   # pyside is staticly disabled
+   export ovs_cv_pyuic4="no"
+
+   local linux_config
+   use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+   econf ${linux_config} \
+   --with-rundir=/var/run/openvswitch \
+   --with-logdir=/var/log/openvswitch \
+   --with-pkidir=/etc/ssl/openvswitch \
+   --with-dbdir=/var/lib/openvswitch \
+   $(use_enable ssl) \
+   $(use_enable !debug ndebug)
+}
+
+src_compile() {
+   default
+
+   use modules && linux-mod_src_compile
+}
+
+src_install() {
+   default
+
+   local SCRIPT
+   if use monitor; then
+   for SCRIPT in 
ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} 
bugtool/ovs-bugtool; do
+   sed -e '1s|^.*$|#!/usr/bin/python|' -i 
utilities/"${SCRIPT}"
+   python_foreach_impl python_doscript 
utilities/"${SCRIPT}"
+   done
+   rm -r "${ED%/}"/usr/share/openvswitch/python || die
+   fi
+
+   keepdir /var/{lib,log}/openvswitch
+   keepdir /etc/ssl/openvswitch
+   fperms 0750 /etc/ssl/openvswitch
+
+   rm -rf "${ED%/}"/var/run || die
+
+   newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+   newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+   newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+   newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+   systemd_dounit "${FILESDIR}/ovsdb-server.service"
+