aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2017-08-22 10:24:48 +0800
committerswills <swills@FreeBSD.org>2017-08-22 10:24:48 +0800
commitc76aa70db8e47c3ae4e058d27c9f709be1f5843a (patch)
tree8b89561b2ae144579859c3e48413c0e8b6c371eb /security
parenteb1e5e7cac7cdb61e0dbc86d2a55b683a296b1dd (diff)
downloadfreebsd-ports-gnome-c76aa70db8e47c3ae4e058d27c9f709be1f5843a.tar.gz
freebsd-ports-gnome-c76aa70db8e47c3ae4e058d27c9f709be1f5843a.tar.zst
freebsd-ports-gnome-c76aa70db8e47c3ae4e058d27c9f709be1f5843a.zip
security/zeronet: Removed the unnecessary TOR option
PR: 221615 Submitted by: Yuri Victorovich <yuri@rawbw.com>
Diffstat (limited to 'security')
-rw-r--r--security/zeronet/Makefile14
-rw-r--r--security/zeronet/files/pkg-message.in10
2 files changed, 10 insertions, 14 deletions
diff --git a/security/zeronet/Makefile b/security/zeronet/Makefile
index 6d4de5bc69e5..804be91e615c 100644
--- a/security/zeronet/Makefile
+++ b/security/zeronet/Makefile
@@ -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} && \
diff --git a/security/zeronet/files/pkg-message.in b/security/zeronet/files/pkg-message.in
index 21cac7042074..eb0f74fd4223 100644
--- a/security/zeronet/files/pkg-message.in
+++ b/security/zeronet/files/pkg-message.in
@@ -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