Index: branches/2019Q2/net/tsocks/Makefile =================================================================== --- branches/2019Q2/net/tsocks/Makefile (revision 503074) +++ branches/2019Q2/net/tsocks/Makefile (revision 503075) @@ -1,57 +1,58 @@ # Created by: Marcin Jessa # $FreeBSD$ PORTNAME= tsocks DISTVERSION= 1.8.b5 -PORTREVISION= 7 +PORTREVISION= 8 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= ehaupt@FreeBSD.org COMMENT= Allow non SOCKS aware applications to use SOCKS without modification LICENSE= GPLv2 -GNU_CONFIGURE= yes USES= gmake USE_LDCONFIG= yes + +GNU_CONFIGURE= 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 SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} -e 's|ufds|fds|g' ${WRKSRC}/tsocks.c @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/tsocks post-install: ${INSTALL_PROGRAM} ${WRKSRC}/inspectsocks ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/validateconf ${STAGEDIR}${PREFIX}/bin ${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: branches/2019Q2/net/tsocks/files/patch-tsocks.8 =================================================================== --- branches/2019Q2/net/tsocks/files/patch-tsocks.8 (revision 503074) +++ branches/2019Q2/net/tsocks/files/patch-tsocks.8 (revision 503075) @@ -1,168 +1,168 @@ --- tsocks.8.orig 2002-03-16 10:20:51 UTC +++ tsocks.8 @@ -1,25 +1,24 @@ -.TH TSOCKS 8 "" "Shaun Clowes" \" -*- - \" nroff -* - -.SH NAME +.\" \" nroff -* +.\" +.TH "TSOCKS" "8" "" "Shaun Clowes" "\"" +.SH "NAME" .BR tsocks \- Library for intercepting outgoing network connections and redirecting them through a SOCKS server. -.SH SYNOPSIS - +.SH "SYNOPSIS" Set LD_PRELOAD to load the library then use applications as normal The syntax to force preload of the library for different shells is specified below: -Bash, Ksh and Bourne shell - +Bash, Ksh and Bourne shell \- -export LD_PRELOAD=/lib/libtsocks.so -+export LD_PRELOAD=/usr/local/lib/tsocks/libtsocks.so ++export LD_PRELOAD=/usr/local/lib/libtsocks.so -C Shell - +C Shell \- -setenv LD_PRELOAD=/lib/libtsocks.so -+setenv LD_PRELOAD=/usr/local/lib/tsocks/libtsocks.so ++setenv LD_PRELOAD=/usr/local/lib/libtsocks.so This process can be automated (for Bash, Bourne and Korn shell users) for a single command or for all commands in a shell session -@@ -30,13 +29,12 @@ automatically use it, a very useful conf +@@ -30,13 +29,12 @@ automatically use it, a very useful configuration. For information on this configuration see the CAVEATS section of this manual page. -.SH DESCRIPTION - +.SH "DESCRIPTION" .BR tsocks is a library to allow transparent SOCKS proxying. It wraps the normal connect() function. When a connection is attempted, it consults the configuration file (which is defined at configure time but defaults to -/etc/tsocks.conf) and determines if the IP address specified is local. If +/usr/local/etc/tsocks.conf) and determines if the IP address specified is local. If it is not, the library redirects the connection to a SOCKS server specified in the configuration file. It then negotiates that connection with the SOCKS server and passes the connection back to the calling -@@ -52,42 +50,42 @@ the SOCKSified TCP/IP stacks seen on oth +@@ -52,42 +50,42 @@ the SOCKSified TCP/IP stacks seen on other platforms. Most arguments to .BR tsocks are provided in the configuration file (the location of which is defined -at configure time by the --with-conf= argument but defaults to -/etc/tsocks.conf). The structure of this file is documented in tsocks.conf(8) +at configure time by the \-\-with\-conf= argument but defaults to +/usr/local/etc/tsocks.conf). The structure of this file is documented in tsocks.conf(8) Some configuration options can be specified at run time using environment variables as follows: -.TP +.TP .I TSOCKS_CONFFILE This environment variable overrides the default location of the tsocks configuration file. This variable is not honored if the program tsocks is embedded in is setuid. In addition this environment variable can -be compiled out of tsocks with the --disable-envconf argument to +be compiled out of tsocks with the \-\-disable\-envconf argument to configure at build time -.TP +.TP .I TSOCKS_DEBUG This environment variable sets the level of debug output that should be generated by tsocks (debug output is generated in the form of output to standard error). If this variable is not present by default the logging level is set to 0 which indicates that only error messages should be output. Setting it to higher values will cause tsocks to generate more messages -describing what it is doing. If set to -1 tsocks will output absolutely no +describing what it is doing. If set to \-1 tsocks will output absolutely no error or debugging messages. This is only needed if tsocks output interferes with a program it is embedded in. Message output can be permanently compiled -out of tsocks by specifying the --disable-debug option to configure at +out of tsocks by specifying the \-\-disable\-debug option to configure at build time -.TP +.TP .I TSOCKS_DEBUG_FILE This option can be used to redirect the tsocks output (which would normally be sent to standard error) to a file. This variable is not honored if the program tsocks is embedded in is setuid. For programs where tsocks output interferes with normal operation this option is generally better than -disabling messages (with TSOCKS_DEBUG = -1) +disabling messages (with TSOCKS_DEBUG = \-1) -.TP +.TP .I TSOCKS_USERNAME This environment variable can be used to specify the username to be used when version 5 SOCKS servers request username/password authentication. This -@@ -95,7 +93,7 @@ overrides the default username that can +@@ -95,7 +93,7 @@ overrides the default username that can be specified i file using 'default_user', see tsocks.conf(8) for more information. This variable is ignored for version 4 SOCKS servers. -.TP +.TP .I TSOCKS_PASSWORD This environment variable can be used to specify the password to be used when version 5 SOCKS servers request username/password authentication. This -@@ -115,11 +113,12 @@ consult the INSTALL file for more inform +@@ -115,11 +113,12 @@ consult the INSTALL file for more information. .BR tsocks will generate error messages and print them to stderr when there are problems with the configuration file or the SOCKS negotiation with the -server if the TSOCKS_DEBUG environment variable is not set to -1 or and ---disable-debug was not specified at compile time. This output may cause +server if the TSOCKS_DEBUG environment variable is not set to \-1 or and +\-\-disable\-debug was not specified at compile time. This output may cause some problems with programs that redirect standard error. .SS CAVEATS +.BR Linux specific: .BR tsocks will not in the above configuration be able to provide SOCKS proxying to setuid applications or applications that are not run from a shell. You can -@@ -132,8 +131,7 @@ the INSTALL file for more info). THIS I +@@ -132,8 +131,7 @@ the INSTALL file for more info). THIS IS A ***WARNING careful. Also be sure the library is in the root filesystem as all hell will break loose if the directory it is in is not available at boot time. -.SH BUGS - +.SH "BUGS" .BR tsocks can only proxy outgoing TCP connections -@@ -157,21 +155,21 @@ not. This introduces overhead and should +@@ -157,21 +155,21 @@ not. This introduces overhead and should only be used .BR tsocks uses ELF dynamic loader features to intercept dynamic function calls from programs in which it is embedded. As a result, it cannot trace the -actions of statically linked executables, non-ELF executables, or +actions of statically linked executables, non\-ELF executables, or executables that make system calls directly with the system call trap or through the syscall() routine. -.SH FILES -/etc/tsocks.conf - default tsocks configuration file +.SH "FILES" +/usr/local/etc/tsocks.conf \- default tsocks configuration file -.SH SEE ALSO +.SH "SEE ALSO" tsocks.conf(5) tsocks(1) -.SH AUTHOR +.SH "AUTHOR" Shaun Clowes (delius@progsoc.uts.edu.au) -.SH COPYRIGHT +.SH "COPYRIGHT" Copyright 2000 Shaun Clowes tsocks and its documentation may be freely copied under the terms and Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 503074) +++ branches/2019Q2 (revision 503075) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r503074