[Midnightbsd-cvs] mports [15966] trunk/security/tor: update tor to 0.2.4.20

Fri Feb 28 20:54:29 EST 2014

Revision: 15966
          http://svnweb.midnightbsd.org/mports/?rev=15966
Author:   laffer1
Date:     2014-02-28 20:54:28 -0500 (Fri, 28 Feb 2014)
Log Message:
-----------
update tor to 0.2.4.20

Modified Paths:
--------------
    trunk/security/tor/Makefile
    trunk/security/tor/distinfo
    trunk/security/tor/files/pkg-message.in
    trunk/security/tor/files/tor.in
    trunk/security/tor/pkg-plist

Modified: trunk/security/tor/Makefile
===================================================================

--- trunk/security/tor/Makefile	2014-03-01 01:48:43 UTC (rev 15965)
+++ trunk/security/tor/Makefile	2014-03-01 01:54:28 UTC (rev 15966)
@@ -1,59 +1,17 @@
 # $MidnightBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.2.3.25
-PORTREVISION=	1
+DISTVERSION=	0.2.4.20
 CATEGORIES=	security net ipv6
-MASTER_SITES=	https://www.torproject.org/dist/ \
-		ftp://ftp.bit.nl/mirror/tor/ \
-		http://cyberside.net.ee/tor/ \
-		http://ftp.bit.nl/mirror/tor/ \
-		http://mirror.hessmo.com/tor/dist/ \
-		http://mirror.host4site.co.il/torproject.org/dist/ \
-		http://mirror.open-networx.org/torproject.org/dist/ \
-		http://mirror.tor.hu/dist/ \
-		https://mirror.torland.me/torproject.org/dist/ \
-		http://mirrors.chaos-darmstadt.de/tor-mirror/dist/ \
-		http://theonionrouter.com/dist/ \
-		http://tor.amorphis.eu/dist/ \
-		http://tor.askapache.com/dist/ \
-		http://tor.beme-it.de/dist/ \
-		http://tor.blingblingsquad.net/dist/ \
-		http://tor.borgmann.tv/dist/ \
-		http://tor.ccc.de/dist/ \
-		http://tor.cyberarmy.at/dist/ \
-		http://tor.dont-know-me.at/dist/ \
-		http://tor.factor.cc/dist/ \
-		http://tor.homosu.net/dist/ \
-		http://tor.idnr.ws/dist/ \
-		http://tor.myrl.net/dist/ \
-		http://tor.kamagurka.org/dist/ \
-		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/ \
-		http://torproject.is/dist/ \
-		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/ \
-		http://www.torproject.org.nyud.net/dist/ \
-		http://www.torproject.us/dist/ \
-		http://www.torservers.net/mirrors/torproject.org/dist/
+MASTER_SITES=	TOR
 
-MAINTAINER=	ports at MidnightBSD.org
+MAINTAINER=	bf at FreeBSD.org
 COMMENT=	An anonymizing overlay network for TCP
+
 LICENSE=	bsd3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-#RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
-#LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
-
+USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
 CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
@@ -60,12 +18,11 @@
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS GMAKE INSTR_DOWNLOADS \
+OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS \
 		STATIC_TOR TCMALLOC THREADS TOR2WEB TRANSPARENT
 
 BUFFEREVENTS_DESC=	Use libevent's buffered IO
 BUFFREELISTS_DESC=	Freelists for buffer RAM
-GMAKE_DESC=		Parallel build safety via GNU make
 INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
@@ -84,19 +41,16 @@
 
 CONFLICTS=	tor-devel-[0-9]*
 
