[Midnightbsd-cvs] mports [19645] trunk/security/tor: tor 0.2.6.9

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 1 09:06:37 EDT 2015 

Revision: 19645
          http://svnweb.midnightbsd.org/mports/?rev=19645
Author:   laffer1
Date:     2015-08-01 09:06:36 -0400 (Sat, 01 Aug 2015)
Log Message:
-----------
tor 0.2.6.9

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	2015-08-01 13:02:09 UTC (rev 19644)
+++ trunk/security/tor/Makefile	2015-08-01 13:06:36 UTC (rev 19645)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.2.5.11
+DISTVERSION=	0.2.6.9
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 
@@ -11,18 +11,18 @@
 LICENSE=	bsd3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake
+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/event2 -I${LOCALBASE}/include" \
-		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
+CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
+		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS \
-		STATIC_TOR TCMALLOC THREADS TOR2WEB TRANSPARENT
+OPTIONS_DEFINE=	BUFFEREVENTS INSTR_DOWNLOADS \
+		STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
 
 BUFFEREVENTS_DESC=	Use libevent's buffered IO
-BUFFREELISTS_DESC=	Freelists for buffer RAM
 INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
@@ -29,7 +29,7 @@
 TOR2WEB_DESC=		Faster but non-anonymous hidden services
 TRANSPARENT_DESC=	Transparent proxy support
 
-OPTIONS_DEFAULT=	BUFFREELISTS THREADS TRANSPARENT
+OPTIONS_DEFAULT=	THREADS TRANSPARENT
 
 USE_OPENSSL=	yes
 
@@ -36,7 +36,7 @@
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 
-GROUPS =	_tor
+GROUPS=		_tor
 USERS=		_tor
 
 CONFLICTS=	tor-devel-[0-9]*
@@ -57,12 +57,6 @@
 CONFIGURE_ARGS+=	--disable-bufferevents
 .endif
 
-.if ${PORT_OPTIONS:MBUFFREELISTS}
-CONFIGURE_ARGS+=	--enable-buf-freelists
-.else
-CONFIGURE_ARGS+=	--disable-buf-freelists
-.endif
-
 .if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
 CONFIGURE_ARGS+=	--enable-instrument-downloads
 .else
@@ -70,19 +64,19 @@
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
-CONFIGURE_ARGS+=	--enable-static-tor --with-libevent-dir=${LOCALBASE}/lib/event2 \
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
-TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/event2/libevent.a
+TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/event2/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
+TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
-LIB_DEPENDS+=		event-2.0:${PORTSDIR}/devel/libevent2
-TOR_LIBEVENT_LIBS=	-levent-2.0
+LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	-levent_openssl-2.0 ${TOR_LIBEVENT_LIBS}
+TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .endif
 .endif
 
@@ -91,17 +85,10 @@
 .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
 
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=	--enable-threads
-CFLAGS+=		${PTHREAD_CFLAGS}
-.else
-CONFIGURE_ARGS+=	--disable-threads
-.endif
-
 .if ${PORT_OPTIONS:MTOR2WEB}
 CONFIGURE_ARGS+=	--enable-tor2web-mode
 .endif
@@ -118,8 +105,6 @@
 		${WRKSRC}/configure
 
 post-configure:
-	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
-		"s|-lpthread|${PTHREAD_LIBS}|g"
 	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
 		${WRKSRC}/Makefile
 

Modified: trunk/security/tor/distinfo
===================================================================
--- trunk/security/tor/distinfo	2015-08-01 13:02:09 UTC (rev 19644)
+++ trunk/security/tor/distinfo	2015-08-01 13:06:36 UTC (rev 19645)
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.5.11.tar.gz) = aee0faee9c3f1bb265ee8e94b4bb93967413f3c56e65f954db16b09451546769
-SIZE (tor-0.2.5.11.tar.gz) = 3310350
+SHA256 (tor-0.2.6.9.tar.gz) = 4a6c29ad89a98d7832c599d9480d6d8e55355fb3b8f4b506c5df557f15942f9c
+SIZE (tor-0.2.6.9.tar.gz) = 3581981

Modified: trunk/security/tor/files/pkg-message.in
===================================================================
--- trunk/security/tor/files/pkg-message.in	2015-08-01 13:02:09 UTC (rev 19644)
+++ trunk/security/tor/files/pkg-message.in	2015-08-01 13:06:36 UTC (rev 19645)
@@ -11,4 +11,9 @@
 chown -R _tor:_tor /var/db/tor /var/log/tor /var/run/tor
 chmod -R 700 /var/db/tor
 
-before starting the tor server.
+before starting the tor server. Tor users are strongly advised to prevent traffic
+analysis that exploits sequential IP IDs by setting:
+
+sysctl net.inet.ip.random_id=1
+
+(see sysctl.conf(5)).

Modified: trunk/security/tor/files/tor.in
===================================================================
--- trunk/security/tor/files/tor.in	2015-08-01 13:02:09 UTC (rev 19644)
+++ trunk/security/tor/files/tor.in	2015-08-01 13:06:36 UTC (rev 19645)
@@ -1,9 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: head/security/tor/files/tor.in 368512 2014-09-18 19:40:36Z bf $
+# $MidnightBSD$
+# $FreeBSD: head/security/tor/files/tor.in 382650 2015-03-30 11:58:44Z bf $
 #
 # PROVIDE: tor
-# REQUIRE: NETWORKING SERVERS USR
+# REQUIRE: DAEMON FILESYSTEMS
 # BEFORE: LOGIN
 #
 # Add the following lines to /etc/rc.conf to enable tor.

Modified: trunk/security/tor/pkg-plist
===================================================================
--- trunk/security/tor/pkg-plist	2015-08-01 13:02:09 UTC (rev 19644)
+++ trunk/security/tor/pkg-plist	2015-08-01 13:06:36 UTC (rev 19645)
@@ -1,9 +1,8 @@
- at stopdaemon tor
 bin/tor
 bin/tor-gencert
 bin/tor-resolve
 bin/torify
-etc/tor/torrc.sample
+ at sample etc/tor/torrc.sample
 man/man1/tor-gencert.1.gz
 man/man1/tor-resolve.1.gz
 man/man1/tor.1.gz
@@ -10,5 +9,3 @@
 man/man1/torify.1.gz
 %%DATADIR%%/geoip
 %%DATADIR%%/geoip6
- at dirrm %%DATADIR%%
- at dirrmtry etc/tor

More information about the Midnightbsd-cvs mailing list