ports/171544: [maintainer] net/openvswitch: Update to latest release 1.7.1

[Ed Maste]

>Number:         171544
>Category:       ports
>Synopsis:       net/openvswitch: Update to latest release 1.7.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 11 15:20:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Ed Maste
>Release:        FreeBSD 9.1-PRERELEASE amd64
>Organization:
FreeBSD
>Environment:
System: FreeBSD feynman 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #1 r240164M: Thu S
ep 6 10:40:42 EDT 2012 emaste at feynman:/data2/emaste/obj/home/emaste/src/9/sys/TE
ST amd64


>Description:
Upstream released 1.7.1.

Also correct a mistake in the bsd port patch (a fix was in the experimental
threading patch, not the base BSD patch) that prevented building with clang.

Also add a regression-test target.

>How-To-Repeat:

>Fix:


--- openvswitch-1.7.1.diff begins here ---
diff -u -r -x '*work*' /usr/ports/net/openvswitch/Makefile ./Makefile
--- /usr/ports/net/openvswitch/Makefile 2012-08-16 05:20:51.000000000 -0400
+++ ./Makefile  2012-09-11 08:57:58.000000000 -0400
@@ -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 @@
 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-install:
	${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${PREFIX}/share/openvswitch/
 
+regression-test: build
+	@cd ${WRKSRC} && ${GMAKE} check
+
 .include <bsd.port.post.mk>
diff -u -r -x '*work*' /usr/ports/net/openvswitch/distinfo ./distinfo
--- /usr/ports/net/openvswitch/distinfo 2012-08-09 04:22:10.000000000 -0400
+++ ./distinfo  2012-09-10 16:25:26.000000000 -0400
@@ -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
diff -u -r -x '*work*' /usr/ports/net/openvswitch/files/patch-bsd-netdev.diff ./files/patch-bsd-netdev.diff
--- /usr/ports/net/openvswitch/files/patch-bsd-netdev.diff      2012-08-09 04:22:10.000000000 -0400
+++ ./files/patch-bsd-netdev.diff       2012-09-11 10:02:57.000000000 -0400
@@ -2468,7 +2468,7 @@
 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 @@
 +#include <string.h>
 +#include <unistd.h>
 +
++#include "vlog.h"
++
 +VLOG_DEFINE_THIS_MODULE(route_table);
 +
 +static int pid;
diff -u -r -x '*work*' /usr/ports/net/openvswitch/files/threaded.diff ./files/threaded.diff
--- /usr/ports/net/openvswitch/files/threaded.diff      2012-08-10 04:19:22.000000000 -0400
+++ ./files/threaded.diff       2012-09-11 09:44:45.000000000 -0400
@@ -453,7 +453,7 @@
 @@ -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 @@
  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 <string.h>
- #include <unistd.h>
- 
-+#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
--- openvswitch-1.7.1.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: