From owner-svn-ports-head@freebsd.org Fri Feb 8 22:45:49 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB9A814C9177; Fri, 8 Feb 2019 22:45:49 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5BB167057E; Fri, 8 Feb 2019 22:45:49 +0000 (UTC) (envelope-from tcberner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F3271FC47; Fri, 8 Feb 2019 22:45:49 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x18Mjnpv082232; Fri, 8 Feb 2019 22:45:49 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x18MjmmC082229; Fri, 8 Feb 2019 22:45:48 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201902082245.x18MjmmC082229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 8 Feb 2019 22:45:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492464 - in head/news/nzbhydra2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/news/nzbhydra2: . files X-SVN-Commit-Revision: 492464 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5BB167057E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Feb 2019 22:45:50 -0000 Author: tcberner Date: Fri Feb 8 22:45:48 2019 New Revision: 492464 URL: https://svnweb.freebsd.org/changeset/ports/492464 Log: news/nzbhydra2: update to 2.3.6 - while here, also address the issue of the missing data directory PR: 235545 Submitted by: Daniel Shafer (maintainer) Differential Revision: https://reviews.freebsd.org/D19091 Modified: head/news/nzbhydra2/Makefile head/news/nzbhydra2/distinfo head/news/nzbhydra2/files/nzbhydra2.in Modified: head/news/nzbhydra2/Makefile ============================================================================== --- head/news/nzbhydra2/Makefile Fri Feb 8 21:50:29 2019 (r492463) +++ head/news/nzbhydra2/Makefile Fri Feb 8 22:45:48 2019 (r492464) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= nzbhydra2 -DISTVERSION= 2.3.4 +DISTVERSION= 2.3.6 DISTVERSIONSUFFIX= -linux CATEGORIES= news java MASTER_SITES= https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -32,7 +32,7 @@ JAVA_RUN= yes USERS= nzbhydra2 GROUPS= nzbhydra2 -PLIST_FILES= ${DATADIR}/lib/core-2.3.4-exec.jar \ +PLIST_FILES= ${DATADIR}/lib/core-2.3.6-exec.jar \ ${DATADIR}/nzbhydra2 \ ${DATADIR}/nzbhydra2wrapper.py \ ${DATADIR}/changelog.md \ Modified: head/news/nzbhydra2/distinfo ============================================================================== --- head/news/nzbhydra2/distinfo Fri Feb 8 21:50:29 2019 (r492463) +++ head/news/nzbhydra2/distinfo Fri Feb 8 22:45:48 2019 (r492464) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549150850 -SHA256 (nzbhydra2-2.3.4-linux.zip) = 4c999d26886531ddba66d7c8e656da3fba50476abd722d8823d3cd128d8d5132 -SIZE (nzbhydra2-2.3.4-linux.zip) = 61624259 +TIMESTAMP = 1549478817 +SHA256 (nzbhydra2-2.3.6-linux.zip) = e3aef24aac61f9094f80cd7d93821a103058b4410bafe3ec7d183abaf40bd5dc +SIZE (nzbhydra2-2.3.6-linux.zip) = 61625733 Modified: head/news/nzbhydra2/files/nzbhydra2.in ============================================================================== --- head/news/nzbhydra2/files/nzbhydra2.in Fri Feb 8 21:50:29 2019 (r492463) +++ head/news/nzbhydra2/files/nzbhydra2.in Fri Feb 8 22:45:48 2019 (r492464) @@ -21,7 +21,7 @@ # as wheel. # nzbhydra2_dir: Directory where nzbhydra lives. # Default: %%PREFIX%%/share/nzbhydra2 -# nzbhydra2_datafolder: Data directory for nzbhydra (DB, Logs, config) +# nzbhydra2_data_dir: Data directory for nzbhydra (DB, Logs, config) # Default: %%PREFIX%%/nzbhydra2 . /etc/rc.subr @@ -35,14 +35,17 @@ load_rc_config ${name} : ${nzbhydra2_user:="nzbhydra2"} : ${nzbhydra2_group:="nzbhydra2"} : ${nzbhydra2_dir:="%%PREFIX%%/share/nzbhydra2"} -: ${nzbhydra2_datafolder:="%%PREFIX%%/nzbhydra2"} +: ${nzbhydra2_data_dir:="%%PREFIX%%/nzbhydra2"} pidfile="/var/run/nzbhydra2/nzbhydra2.pid" command="%%PYTHON_CMD%%" -command_args="${nzbhydra2_dir}/nzbhydra2wrapper.py --datafolder ${nzbhydra2_datafolder} --pidfile ${pidfile} --daemon --nobrowser --java %%JAVA%%" +command_args="${nzbhydra2_dir}/nzbhydra2wrapper.py --datafolder ${nzbhydra2_data_dir} --pidfile ${pidfile} --daemon --nobrowser --java %%JAVA%%" +start_precmd=nzbhydra2_precmd -start_precmd="prestart" -prestart() { +nzbhydra2_precmd() +{ + export XDG_CONFIG_HOME=${nzbhydra2_data_dir} + if [ -f ${pidfile} ]; then rm -f ${pidfile} echo "Removing stale pidfile." @@ -50,8 +53,8 @@ prestart() { install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${pidfile%/*} fi - if [ ! -d ${nzbhydra2_datadir} ]; then - install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${nzbhydra2_datadir} + if [ ! -d ${nzbhydra2_data_dir} ]; then + install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${nzbhydra2_data_dir} fi }