svn commit: r467222 - in head/net/openvswitch: . files

Luca Pizzamiglio pizzamig at FreeBSD.org
Fri Apr 13 09:25:44 UTC 2018 

Author: pizzamig
Date: Fri Apr 13 09:25:42 2018
New Revision: 467222
URL: https://svnweb.freebsd.org/changeset/ports/467222

Log:
  net/openvswitch: update to 2.9.0
  
  PR:		227458
  Submitted by:	Nikola Kolev <koue at chaosophia.net> (maintainer)

Added:
  head/net/openvswitch/files/patch-configure   (contents, props changed)
Deleted:
  head/net/openvswitch/files/patch-lib_conntrack.c
  head/net/openvswitch/files/patch-lib_dpif-netdev.c
  head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c
Modified:
  head/net/openvswitch/Makefile
  head/net/openvswitch/distinfo
  head/net/openvswitch/files/ovs-vswitchd.in
  head/net/openvswitch/pkg-plist

Modified: head/net/openvswitch/Makefile
==============================================================================
--- head/net/openvswitch/Makefile	Fri Apr 13 09:25:29 2018	(r467221)
+++ head/net/openvswitch/Makefile	Fri Apr 13 09:25:42 2018	(r467222)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openvswitch
-PORTVERSION=	2.8.1
+PORTVERSION=	2.9.0
 CATEGORIES=	net
 MASTER_SITES=	http://openvswitch.org/releases/
 
@@ -11,15 +11,17 @@ COMMENT=	Production quality, multilayer virtual switch
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
-
 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 \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+
+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>

Modified: head/net/openvswitch/distinfo
==============================================================================
--- head/net/openvswitch/distinfo	Fri Apr 13 09:25:29 2018	(r467221)
+++ head/net/openvswitch/distinfo	Fri Apr 13 09:25:42 2018	(r467222)
@@ -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

Modified: head/net/openvswitch/files/ovs-vswitchd.in
==============================================================================
--- head/net/openvswitch/files/ovs-vswitchd.in	Fri Apr 13 09:25:29 2018	(r467221)
+++ head/net/openvswitch/files/ovs-vswitchd.in	Fri Apr 13 09:25:42 2018	(r467222)
@@ -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"

Added: head/net/openvswitch/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/openvswitch/files/patch-configure	Fri Apr 13 09:25:42 2018	(r467222)
@@ -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=

Modified: head/net/openvswitch/pkg-plist
==============================================================================
--- head/net/openvswitch/pkg-plist	Fri Apr 13 09:25:29 2018	(r467221)
+++ head/net/openvswitch/pkg-plist	Fri Apr 13 09:25:42 2018	(r467222)
@@ -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
+ at dir /var/log/openvswitch
+ at dir /var/run/openvswitch
 @dir %%ETCDIR%%

More information about the svn-ports-all mailing list