Date: Mon, 5 Aug 2019 20:31:44 +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: r508209 - in head/security/zeronet: . files Message-ID: <201908052031.x75KViIP098591@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Aug 5 20:31:44 2019 New Revision: 508209 URL: https://svnweb.freebsd.org/changeset/ports/508209 Log: security/zeronet: Unbreak the non-tor mode because it tries to write the file zeronet.conf and the location was read-only Modified: head/security/zeronet/Makefile head/security/zeronet/files/zeronet-service.in head/security/zeronet/pkg-plist Modified: head/security/zeronet/Makefile ============================================================================== --- head/security/zeronet/Makefile Mon Aug 5 20:29:57 2019 (r508208) +++ head/security/zeronet/Makefile Mon Aug 5 20:31:44 2019 (r508209) @@ -5,7 +5,7 @@ PORTNAME= zeronet DISTVERSIONPREFIX= v DISTVERSION= 0.6.5-25 DISTVERSIONSUFFIX= -gabb566e3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net-p2p MAINTAINER= yuri@FreeBSD.org @@ -61,6 +61,7 @@ do-install: @${MKDIR} ${STAGEDIR}/var/log/zeronet @${LN} -s /var/db/zeronet ${STAGEDIR}${DATADIR}/data @${LN} -s /var/log/zeronet ${STAGEDIR}${DATADIR}/log + @${LN} -s /var/db/zeronet/zeronet.conf ${STAGEDIR}${DATADIR}/zeronet.conf # ZeroNet writes this file when it is used w/out the 'tor' option ${INSTALL_SCRIPT} ${WRKDIR}/zeronet-cmd ${STAGEDIR}${PREFIX}/bin/zeronet ${INSTALL_SCRIPT} ${WRKDIR}/zeronet-service ${STAGEDIR}${PREFIX}/etc/rc.d/zeronet Modified: head/security/zeronet/files/zeronet-service.in ============================================================================== --- head/security/zeronet/files/zeronet-service.in Mon Aug 5 20:29:57 2019 (r508208) +++ head/security/zeronet/files/zeronet-service.in Mon Aug 5 20:31:44 2019 (r508209) @@ -54,6 +54,9 @@ zeronet_start() { 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`) + # create /var/db/zeronet/zeronet.conf because it is written to by ZeroNet when the 'tor' option isn't used + touch /var/db/zeronet/zeronet.conf + chown -R %%USER%%:%%GROUP%% /var/db/zeronet/zeronet.conf # run cd %%LOCALBASE%%/share/zeronet /usr/sbin/daemon -P $pidfile -u %%USER%% %%LOCALBASE%%/share/zeronet/zeronet.py ${zeronet_args} >>$logfile 2>&1 Modified: head/security/zeronet/pkg-plist ============================================================================== --- head/security/zeronet/pkg-plist Mon Aug 5 20:29:57 2019 (r508208) +++ head/security/zeronet/pkg-plist Mon Aug 5 20:31:44 2019 (r508209) @@ -1136,6 +1136,7 @@ etc/rc.d/zeronet %%DATADIR%%/zeronet.py %%DATADIR%%/zeronet.pyc %%DATADIR%%/zeronet.pyo +%%DATADIR%%/zeronet.conf @owner %%USER%% @group %%GROUP%% @dir /var/db/zeronet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908052031.x75KViIP098591>