svn commit: r421494 - head/security/tor-devel

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Sep  7 11:46:53 2016
New Revision: 421494
URL: https://svnweb.freebsd.org/changeset/ports/421494

Log:
  - Update to 0.2.9.2-alpha [1]
  - Remove unsupported BUFFEREVENTS and INSTR_DOWNLOADS options [2]
  - Switch to USES=ssl
  
  PR:		212124 [1], 210389 [2]
  Submitted by:	neel at neelc.org [1], U+039b at 0x39b.fr [2]
  Approved by:	yuri at rawbw.com (maintainer)

Modified:
  head/security/tor-devel/Makefile
  head/security/tor-devel/distinfo

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Wed Sep  7 11:46:01 2016	(r421493)
+++ head/security/tor-devel/Makefile	Wed Sep  7 11:46:53 2016	(r421494)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.2.9.1-alpha
+DISTVERSION=	0.2.9.2-alpha
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	Does not build
 
-USES=		cpe gmake
+USES=		cpe gmake ssl
 CPE_VENDOR=	torproject
 #CPE_VERSION=	${DISTVERSION:C/-.*//}
 #CPE_UPDATE=	${DISTVERSION:C/.*-//}
@@ -25,19 +25,14 @@ CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	BUFFEREVENTS INSTR_DOWNLOADS \
-		STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
+OPTIONS_DEFINE=	STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
 
-BUFFEREVENTS_DESC=	Use libevent's buffered IO
-INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
 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=	THREADS TRANSPARENT
-
-USE_OPENSSL=	yes
+OPTIONS_DEFAULT=	TRANSPARENT
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
@@ -60,33 +55,15 @@ CONFIGURE_ARGS+=	--enable-gcc-hardening
 CONFIGURE_ARGS+=	--disable-gcc-hardening
 .endif
 
-.if ${PORT_OPTIONS:MBUFFEREVENTS}
-CONFIGURE_ARGS+=	--enable-bufferevents
-.else
-CONFIGURE_ARGS+=	--disable-bufferevents
-.endif
-
-.if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
-CONFIGURE_ARGS+=	--enable-instrument-downloads
-.else
-CONFIGURE_ARGS+=	--disable-instrument-downloads
-.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
-.if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
-.endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
 LIB_DEPENDS+=		libevent.so:devel/libevent2
 TOR_LIBEVENT_LIBS=	-levent
-.if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
-.endif
 .endif
 
 .if ${PORT_OPTIONS:MTCMALLOC}
@@ -134,7 +111,7 @@ post-install:
 .if ! ${PORT_OPTIONS:MTOR2WEB}
 check regression-test test: build
 	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-	${MAKE_ARGS} check
-
+		${MAKE_ARGS} check
 .endif
+
 .include <bsd.port.mk>

Modified: head/security/tor-devel/distinfo
==============================================================================
--- head/security/tor-devel/distinfo	Wed Sep  7 11:46:01 2016	(r421493)
+++ head/security/tor-devel/distinfo	Wed Sep  7 11:46:53 2016	(r421494)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471439233
-SHA256 (tor-0.2.9.1-alpha.tar.gz) = 1a1b57af6bb47ecb62e4c60e2ceecb5609b558b1fdd87c86a91571d1601ba3f2
-SIZE (tor-0.2.9.1-alpha.tar.gz) = 5284721
+TIMESTAMP = 1472083233
+SHA256 (tor-0.2.9.2-alpha.tar.gz) = dd93cf6b8531acf68152adbfa2f693cebd1b3254bc6190c920a99cc587944922
+SIZE (tor-0.2.9.2-alpha.tar.gz) = 5294923