svn commit: r414130 - in head/net/csync2: . files

[Tijl Coosemans]

Author: tijl
Date: Wed Apr 27 20:05:11 2016
New Revision: 414130
URL: https://svnweb.freebsd.org/changeset/ports/414130

Log:
  Rather than listening on two sockets, one for IPv4 and one for IPv6 the
  csync server listens on one IPv6 socket and uses IPv4 mapped IPv6 addresses
  to support IPv4.  This IPv6 feature is disabled by default on FreeBSD so
  add a patch to enable it on the server socket.
  
  PR:		208928
  Tested by:	ari at ish.com.au
  Approved by:	alexey at renatasystems.org (maintainer)

Added:
  head/net/csync2/files/patch-csync2.c   (contents, props changed)
Modified:
  head/net/csync2/Makefile

Modified: head/net/csync2/Makefile
==============================================================================
--- head/net/csync2/Makefile	Wed Apr 27 19:24:33 2016	(r414129)
+++ head/net/csync2/Makefile	Wed Apr 27 20:05:11 2016	(r414130)
@@ -3,7 +3,7 @@
 
 PORTNAME=	csync2
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://oss.linbit.com/csync2/
 

Added: head/net/csync2/files/patch-csync2.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/csync2/files/patch-csync2.c	Wed Apr 27 20:05:11 2016	(r414130)
@@ -0,0 +1,21 @@
+--- csync2.c.orig	2013-05-02 12:58:04 UTC
++++ csync2.c
+@@ -256,7 +256,7 @@ static int csync_server_bind(void)
+ 	struct addrinfo hints;
+ 	struct addrinfo *result, *rp;
+ 	int save_errno;
+-	int sfd = -1, s, on = 1;
++	int sfd = -1, s, off = 0, on = 1;
+ 	memset(&hints, 0, sizeof(struct addrinfo));
+ 	hints.ai_family = AF_UNSPEC;	/* Allow IPv4 or IPv6 */
+ 	hints.ai_socktype = SOCK_STREAM;
+@@ -284,6 +284,9 @@ static int csync_server_bind(void)
+ 			goto error;
+ 		if (setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &on, (socklen_t) sizeof(on)) < 0)
+ 			goto error;
++		if (rp->ai_family == AF_INET6)
++			if (setsockopt(sfd, IPPROTO_IPV6, IPV6_V6ONLY, &off, (socklen_t) sizeof(off)) < 0)
++				goto error;
+ 
+ 		if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == 0)
+ 			break;	/* Success */