-MANCOMPRESSED=	no
-MAN1=		tor.1 tor-resolve.1 torify.1 tor-gencert.1
-
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MGMAKE}
-USE_GMAKE=		yes
+.if ( (${OSVERSION} < 4015) || \
+(${OSVERSION} >= 4015) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
+empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
+CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else
-MAKE_JOBS_UNSAFE=	yes
+CONFIGURE_ARGS+=	--disable-gcc-hardening
 .endif
 
-CONFIGURE_ARGS+=	--disable-gcc-hardening
-
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 CONFIGURE_ARGS+=	--enable-bufferevents
 .else
@@ -159,12 +113,6 @@
 .endif
 
 post-patch:
-	@${MV} ${WRKSRC}/contrib/tor-tsocks.conf \
-		${WRKSRC}/contrib/tor-tsocks.conf.sample
-	@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
-		${WRKSRC}/contrib/Makefile.in
-	@${REINPLACE_CMD} -e '\|^install-data-am:|s|install-docDATA||' \
-		${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -E -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
 		-e "s@(-z) (relro|now)@-Wl,\1,\2 at g" \
 		${WRKSRC}/configure
@@ -172,7 +120,13 @@
 post-configure:
 	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		"s|-lpthread|${PTHREAD_LIBS}|g"
-	@${REINPLACE_CMD} -e '\|^nodist_man_MANS =|s|$$|${MAN1}|' \
-		${WRKSRC}/doc/Makefile
+	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(regular_mans:=.1)|' \
+		${WRKSRC}/Makefile
 
+.if ! ${PORT_OPTIONS:MTOR2WEB}
+check regression-test test: build
+	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+	${MAKE_ARGS} check
+
+.endif
 .include <bsd.port.mk>

Modified: trunk/security/tor/distinfo
===================================================================
--- trunk/security/tor/distinfo	2014-03-01 01:48:43 UTC (rev 15965)
+++ trunk/security/tor/distinfo	2014-03-01 01:54:28 UTC (rev 15966)
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.3.25.tar.gz) = bb2d6f1136f33e11d37e6e34184143bf191e59501613daf33ae3d6f78f3176a0
-SIZE (tor-0.2.3.25.tar.gz) = 3190011
+SHA256 (tor-0.2.4.20.tar.gz) = ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f
+SIZE (tor-0.2.4.20.tar.gz) = 2867180

Modified: trunk/security/tor/files/pkg-message.in
===================================================================
--- trunk/security/tor/files/pkg-message.in	2014-03-01 01:48:43 UTC (rev 15965)
+++ trunk/security/tor/files/pkg-message.in	2014-03-01 01:54:28 UTC (rev 15966)
@@ -1,8 +1,14 @@
-================================================================================
 To enable the tor server, set tor_enable="YES" in your /etc/rc.conf
-and edit %%PREFIX%%/etc/tor/torrc.  Note that the rc.subr script overrides
-many torrc options and is tunable: see %%PREFIX%%/etc/rc.d/tor for details.
-To use the torify script, install the net/torsocks port. After removing the
-package, or updating to a new version, users may need to delete all files
-in /var/db/tor.
-================================================================================
+and edit %%PREFIX%%/etc/tor/torrc as desired. (However, note that the
+%%PREFIX%%/etc/rc.d/tor rc.subr script can override some torrc
+options: see that script for details.) To use the torify script, install
+the net/torsocks port. After installing tor for the first time, or after
+a major update of tor, you should:
+
+rm -r /var/db/tor /var/run/tor
+mkdir -p /var/db/tor/data /var/run/tor
+touch /var/log/tor
+chown -R _tor:_tor /var/db/tor /var/log/tor /var/run/tor
+chmod -R 700 /var/db/tor
+
+before starting the tor server.

Modified: trunk/security/tor/files/tor.in
===================================================================
--- trunk/security/tor/files/tor.in	2014-03-01 01:48:43 UTC (rev 15965)
+++ trunk/security/tor/files/tor.in	2014-03-01 01:54:28 UTC (rev 15966)
@@ -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,6 +31,7 @@
 : ${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}
@@ -37,7 +38,7 @@
 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: trunk/security/tor/pkg-plist
===================================================================
--- trunk/security/tor/pkg-plist	2014-03-01 01:48:43 UTC (rev 15965)
+++ trunk/security/tor/pkg-plist	2014-03-01 01:54:28 UTC (rev 15966)
@@ -1,8 +1,8 @@
+ at stopdaemon tor
 bin/tor
 bin/tor-gencert
 bin/tor-resolve
 bin/torify
-etc/tor/tor-tsocks.conf.sample
 etc/tor/torrc.sample
 %%DATADIR%%/geoip
 @dirrm %%DATADIR%%

