[23418] trunk/dports/net/tsocks
source_changes at macosforge.org
source_changes at macosforge.org
Sat Mar 31 11:33:13 PDT 2007
Revision: 23418
http://trac.macosforge.org/projects/macports/changeset/23418
Author: markd at macports.org
Date: 2007-03-31 11:33:13 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
Closes #11652. Updated to 1.8.3 with patch from maintainer.
Modified Paths:
--------------
trunk/dports/net/tsocks/Portfile
trunk/dports/net/tsocks/files/patch-Makefile.in
trunk/dports/net/tsocks/files/patch-configure.in
trunk/dports/net/tsocks/files/patch-tsocks.c
trunk/dports/net/tsocks/files/patch-tsocks.h
Removed Paths:
-------------
trunk/dports/net/tsocks/files/patch-parser.c
Modified: trunk/dports/net/tsocks/Portfile
===================================================================
--- trunk/dports/net/tsocks/Portfile 2007-03-31 18:15:45 UTC (rev 23417)
+++ trunk/dports/net/tsocks/Portfile 2007-03-31 18:33:13 UTC (rev 23418)
@@ -2,10 +2,9 @@
PortSystem 1.0
name tsocks
-version 1.8beta5
-revision 4
+version 1.8.3
categories net
-maintainers darren.bane at ul.ie
+maintainers darren.bane at gmail.com
description Transparent SOCKS proxying library
long_description \
tsocks allows non SOCKS aware applications (e.g \
@@ -14,18 +13,20 @@
calls that applications make to establish \
network connections and negotating them through \
a SOCKS server as necessary.
-homepage http://tsocks.sourceforge.net/
+homepage http://giig.ugr.es/~rgarcia/tsocks/
+master_sites ${homepage}
+extract.suffix .tar.bz2
+use_bzip2 yes
platforms darwin
-master_sites sourceforge
-checksums md5 51caefd77e5d440d0bbd6443db4fc0f8
-worksrcdir ${name}-1.8
+checksums md5 42eafd7fe0ee08cb27bb3228295fb36c
+worksrcdir ${name}-1.8.3
use_autoconf yes
patchfiles patch-configure.in \
patch-Makefile.in \
patch-tsocks.in \
patch-tsocks.c \
- patch-parser.c \
- patch-tsocks.h
+ patch-tsocks.h \
+ patch-dead_pool.c
configure.args --with-conf=${prefix}/etc/tsocks.conf \
--libdir=${prefix}/lib \
@@ -33,10 +34,6 @@
post-extract {
reinplace "s|/etc/tsocks.conf|${prefix}/etc/tsocks.conf|g" \
- ${worksrcpath}/tsocks.1 \
- ${worksrcpath}/tsocks.8
-
- reinplace "s|TSOCKS_CONFFILE|TSOCKS_CONF_FILE|g" \
${worksrcpath}/tsocks.8
}
@@ -54,5 +51,5 @@
}
post-activate { ui_msg "\n
-The tsocks.conf.sample file is in ${prefix}/etc. Rename it to tsocks.conf to use it. \n"
+The tsocks.conf.sample file is in ${prefix}/etc. Rename it to tsocks.conf to use it. You should set tordns_enable to false if you're not using Tor.\n"
}
Modified: trunk/dports/net/tsocks/files/patch-Makefile.in
===================================================================
--- trunk/dports/net/tsocks/files/patch-Makefile.in 2007-03-31 18:15:45 UTC (rev 23417)
+++ trunk/dports/net/tsocks/files/patch-Makefile.in 2007-03-31 18:33:13 UTC (rev 23418)
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2006-01-28 17:33:25.000000000 -0800
-+++ Makefile.in 2006-01-28 17:33:33.000000000 -0800
+--- Makefile.in.orig 2007-03-28 12:26:27.000000000 +0100
++++ Makefile.in 2007-03-28 12:21:01.000000000 +0100
@@ -1,6 +1,7 @@
# Makefile used by configure to create real Makefile
@@ -8,12 +8,13 @@
prefix=@prefix@
exec_prefix = @exec_prefix@
libexecdir = @libexecdir@
-@@ -23,11 +24,12 @@
+@@ -24,12 +25,13 @@
SCRIPT = tsocks
SHLIB_MAJOR = 1
SHLIB_MINOR = 8
-SHLIB = ${LIB_NAME}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+SHLIB = ${LIB_NAME}.${SHLIB_EXT}.${SHLIB_MAJOR}.${SHLIB_MINOR}
+ DEADPOOL_O = @DEADPOOL_O@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -22,33 +23,33 @@
INCLUDES = -I.
LIBS = @LIBS@
SPECIALLIBS = @SPECIALLIBS@
-@@ -47,11 +49,11 @@
+@@ -49,11 +51,11 @@
${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS}
${SAVE}: ${SAVE}.c
- ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
+ ${SHCC} ${CFLAGS} ${INCLUDES} -o ${SAVE} ${SAVE}.c
- ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o
-- ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
+ ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o ${DEADPOOL_O}
+- ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DEADPOOL_O} ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
- ln -sf ${SHLIB} ${LIB_NAME}.so
-+ ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib ${LDFLAGS} -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
++ ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib ${LDFLAGS} -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DEADPOOL_O} ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
+ ln -sf ${SHLIB} ${LIB_NAME}.${SHLIB_EXT}
%.so: %.c
${SHCC} ${CFLAGS} ${INCLUDES} -c ${CC_SWITCHES} $< -o $@
-@@ -68,8 +70,8 @@
+@@ -69,8 +71,8 @@
+
installlib:
${MKINSTALLDIRS} "${DESTDIR}${libdir}"
- ${INSTALL} ${SHLIB} ${DESTDIR}${libdir}
-- ln -sf ${SHLIB} ${DESTDIR}${libdir}/${LIB_NAME}.so.${SHLIB_MAJOR}
+- ${INSTALL} ${SHLIB} ${DESTDIR}${libdir}/${LIB_NAME}.so.${SHLIB_MAJOR}
- ln -sf ${LIB_NAME}.so.${SHLIB_MAJOR} ${DESTDIR}${libdir}/${LIB_NAME}.so
-+ ln -sf ${SHLIB} ${DESTDIR}${libdir}/${LIB_NAME}.${SHLIB_EXT}.${SHLIB_MAJOR}
++ ${INSTALL} ${SHLIB} ${DESTDIR}${libdir}/${LIB_NAME}.${SHLIB_EXT}.${SHLIB_MAJOR}
+ ln -sf ${LIB_NAME}.${SHLIB_EXT}.${SHLIB_MAJOR} ${DESTDIR}${libdir}/${LIB_NAME}.${SHLIB_EXT}
installman:
${MKINSTALLDIRS} "${DESTDIR}${mandir}/man1"
-@@ -80,7 +82,7 @@
+@@ -81,7 +83,7 @@
${INSTALL_DATA} tsocks.conf.5 ${DESTDIR}${mandir}/man5/
clean:
@@ -56,5 +57,4 @@
+ -rm -f *.so *.so.* *.dylib *.dylib.* *.o *~ ${TARGETS}
distclean: clean
- -rm -f config.cache config.log config.h Makefile
-
+ -rm -f config.cache config.log config.h Makefile \
Modified: trunk/dports/net/tsocks/files/patch-configure.in
===================================================================
--- trunk/dports/net/tsocks/files/patch-configure.in 2007-03-31 18:15:45 UTC (rev 23417)
+++ trunk/dports/net/tsocks/files/patch-configure.in 2007-03-31 18:33:13 UTC (rev 23418)
@@ -1,6 +1,6 @@
---- configure.in.orig 2006-08-16 18:02:42.000000000 +0100
-+++ configure.in 2006-08-16 18:01:26.000000000 +0100
-@@ -312,7 +312,7 @@
+--- configure.in.orig 2007-03-28 12:26:34.000000000 +0100
++++ configure.in 2007-03-28 12:16:28.000000000 +0100
+@@ -365,7 +365,7 @@
dnl Find the correct poll prototype on this machine
AC_MSG_CHECKING(for correct poll prototype)
PROTO=
@@ -9,8 +9,8 @@
do
if test "${PROTO}" = ""; then
AC_TRY_COMPILE([
-@@ -328,8 +328,46 @@
- AC_DEFINE_UNQUOTED(POLL_SIGNATURE, [${PROTO}])
+@@ -393,8 +393,46 @@
+ AC_DEFINE_UNQUOTED(GETIPNODEBYNAME_SIGNATURE, [${PROTO}])
dnl Output the special librarys (libdl etc needed for tsocks)
-SPECIALLIBS=${LIBS}
Deleted: trunk/dports/net/tsocks/files/patch-parser.c
===================================================================
--- trunk/dports/net/tsocks/files/patch-parser.c 2007-03-31 18:15:45 UTC (rev 23417)
+++ trunk/dports/net/tsocks/files/patch-parser.c 2007-03-31 18:33:13 UTC (rev 23418)
@@ -1,15 +0,0 @@
---- parser.c.org 2002-03-13 04:34:22.000000000 -0800
-+++ parser.c 2006-05-30 18:30:12.000000000 -0700
-@@ -74,8 +74,10 @@
- }
- fclose(conf);
-
-- /* Always add the 127.0.0.1/255.0.0.0 subnet to local */
-- handle_local(config, 0, "127.0.0.0/255.0.0.0");
-+ if (!config->localnets) {
-+ /* Use 127.0.0.1/255.0.0.0 by default */
-+ handle_local(config, 0, "127.0.0.0/255.0.0.0");
-+ }
-
- /* Check default server */
- check_server(&(config->defaultserver));
Modified: trunk/dports/net/tsocks/files/patch-tsocks.c
===================================================================
--- trunk/dports/net/tsocks/files/patch-tsocks.c 2007-03-31 18:15:45 UTC (rev 23417)
+++ trunk/dports/net/tsocks/files/patch-tsocks.c 2007-03-31 18:33:13 UTC (rev 23418)
@@ -1,14 +1,15 @@
---- tsocks.c.orig 2006-01-28 16:36:44.000000000 -0800
-+++ tsocks.c 2006-01-28 16:27:51.000000000 -0800
-@@ -99,6 +99,7 @@
- static int read_socksv4_req(struct connreq *conn);
- static int read_socksv5_connect(struct connreq *conn);
- static int read_socksv5_auth(struct connreq *conn);
+--- tsocks.c.orig 2007-03-28 12:26:49.000000000 +0100
++++ tsocks.c 2007-03-28 12:25:55.000000000 +0100
+@@ -76,7 +76,7 @@
+ static char *conffile = NULL;
+
+ /* Exported Function Prototypes */
+-void _init(void);
+void _init(void) __attribute__ ((constructor));
-
- void _init(void) {
- #ifdef USE_OLD_DLSYM
-@@ -191,9 +192,10 @@
+ int connect(CONNECT_SIGNATURE);
+ int select(SELECT_SIGNATURE);
+ int poll(POLL_SIGNATURE);
+@@ -225,9 +225,10 @@
struct sockaddr_in *connaddr;
struct sockaddr_in peer_address;
struct sockaddr_in server_address;
@@ -21,7 +22,7 @@
unsigned int res = -1;
struct serverent *path;
struct connreq *newconn;
-@@ -660,7 +660,7 @@
+@@ -699,7 +700,7 @@
* 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) {
@@ -30,14 +31,15 @@
nevents++;
}
}
-@@ -854,7 +854,11 @@
+@@ -937,7 +938,12 @@
sizeof(conn->serveraddr));
-
+
show_msg(MSGDEBUG, "Connect returned %d, errno is %d\n", rc, errno);
-- if (rc) {
-+ if (rc && errno == EISCONN) {
+- if (rc) {
++ if (rc && errno == EISCONN) {
+ rc = 0;
-+ show_msg(MSGDEBUG, "Socket %d already connected to SOCKS server\n", conn->sockid);
++ show_msg(MSGDEBUG, "Socket %d already connected to SOCKS server\n",
++conn->sockid);
+ conn->state = CONNECTED;
+ } else if (rc) {
if (errno != EINPROGRESS) {
Modified: trunk/dports/net/tsocks/files/patch-tsocks.h
===================================================================
--- trunk/dports/net/tsocks/files/patch-tsocks.h 2007-03-31 18:15:45 UTC (rev 23417)
+++ trunk/dports/net/tsocks/files/patch-tsocks.h 2007-03-31 18:33:13 UTC (rev 23418)
@@ -1,5 +1,5 @@
---- tsocks.h.orig 2006-06-13 19:12:30.000000000 +0100
-+++ tsocks.h 2006-06-13 19:13:11.000000000 +0100
+--- tsocks.h.orig 2007-03-28 12:26:58.000000000 +0100
++++ tsocks.h 2007-03-28 12:16:46.000000000 +0100
@@ -75,9 +75,9 @@
#define FAILED 14
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070331/2d1790d1/attachment.html
More information about the macports-changes
mailing list