From owner-svn-ports-branches@freebsd.org Thu May 30 16:32:36 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F0C415C6C94; Thu, 30 May 2019 16:32:36 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B2C0393303; Thu, 30 May 2019 16:32:35 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CF721BB48; Thu, 30 May 2019 16:32:35 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4UGWZJq067038; Thu, 30 May 2019 16:32:35 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4UGWZbY067037; Thu, 30 May 2019 16:32:35 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201905301632.x4UGWZbY067037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Thu, 30 May 2019 16:32:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r503075 - in branches/2019Q2/net/tsocks: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in branches/2019Q2/net/tsocks: . files X-SVN-Commit-Revision: 503075 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B2C0393303 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 May 2019 16:32:36 -0000 Author: ehaupt Date: Thu May 30 16:32:34 2019 New Revision: 503075 URL: https://svnweb.freebsd.org/changeset/ports/503075 Log: MFH: r503074 tsocks(8) suggests the the following line (twice): LD_PRELOAD=/usr/local/lib/tsocks/libtsocks.so This is wrong, because the library is installed under regular path, without the `tsocks' subdirectory. Fix the manpage accordingly. Notified by: danfe Approved by: ports-secteam (blanket) Modified: branches/2019Q2/net/tsocks/Makefile branches/2019Q2/net/tsocks/files/patch-tsocks.8 Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/net/tsocks/Makefile ============================================================================== --- branches/2019Q2/net/tsocks/Makefile Thu May 30 16:31:38 2019 (r503074) +++ branches/2019Q2/net/tsocks/Makefile Thu May 30 16:32:34 2019 (r503075) @@ -3,7 +3,7 @@ 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/ \ @@ -15,9 +15,10 @@ COMMENT= Allow non SOCKS aware applications to use SOC LICENSE= GPLv2 -GNU_CONFIGURE= yes USES= gmake USE_LDCONFIG= yes + +GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.b.*//} Modified: branches/2019Q2/net/tsocks/files/patch-tsocks.8 ============================================================================== --- branches/2019Q2/net/tsocks/files/patch-tsocks.8 Thu May 30 16:31:38 2019 (r503074) +++ branches/2019Q2/net/tsocks/files/patch-tsocks.8 Thu May 30 16:32:34 2019 (r503075) @@ -25,17 +25,17 @@ +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. @@ -51,7 +51,7 @@ 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 @@ -104,7 +104,7 @@ .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. @@ -113,7 +113,7 @@ .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 @@ -128,7 +128,7 @@ .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. @@ -138,7 +138,7 @@ .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