diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile index 64c70e61ef38..18b85f92246b 100644 --- a/news/nzbhydra2/Makefile +++ b/news/nzbhydra2/Makefile @@ -1,50 +1,54 @@ PORTNAME= nzbhydra2 -DISTVERSION= 4.7.2 +DISTVERSION= 4.7.4 DISTVERSIONSUFFIX= -linux CATEGORIES= news java MASTER_SITES= https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/ -MAINTAINER= daniel@shafer.cc +MAINTAINER= marcel@herrbischoff.com COMMENT= Usenet meta search WWW= https://github.com/theotherp/nzbhydra2 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le USES= python:3.5+ zip USE_JAVA= yes USE_RC_SUBR= nzbhydra2 NO_BUILD= yes NO_WRKSUBDIR= yes SUB_FILES= nzbhydra2 SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ JAVA=${JAVA} -JAVA_VERSION= 8+ +JAVA_VERSION= 17+ JAVA_VENDOR= openjdk JAVA_RUN= yes USERS= nzbhydra2 GROUPS= nzbhydra2 PLIST_FILES= ${DATADIR}/lib/core-${DISTVERSION}-exec.jar \ ${DATADIR}/nzbhydra2 \ ${DATADIR}/nzbhydra2wrapperPy3.py \ ${DATADIR}/changelog.md \ ${DATADIR}/readme.md \ ${DATADIR}/LICENSE post-extract: # Cleanup unnecessary files @${RM} -r ${WRKSRC}/systemd ${WRKSRC}/sysv ${WRKSRC}/rc.d ${WRKSRC}/upstart ${WRKSRC}/nzbhydra2wrapper.py +pre-install: + # temp fix for https://github.com/theotherp/nzbhydra2/issues/812 + ${RM} -r ${WRKSRC}/data + do-install: @${MKDIR} ${STAGEDIR}/${DATADIR} ${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR} .include diff --git a/news/nzbhydra2/distinfo b/news/nzbhydra2/distinfo index 95d660816b3c..14f3161ecf8a 100644 --- a/news/nzbhydra2/distinfo +++ b/news/nzbhydra2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669893469 -SHA256 (nzbhydra2-4.7.2-linux.zip) = 3d3f281563e64d104a59b47ba337b7ee2ffcbdb0574cfd6874640f5ad3470ca5 -SIZE (nzbhydra2-4.7.2-linux.zip) = 83317938 +TIMESTAMP = 1671278127 +SHA256 (nzbhydra2-4.7.4-linux.zip) = 70ca65452f1e80f010a61bd5a760961efcab04e06cd0599403b174af753d8a84 +SIZE (nzbhydra2-4.7.4-linux.zip) = 83396533 diff --git a/news/nzbhydra2/files/nzbhydra2.in b/news/nzbhydra2/files/nzbhydra2.in index ff4a9fa85df0..490cceb158c0 100644 --- a/news/nzbhydra2/files/nzbhydra2.in +++ b/news/nzbhydra2/files/nzbhydra2.in @@ -1,59 +1,60 @@ #!/bin/sh # PROVIDE: nzbhydra2 # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # nzbhydra2_enable (bool): Set to NO by default. # Set it to YES to enable it. # nzbhydra2_user: The user account nzbhydra daemon runs as what # you want it to be. It uses '_sabnzbd' user by # default. Do not sets it as empty or it will run # as root. # nzbhydra2_group: The group account nzbhydra daemon runs as what # you want it to be. It uses 'nzbhydra2' group by # default. Do not sets it as empty or it will run # as wheel. # nzbhydra2_dir: Directory where nzbhydra lives. # Default: %%PREFIX%%/share/nzbhydra2 # nzbhydra2_data_dir: Data directory for nzbhydra (DB, Logs, config) # Default: %%PREFIX%%/nzbhydra2 . /etc/rc.subr name="nzbhydra2" rcvar=${name}_enable load_rc_config ${name} : ${nzbhydra2_enable:="NO"} : ${nzbhydra2_user:="nzbhydra2"} : ${nzbhydra2_group:="nzbhydra2"} : ${nzbhydra2_dir:="%%PREFIX%%/share/nzbhydra2"} : ${nzbhydra2_data_dir:="%%PREFIX%%/nzbhydra2"} pidfile="/var/run/nzbhydra2/nzbhydra2.pid" command="%%PYTHON_CMD%%" command_args="${nzbhydra2_dir}/nzbhydra2wrapperPy3.py --datafolder ${nzbhydra2_data_dir} --pidfile ${pidfile} --daemon --nobrowser --java %%JAVA%%" start_precmd=nzbhydra2_precmd nzbhydra2_precmd() { export XDG_CONFIG_HOME=${nzbhydra2_data_dir} + export NZBHYDRA_DISABLE_UPDATE=1 if [ -f ${pidfile} ]; then rm -f ${pidfile} echo "Removing stale pidfile." elif [ ! -d ${pidfile%/*} ]; then install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${pidfile%/*} fi if [ ! -d ${nzbhydra2_data_dir} ]; then install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${nzbhydra2_data_dir} fi } run_rc_command "$1"