From owner-svn-ports-all@freebsd.org  Wed Oct 14 13:55:08 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 221CFA13CBF;
 Wed, 14 Oct 2015 13:55:08 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC8B417B5;
 Wed, 14 Oct 2015 13:55:07 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9EDt6kV070402;
 Wed, 14 Oct 2015 13:55:06 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9EDt6xe070400;
 Wed, 14 Oct 2015 13:55:06 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201510141355.t9EDt6xe070400@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 14 Oct 2015 13:55:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399264 - in head/sysutils/tmux: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2015 13:55:08 -0000

Author: mat
Date: Wed Oct 14 13:55:06 2015
New Revision: 399264
URL: https://svnweb.freebsd.org/changeset/ports/399264

Log:
  Fix tmux not starting on an IPv6 only system.
  
  Note that tmux will still not work if you have neither v4 nor v6.
  
  PR:		203720
  Obtained from:	https://github.com/tmux/tmux/issues/139
  Sponsored by:	Absolight

Added:
  head/sysutils/tmux/files/patch-compat_imsg.c   (contents, props changed)
Modified:
  head/sysutils/tmux/Makefile

Modified: head/sysutils/tmux/Makefile
==============================================================================
--- head/sysutils/tmux/Makefile	Wed Oct 14 13:55:00 2015	(r399263)
+++ head/sysutils/tmux/Makefile	Wed Oct 14 13:55:06 2015	(r399264)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tmux
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ \
 		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}

Added: head/sysutils/tmux/files/patch-compat_imsg.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/tmux/files/patch-compat_imsg.c	Wed Oct 14 13:55:06 2015	(r399264)
@@ -0,0 +1,17 @@
+--- compat/imsg.c.orig	2015-10-14 13:20:40 UTC
++++ compat/imsg.c
+@@ -54,8 +54,12 @@ available_fds(unsigned int n)
+ 	for (i = 0; i < n; i++) {
+ 		fds[i] = -1;
+ 		if ((fds[i] = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+-			ret = 1;
+-			break;
++			if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT)
++				fds[i] = socket(AF_INET6, SOCK_DGRAM, 0);
++			if (fds[i] < 0) {
++				ret = 1;
++				break;
++			}
+ 		}
+ 	}
+