From owner-svn-ports-all@freebsd.org Tue Aug 22 02:24:49 2017 Return-Path: <owner-svn-ports-all@freebsd.org> 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 DF416DE82FD; Tue, 22 Aug 2017 02:24:49 +0000 (UTC) (envelope-from swills@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 B993B6C9AB; Tue, 22 Aug 2017 02:24:49 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7M2Omhu040876; Tue, 22 Aug 2017 02:24:48 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7M2Om28040874; Tue, 22 Aug 2017 02:24:48 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201708220224.v7M2Om28040874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills <swills@FreeBSD.org> Date: Tue, 22 Aug 2017 02:24:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448507 - in head/security/zeronet: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/security/zeronet: . files X-SVN-Commit-Revision: 448507 X-SVN-Commit-Repository: ports 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 <svn-ports-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>, <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/> List-Post: <mailto:svn-ports-all@freebsd.org> List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>, <mailto:svn-ports-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 22 Aug 2017 02:24:50 -0000 Author: swills Date: Tue Aug 22 02:24:48 2017 New Revision: 448507 URL: https://svnweb.freebsd.org/changeset/ports/448507 Log: security/zeronet: Removed the unnecessary TOR option PR: 221615 Submitted by: Yuri Victorovich <yuri@rawbw.com> Modified: head/security/zeronet/Makefile head/security/zeronet/files/pkg-message.in Modified: head/security/zeronet/Makefile ============================================================================== --- head/security/zeronet/Makefile Tue Aug 22 02:11:39 2017 (r448506) +++ head/security/zeronet/Makefile Tue Aug 22 02:24:48 2017 (r448507) @@ -4,6 +4,7 @@ PORTNAME= zeronet PORTVERSION= 0.5.7 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= security net-p2p MAINTAINER= yuri@rawbw.com @@ -13,7 +14,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent + ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \ + ${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem SUB_FILES= zeronet-service zeronet-cmd pkg-message SUB_LIST= LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP} @@ -27,22 +29,14 @@ GH_ACCOUNT= HelloZeroNet GH_PROJECT= ZeroNet NO_ARCH= yes -OPTIONS_DEFINE= TOR DEBUG -TOR_DESC= Enable TOR anonymity network integration +OPTIONS_DEFINE= DEBUG -TOR_RUN_DEPENDS=tor:security/tor \ - ${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem DEBUG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MTOR} -USER= _tor -GROUP= _tor -.else USER= nobody GROUP= nobody -.endif do-build: @(cd ${WRKSRC} && \ Modified: head/security/zeronet/files/pkg-message.in ============================================================================== --- head/security/zeronet/files/pkg-message.in Tue Aug 22 02:11:39 2017 (r448506) +++ head/security/zeronet/files/pkg-message.in Tue Aug 22 02:24:48 2017 (r448507) @@ -16,10 +16,12 @@ To run ZeroNet commands: For example, to create a new ZeroNet site: # su -m %%USER%% zeronet siteCreate -For Tor integration (recommended) please have these items: -* option TOR=on in zeronet package -* make sure %%LOCALBASE%%/etc/tor/torrc has "ControlPort 9051" -* make sure tor service runs (service tor start) +For Tor integration (recommended) please make sure: +* Tor is installed: + # pkg install tor +* %%LOCALBASE%%/etc/tor/torrc has "ControlPort 9051" +* Tor service runs: + # service tor start * zeronet_args in /etc/rc.conf has "--tor enable" or "--tor always" Without the Tor integration, you need to make sure that your router