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 <[email protected]>
-
---- 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 <[email protected]>
-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 <[email protected]>
-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 [email protected]
-+Alexandru Copot [email protected]
-+Alexei Starovoitov [email protected]
- Alexey I. Froloff [email protected]
- Alex Wang [email protected]
- Andrew Evans [email protected]
-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 <[email protected]>
-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:
