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

Kevin Lo kevlo at FreeBSD.org
Wed Apr 8 07:58:23 UTC 2015 

Author: kevlo
Date: Wed Apr  8 07:58:20 2015
New Revision: 383557
URL: https://svnweb.freebsd.org/changeset/ports/383557

Log:
  - Update to 2.3.1
  - Take over maintainerhip

Added:
  head/net/openvswitch/files/patch-lib-netdev-bsd.c   (contents, props changed)
Deleted:
  head/net/openvswitch/files/patch-bsd-netdev.diff
  head/net/openvswitch/files/threaded.diff
Modified:
  head/net/openvswitch/Makefile
  head/net/openvswitch/distinfo
  head/net/openvswitch/files/ovs-vswitchd.in
  head/net/openvswitch/files/ovsdb-server.in
  head/net/openvswitch/pkg-plist

Modified: head/net/openvswitch/Makefile
==============================================================================
--- head/net/openvswitch/Makefile	Wed Apr  8 06:57:20 2015	(r383556)
+++ head/net/openvswitch/Makefile	Wed Apr  8 07:58:20 2015	(r383557)
@@ -2,43 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	openvswitch
-PORTVERSION=	1.7.1
+PORTVERSION=	2.3.1
 CATEGORIES=	net
 MASTER_SITES=	http://openvswitch.org/releases/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	kevlo at FreeBSD.org
 COMMENT=	Production quality, multilayer virtual switch
 
 LICENSE=	APACHE20
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	PERL=${PREFIX}/bin/perl \
-		SSL_CFLAGS="-I${OPENSSLINC}" \
-		SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
-USES=		autoreconf gmake pkgconfig python
+USES=		gmake libtool perl5 pkgconfig python
 USE_OPENSSL=	yes
+USE_LDCONFIG=   yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared --localstatedir=/var \
+		--with-dbdir=/var/db/${PORTNAME} \
+		--with-openssl=${OPENSSLBASE}
 USE_RC_SUBR=	ovs-vswitchd ovsdb-server
-
-OPTIONS_DEFINE=	THREADED
-THREADED_DESC=	Experimental high-performance threading patch
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MTHREADED}
-CONFIGURE_ARGS+=--enable-threaded=yes
-.endif
-
-post-patch:
-.if ${PORT_OPTIONS:MTHREADED}
-	@# We can't use EXTRA_PATCHES, since we need to apply this one
-	@# after files/patch-bsd-netdef.diff, not before.
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/threaded.diff
-.endif
+LDFLAGS+=	-lpthread
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/
 
-#regression-test: build
-#	@cd ${WRKSRC} && ${MAKE_CMD} check
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/openvswitch/distinfo
==============================================================================
--- head/net/openvswitch/distinfo	Wed Apr  8 06:57:20 2015	(r383556)
+++ head/net/openvswitch/distinfo	Wed Apr  8 07:58:20 2015	(r383557)
@@ -1,2 +1,2 @@
-SHA256 (openvswitch-1.7.1.tar.gz) = a31fdae8400e9a1af89bd9031c83de15d4ba6dc2fb3ff92e5bf772577fa1c882
-SIZE (openvswitch-1.7.1.tar.gz) = 2153423
+SHA256 (openvswitch-2.3.1.tar.gz) = 21174901c311d54703b4a7f498be0c42e5d2cc68bdecb0090dbb555e2af4bcd2
+SIZE (openvswitch-2.3.1.tar.gz) = 3266916

Modified: head/net/openvswitch/files/ovs-vswitchd.in
==============================================================================
--- head/net/openvswitch/files/ovs-vswitchd.in	Wed Apr  8 06:57:20 2015	(r383556)
+++ head/net/openvswitch/files/ovs-vswitchd.in	Wed Apr  8 07:58:20 2015	(r383557)
@@ -11,19 +11,17 @@
 name="ovs_vswitchd"
 rcvar=ovs_vswitchd_enable
 
-command="%%PREFIX%%/sbin/ovs-vswitchd"
-pidfile="%%PREFIX%%/var/run/ovs-vswitchd.pid"
+command="/usr/local/sbin/ovs-vswitchd"
 start_precmd="ovs_vswitchd_precmd"
 
 load_rc_config $name
 
 : ${ovs_vswitchd_enable="NO"}
-: ${ovsdb_server_sock="%%PREFIX%%/var/run/openvswitch/db.sock"}
 
 ovs_vswitchd_precmd() {
 	load_kld if_tap || return 1
 }
 
