head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.162 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.160 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.158 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.156 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.154 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.152 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.150 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.148 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.146 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.144 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.142 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.140 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.138 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.136 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.134 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.132 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.130 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.128 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.126 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.124 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.122 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.120 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.118 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.114 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.94 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.116 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.112 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.110 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.108 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.106 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.104 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.102 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.100 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.98 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.96 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.92 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.90 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.88 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.86 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.84 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.82 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.80 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.78 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.76 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.74 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.72 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.70 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.68 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.66 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.64 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.62 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.60 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.58 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.56 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.54 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.52 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.50 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.48 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.46 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.44 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.42 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.40 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.38 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.36 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.34 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.32 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.30 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.28 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.26 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.24 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.22 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.20 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.18 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.16 pkgsrc-2008Q1:1.2.0.14 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.12 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.10 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.8 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.6 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.4 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.2 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.1.0.8 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.6 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2006.09.17.11.45.04; author jmmv; state Exp; branches; next 1.1; 1.1 date 2005.08.04.10.22.21; author drochner; state Exp; branches; next ; desc @@ 1.2 log @Fix serious portability issues (to NetBSD) as regards poll(2) usage. This change lets, e.g. tnftp work when using tsocks. From soda@@ in PR pkg/30921. Bump PKGREVISION to 2. @ text @$NetBSD: patch-ac,v 1.1 2005/08/04 10:22:21 drochner Exp $ Except for the first two chunks: https://sourceforge.net/tracker/index.php?func=detail&aid=1252703&group_id=17338&atid=117338 --- tsocks.c.orig 2002-07-16 00:50:52.000000000 +0200 +++ tsocks.c @@@@ -68,7 +68,7 @@@@ static int suid = 0; static char *conffile = NULL; /* Exported Function Prototypes */ -void _init(void); +void __tsocks_init(void) __attribute__ ((__constructor__)); int connect(CONNECT_SIGNATURE); int select(SELECT_SIGNATURE); int poll(POLL_SIGNATURE); @@@@ -100,7 +100,7 @@@@ static int read_socksv4_req(struct connr static int read_socksv5_connect(struct connreq *conn); static int read_socksv5_auth(struct connreq *conn); -void _init(void) { +void __tsocks_init(void) { #ifdef USE_OLD_DLSYM void *lib; #endif @@@@ -658,7 +658,7 @@@@ int poll(POLL_SIGNATURE) { * come around again (since we can't flag it for read, we don't know * if there is any data to be read and can't be bothered checking) */ if (conn->selectevents & WRITE) { - setevents |= POLLOUT; + ufds[i].revents |= (conn->selectevents & WRITE); nevents++; } } @@@@ -852,7 +852,12 @@@@ 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) { + rc = 0; + show_msg(MSGDEBUG, "Socket %d already connected to SOCKET server\n", + conn->sockid); + conn->state = CONNECTED; + } else if (rc) { if (errno != EINPROGRESS) { show_msg(MSGERR, "Error %d attempting to connect to SOCKS " "server (%s)\n", errno, strerror(errno)); @ 1.1 log @-update to 1.8beta5 (the last release existing, from 2002) this is a major rewrite changes: -much more flexible debug logging -support for non blocking sockets -addition of the tsocks shell script -TSOCKS_CONF_FILE environment variable -pkg changes: -libtoolized -changed redefinition of the crt0 _init into a __constructor__ attribute, to avoid link errors with jmmv's blessing @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 1 --- tsocks.c.orig 2005-08-04 11:46:19.000000000 +0200 d26 23 @