diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-12-19 10:17:30 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-12-19 10:17:30 +0800 |
| commit | e1df4f1057182d39aba9250dffe48cfb82340d84 (patch) | |
| tree | b691cbbefdcf080863e7bc603ef7df629e104a43 /net/tsocks | |
| parent | 69905ec382b73bc834d2a4ee06877eadc5b7e151 (diff) | |
| download | freebsd-ports-gnome-e1df4f1057182d39aba9250dffe48cfb82340d84.tar.gz freebsd-ports-gnome-e1df4f1057182d39aba9250dffe48cfb82340d84.tar.zst freebsd-ports-gnome-e1df4f1057182d39aba9250dffe48cfb82340d84.zip | |
- Handle EISCONN
PR: ports/196115
Submitted by: Anthony Cornehl <accornehl@fastmail.fm>
Diffstat (limited to 'net/tsocks')
| -rw-r--r-- | net/tsocks/Makefile | 3 | ||||
| -rw-r--r-- | net/tsocks/files/patch-tsocks.c | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile index 5bf388b92cbd..6ddc46554b93 100644 --- a/net/tsocks/Makefile +++ b/net/tsocks/Makefile @@ -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> diff --git a/net/tsocks/files/patch-tsocks.c b/net/tsocks/files/patch-tsocks.c new file mode 100644 index 000000000000..7d5b4984dbdd --- /dev/null +++ b/net/tsocks/files/patch-tsocks.c @@ -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; + } |