-command_args="--detach --pidfile=$pidfile unix:$ovsdb_server_sock"
+command_args="--detach --pidfile"
 
 run_rc_command "$1"

Modified: head/net/openvswitch/files/ovsdb-server.in
==============================================================================
--- head/net/openvswitch/files/ovsdb-server.in	Wed Apr  8 06:57:20 2015	(r383556)
+++ head/net/openvswitch/files/ovsdb-server.in	Wed Apr  8 07:58:20 2015	(r383557)
@@ -11,30 +11,29 @@
 name="ovsdb_server"
 rcvar=ovsdb_server_enable
 
-command="%%PREFIX%%/sbin/ovsdb-server"
-pidfile="%%PREFIX%%/var/run/ovsdb-server.pid"
+command="/usr/local/sbin/ovsdb-server"
+pidfile="/var/run/ovsdb-server.pid"
 start_precmd="ovsdb_server_precmd"
 
 load_rc_config $name
 
 : ${ovsdb_server_enable="NO"}
-: ${ovsdb_server_sock="%%PREFIX%%/var/run/openvswitch/db.sock"}
-: ${ovsdb_server_database="%%PREFIX%%/etc/openvswitch/conf.db"}
+: ${ovsdb_server_sock="/var/run/openvswitch/db.sock"}
+: ${ovsdb_server_database="/var/db/openvswitch/conf.db"}
 
 ovsdb_server_precmd() {
 	[ -e "`dirname $ovsdb_server_database`" ] || \
 		mkdir -p "`dirname $ovsdb_server_database`"
 	[ -e "$ovsdb_server_database" ] || \
-		%%PREFIX%%/bin/ovsdb-tool create "$ovsdb_server_database" \
-		%%PREFIX%%/share/openvswitch/vswitch.ovsschema
+		/usr/local/bin/ovsdb-tool create "$ovsdb_server_database" \
+		/usr/local/share/openvswitch/vswitch.ovsschema
 }
 
 command_args="--detach --pidfile=$pidfile \
 	--remote=punix:$ovsdb_server_sock \
-	--remote=db:Open_vSwitch,manager_options \
-	--private-key=db:SSL,private_key \
-	--certificate=db:SSL,certificate \
-	--bootstrap-ca-cert=db:SSL,ca_cert \
-	$ovsdb_server_database"
+ 	--remote=db:Open_vSwitch,Open_vSwitch,manager_options \
+	--private-key=db:Open_vSwitch,SSL,private_key \
+	--certificate=db:Open_vSwitch,SSL,certificate \
+	--bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert"
 
 run_rc_command "$1"

