From owner-svn-ports-all@freebsd.org Wed Sep 7 11:46:02 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECBD8BCFBA6; Wed, 7 Sep 2016 11:46:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9C92FB6; Wed, 7 Sep 2016 11:46:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87Bk2FS057858; Wed, 7 Sep 2016 11:46:02 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87Bk1mx057856; Wed, 7 Sep 2016 11:46:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201609071146.u87Bk1mx057856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 7 Sep 2016 11:46:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421493 - head/security/tor X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 11:46:03 -0000 Author: amdmi3 Date: Wed Sep 7 11:46:01 2016 New Revision: 421493 URL: https://svnweb.freebsd.org/changeset/ports/421493 Log: - Update to 0.2.8.7 [1] - Remove broken BUFFEREVENTS and INSTR_DOWNLOADS options [2] - Switch to USES=ssl PR: 212124 [1], 210389 [2] Submitted by: neel@neelc.org [1], U+039b@0x39b.fr [2] Approved by: yuri@rawbw.com (maintainer) Modified: head/security/tor/Makefile head/security/tor/distinfo Modified: head/security/tor/Makefile ============================================================================== --- head/security/tor/Makefile Wed Sep 7 11:27:17 2016 (r421492) +++ head/security/tor/Makefile Wed Sep 7 11:46:01 2016 (r421493) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tor -PORTVERSION= 0.2.8.6 +PORTVERSION= 0.2.8.7 CATEGORIES= security net ipv6 MASTER_SITES= TOR @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= Does not build -USES= cpe gmake +USES= cpe gmake ssl CPE_VENDOR= torproject GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc @@ -22,19 +22,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 @@ -57,33 +52,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} @@ -131,7 +108,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 Modified: head/security/tor/distinfo ============================================================================== --- head/security/tor/distinfo Wed Sep 7 11:27:17 2016 (r421492) +++ head/security/tor/distinfo Wed Sep 7 11:46:01 2016 (r421493) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470238261 -SHA256 (tor-0.2.8.6.tar.gz) = 3dc9fc02f7cd22ed5fce707e0d9b26a72b1bd0976766a804cb13078d32e3ab5a -SIZE (tor-0.2.8.6.tar.gz) = 5163500 +TIMESTAMP = 1472080840 +SHA256 (tor-0.2.8.7.tar.gz) = ae44e2b699e82db7ff318432fd558dfa941ad154e4055f16d208514951742fc6 +SIZE (tor-0.2.8.7.tar.gz) = 5179093