Index: head/security/zeronet/Makefile =================================================================== --- head/security/zeronet/Makefile (revision 421457) +++ head/security/zeronet/Makefile (revision 421458) @@ -1,67 +1,66 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= zeronet -PORTVERSION= 0.3.7 -#DISTVERSIONPREFIX= v +PORTVERSION= 0.4.0 CATEGORIES= security net-p2p MAINTAINER= yuri@rawbw.com COMMENT= Decentralized websites using Bitcoin crypto and BitTorrent network 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}sqlite3>0:databases/py-sqlite3 USE_GITHUB= yes GH_ACCOUNT= HelloZeroNet GH_PROJECT= ZeroNet GH_TAGNAME= 523a7d4 SUB_FILES= zeronet-service zeronet-cmd pkg-message SUB_LIST= LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP} PLIST_SUB= USER=${USER} GROUP=${GROUP} USES= python NO_ARCH= yes OPTIONS_DEFINE= TOR DEBUG TOR_DESC= Enable TOR anonymity network integration TOR_RUN_DEPENDS= tor:security/tor DEBUG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug .include .if ${PORT_OPTIONS:MTOR} USER= _tor GROUP= _tor .else USER= nobody GROUP= nobody .endif do-build: @(cd ${WRKSRC} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${WRKSRC} -f ${WRKSRC} && \ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${WRKSRC} -f ${WRKSRC}) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${CP} -R ${WRKSRC}/* ${STAGEDIR}${DATADIR}/ @${RM} `${FIND} ${STAGEDIR}${DATADIR} -name LICENSE` @${RM} ${STAGEDIR}${DATADIR}/README.md ${STAGEDIR}${DATADIR}/requirements.txt @${RM} ${STAGEDIR}${DATADIR}/Vagrantfile ${STAGEDIR}${DATADIR}/Dockerfile @${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -name test` @${MKDIR} ${STAGEDIR}/var/db/zeronet @${MKDIR} ${STAGEDIR}/var/log/zeronet @${LN} -s /var/db/zeronet ${STAGEDIR}${DATADIR}/data @${LN} -s /var/log/zeronet ${STAGEDIR}${DATADIR}/log ${INSTALL_SCRIPT} ${WRKDIR}/zeronet-cmd ${STAGEDIR}${PREFIX}/bin/zeronet ${INSTALL_SCRIPT} ${WRKDIR}/zeronet-service ${STAGEDIR}${PREFIX}/etc/rc.d/zeronet .include Index: head/security/zeronet/distinfo =================================================================== --- head/security/zeronet/distinfo (revision 421457) +++ head/security/zeronet/distinfo (revision 421458) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464561785 -SHA256 (HelloZeroNet-ZeroNet-0.3.7-523a7d4_GH0.tar.gz) = ec7004ecfbce36ad83e708161f5553b76bdb5b6fb2954aa2a04a391d6047c7cc -SIZE (HelloZeroNet-ZeroNet-0.3.7-523a7d4_GH0.tar.gz) = 2384517 +TIMESTAMP = 1473177926 +SHA256 (HelloZeroNet-ZeroNet-0.4.0-523a7d4_GH0.tar.gz) = ec7004ecfbce36ad83e708161f5553b76bdb5b6fb2954aa2a04a391d6047c7cc +SIZE (HelloZeroNet-ZeroNet-0.4.0-523a7d4_GH0.tar.gz) = 2384517 Index: head/security/zeronet/files/zeronet-service.in =================================================================== --- head/security/zeronet/files/zeronet-service.in (revision 421457) +++ head/security/zeronet/files/zeronet-service.in (revision 421458) @@ -1,79 +1,89 @@ #!/bin/sh # # $FreeBSD$ # -# Copyright (C) 2015 by Yuri Victorovich. All rights reserved. +# Copyright (C) 2016 by Yuri Victorovich. All rights reserved. # PROVIDE: zeronet -# REQUIRE: LOGIN +# REQUIRE: NETWORKING SERVERS tor # KEYWORD: shutdown # zeronet is disabled by default, if you have configuration file # # Add the following line to /etc/rc.conf to enable zeronet: # #zeronet_enable="YES" . /etc/rc.subr name="zeronet" rcvar=zeronet_enable start_cmd="zeronet_start" stop_cmd="zeronet_stop" +status_cmd="zeronet_status" load_rc_config ${name} : ${zeronet_enable="NO"} : ${zeronet_args=""} is_process_running() { local pidfile=$1 [ -f $pidfile ] && procstat `cat $pidfile` >/dev/null 2>&1 } stop_daemon() { # assume PID is also PGID (daemon(8) PID is always PGID) [ -f "$1" ] && kill -- -$(cat $1) } zeronet_start() { local logfile=/var/log/zeronet.log local pidfile=/var/run/zeronet.pid # already running? if is_process_running $pidfile; then echo "zeronet is already running (pid=$(cat $pidfile))" return 1 fi # log file touch $logfile chmod 640 $logfile # user depends on the port option, so better force it on directories to avoid user confusion chown -R %%USER%%:%%GROUP%% /var/db/zeronet /var/log/zeronet # workaround for https://github.com/HelloZeroNet/ZeroNet/issues/477: ZeroNet shouldn't be re-running coffee on the pre-installed files. (cd %%LOCALBASE%%/share/zeronet && touch `find . -name all.js`) # run cd %%LOCALBASE%%/share/zeronet /usr/sbin/daemon -P $pidfile -u %%USER%% %%LOCALBASE%%/share/zeronet/zeronet.py ${zeronet_args} >>$logfile 2>&1 # make sure it runs if is_process_running $pidfile; then echo "started zeronet (pid=$(cat $pidfile))" else echo "failed to start zeronet" fi } zeronet_stop() { local pidfile=/var/run/zeronet.pid if is_process_running $pidfile; then echo "stopping zeronet (pid=$(cat $pidfile))" stop_daemon $pidfile + else + echo "zeronet isn't running" + fi +} + +zeronet_status() { + local pidfile=/var/run/zeronet.pid + if is_process_running $pidfile; then + echo "zeronet is running, pid=$(cat $pidfile)" else echo "zeronet isn't running" fi } command="/usr/bin/true" run_rc_command "$1"