svn commit: r374938 - in head/net/tsocks: . files
Bryan Drewery
bdrewery at FreeBSD.org
Fri Dec 19 02:17:32 UTC 2014
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 at 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;
+ }
More information about the svn-ports-head
mailing list