Attachment 192447 Details for Bug 227458 – openvswitch 2.9.0 patch

[patch] openvswitch 2.9.0 patch

openvswitch-2.9.0-patch.txt (text/plain), 9.11 KB, created by Nikola Kolev on 2018-04-12 09:01:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikola Kolev

Created: 2018-04-12 09:01:26 UTC

Size: 9.11 KB

patch

obsolete

>diff -rupN openvswitch.orig/Makefile openvswitch/Makefile
>--- openvswitch.orig/Makefile	2018-04-12 08:56:28.488771000 +0000
>+++ openvswitch/Makefile	2018-04-12 08:43:33.482332000 +0000
>@@ -1,8 +1,8 @@
> # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
>-# $FreeBSD: head/net/openvswitch/Makefile 461846 2018-02-14 23:17:48Z antoine $
>+# $FreeBSD$
> 
> PORTNAME=	openvswitch
>-PORTVERSION=	2.8.1
>+PORTVERSION=	2.9.0
> CATEGORIES=	net
> MASTER_SITES=	http://openvswitch.org/releases/
> 
>@@ -15,11 +15,13 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}si
> 
> BROKEN_powerpc64=	fails to compile: bfd.c: internal compiler error: in extract_insn, at recog.c
> 
>-USES=		cpe gmake libtool perl5 pkgconfig python:2.7 shebangfix ssl
>-SHEBANG_FILES=	utilities/ovs-docker \
>+USES=		compiler:c++14-lang cpe gmake libtool perl5 pkgconfig python:2.7 shebangfix ssl
>+SHEBANG_FILES=	ovn/utilities/ovndb-servers.ocf \
>+		utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \
>+		utilities/ovs-docker \
> 		utilities/ovs-appctl-bashcomp.bash \
>-		ovn/utilities/ovndb-servers.ocf \
> 		vtep/ovs-vtep.in
>+
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-shared --localstatedir=/var \
>@@ -30,6 +32,8 @@ LDFLAGS+=	-lpthread
> INSTALL_TARGET=install-strip
> 
> post-install:
>+	@${MKDIR} ${STAGEDIR}/var/run/openvswitch
>+	@${MKDIR} ${STAGEDIR}/var/log/openvswitch
> 	${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/
> 
> .include <bsd.port.mk>
>diff -rupN openvswitch.orig/distinfo openvswitch/distinfo
>--- openvswitch.orig/distinfo	2018-04-12 08:56:28.488658000 +0000
>+++ openvswitch/distinfo	2018-04-12 08:43:33.482426000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1511968087
>-SHA256 (openvswitch-2.8.1.tar.gz) = 8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893
>-SIZE (openvswitch-2.8.1.tar.gz) = 6746474
>+TIMESTAMP = 1522945468
>+SHA256 (openvswitch-2.9.0.tar.gz) = 3699ce579acd346e9aa2fba89514cdcc79b231f6227659eea6714917b398419d
>+SIZE (openvswitch-2.9.0.tar.gz) = 6933057
>diff -rupN openvswitch.orig/files/ovs-vswitchd.in openvswitch/files/ovs-vswitchd.in
>--- openvswitch.orig/files/ovs-vswitchd.in	2018-04-12 08:56:28.488069000 +0000
>+++ openvswitch/files/ovs-vswitchd.in	2018-04-12 08:43:33.482571000 +0000
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# $FreeBSD: head/net/openvswitch/files/ovs-vswitchd.in 417410 2016-06-24 03:31:33Z kevlo $
>+# $FreeBSD$
> #
> 
> # PROVIDE: ovs_vswitchd
>@@ -18,11 +18,15 @@ start_precmd="ovs_vswitchd_precmd"
> load_rc_config $name
> 
> : ${ovs_vswitchd_enable="NO"}
>+: ${ovs_vswitchd_flags=""}
>+: ${ovs_vswitchd_logfile="/var/log/openvswitch/${name}.log"}
>+: ${ovs_vswitchd_pidfile="/var/run/openvswitch/${name}.pid"}
> 
> ovs_vswitchd_precmd() {
> 	load_kld if_tap || return 1
> }
> 
>-command_args="--detach --pidfile"
>+command_args="--detach --log-file=${ovs_vswitchd_logfile} \
>+			--pidfile=${ovs_vswitchd_pidfile} ${ovs_vswitchd_flags}"
> 
> run_rc_command "$1"
>diff -rupN openvswitch.orig/files/patch-configure openvswitch/files/patch-configure
>--- openvswitch.orig/files/patch-configure	1970-01-01 00:00:00.000000000 +0000
>+++ openvswitch/files/patch-configure	2018-04-12 08:55:41.577948000 +0000
>@@ -0,0 +1,13 @@
>+--- configure.orig	2018-04-11 14:28:38 UTC
>++++ configure
>+@@ -18310,8 +18310,8 @@ fi
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ovs_cv_sphinx" >&5
>+ $as_echo "$ovs_cv_sphinx" >&6; }
>+     if test "$ovs_cv_sphinx" = yes; then
>+-  HAVE_SPHINX_TRUE=
>+-  HAVE_SPHINX_FALSE='#'
>++  HAVE_SPHINX_TRUE='#'
>++  HAVE_SPHINX_FALSE=
>+ else
>+   HAVE_SPHINX_TRUE='#'
>+   HAVE_SPHINX_FALSE=
>diff -rupN openvswitch.orig/files/patch-lib_conntrack.c openvswitch/files/patch-lib_conntrack.c
>--- openvswitch.orig/files/patch-lib_conntrack.c	2018-04-12 08:56:28.488303000 +0000
>+++ openvswitch/files/patch-lib_conntrack.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,14 +0,0 @@
>---- lib/conntrack.c.orig	2017-11-29 15:45:30 UTC
>-+++ lib/conntrack.c
>-@@ -17,10 +17,10 @@
>- #include <config.h>
>- #include <ctype.h>
>- #include <errno.h>
>-+#include <sys/types.h>
>- #include <netinet/in.h>
>- #include <netinet/icmp6.h>
>- #include <string.h>
>--#include <sys/types.h>
>- 
>- #include "bitmap.h"
>- #include "conntrack.h"
>diff -rupN openvswitch.orig/files/patch-lib_dpif-netdev.c openvswitch/files/patch-lib_dpif-netdev.c
>--- openvswitch.orig/files/patch-lib_dpif-netdev.c	2018-04-12 08:56:28.487821000 +0000
>+++ openvswitch/files/patch-lib_dpif-netdev.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,23 +0,0 @@
>---- lib/dpif-netdev.c.orig	2017-11-29 15:46:19 UTC
>-+++ lib/dpif-netdev.c
>-@@ -78,6 +78,8 @@
>- #include "unixctl.h"
>- #include "util.h"
>- 
>-+#define	ERRNO_NO_LOCAL_MAPPING	-600
>-+
>- VLOG_DEFINE_THIS_MODULE(dpif_netdev);
>- 
>- #define FLOW_DUMP_MAX_BATCH 50
>-@@ -4086,7 +4088,11 @@ dpif_netdev_meter_set(struct dpif *dpif,
>-     /* Validate rates */
>-     for (i = 0; i < config->n_bands; i++) {
>-         if (config->bands[i].rate == 0) {
>-+#ifdef EBADRQC
>-             return EBADRQC; /* rate must be non-zero */
>-+#else
>-+            return ERRNO_NO_LOCAL_MAPPING;
>-+#endif
>-         }
>-     }
>- 
>diff -rupN openvswitch.orig/files/patch-ofproto_ofproto-dpif.c openvswitch/files/patch-ofproto_ofproto-dpif.c
>--- openvswitch.orig/files/patch-ofproto_ofproto-dpif.c	2018-04-12 08:56:28.488186000 +0000
>+++ openvswitch/files/patch-ofproto_ofproto-dpif.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,23 +0,0 @@
>---- ofproto/ofproto-dpif.c.orig	2017-11-29 15:48:58 UTC
>-+++ ofproto/ofproto-dpif.c
>-@@ -73,6 +73,8 @@
>- #include "util.h"
>- #include "vlan-bitmap.h"
>- 
>-+#define	ERRNO_NO_LOCAL_MAPPING	-600
>-+
>- VLOG_DEFINE_THIS_MODULE(ofproto_dpif);
>- 
>- COVERAGE_DEFINE(ofproto_dpif_expired);
>-@@ -5695,7 +5697,11 @@ meter_set(struct ofproto *ofproto_, ofpr
>-         return OFPERR_OFPMMFC_OUT_OF_BANDS;
>-     case ENODEV: /* Unsupported band type */
>-         return OFPERR_OFPMMFC_BAD_BAND;
>-+#ifdef EBADRQC
>-     case EBADRQC: /* Rate must be non-zero */
>-+#else
>-+    case ERRNO_NO_LOCAL_MAPPING:
>-+#endif
>-         return OFPERR_OFPMMFC_BAD_RATE;
>-     default:
>-         return OFPERR_OFPMMFC_UNKNOWN;
>diff -rupN openvswitch.orig/pkg-plist openvswitch/pkg-plist
>--- openvswitch.orig/pkg-plist	2018-04-12 08:56:28.488541000 +0000
>+++ openvswitch/pkg-plist	2018-04-12 08:55:41.578152000 +0000
>@@ -60,6 +60,8 @@ include/openvswitch/ofp-prop.h
> include/openvswitch/ofp-util.h
> include/openvswitch/ofpbuf.h
> include/openvswitch/packets.h
>+include/openvswitch/poll-loop.h
>+include/openvswitch/rconn.h
> include/openvswitch/shash.h
> include/openvswitch/thread.h
> include/openvswitch/token-bucket.h
>@@ -74,28 +76,28 @@ include/openvswitch/vlog.h
> include/ovn/actions.h
> include/ovn/expr.h
> include/ovn/lex.h
>-lib/libofproto-2.8.so.0
>-lib/libofproto-2.8.so.0.0.1
>+lib/libofproto-2.9.so.0
>+lib/libofproto-2.9.so.0.0.0
> lib/libofproto.a
> lib/libofproto.so
>-lib/libopenvswitch-2.8.so.0
>-lib/libopenvswitch-2.8.so.0.0.1
>+lib/libopenvswitch-2.9.so.0
>+lib/libopenvswitch-2.9.so.0.0.0
> lib/libopenvswitch.a
> lib/libopenvswitch.so
>-lib/libovn-2.8.so.0
>-lib/libovn-2.8.so.0.0.1
>+lib/libovn-2.9.so.0
>+lib/libovn-2.9.so.0.0.0
> lib/libovn.a
> lib/libovn.so
>-lib/libovsdb-2.8.so.0
>-lib/libovsdb-2.8.so.0.0.1
>+lib/libovsdb-2.9.so.0
>+lib/libovsdb-2.9.so.0.0.0
> lib/libovsdb.a
> lib/libovsdb.so
>-lib/libsflow-2.8.so.0
>-lib/libsflow-2.8.so.0.0.1
>+lib/libsflow-2.9.so.0
>+lib/libsflow-2.9.so.0.0.0
> lib/libsflow.a
> lib/libsflow.so
>-lib/libvtep-2.8.so.0
>-lib/libvtep-2.8.so.0.0.1
>+lib/libvtep-2.9.so.0
>+lib/libvtep-2.9.so.0.0.0
> lib/libvtep.a
> lib/libvtep.so
> libdata/pkgconfig/libofproto.pc
>@@ -183,27 +185,20 @@ sbin/ovsdb-server
> %%DATADIR%%/python/ovstest/udp.py
> %%DATADIR%%/python/ovstest/util.py
> %%DATADIR%%/python/ovstest/vswitch.py
>+%%DATADIR%%/scripts/ovs-bugtool-daemons-ver
>+%%DATADIR%%/scripts/ovs-bugtool-fdb-show
>+%%DATADIR%%/scripts/ovs-bugtool-get-dpdk-nic-numa
>+%%DATADIR%%/scripts/ovs-bugtool-qos-configs
> %%DATADIR%%/scripts/ovn-bugtool-nbctl-show
>+%%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif
>+%%DATADIR%%/scripts/ovs-bugtool-ovs-bridge-datapath-type
>+%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges
>+%%DATADIR%%/scripts/ovs-bugtool-ovs-vswitchd-threads-affinity
> %%DATADIR%%/scripts/ovn-bugtool-sbctl-lflow-list
> %%DATADIR%%/scripts/ovn-bugtool-sbctl-show
>+%%DATADIR%%/scripts/ovs-bugtool-tc-class-show
> %%DATADIR%%/scripts/ovn-ctl
> %%DATADIR%%/scripts/ovndb-servers.ocf
>-%%DATADIR%%/scripts/ovs-bugtool-bfd-show
>-%%DATADIR%%/scripts/ovs-bugtool-bond-show
>-%%DATADIR%%/scripts/ovs-bugtool-cfm-show
>-%%DATADIR%%/scripts/ovs-bugtool-conntrack-dump
>-%%DATADIR%%/scripts/ovs-bugtool-coverage-show
>-%%DATADIR%%/scripts/ovs-bugtool-daemons-ver
>-%%DATADIR%%/scripts/ovs-bugtool-fdb-show
>-%%DATADIR%%/scripts/ovs-bugtool-lacp-show
>-%%DATADIR%%/scripts/ovs-bugtool-list-dbs
>-%%DATADIR%%/scripts/ovs-bugtool-memory-show
>-%%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif
>-%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-dump-flows
>-%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-show
>-%%DATADIR%%/scripts/ovs-bugtool-ovsdb-dump
>-%%DATADIR%%/scripts/ovs-bugtool-tc-class-show
>-%%DATADIR%%/scripts/ovs-bugtool-vsctl-show
> %%DATADIR%%/scripts/ovs-check-dead-ifs
> %%DATADIR%%/scripts/ovs-ctl
> %%DATADIR%%/scripts/ovs-lib
>@@ -214,4 +209,6 @@ sbin/ovsdb-server
> @dir /var/lib/openvswitch/pki
> @dir /var/lib/openvswitch
> @dir /var/lib
>+@dir /var/log/openvswitch
>+@dir /var/run/openvswitch
> @dir %%ETCDIR%%

Actions: View | Diff

Attachments on bug 227458: 192447