Index: head/net/tsocks/Makefile =================================================================== --- head/net/tsocks/Makefile (revision 374937) +++ head/net/tsocks/Makefile (revision 374938) @@ -1,49 +1,50 @@ # Created by: Marcin Jessa # $FreeBSD$ 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/ \ http://www.yazzy.org/ports/tsocks/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/.b/beta/} MAINTAINER= ports@FreeBSD.org COMMENT= Allow non SOCKS aware applications to use SOCKS without modification GNU_CONFIGURE= yes USES= gmake USE_LDCONFIG= yes WRKSRC=${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.b.*//} CONFIGURE_ARGS= --with-conf=${PREFIX}/etc/tsocks.conf \ --libdir=${PREFIX}/lib OPTIONS_DEFINE= DOCS EXAMPLES HOSTNAMES MUTE OLDMETHOD SOCKSDNS OPTIONS_DEFAULT= HOSTNAMES HOSTNAMES_DESC= Enable DNS lookups OLDMETHOD_DESC= Do not use RTLD_NEXT parameter to dlsym MUTE_DESC= Disable all error messages SOCKSDNS_DESC= Intercept DNS requests and attempt to force them to use TCP HOSTNAMES_CONFIGURE_OFF= --disable-hostnames MUTE_CONFIGURE_ON= --disable-debug OLDMETHOD_CONFIGURE_ON= --enable-oldmethod SOCKSDNS_CONFIGURE_ON= --enable-socksdns post-patch: @${REINPLACE_CMD} -e 's|ufds|fds|g' ${WRKSRC}/tsocks.c @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/tsocks post-install: ${INSTALL_DATA} ${WRKSRC}/tsocks.conf.simple.example ${STAGEDIR}${PREFIX}/etc/tsocks.conf.sample @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${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 Index: head/net/tsocks/files/patch-tsocks.c =================================================================== --- head/net/tsocks/files/patch-tsocks.c (nonexistent) +++ head/net/tsocks/files/patch-tsocks.c (revision 374938) @@ -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; + } Property changes on: head/net/tsocks/files/patch-tsocks.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property