svn commit: r380776 - in head/security/tor-devel: . files

[Brendan Fabeny]

Author: bf
Date: Sun Mar  8 15:51:58 2015
New Revision: 380776
URL: https://svnweb.freebsd.org/changeset/ports/380776
QAT: https://qat.redports.org/buildarchive/r380776/

Log:
  update to 0.2.6.3-alpha [1]; use cpe [2]; adjust rc-script REQUIRES [3];
  use @sample [4]
  
  PR:		197839 [1], 197494 [2], 197998 [3], 198164 [4]
  Submitted by:	C. Sturm [1], J. Beich [3], amdmi3 [4]

Modified:
  head/security/tor-devel/Makefile
  head/security/tor-devel/distinfo
  head/security/tor-devel/files/tor.in
  head/security/tor-devel/pkg-plist

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Sun Mar  8 15:38:17 2015	(r380775)
+++ head/security/tor-devel/Makefile	Sun Mar  8 15:51:58 2015	(r380776)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.2.6.2-alpha
+DISTVERSION=	0.2.6.3-alpha
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
@@ -13,20 +13,21 @@ COMMENT=	Anonymizing overlay network for
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake
+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=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS MEMPOOLS \
-		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
-MEMPOOLS_DESC=		Mempools for relay cells
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 TOR2WEB_DESC=		Faster but non-anonymous hidden services
@@ -60,24 +61,12 @@ CONFIGURE_ARGS+=	--enable-bufferevents
 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
 CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
-.if ${PORT_OPTIONS:MMEMPOOLS}
-CONFIGURE_ARGS+=	--enable-mempools
-.else
-CONFIGURE_ARGS+=	--disable-mempools
-.endif
-
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
@@ -104,13 +93,6 @@ LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR
 .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

Modified: head/security/tor-devel/distinfo
==============================================================================
--- head/security/tor-devel/distinfo	Sun Mar  8 15:38:17 2015	(r380775)
+++ head/security/tor-devel/distinfo	Sun Mar  8 15:51:58 2015	(r380776)
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.6.2-alpha.tar.gz) = b0e765736b17b91088a2016e7f09e4fafee81282f8bc8647987f975b6a583379
-SIZE (tor-0.2.6.2-alpha.tar.gz) = 3486176
+SHA256 (tor-0.2.6.3-alpha.tar.gz) = 5e31a0ccbb1fbe9ac6fc64d157c5c3db9b478908ea09bbe15adea2f1fd11d670
+SIZE (tor-0.2.6.3-alpha.tar.gz) = 3526195

Modified: head/security/tor-devel/files/tor.in
==============================================================================
--- head/security/tor-devel/files/tor.in	Sun Mar  8 15:38:17 2015	(r380775)
+++ head/security/tor-devel/files/tor.in	Sun Mar  8 15:51:58 2015	(r380776)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: tor
-# REQUIRE: NETWORKING SERVERS USR
+# REQUIRE: DAEMON FILESYSTEMS
 # BEFORE: LOGIN
 #
 # Add the following lines to /etc/rc.conf to enable tor.

Modified: head/security/tor-devel/pkg-plist
==============================================================================
--- head/security/tor-devel/pkg-plist	Sun Mar  8 15:38:17 2015	(r380775)
+++ head/security/tor-devel/pkg-plist	Sun Mar  8 15:51:58 2015	(r380776)
@@ -2,7 +2,7 @@ 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