Index: head/security/tor/Makefile =================================================================== --- head/security/tor/Makefile (revision 424186) +++ head/security/tor/Makefile (revision 424187) @@ -1,120 +1,131 @@ # Created by: peter.thoenen@yahoo.com # $FreeBSD$ PORTNAME= tor -PORTVERSION= 0.2.8.7 -PORTREVISION= 1 +PORTVERSION= 0.2.8.9 CATEGORIES= security net ipv6 MASTER_SITES= TOR MAINTAINER= yuri@rawbw.com COMMENT= Anonymizing overlay network for TCP LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_mips64= Does not build: error: Need a uint128_t implementation! BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not build: error: Need a uint128_t implementation! USES= cpe gmake CPE_VENDOR= torproject GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \ TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \ TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}" OPTIONS_DEFINE= STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT STATIC_TOR_DESC= Build a static tor TCMALLOC_DESC= Use the tcmalloc memory allocation library -TOR2WEB_DESC= Faster but non-anonymous hidden services +TOR2WEB_DESC= (EXPERT OPTION) Faster but non-anonymous hidden services TRANSPARENT_DESC= Transparent proxy support OPTIONS_DEFAULT= TRANSPARENT USE_RC_SUBR= tor SUB_FILES= pkg-message +SUB_LIST= USER="${USERS}" GROUP="${GROUPS}" +PLIST_SUB= USER="${USERS}" GROUP="${GROUPS}" GROUPS= _tor USERS= _tor CONFLICTS= tor-devel-[0-9]* STATIC_TOR_USES= ssl:build STATIC_TOR_USES_OFF= ssl .include .if ${OSVERSION} < 1000000 WITH_OPENSSL_PORT= yes .endif .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening .else CONFIGURE_ARGS+= --disable-gcc-hardening .endif .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS += ${LOCALBASE}/lib/libevent.a:devel/libevent2 CONFIGURE_ARGS+= --enable-static-tor \ --with-zlib-dir=/usr/lib --disable-linker-hardening TOR_LIBEVENT_LIBS= ${LOCALBASE}/lib/libevent.a .else CONFIGURE_ARGS+= --enable-linker-hardening LIB_DEPENDS+= libevent.so:devel/libevent2 TOR_LIBEVENT_LIBS= -levent .endif .if ${PORT_OPTIONS:MTCMALLOC} CONFIGURE_ARGS+= --with-tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools .else LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools .endif .endif .if ${PORT_OPTIONS:MTOR2WEB} CONFIGURE_ARGS+= --enable-tor2web-mode .endif .if ${PORT_OPTIONS:MTRANSPARENT} CONFIGURE_ARGS+= --enable-transparent .else CONFIGURE_ARGS+= --disable-transparent .endif +pre-everything:: +.if ${PORT_OPTIONS:MTOR2WEB} + @${ECHO_MSG} + @${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen." + @${ECHO_MSG} " With this option tor cannot be used for regular traffic," + @${ECHO_MSG} " only for non-anonymous hidden service traffic." + @${ECHO_MSG} " Please make sure you understand this option." + @${ECHO_MSG} +.endif + post-patch: @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \ ${WRKSRC}/src/config/torrc.*.in \ ${WRKSRC}/doc/tor.1.* \ ${WRKSRC}/doc/tor.html.in post-patch-STATIC_TOR-off: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ ${WRKSRC}/configure post-patch-STATIC_TOR-on: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \ ${WRKSRC}/configure post-configure: @${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \ ${WRKSRC}/Makefile post-install: - @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor + @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor .if ! ${PORT_OPTIONS:MTOR2WEB} check regression-test test: build @cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check .endif .include Index: head/security/tor/distinfo =================================================================== --- head/security/tor/distinfo (revision 424186) +++ head/security/tor/distinfo (revision 424187) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472080840 -SHA256 (tor-0.2.8.7.tar.gz) = ae44e2b699e82db7ff318432fd558dfa941ad154e4055f16d208514951742fc6 -SIZE (tor-0.2.8.7.tar.gz) = 5179093 +TIMESTAMP = 1476740628 +SHA256 (tor-0.2.8.9.tar.gz) = 3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316 +SIZE (tor-0.2.8.9.tar.gz) = 5306773 Index: head/security/tor/files/tor.in =================================================================== --- head/security/tor/files/tor.in (revision 424186) +++ head/security/tor/files/tor.in (revision 424187) @@ -1,41 +1,41 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: tor # REQUIRE: DAEMON FILESYSTEMS # BEFORE: LOGIN # # Add the following lines to /etc/rc.conf to enable tor. # All these options will overide any settings in your local torrc as # they are command line options. # # 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. Default: /var/db/tor # . /etc/rc.subr name="tor" rcvar=tor_enable load_rc_config ${name} : ${tor_enable="NO"} : ${tor_conf="%%PREFIX%%/etc/tor/torrc"} -: ${tor_user="_tor"} +: ${tor_user="%%USER%%"} : ${tor_pidfile="/var/run/tor/tor.pid"} : ${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}" extra_commands="reload" run_rc_command "$1" Index: head/security/tor/pkg-plist =================================================================== --- head/security/tor/pkg-plist (revision 424186) +++ head/security/tor/pkg-plist (revision 424187) @@ -1,13 +1,14 @@ bin/tor bin/tor-gencert bin/tor-resolve bin/torify @sample etc/tor/torrc.sample man/man1/tor-gencert.1.gz man/man1/tor-resolve.1.gz man/man1/tor.1.gz man/man1/torify.1.gz %%DATADIR%%/geoip %%DATADIR%%/geoip6 -@dir(_tor,_tor,750) /var/run/tor -@dir(_tor,_tor,750) /var/log/tor +@dir(%%USER%%,%%GROUP%%,700) /var/run/tor +@dir(%%USER%%,%%GROUP%%,700) /var/log/tor +@dir(%%USER%%,%%GROUP%%,700) /var/db/tor Index: head/security/tor-devel/Makefile =================================================================== --- head/security/tor-devel/Makefile (revision 424186) +++ head/security/tor-devel/Makefile (revision 424187) @@ -1,123 +1,122 @@ # Created by: peter.thoenen@yahoo.com # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.2.9.2-alpha -PORTREVISION= 1 +DISTVERSION= 0.2.9.4-alpha CATEGORIES= security net ipv6 MASTER_SITES= TOR PKGNAMESUFFIX= -devel MAINTAINER= yuri@rawbw.com COMMENT= Anonymizing overlay network for TCP LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_mips64= Does not build: error: Need a uint128_t implementation! BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not build: error: Need a uint128_t implementation! USES= cpe gmake CPE_VENDOR= torproject #CPE_VERSION= ${DISTVERSION:C/-.*//} #CPE_UPDATE= ${DISTVERSION:C/.*-//} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \ TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \ TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}" OPTIONS_DEFINE= STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT STATIC_TOR_DESC= Build a static tor TCMALLOC_DESC= Use the tcmalloc memory allocation library TOR2WEB_DESC= Faster but non-anonymous hidden services TRANSPARENT_DESC= Transparent proxy support OPTIONS_DEFAULT= TRANSPARENT USE_RC_SUBR= tor SUB_FILES= pkg-message GROUPS= _tor USERS= _tor CONFLICTS= tor-[0-9]* STATIC_TOR_USES= ssl:build STATIC_TOR_USES_OFF= ssl .include .if ${OSVERSION} < 1000000 WITH_OPENSSL_PORT= yes .endif .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening .else CONFIGURE_ARGS+= --disable-gcc-hardening .endif .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS += ${LOCALBASE}/lib/libevent.a:devel/libevent2 CONFIGURE_ARGS+= --enable-static-tor \ --with-zlib-dir=/usr/lib --disable-linker-hardening TOR_LIBEVENT_LIBS= ${LOCALBASE}/lib/libevent.a .else CONFIGURE_ARGS+= --enable-linker-hardening LIB_DEPENDS+= libevent.so:devel/libevent2 TOR_LIBEVENT_LIBS= -levent .endif .if ${PORT_OPTIONS:MTCMALLOC} CONFIGURE_ARGS+= --with-tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools .else LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools .endif .endif .if ${PORT_OPTIONS:MTOR2WEB} CONFIGURE_ARGS+= --enable-tor2web-mode .endif .if ${PORT_OPTIONS:MTRANSPARENT} CONFIGURE_ARGS+= --enable-transparent .else CONFIGURE_ARGS+= --disable-transparent .endif post-patch: @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \ ${WRKSRC}/src/config/torrc.*.in \ ${WRKSRC}/doc/tor.1.* \ ${WRKSRC}/doc/tor.html.in post-patch-STATIC_TOR-off: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ ${WRKSRC}/configure post-patch-STATIC_TOR-on: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \ ${WRKSRC}/configure post-configure: @${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \ ${WRKSRC}/Makefile post-install: @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor .if ! ${PORT_OPTIONS:MTOR2WEB} check regression-test test: build @cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check .endif .include Index: head/security/tor-devel/distinfo =================================================================== --- head/security/tor-devel/distinfo (revision 424186) +++ head/security/tor-devel/distinfo (revision 424187) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472083233 -SHA256 (tor-0.2.9.2-alpha.tar.gz) = dd93cf6b8531acf68152adbfa2f693cebd1b3254bc6190c920a99cc587944922 -SIZE (tor-0.2.9.2-alpha.tar.gz) = 5294923 +TIMESTAMP = 1476741065 +SHA256 (tor-0.2.9.4-alpha.tar.gz) = fc5664fff4c86d3644043a068f11b17c57f9a295c37b7186bf90bb237913e400 +SIZE (tor-0.2.9.4-alpha.tar.gz) = 5481286