From owner-svn-ports-all@FreeBSD.ORG Tue Sep 11 17:25:00 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A99DA106566B; Tue, 11 Sep 2012 17:25:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 931D68FC14; Tue, 11 Sep 2012 17:25:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8BHP0hH094133; Tue, 11 Sep 2012 17:25:00 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8BHP0Uo094128; Tue, 11 Sep 2012 17:25:00 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201209111725.q8BHP0Uo094128@svn.freebsd.org> From: Bryan Drewery Date: Tue, 11 Sep 2012 17:25:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304110 - in head/net/openvswitch: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2012 17:25:00 -0000 Author: bdrewery Date: Tue Sep 11 17:24:59 2012 New Revision: 304110 URL: http://svn.freebsd.org/changeset/ports/304110 Log: - Update to 1.7.1 - Add a regression-test target, but leave it commented out for now as it is failing - Fix build with clang PR: ports/171544 Submitted by: emaste (maintainer) Modified: head/net/openvswitch/Makefile head/net/openvswitch/distinfo head/net/openvswitch/files/patch-bsd-netdev.diff head/net/openvswitch/files/threaded.diff Modified: head/net/openvswitch/Makefile ============================================================================== --- head/net/openvswitch/Makefile Tue Sep 11 16:56:45 2012 (r304109) +++ head/net/openvswitch/Makefile Tue Sep 11 17:24:59 2012 (r304110) @@ -6,7 +6,7 @@ # PORTNAME= openvswitch -PORTVERSION= 1.7.0 +PORTVERSION= 1.7.1 CATEGORIES= net MASTER_SITES= http://openvswitch.org/releases/ @@ -46,8 +46,8 @@ CONFIGURE_ARGS+=--enable-threaded=yes AUTOTOOLSFILES= aclocal.m4 post-patch: - @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ - -e 's|2.65|%%AUTOCONF_VERSION%%|g' \ + @${REINPLACE_CMD} -e 's|1.11.3|%%AUTOMAKE_APIVER%%|g' \ + -e 's|2.68|%%AUTOCONF_VERSION%%|g' \ ${WRKSRC}/aclocal.m4 .if ${PORT_OPTIONS:MTHREADED} @# We can't use EXTRA_PATCHES, since we need to apply this one @@ -58,4 +58,7 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${PREFIX}/share/openvswitch/ +#regression-test: build +# @cd ${WRKSRC} && ${GMAKE} check + .include Modified: head/net/openvswitch/distinfo ============================================================================== --- head/net/openvswitch/distinfo Tue Sep 11 16:56:45 2012 (r304109) +++ head/net/openvswitch/distinfo Tue Sep 11 17:24:59 2012 (r304110) @@ -1,2 +1,2 @@ -SHA256 (openvswitch-1.7.0.tar.gz) = 8e3942cbce80048fb2ce8077be5d35bbe50bb12a1feba33d7c1db68ce711eb53 -SIZE (openvswitch-1.7.0.tar.gz) = 2154289 +SHA256 (openvswitch-1.7.1.tar.gz) = a31fdae8400e9a1af89bd9031c83de15d4ba6dc2fb3ff92e5bf772577fa1c882 +SIZE (openvswitch-1.7.1.tar.gz) = 2153423 Modified: head/net/openvswitch/files/patch-bsd-netdev.diff ============================================================================== --- head/net/openvswitch/files/patch-bsd-netdev.diff Tue Sep 11 16:56:45 2012 (r304109) +++ head/net/openvswitch/files/patch-bsd-netdev.diff Tue Sep 11 17:24:59 2012 (r304110) @@ -2468,7 +2468,7 @@ new file mode 100644 index 0000000..c145091 --- /dev/null +++ lib/route-table-bsd.c -@@ -0,0 +1,129 @@ +@@ -0,0 +1,131 @@ +/* + * Copyright (c) 2012 Ed Maste. All rights reserved. + * @@ -2500,6 +2500,8 @@ index 0000000..c145091 +#include +#include + ++#include "vlog.h" ++ +VLOG_DEFINE_THIS_MODULE(route_table); + +static int pid; Modified: head/net/openvswitch/files/threaded.diff ============================================================================== --- head/net/openvswitch/files/threaded.diff Tue Sep 11 16:56:45 2012 (r304109) +++ head/net/openvswitch/files/threaded.diff Tue Sep 11 17:24:59 2012 (r304110) @@ -453,7 +453,7 @@ index cade79e..509e2ef 100644 @@ -1003,7 +1209,12 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, return; } - flow_extract(packet, 0, 0, port->port_no, &key); + flow_extract(packet, 0, 0, odp_port_to_ofp_port(port->port_no), &key); +#ifdef THREADED + pthread_mutex_lock(&dp->table_mutex); + flow = dp_netdev_lookup_flow_locked(dp, &key); @@ -1205,19 +1205,6 @@ index 4b86c21..4fad796 100644 int netdev_drain(struct netdev *); int netdev_send(struct netdev *, const struct ofpbuf *); -diff --git lib/route-table-bsd.c lib/route-table-bsd.c -index c145091..1c29071 100644 ---- lib/route-table-bsd.c -+++ lib/route-table-bsd.c -@@ -29,6 +29,8 @@ - #include - #include - -+#include "vlog.h" -+ - VLOG_DEFINE_THIS_MODULE(route_table); - - static int pid; diff --git lib/vlog.c lib/vlog.c index 899072e..b6bd4ef 100644 --- lib/vlog.c