Date: Wed, 7 Aug 2013 12:54:38 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324351 - in head/security: tor tor-devel tor/files Message-ID: <201308071254.r77CscnF007311@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Wed Aug 7 12:54:37 2013 New Revision: 324351 URL: http://svnweb.freebsd.org/changeset/ports/324351 Log: Make the torrc log domain(s) and level(s) user-configurable in security/tor, as was done for security/tor-devel in r322977; remove some problematic mirrors; update Makefile idioms (gmake, LIB_DEPENDS, etc.); attempt to remove leftovers in /var during deinstallation [1] Reported by: miwi [1] Modified: head/security/tor-devel/Makefile head/security/tor-devel/pkg-plist head/security/tor/Makefile head/security/tor/files/tor.in head/security/tor/pkg-plist (contents, props changed) Modified: head/security/tor-devel/Makefile ============================================================================== --- head/security/tor-devel/Makefile Wed Aug 7 11:42:40 2013 (r324350) +++ head/security/tor-devel/Makefile Wed Aug 7 12:54:37 2013 (r324351) @@ -37,7 +37,6 @@ MASTER_SITES= https://www.torproject.org http://torproject.jcsh.it/dist/ \ http://torproject.nwlinux.us/dist/ \ http://torproject.ph3x.at/dist/ \ - http://torua.reactor-xg.kiev.ua/dist/ \ https://www.coevoet.nl/tor/dist/ \ http://www.oignon.net/dist/ \ http://www.torproject.org.nyud.net/dist/ \ @@ -139,7 +138,7 @@ TOR_LIBEVENT_LIBS:= ${LOCALBASE}/lib/eve .endif .else CONFIGURE_ARGS+= --enable-linker-hardening -LIB_DEPENDS+= event-2.0:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS+= libevent-2.0.so:${PORTSDIR}/devel/libevent2 TOR_LIBEVENT_LIBS= -levent-2.0 .if ${PORT_OPTIONS:MBUFFEREVENTS} TOR_LIBEVENT_LIBS:= -levent_openssl-2.0 ${TOR_LIBEVENT_LIBS} @@ -151,7 +150,7 @@ CONFIGURE_ARGS+= --with-tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools .else -LIB_DEPENDS+= tcmalloc:${PORTSDIR}/devel/google-perftools +LIB_DEPENDS+= libtcmalloc.so:${PORTSDIR}/devel/google-perftools .endif .endif @@ -195,8 +194,8 @@ post-install: .if empty(PORT_OPTIONS:MTOR2WEB) check regression-test test: build - @( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check ) + @cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check .endif .include <bsd.port.mk> Modified: head/security/tor-devel/pkg-plist ============================================================================== --- head/security/tor-devel/pkg-plist Wed Aug 7 11:42:40 2013 (r324350) +++ head/security/tor-devel/pkg-plist Wed Aug 7 12:54:37 2013 (r324351) @@ -1,3 +1,4 @@ +@stopdaemon tor bin/tor bin/tor-gencert bin/tor-resolve @@ -7,3 +8,8 @@ etc/tor/torrc.sample %%DATADIR%%/geoip6 @dirrm %%DATADIR%% @dirrmtry etc/tor +@cwd / +@dirrmtry var/run/tor +@dirrmtry var/db/tor/data +@dirrmtry var/db/tor +@cwd Modified: head/security/tor/Makefile ============================================================================== --- head/security/tor/Makefile Wed Aug 7 11:42:40 2013 (r324350) +++ head/security/tor/Makefile Wed Aug 7 12:54:37 2013 (r324351) @@ -3,6 +3,7 @@ PORTNAME= tor DISTVERSION= 0.2.3.25 +PORTREVISION= 1 CATEGORIES= security net ipv6 MASTER_SITES= https://www.torproject.org/dist/ \ ftp://ftp.bit.nl/mirror/tor/ \ @@ -31,7 +32,6 @@ MASTER_SITES= https://www.torproject.org http://tor.spline.de/dist/ \ http://tor.taiga-san.net/dist/ \ http://tor.vesta.nu/dist/ \ - http://tordistua.reactor-xg.kiev.ua/ \ http://torproj.xpdm.us/dist/ \ https://torproject.antagonism.org/dist/ \ https://torproject.crypto.is/dist/ \ @@ -39,7 +39,6 @@ MASTER_SITES= https://www.torproject.org http://torproject.jcsh.it/dist/ \ http://torproject.nwlinux.us/dist/ \ http://torproject.ph3x.at/dist/ \ - http://torua.reactor-xg.kiev.ua/dist/ \ https://www.coevoet.nl/tor/dist/ \ http://www.oignon.net/dist/ \ http://www.torproject.nl/dist/ \ @@ -89,7 +88,7 @@ MAN1= tor.1 tor-resolve.1 torify.1 tor- .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGMAKE} -USE_GMAKE= yes +USES+= gmake .else MAKE_JOBS_UNSAFE= yes .endif @@ -137,7 +136,7 @@ TOR_LIBEVENT_LIBS:= ${LOCALBASE}/lib/eve .endif .else CONFIGURE_ARGS+= --enable-linker-hardening -LIB_DEPENDS+= event-2.0:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS+= libevent-2.0.so:${PORTSDIR}/devel/libevent2 TOR_LIBEVENT_LIBS= -levent-2.0 .if ${PORT_OPTIONS:MBUFFEREVENTS} TOR_LIBEVENT_LIBS:= -levent_openssl-2.0 ${TOR_LIBEVENT_LIBS} @@ -149,7 +148,7 @@ CONFIGURE_ARGS+= --with-tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools .else -LIB_DEPENDS+= tcmalloc:${PORTSDIR}/devel/google-perftools +LIB_DEPENDS+= libtcmalloc.so:${PORTSDIR}/devel/google-perftools .endif .endif @@ -199,8 +198,8 @@ post-install: .if empty(PORT_OPTIONS:MTOR2WEB) check regression-test test: build - @( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check ) + @cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check .endif .include <bsd.port.mk> Modified: head/security/tor/files/tor.in ============================================================================== --- head/security/tor/files/tor.in Wed Aug 7 11:42:40 2013 (r324350) +++ head/security/tor/files/tor.in Wed Aug 7 12:54:37 2013 (r324351) @@ -10,13 +10,13 @@ # All these options will overide any settings in your local torrc as # they are command line options. # -# tor_enable (bool): Set to "NO" by default -# Set it to "YES" to enable tor -# tor_conf (str): Points to your tor conf file +# tor_enable (bool): Set it to "YES" to enable tor. Default: NO +# tor_conf (str): Points to your torrc file. # Default: %%PREFIX%%/etc/tor/torrc -# tor_user (str): Tor Daemon user. Default _tor -# tor_datadir (str): Tor DataDir. Defaults /var/db/tor -# tor_logfile (str): Tor Log File. Defaults /var/log/tor +# tor_user (str): Tor daemon user. Default: _tor +# tor_datadir (str): Tor datadir. Default: /var/db/tor +# tor_logfile (str): Tor log file. Default: /var/log/tor +# tor_loglevel (str): Tor log severity level. Default: notice # . /etc/rc.subr @@ -31,13 +31,14 @@ load_rc_config ${name} : ${tor_user="_tor"} : ${tor_pidfile="/var/run/tor/tor.pid"} : ${tor_logfile="/var/log/tor"} +: ${tor_loglevel="notice"} : ${tor_datadir="/var/db/tor"} required_files=${tor_conf} required_dirs=${tor_datadir} pidfile=${tor_pidfile} command="%%PREFIX%%/bin/${name}" -command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --+Log notice\ file\ ${tor_logfile}" +command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --+Log ${tor_loglevel}\ file\ ${tor_logfile}" extra_commands="log" log_cmd="${name}_log" Modified: head/security/tor/pkg-plist ============================================================================== --- head/security/tor/pkg-plist Wed Aug 7 11:42:40 2013 (r324350) +++ head/security/tor/pkg-plist Wed Aug 7 12:54:37 2013 (r324351) @@ -1,3 +1,4 @@ +@stopdaemon tor bin/tor bin/tor-gencert bin/tor-resolve @@ -7,3 +8,8 @@ etc/tor/torrc.sample %%DATADIR%%/geoip @dirrm %%DATADIR%% @dirrmtry etc/tor +@cwd / +@dirrmtry var/run/tor +@dirrmtry var/db/tor/data +@dirrmtry var/db/tor +@cwd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308071254.r77CscnF007311>