Update to 0.6.1.

svn path=/head/; revision=265452

net/olsrd/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	olsrd
-DISTVERSION=	0.6.0
+DISTVERSION=	0.6.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.olsr.org/releases/0.6/ \
 		http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/

net/olsrd/distinfo

@@ -1,3 +1,2 @@
-MD5 (olsrd-0.6.0.tar.bz2) = 8425a10e315be5e061143ac310f2424b
-SHA256 (olsrd-0.6.0.tar.bz2) = 472b5a9ef763e689ccf43b831305330314d9912d13386bf4988123c362fe3e3c
-SIZE (olsrd-0.6.0.tar.bz2) = 600333
+SHA256 (olsrd-0.6.1.tar.bz2) = 03d359b65711ef7bf235bf530d2afe61eeae3cbf3f8e60ddf2c14e68f3b48f9f
+SIZE (olsrd-0.6.1.tar.bz2) = 643250

net/olsrd/files/patch-mcast

@@ -1,29 +0,0 @@
---- src/bsd/net.c.orig	2010-01-13 16:49:47.000000000 +0000
-+++ src/bsd/net.c	2010-02-10 10:55:16.582716012 +0000
-@@ -494,6 +494,8 @@
-   mcastreq.ipv6mr_multiaddr = ifs->int6_multaddr.sin6_addr;
-   mcastreq.ipv6mr_interface = ifs->if_index;
- 
-+if (ifs->olsr_socket == sock) {
-+
-   OLSR_PRINTF(3, "Interface %s joining multicast %s...", ifs->int_name,
-               olsr_ip_to_string(&addrstr, (union olsr_ip_addr *)&ifs->int6_multaddr.sin6_addr));
- 
-@@ -509,6 +511,7 @@
-     perror("Join multicast send");
-     return -1;
-   }
-+}
- 
-   if (setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, (char *)&mcastreq.ipv6mr_interface, sizeof(mcastreq.ipv6mr_interface)) < 0) {
-     perror("Set multicast if");
---- src/unix/ifnet.c.orig	2010-01-17 17:32:53.000000000 +0000
-+++ src/unix/ifnet.c	2010-02-10 10:55:54.958215804 +0000
-@@ -840,6 +840,7 @@
-     ifp->send_socket = getsocket6(0, ifp);
- 
-     join_mcast(ifp, ifp->olsr_socket);
-+    join_mcast(ifp, ifp->send_socket);
- 
-     if (ifp->olsr_socket < 0) {
-       fprintf(stderr, "Could not initialize socket... exiting!\n\n");