* [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
@ 2016-12-18 19:03 Matt Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matt Thode @ 2016-12-18 19:03 UTC (permalink / raw
To: gentoo-commits
commit: 4da1a5e2b8c81ad3f9cdafd02957f1f522211152
Author: Geaaru <geaaru <AT> gmail <DOT> com>
AuthorDate: Sun Dec 18 18:36:30 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 19:03:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da1a5e2
net-misc/openvswitch: fix ovs-vswitchd.service
Package-Manager: portage-2.3.0
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
net-misc/openvswitch/files/ovs-vswitchd.service | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service
index 266bb0a..a573a50 100644
--- a/net-misc/openvswitch/files/ovs-vswitchd.service
+++ b/net-misc/openvswitch/files/ovs-vswitchd.service
@@ -7,7 +7,9 @@ Requires=ovsdb-server.service
After=ovsdb-server.service
[Service]
-ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock
+# --pidfile options is needed for create file used
+# by ovs-appctl command.
+ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock --pidfile
[Install]
WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
@ 2017-08-24 19:14 Matt Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matt Thode @ 2017-08-24 19:14 UTC (permalink / raw
To: gentoo-commits
commit: bc6832812b3411e182361a77c997eef96ba84371
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 23 08:20:26 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 19:14:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc683281
net-misc/openvswitch: remove unused patches/files
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
net-misc/openvswitch/files/CVE-2017-9214.patch | 27 ------
net-misc/openvswitch/files/atomic-test.patch | 14 ---
net-misc/openvswitch/files/configure.patch | 15 ---
net-misc/openvswitch/files/doc-fix.patch | 16 ---
.../openvswitch/files/kernel-3.11-support.patch | 68 -------------
.../openvswitch/files/kernel-3.12-support.patch | 19 ----
net-misc/openvswitch/files/ovs-controller-r1 | 22 -----
net-misc/openvswitch/files/ovs-controller.service | 9 --
net-misc/openvswitch/files/ovs-controller_conf | 7 --
net-misc/openvswitch/files/prevent-traceback.patch | 107 ---------------------
.../files/xcp-interface-reconfigure.patch | 20 ----
11 files changed, 324 deletions(-)
diff --git a/net-misc/openvswitch/files/CVE-2017-9214.patch b/net-misc/openvswitch/files/CVE-2017-9214.patch
deleted file mode 100644
index 33686df3acf..00000000000
--- a/net-misc/openvswitch/files/CVE-2017-9214.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix buffer overrread in ofputil_pull_queue_get_config_reply10()
-
-msg->size isn't the relevant measurement here because we're only supposed
-to read 'len' bytes. Reading more than that causes 'len' to underflow to a
-large number at the end of the loop.
-
-Reported-by: Bhargava Shastry <bshastry at sec.t-labs.tu-berlin.de>
-Signed-off-by: Ben Pfaff <blp at ovn.org>
----
- lib/ofp-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ofp-util.c b/lib/ofp-util.c
-index bdf89b6c3017..f05ca398c13e 100644
---- a/lib/ofp-util.c
-+++ b/lib/ofp-util.c
-@@ -2610,7 +2610,7 @@ ofputil_pull_queue_get_config_reply10(struct ofpbuf *msg,
-
- hdr = ofpbuf_at_assert(msg, 0, sizeof *hdr);
- prop_len = ntohs(hdr->len);
-- if (prop_len < sizeof *hdr || prop_len > msg->size || prop_len % 8) {
-+ if (prop_len < sizeof *hdr || prop_len > len || prop_len % 8) {
- return OFPERR_OFPBRC_BAD_LEN;
- }
-
---
-2.10.2
diff --git a/net-misc/openvswitch/files/atomic-test.patch b/net-misc/openvswitch/files/atomic-test.patch
deleted file mode 100644
index 14de564de9c..00000000000
--- a/net-misc/openvswitch/files/atomic-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Link atomic test with -latomic for powerpc.
-Author: Adam Conrad <adconrad@ubuntu.com>
-
---- openvswitch-2.0.0.orig/tests/automake.mk
-+++ openvswitch-2.0.0/tests/automake.mk
-@@ -181,7 +181,7 @@ tests_test_aes128_LDADD = lib/libopenvsw
-
- noinst_PROGRAMS += tests/test-atomic
- tests_test_atomic_SOURCES = tests/test-atomic.c
--tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-+tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS) -latomic
-
- noinst_PROGRAMS += tests/test-bundle
- tests_test_bundle_SOURCES = tests/test-bundle.c
diff --git a/net-misc/openvswitch/files/configure.patch b/net-misc/openvswitch/files/configure.patch
deleted file mode 100644
index 47f5614d8ed..00000000000
--- a/net-misc/openvswitch/files/configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig 2014-01-27 21:55:14.116272645 +0200
-+++ configure 2014-01-27 21:55:40.687273108 +0200
-@@ -7949,10 +7949,10 @@
- $as_echo "$kversion" >&6; }
-
- if test "$version" -ge 3; then
-- if test "$version" = 3 && test "$patchlevel" -le 10; then
-+ if test "$version" = 3 && test "$patchlevel" -le 12; then
- : # Linux 3.x
- else
-- as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.10.x is not supported" "$LINENO" 5
-+ as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported" "$LINENO" 5
- fi
- else
- if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
diff --git a/net-misc/openvswitch/files/doc-fix.patch b/net-misc/openvswitch/files/doc-fix.patch
deleted file mode 100644
index 1d6df01147e..00000000000
--- a/net-misc/openvswitch/files/doc-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/files/kernel-3.11-support.patch b/net-misc/openvswitch/files/kernel-3.11-support.patch
deleted file mode 100644
index 7ee53d83500..00000000000
--- a/net-misc/openvswitch/files/kernel-3.11-support.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
- AC_MSG_RESULT([$kversion])
-
- if test "$version" -ge 3; then
-- if test "$version" = 3 && test "$patchlevel" -le 10; then
-+ if test "$version" = 3 && test "$patchlevel" -le 11; then
- : # Linux 3.x
- else
-- AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.10.x is not supported])
-+ AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.11.x is not supported])
- fi
- else
- if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
---- a/datapath/dp_notify.c
-+++ b/datapath/dp_notify.c
-@@ -79,7 +79,7 @@ static int dp_device_event(struct notifi
- void *ptr)
- {
- struct ovs_net *ovs_net;
-- struct net_device *dev = ptr;
-+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
- struct vport *vport = NULL;
-
- if (!ovs_is_internal_dev(dev))
---- a/datapath/linux/compat/include/linux/netdevice.h
-+++ b/datapath/linux/compat/include/linux/netdevice.h
-@@ -120,4 +120,11 @@ static inline void netdev_upper_dev_unli
- }
- #endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
-+static inline struct net_device *netdev_notifier_info_to_dev(void *info)
-+{
-+ return info;
-+}
-+#endif
-+
- #endif
---- a/datapath/linux/compat/include/net/gre.h
-+++ b/datapath/linux/compat/include/net/gre.h
-@@ -74,12 +74,17 @@ static inline __be16 tnl_flags_to_gre_fl
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */
-
- #define MAX_GRE_PROTO_PRIORITY 255
-+#define gre_cisco_protocol rpl_gre_cisco_protocol
-+
- struct gre_cisco_protocol {
- int (*handler)(struct sk_buff *skb, const struct tnl_ptk_info *tpi);
- u8 priority;
- };
-
-+#define gre_cisco_register rpl_gre_cisco_register
- int gre_cisco_register(struct gre_cisco_protocol *proto);
-+
-+#define gre_cisco_unregister rpl_gre_cisco_unregister
- int gre_cisco_unregister(struct gre_cisco_protocol *proto);
-
- #define gre_build_header rpl_gre_build_header
-@@ -89,6 +94,7 @@ void gre_build_header(struct sk_buff *sk
- #define gre_handle_offloads rpl_gre_handle_offloads
- struct sk_buff *gre_handle_offloads(struct sk_buff *skb, bool gre_csum);
-
-+#define ip_gre_calc_hlen rpl_ip_gre_calc_hlen
- static inline int ip_gre_calc_hlen(__be16 o_flags)
- {
- int addend = 4;
diff --git a/net-misc/openvswitch/files/kernel-3.12-support.patch b/net-misc/openvswitch/files/kernel-3.12-support.patch
deleted file mode 100644
index 85f19ecc2ab..00000000000
--- a/net-misc/openvswitch/files/kernel-3.12-support.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Enable support for 3.12 kernel
-Author: James Page <james.page@ubuntu.com>
-Forwarded: no
-
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
- AC_MSG_RESULT([$kversion])
-
- if test "$version" -ge 3; then
-- if test "$version" = 3 && test "$patchlevel" -le 11; then
-+ if test "$version" = 3 && test "$patchlevel" -le 12; then
- : # Linux 3.x
- else
-- AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.11.x is not supported])
-+ AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported])
- fi
- else
- if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
diff --git a/net-misc/openvswitch/files/ovs-controller-r1 b/net-misc/openvswitch/files/ovs-controller-r1
deleted file mode 100644
index b48d2975747..00000000000
--- a/net-misc/openvswitch/files/ovs-controller-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Open vSwitch OpenFlow controller"
-
-command="/usr/bin/ovs-controller"
-command_args="
- --pidfile
- --detach
- --monitor
- ${OPTIONS} ${METHODS}"
-pidfile="/var/run/openvswitch/ovs-controller.pid"
-
-depend() {
- need net
- use logger
-}
-
-start_pre() {
- checkpath -d "/var/run/openvswitch" -m 0750
-}
diff --git a/net-misc/openvswitch/files/ovs-controller.service b/net-misc/openvswitch/files/ovs-controller.service
deleted file mode 100644
index 723c5caa1f6..00000000000
--- a/net-misc/openvswitch/files/ovs-controller.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Open vSwitch OpenFlow controller
-Requires=network.target
-
-[Service]
-ExecStart=/usr/bin/ovs-controller --monitor ptcp:
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovs-controller_conf b/net-misc/openvswitch/files/ovs-controller_conf
deleted file mode 100644
index 1756c9b98bc..00000000000
--- a/net-misc/openvswitch/files/ovs-controller_conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Space separated list of methods to listen for OpenFlow connections from switches
-# The default ist "ptcp:" which starts ovs-controller listening on port 6633 on all interfaces.
-METHODS="ptcp:"
-
-# Additional options
-# OPTIONS=""
diff --git a/net-misc/openvswitch/files/prevent-traceback.patch b/net-misc/openvswitch/files/prevent-traceback.patch
deleted file mode 100644
index 858f24c2f59..00000000000
--- a/net-misc/openvswitch/files/prevent-traceback.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-commit d4d1107c3a49a4dadf6dc8ac55d6fefa25a8e06a
-Author: Alexei Starovoitov <ast@plumgrid.com>
-Date: Wed Oct 16 15:28:23 2013 -0700
-
- cherry-pick 8e04c6e10c28e42c715eb9fef749554c123bddbc
-
-diff --git a/AUTHORS b/AUTHORS
-index 2d29e66..7a62704 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -2,6 +2,8 @@ The following people, in alphabetical order, have either authored or
- signed off on commits in the Open vSwitch version control repository.
-
- Aaron Rosen arosen@clemson.edu
-+Alexandru Copot alex.mihai.c@gmail.com
-+Alexei Starovoitov ast@plumgrid.com
- Alexey I. Froloff raorn@altlinux.org
- Alex Wang alexw@nicira.com
- Andrew Evans aevans@nicira.com
-diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
-index 847f611..a973623 100644
---- a/datapath/dp_notify.c
-+++ b/datapath/dp_notify.c
-@@ -66,8 +66,7 @@ void ovs_dp_notify_wq(struct work_struct *work)
- continue;
-
- netdev_vport = netdev_vport_priv(vport);
-- if (netdev_vport->dev->reg_state == NETREG_UNREGISTERED ||
-- netdev_vport->dev->reg_state == NETREG_UNREGISTERING)
-+ if (!(ovs_netdev_get_vport(netdev_vport->dev)))
- dp_detach_port_notify(vport);
- }
- }
-@@ -89,6 +88,10 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
- return NOTIFY_DONE;
-
- if (event == NETDEV_UNREGISTER) {
-+ /* upper_dev_unlink and decrement promisc immediately */
-+ ovs_netdev_detach_dev(vport);
-+
-+ /* schedule vport destroy, dev_put and genl notification */
- ovs_net = net_generic(dev_net(dev), ovs_net_id);
- queue_work(&ovs_net->dp_notify_work);
- }
-diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h
-index 4e2b7f5..908ed86 100644
---- a/datapath/linux/compat/include/linux/netdevice.h
-+++ b/datapath/linux/compat/include/linux/netdevice.h
-@@ -118,6 +118,11 @@ static inline void netdev_upper_dev_unlink(struct net_device *dev,
- struct net_device *upper_dev)
- {
- }
-+
-+static inline struct net_device *netdev_master_upper_dev_get(struct net_device *dev)
-+{
-+ return NULL;
-+}
- #endif
-
- #endif
-diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
-index 215a47e..0c9f603 100644
---- a/datapath/vport-netdev.c
-+++ b/datapath/vport-netdev.c
-@@ -201,16 +201,27 @@ static void free_port_rcu(struct rcu_head *rcu)
- ovs_vport_free(vport_from_priv(netdev_vport));
- }
-
--static void netdev_destroy(struct vport *vport)
-+void ovs_netdev_detach_dev(struct vport *vport)
- {
- struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-
-- netdev_exit();
-- rtnl_lock();
-+ ASSERT_RTNL();
- netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;
- netdev_rx_handler_unregister(netdev_vport->dev);
-- netdev_upper_dev_unlink(netdev_vport->dev, get_dpdev(vport->dp));
-+ netdev_upper_dev_unlink(netdev_vport->dev,
-+ netdev_master_upper_dev_get(netdev_vport->dev));
- dev_set_promiscuity(netdev_vport->dev, -1);
-+}
-+
-+static void netdev_destroy(struct vport *vport)
-+{
-+ struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-+
-+ netdev_exit();
-+
-+ rtnl_lock();
-+ if (ovs_netdev_get_vport(netdev_vport->dev))
-+ ovs_netdev_detach_dev(vport);
- rtnl_unlock();
-
- call_rcu(&netdev_vport->rcu, free_port_rcu);
-diff --git a/datapath/vport-netdev.h b/datapath/vport-netdev.h
-index dd298b5..8df01c1 100644
---- a/datapath/vport-netdev.h
-+++ b/datapath/vport-netdev.h
-@@ -39,5 +39,6 @@ netdev_vport_priv(const struct vport *vport)
- }
-
- const char *ovs_netdev_get_name(const struct vport *);
-+void ovs_netdev_detach_dev(struct vport *);
-
- #endif /* vport_netdev.h */
diff --git a/net-misc/openvswitch/files/xcp-interface-reconfigure.patch b/net-misc/openvswitch/files/xcp-interface-reconfigure.patch
deleted file mode 100644
index 8f685b8157f..00000000000
--- a/net-misc/openvswitch/files/xcp-interface-reconfigure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use xcp-xapi interface-reconfigure if found
- Ubuntu/Debian provide the XCP interface-reconfigure hook in
- a FHS compliant location; use this if found.
-Author: James Page <james.page@ubuntu.com>
-Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1195053
-Forwarded: no
-
---- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
-+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
-@@ -43,6 +43,10 @@ def delete_cacert():
- def update(session, args):
- # Refresh bridge network UUIDs in case this host joined or left a pool.
- script = "/opt/xensource/libexec/interface-reconfigure"
-+ # NOTE(jamespage): Override with distro xcp xapi locations
-+ # if present
-+ if os.path.exists('/usr/lib/xcp/lib/interface-reconfigure'):
-+ script = '/usr/lib/xcp/lib/interface-reconfigure'
- try:
- retval = subprocess.call([script, "rewrite"])
- if retval != 0:
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
@ 2019-06-29 19:20 Matthew Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Thode @ 2019-06-29 19:20 UTC (permalink / raw
To: gentoo-commits
commit: ad49e79cd1c439fb595b872db60b97eff18e1a62
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 29 18:13:46 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 19:19:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad49e79c
net-misc/openvswitch: remove unused files
Closes: https://github.com/gentoo/gentoo/pull/12354
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
net-misc/openvswitch/files/ovs-vswitchd-r2.service | 26 ----------------------
net-misc/openvswitch/files/ovs-vswitchd_conf | 6 -----
net-misc/openvswitch/files/ovsdb-server-r2.service | 24 --------------------
3 files changed, 56 deletions(-)
diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r2.service b/net-misc/openvswitch/files/ovs-vswitchd-r2.service
deleted file mode 100644
index 3092fdaaa66..00000000000
--- a/net-misc/openvswitch/files/ovs-vswitchd-r2.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=Open vSwitch Daemon
-Documentation=man:ovs-vswitchd
-Wants=network.target
-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
-
-[Service]
-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
-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
-TimeoutSec=300
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovs-vswitchd_conf b/net-misc/openvswitch/files/ovs-vswitchd_conf
deleted file mode 100644
index c9eadb41862..00000000000
--- a/net-misc/openvswitch/files/ovs-vswitchd_conf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# Connection string for the configuration database (usually a unix socket)
-DATABASE="unix:/var/run/openvswitch/db.sock"
-
-# Additional options
-OPTIONS="--mlockall"
diff --git a/net-misc/openvswitch/files/ovsdb-server-r2.service b/net-misc/openvswitch/files/ovsdb-server-r2.service
deleted file mode 100644
index 5ff6f904466..00000000000
--- a/net-misc/openvswitch/files/ovsdb-server-r2.service
+++ /dev/null
@@ -1,24 +0,0 @@
-[Unit]
-Description=Open vSwitch Database Unit
-Documentation=man:ovsdb-server
-After=syslog.target network-pre.target
-Before=network.target network.service
-Wants=ovs-delete-transient-ports.service
-
-[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/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi'
-EnvironmentFile=-/run/openvswitch/useropts
-ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
- --no-ovs-vswitchd --no-monitor --system-id=random \
- ${OVSUSER} \
- start $OPTIONS
-ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop
-ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
- ${OVSUSER} \
- --no-monitor restart $OPTIONS
-RuntimeDirectory=openvswitch
-RuntimeDirectoryMode=0755
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
@ 2020-06-27 20:51 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2020-06-27 20:51 UTC (permalink / raw
To: gentoo-commits
commit: f3997db2fc476258099dc8e26d746269caa81dca
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jun 26 06:54:48 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 20:49:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3997db2
net-misc/openvswitch: remove unused patch
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16428
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
...nntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 ----------------------
1 file changed, 46 deletions(-)
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
deleted file mode 100644
index 1f77ab54b0a..00000000000
--- a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <zhouyousong@yunionyun.com>
-Date: Fri, 3 May 2019 15:03:24 +0000
-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 <zhouyousong@yunionyun.com>
----
- 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 <net/netfilter/nf_conntrack_seqadj.h>
- #include <net/netfilter/nf_conntrack_zones.h>
- #include <net/netfilter/ipv6/nf_defrag_ipv6.h>
-+#include <net/ipv6_frag.h>
-
- #ifdef CONFIG_NF_NAT_NEEDED
- #include <linux/netfilter/nf_nat.h>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
@ 2024-05-09 19:54 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-05-09 19:54 UTC (permalink / raw
To: gentoo-commits
commit: a3ab78d7f79a637cf1c5e9a286f4e32b6fcfad53
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed May 8 18:11:24 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu May 9 19:54:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ab78d7
net-misc/openvswitch: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/36605
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/openvswitch-2.17.6-groff-1.23.0.patch | 145 ---------------------
1 file changed, 145 deletions(-)
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
deleted file mode 100644
index 3035005ae52e..000000000000
--- a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-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; \
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-09 19:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-09 19:54 [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-06-27 20:51 Aaron Bauman
2019-06-29 19:20 Matthew Thode
2017-08-24 19:14 Matt Thode
2016-12-18 19:03 Matt Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox