Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jan 2019 07:48:29 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r489648 - head/security/tor
Message-ID:  <201901080748.x087mTPa098676@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Tue Jan  8 07:48:29 2019
New Revision: 489648
URL: https://svnweb.freebsd.org/changeset/ports/489648

Log:
  security/tor: Update 0.3.4.9 -> 0.3.5.7
  
  The TOR2WEB option is retired by the upstream.
  
  Reported by:	upstream notification

Modified:
  head/security/tor/Makefile
  head/security/tor/distinfo
  head/security/tor/pkg-plist

Modified: head/security/tor/Makefile
==============================================================================
--- head/security/tor/Makefile	Tue Jan  8 07:47:10 2019	(r489647)
+++ head/security/tor/Makefile	Tue Jan  8 07:48:29 2019	(r489648)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.3.4.9
-PORTREVISION=	1
+DISTVERSION=	0.3.5.7
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 
@@ -23,14 +22,13 @@ CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/i
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB
+OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC
 OPTIONS_GROUP=	COMPRESSION
 OPTIONS_GROUP_COMPRESSION=ZSTD LZMA
 OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
 OPTIONS_SUB=	yes
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
-TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services
 COMPRESSION_DESC=	Supported compression libraries
 
 USE_RC_SUBR=	tor
@@ -46,7 +44,6 @@ CONFLICTS_INSTALL=	tor-devel-[0-9]*
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
 
-TOR2WEB_CONFIGURE_ENABLE=	tor2web-mode
 ZSTD_CONFIGURE_ENABLE=		zstd
 ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
 LZMA_CONFIGURE_ENABLE=		lzma
@@ -86,7 +83,7 @@ TOR_ZSTD_LIBS=		-lzstd
 .endif
 
 .if ${PORT_OPTIONS:MTCMALLOC}
-CONFIGURE_ARGS+=	--with-tcmalloc
+CONFIGURE_ARGS+=	--with-malloc=tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
@@ -94,16 +91,6 @@ LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
-pre-everything::
-.if ${PORT_OPTIONS:MTOR2WEB}
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen."
-	@${ECHO_MSG} "         With this option tor cannot be used for regular traffic,"
-	@${ECHO_MSG} "         only for non-anonymous hidden service traffic."
-	@${ECHO_MSG} "         Please make sure you understand this option."
-	@${ECHO_MSG}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
 		${WRKSRC}/configure
@@ -123,10 +110,8 @@ post-patch-STATIC_TOR-on:
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
 
-.if ! ${PORT_OPTIONS:MTOR2WEB}
 check regression-test test: build
-	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS} check
-.endif
 
 .include <bsd.port.mk>

Modified: head/security/tor/distinfo
==============================================================================
--- head/security/tor/distinfo	Tue Jan  8 07:47:10 2019	(r489647)
+++ head/security/tor/distinfo	Tue Jan  8 07:48:29 2019	(r489648)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541177990
-SHA256 (tor-0.3.4.9.tar.gz) = 1a171081f02b9a6ff9e28c0898defb7670e5bbb3bdbcaddfcf4e4304aedd164a
-SIZE (tor-0.3.4.9.tar.gz) = 6695931
+TIMESTAMP = 1546931112
+SHA256 (tor-0.3.5.7.tar.gz) = 1b0887fc21ac535befea7243c5d5f1e31394d7458d64b30807a3e98cca0d839e
+SIZE (tor-0.3.5.7.tar.gz) = 6934521

Modified: head/security/tor/pkg-plist
==============================================================================
--- head/security/tor/pkg-plist	Tue Jan  8 07:47:10 2019	(r489647)
+++ head/security/tor/pkg-plist	Tue Jan  8 07:48:29 2019	(r489648)
@@ -1,13 +1,16 @@
 bin/tor
 bin/tor-gencert
+bin/tor-print-ed-signing-cert
 bin/tor-resolve
 bin/torify
 @sample etc/tor/torrc.sample
 %%MANPAGES%%man/man1/tor-gencert.1.gz
+%%MANPAGES%%man/man1/tor-print-ed-signing-cert.1.gz
 %%MANPAGES%%man/man1/tor-resolve.1.gz
 %%MANPAGES%%man/man1/tor.1.gz
 %%MANPAGES%%man/man1/torify.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/tor-gencert.html
+%%PORTDOCS%%%%DOCSDIR%%/tor-print-ed-signing-cert.html
 %%PORTDOCS%%%%DOCSDIR%%/tor-resolve.html
 %%PORTDOCS%%%%DOCSDIR%%/tor.html
 %%PORTDOCS%%%%DOCSDIR%%/torify.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901080748.x087mTPa098676>