From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 19 02:17:32 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 04DE2BD0;
 Fri, 19 Dec 2014 02:17:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 CB425794;
 Fri, 19 Dec 2014 02:17:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBJ2HVLo033425;
 Fri, 19 Dec 2014 02:17:31 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBJ2HVSG033422;
 Fri, 19 Dec 2014 02:17:31 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201412190217.sBJ2HVSG033422@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 19 Dec 2014 02:17:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374938 - in head/net/tsocks: . 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Dec 2014 02:17:32 -0000

Author: bdrewery
Date: Fri Dec 19 02:17:30 2014
New Revision: 374938
URL: https://svnweb.freebsd.org/changeset/ports/374938
QAT: https://qat.redports.org/buildarchive/r374938/

Log:
  - Handle EISCONN
  
  PR:		ports/196115
  Submitted by:	Anthony Cornehl <accornehl@fastmail.fm>

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

Modified: head/net/tsocks/Makefile
==============================================================================
--- head/net/tsocks/Makefile	Fri Dec 19 01:23:04 2014	(r374937)
+++ head/net/tsocks/Makefile	Fri Dec 19 02:17:30 2014	(r374938)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tsocks
 PORTVERSION=	1.8.b5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.8%20beta%205 \
 		http://ftp1.sourceforge.net/tsocks/ \
@@ -45,5 +45,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/*.example ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}/README
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
 
 .include <bsd.port.mk>

Added: head/net/tsocks/files/patch-tsocks.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/tsocks/files/patch-tsocks.c	Fri Dec 19 02:17:30 2014	(r374938)
@@ -0,0 +1,19 @@
+--- tsocks.c.orig	2014-12-19 02:01:24 UTC
++++ tsocks.c
+@@ -852,7 +852,7 @@ static int connect_server(struct connreq
+                     sizeof(conn->serveraddr));
+ 
+    show_msg(MSGDEBUG, "Connect returned %d, errno is %d\n", rc, errno); 
+-	if (rc) {
++	if (rc && errno != EISCONN) {
+       if (errno != EINPROGRESS) {
+          show_msg(MSGERR, "Error %d attempting to connect to SOCKS "
+                   "server (%s)\n", errno, strerror(errno));
+@@ -862,6 +862,7 @@ static int connect_server(struct connreq
+          conn->state = CONNECTING;
+       }
+    } else {
++      rc = 0;
+       show_msg(MSGDEBUG, "Socket %d connected to SOCKS server\n", conn->sockid);
+       conn->state = CONNECTED;
+    }