Date: Mon, 2 Apr 2007 17:24:45 GMT From: Fabian Keil<fk@fabiankeil.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/111149: [maintainer update] Make some of security/trans-proxy-tor's dependencies OPTIONal Message-ID: <200704021724.l32HOjwa093598@www.freebsd.org> Resent-Message-ID: <200704021730.l32HU5Im081297@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111149 >Category: ports >Synopsis: [maintainer update] Make some of security/trans-proxy-tor's dependencies OPTIONal >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 02 17:30:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Fabian Keil >Release: RELENG_6 >Organization: >Environment: FreeBSD TP51.local 6.2-STABLE FreeBSD 6.2-STABLE #12: Mon Mar 19 19:25:35 CET 2007 fk@TP51.local:/usr/obj/usr/src/sys/THINKPAD i386 >Description: The attached security/trans-proxy-tor update is supposed to: - give the user the option not to depend on Tor and/or dns-proxy-tor (in case Tor/dns-proxy-tor and trans-proxy-tor run on different systems/jails or DNS leaks aren't an issue). - detect an installed Tor port properly. The previous version would register a dependency on security/tor-devel if security/tor was already installed. Thanks to Steve Clement for the report. - bump the port revision >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN trans-proxy-tor.old/Makefile trans-proxy-tor/Makefile --- trans-proxy-tor.old/Makefile Sat Jul 22 21:16:59 2006 +++ trans-proxy-tor/Makefile Mon Apr 2 18:39:01 2007 @@ -7,6 +7,7 @@ PORTNAME= trans-proxy-tor PORTVERSION= 0.1.0 +PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= http://p56soo2ibjkx23xo.onion/ \ http://www.fabiankeil.de/sourcecode/freebsd/ @@ -14,9 +15,7 @@ MAINTAINER= fk@fabiankeil.de COMMENT= Transparent proxy used to redirect TCP connections into Tor -RUN_DEPENDS= ${LOCALBASE}/bin/dns-proxy-tor:${PORTSDIR}/security/dns-proxy-tor \ - ${SITE_PERL}/${PERL_ARCH}/Event/Lib.pm:${PORTSDIR}/devel/p5-Event-Lib \ - ${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor-devel +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Event/Lib.pm:${PORTSDIR}/devel/p5-Event-Lib USE_PERL5_RUN= yes USE_RC_SUBR= ${PORTNAME} @@ -24,7 +23,39 @@ SUB_FILES= pkg-message DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} +OPTIONS= DNS_PROXY_TOR "Depend on dns-proxy-tor" On \ + TOR_DEVEL "Depend on tor-devel" Off \ + TOR "Depend on tor" Off + +DEPRECATED= trans-proxy-tor is rendered obsolete by Tor's TransPort option\ + (currently only available in tor-devel) + +HAVE_TOR_DEVEL!= if pkg_info -I tor-devel\* >/dev/null 2>&1 ; then ${ECHO} YES; fi +.if (${HAVE_TOR_DEVEL} == "YES") +OPTIONS= DNS_PROXY_TOR "Depend on dns-proxy-tor" On \ + TOR_DEVEL "Depend on tor-devel (already installed)" Off +.else +HAVE_TOR_DEVEL!= if pkg_info -I tor-\* >/dev/null 2>&1 ; then ${ECHO} YES; fi +.endif +.if (defined(HAVE_TOR) && ${HAVE_TOR} == "YES") +OPTIONS= DNS_PROXY_TOR "Depend on dns-proxy-tor" On \ + TOR "Depend on tor (already installed)" Off +.endif + .include <bsd.port.pre.mk> + +.if defined(WITH_DNS_PROXY_TOR) +RUN_DEPENDS+= ${LOCALBASE}/bin/dns-proxy-tor:${PORTSDIR}/security/dns-proxy-tor +.endif + +.if defined(WITH_TOR_DEVEL) +.if defined(WITH_TOR) +IGNORE= cannot depend on tor and tor-devel at the same time +.endif +RUN_DEPENDS+= ${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor-devel +.elif defined(WITH_TOR) +RUN_DEPENDS+= ${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor +.endif .if defined(NO_PF) IGNORE= requires PF diff -ruN trans-proxy-tor.old/files/pkg-message.in trans-proxy-tor/files/pkg-message.in --- trans-proxy-tor.old/files/pkg-message.in Sat Jul 22 11:56:26 2006 +++ trans-proxy-tor/files/pkg-message.in Sun Jan 14 15:34:17 2007 @@ -41,8 +41,7 @@ Unfortunately most browser's do that by default. If you aren't already using Privoxy, now would be a good time -to start. Additionally you might want to use the minor improvements -from: http://www.fabiankeil.de/sourcecode/privoxy/ +to start. Note that the broken browser configuration is just an example, the same is true for a lot of other programs you might be using! >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704021724.l32HOjwa093598>