Added: head/net/openvswitch/files/patch-lib-netdev-bsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/openvswitch/files/patch-lib-netdev-bsd.c	Wed Apr  8 07:58:20 2015	(r383557)
@@ -0,0 +1,24 @@
+--- lib/netdev-bsd.c.orig	2015-04-08 13:49:06.863643000 +0800
++++ lib/netdev-bsd.c	2015-04-08 13:50:53.973989000 +0800
+@@ -1771,7 +1771,7 @@
+ ifr_get_flags(const struct ifreq *ifr)
+ {
+ #ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH
+-    return (ifr->ifr_flagshigh << 16) | ifr->ifr_flags;
++    return (ifr->ifr_flagshigh << 16) | (ifr->ifr_flags & 0xffff);
+ #else
+     return ifr->ifr_flags;
+ #endif
+@@ -1780,9 +1780,11 @@
+ static void
+ ifr_set_flags(struct ifreq *ifr, int flags)
+ {
+-    ifr->ifr_flags = flags;
+ #ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH
++    ifr->ifr_flags = flags & 0xffff;
+     ifr->ifr_flagshigh = flags >> 16;
++#else
++    ifr->ifr_flags = flags;
+ #endif
+ }
+ 

Modified: head/net/openvswitch/pkg-plist
==============================================================================
--- head/net/openvswitch/pkg-plist	Wed Apr  8 06:57:20 2015	(r383556)
+++ head/net/openvswitch/pkg-plist	Wed Apr  8 07:58:20 2015	(r383557)
@@ -1,17 +1,31 @@
 bin/ovs-appctl
-bin/ovs-controller
+bin/ovs-benchmark
 bin/ovs-dpctl
+bin/ovs-dpctl-top
+bin/ovs-l3ping
 bin/ovs-ofctl
-bin/ovs-vsctl
-bin/ovs-benchmark
-bin/ovsdb-tool
-bin/ovsdb-client
-bin/ovs-pki
-bin/ovs-parse-leaks
+bin/ovs-parse-backtrace
 bin/ovs-pcap
+bin/ovs-pki
 bin/ovs-tcpundump
 bin/ovs-test
 bin/ovs-vlan-test
+bin/ovs-vsctl
+bin/ovsdb-client
+bin/ovsdb-tool
+bin/vtep-ctl
+lib/libofproto-2.3.1.so
+lib/libofproto.a
+lib/libofproto.so
+lib/libopenvswitch-2.3.1.so
+lib/libopenvswitch.a
+lib/libopenvswitch.so
+lib/libovsdb-2.3.1.so
+lib/libovsdb.a
+lib/libovsdb.so
+lib/libsflow-2.3.1.so
+lib/libsflow.a
+lib/libsflow.so
 man/man1/ovs-benchmark.1.gz
 man/man1/ovs-pcap.1.gz
 man/man1/ovs-tcpundump.1.gz
@@ -19,72 +33,87 @@ man/man1/ovsdb-client.1.gz
 man/man1/ovsdb-server.1.gz
 man/man1/ovsdb-tool.1.gz
 man/man5/ovs-vswitchd.conf.db.5.gz
+man/man5/vtep.5.gz
 man/man8/ovs-appctl.8.gz
-man/man8/ovs-brcompatd.8.gz
 man/man8/ovs-bugtool.8.gz
-man/man8/ovs-controller.8.gz
 man/man8/ovs-ctl.8.gz
+man/man8/ovs-dpctl-top.8.gz
 man/man8/ovs-dpctl.8.gz
+man/man8/ovs-l3ping.8.gz
 man/man8/ovs-ofctl.8.gz
-man/man8/ovs-parse-leaks.8.gz
+man/man8/ovs-parse-backtrace.8.gz
 man/man8/ovs-pki.8.gz
 man/man8/ovs-test.8.gz
 man/man8/ovs-vlan-bug-workaround.8.gz
 man/man8/ovs-vlan-test.8.gz
 man/man8/ovs-vsctl.8.gz
 man/man8/ovs-vswitchd.8.gz
+man/man8/vtep-ctl.8.gz
+sbin/ovs-bugtool
 sbin/ovs-vswitchd
 sbin/ovsdb-server
-sbin/ovs-bugtool
-share/openvswitch/bugtool-plugins/kernel-info/openvswitch.xml
-share/openvswitch/bugtool-plugins/network-status/openvswitch.xml
-share/openvswitch/bugtool-plugins/system-configuration.xml
-share/openvswitch/bugtool-plugins/system-logs/openvswitch.xml
-share/openvswitch/bugtool-plugins/system-configuration/openvswitch.xml
-share/openvswitch/python/ovs/dirs.py
-share/openvswitch/python/ovs/db/__init__.py
-share/openvswitch/python/ovs/db/data.py
-share/openvswitch/python/ovs/db/error.py
-share/openvswitch/python/ovs/db/idl.py
-share/openvswitch/python/ovs/db/parser.py
-share/openvswitch/python/ovs/db/schema.py
-share/openvswitch/python/ovs/db/types.py
-share/openvswitch/python/ovs/__init__.py
-share/openvswitch/python/ovs/daemon.py
-share/openvswitch/python/ovs/fatal_signal.py
-share/openvswitch/python/ovs/json.py
-share/openvswitch/python/ovs/jsonrpc.py
-share/openvswitch/python/ovs/ovsuuid.py
-share/openvswitch/python/ovs/poller.py
-share/openvswitch/python/ovs/process.py
-share/openvswitch/python/ovs/reconnect.py
-share/openvswitch/python/ovs/socket_util.py
-share/openvswitch/python/ovs/stream.py
-share/openvswitch/python/ovs/timeval.py
-share/openvswitch/python/ovs/unixctl.py
-share/openvswitch/python/ovs/util.py
-share/openvswitch/python/ovs/version.py
-share/openvswitch/python/ovs/vlog.py
-share/openvswitch/python/ovstest/__init__.py
-share/openvswitch/python/ovstest/args.py
-share/openvswitch/python/ovstest/rpcserver.py
-share/openvswitch/python/ovstest/tcp.py
-share/openvswitch/python/ovstest/udp.py
-share/openvswitch/python/ovstest/util.py
-share/openvswitch/python/ovstest/vswitch.py
-share/openvswitch/vswitch.ovsschema
-share/openvswitch/scripts/ovs-lib
-share/openvswitch/scripts/ovs-ctl
-share/openvswitch/scripts/ovs-save
-share/openvswitch/scripts/ovs-bugtool-cfm-show
-share/openvswitch/scripts/ovs-bugtool-lacp-show
-share/openvswitch/scripts/ovs-bugtool-tc-class-show
-share/openvswitch/scripts/ovs-bugtool-ovsdb-dump
-share/openvswitch/scripts/ovs-check-dead-ifs
-share/openvswitch/scripts/ovs-bugtool-coverage-show
-share/openvswitch/scripts/ovs-bugtool-vsctl-show
-share/openvswitch/scripts/ovs-bugtool-daemons-ver
-share/openvswitch/scripts/ovs-bugtool-bond-show
- at dir var/lib/openvswitch/pki
- at dir var/log/openvswitch
- at dir var/run/openvswitch
+%%DATADIR%%/bugtool-plugins/kernel-info/openvswitch.xml
+%%DATADIR%%/bugtool-plugins/network-status/openvswitch.xml
+%%DATADIR%%/bugtool-plugins/system-configuration.xml
+%%DATADIR%%/bugtool-plugins/system-configuration/openvswitch.xml
+%%DATADIR%%/bugtool-plugins/system-logs/openvswitch.xml
+%%DATADIR%%/python/ovs/__init__.py
+%%DATADIR%%/python/ovs/daemon.py
+%%DATADIR%%/python/ovs/db/__init__.py
+%%DATADIR%%/python/ovs/db/data.py
+%%DATADIR%%/python/ovs/db/error.py
+%%DATADIR%%/python/ovs/db/idl.py
+%%DATADIR%%/python/ovs/db/parser.py
+%%DATADIR%%/python/ovs/db/schema.py
+%%DATADIR%%/python/ovs/db/types.py
+%%DATADIR%%/python/ovs/dirs.py
+%%DATADIR%%/python/ovs/fatal_signal.py
+%%DATADIR%%/python/ovs/json.py
+%%DATADIR%%/python/ovs/jsonrpc.py
+%%DATADIR%%/python/ovs/ovsuuid.py
+%%DATADIR%%/python/ovs/poller.py
+%%DATADIR%%/python/ovs/process.py
+%%DATADIR%%/python/ovs/reconnect.py
+%%DATADIR%%/python/ovs/socket_util.py
+%%DATADIR%%/python/ovs/stream.py
+%%DATADIR%%/python/ovs/timeval.py
+%%DATADIR%%/python/ovs/unixctl/__init__.py
+%%DATADIR%%/python/ovs/unixctl/client.py
+%%DATADIR%%/python/ovs/unixctl/server.py
+%%DATADIR%%/python/ovs/util.py
+%%DATADIR%%/python/ovs/version.py
+%%DATADIR%%/python/ovs/vlog.py
+%%DATADIR%%/python/ovstest/__init__.py
+%%DATADIR%%/python/ovstest/args.py
+%%DATADIR%%/python/ovstest/rpcserver.py
+%%DATADIR%%/python/ovstest/tcp.py
+%%DATADIR%%/python/ovstest/tests.py
+%%DATADIR%%/python/ovstest/udp.py
+%%DATADIR%%/python/ovstest/util.py
+%%DATADIR%%/python/ovstest/vswitch.py
+%%DATADIR%%/scripts/ovs-bugtool-bfd-show
+%%DATADIR%%/scripts/ovs-bugtool-bond-show
+%%DATADIR%%/scripts/ovs-bugtool-cfm-show
+%%DATADIR%%/scripts/ovs-bugtool-coverage-show
+%%DATADIR%%/scripts/ovs-bugtool-daemons-ver
+%%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
+%%DATADIR%%/scripts/ovs-save
+%%DATADIR%%/scripts/ovs-vtep
+%%DATADIR%%/vswitch.ovsschema
+%%DATADIR%%/vtep.ovsschema
+ at dir /var/lib/openvswitch/pki
+ at dir /var/lib/openvswitch
+ at dir /var/lib
+ at dir /var/log/openvswitch
+ at dir /var/run/openvswitch

More information about the svn-ports-all mailing list