diff --git a/biology/linux-foldingathome/Makefile b/biology/linux-foldingathome/Makefile index 09a06fabcccb..2c019027e65a 100644 --- a/biology/linux-foldingathome/Makefile +++ b/biology/linux-foldingathome/Makefile @@ -1,64 +1,64 @@ # Created by: Yonatan PORTNAME= foldingathome -DISTVERSION= 7.6.13 +DISTVERSION= 7.6.21 CATEGORIES= biology linux MASTER_SITES= https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v${DISTVERSION:R}/ PKGNAMEPREFIX= linux- DISTNAME= fahclient-${DISTVERSION}-1 EXTRACT_SUFX= .x86_64.rpm MAINTAINER= 0mp@FreeBSD.org COMMENT= Folding@home Client # Distribution without permission is prohibited LICENSE= FAHSL LICENSE_NAME= Folding@home Software License LICENSE_FILE= ${WRKSRC}/usr/share/doc/fahclient/copyright LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell \ auto-accept ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= The i386 client has not been ported USES= dos2unix linux DOS2UNIX_FILES= usr/share/doc/fahclient/* USE_RC_SUBR= fahclient ETCDIR= ${PREFIX}/etc/fahclient DOCSDIR= ${PREFIX}/share/doc/fahclient NO_BUILD= yes SUB_FILES= pkg-message SUB_LIST= FAHCLIENT_CONFIG_XML=${_FAHCLIENT_CONFIG_XML} \ FAHCLIENT_PROGRAM=${_FAHCLIENT_PROGRAM} \ FAHCLIENT_WORK_DIR=${_FAHCLIENT_WORK_DIR} NO_WRKSUBDIR= yes USERS= fahclient GROUPS= fahclient PLIST_SUB= FAHCLIENT_WORK_DIR=${_FAHCLIENT_WORK_DIR} PORTDOCS= CHANGELOG.md README.md OPTIONS_DEFINE= DOCS _FAHCLIENT_CONFIG_XML= ${ETCDIR}/config.xml _FAHCLIENT_WORK_DIR= /var/db/fahclient _FAHCLIENT_PROGRAM= ${PREFIX}/bin/FAHClient do-install: ${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/FAHClient ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/FAHCoreWrapper ${STAGEDIR}${PREFIX}/bin/ @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/usr/share/doc/fahclient/sample-config.xml \ ${STAGEDIR}${_FAHCLIENT_CONFIG_XML}.sample @${MKDIR} ${STAGEDIR}${_FAHCLIENT_WORK_DIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/usr/share/doc/fahclient/|} \ ${STAGEDIR}${DOCSDIR} .include diff --git a/biology/linux-foldingathome/distinfo b/biology/linux-foldingathome/distinfo index 98804e70cb9a..33d4bcc5607a 100644 --- a/biology/linux-foldingathome/distinfo +++ b/biology/linux-foldingathome/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1589030361 -SHA256 (fahclient-7.6.13-1.x86_64.rpm) = 5abb3288a052890555c5b823f4a283593e122aadffbb0790879f58e266fcc28f -SIZE (fahclient-7.6.13-1.x86_64.rpm) = 3679564 +TIMESTAMP = 1624640434 +SHA256 (fahclient-7.6.21-1.x86_64.rpm) = a9f8b5073cd800cc63e32c623a8b4d7487c4e19a1e84760202e451b997d95073 +SIZE (fahclient-7.6.21-1.x86_64.rpm) = 3779272 diff --git a/biology/linux-foldingathome/files/fahclient.in b/biology/linux-foldingathome/files/fahclient.in index 7d8e72bfcbdb..6b42171980fe 100644 --- a/biology/linux-foldingathome/files/fahclient.in +++ b/biology/linux-foldingathome/files/fahclient.in @@ -1,114 +1,110 @@ #! /bin/sh - # SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2020 Mateusz Piotrowski <0mp@FreeBSD.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # # 1. Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # PROVIDE: fahclient # REQUIRE: DAEMON LOGIN NETWORKING linux # # Add the following lines to /etc/rc.conf to enable nginx: # fahclient_enable (bool): Set to "NO" by default. # Set it to "YES" to enable fahclient. # fahclient_user (str): Default: "fahclient" # User to run fahclient as. # fahclient_chdir (str): Default: "%%FAHCLIENT_WORK_DIR%%" # Directory to chdir before starting fahclient. # fahclient_config (str): Default: "%%ETCDIR%%/config.xml" # Path to fahclient configuration file. # fahclient_donor (str): Default: "Anonymous" # Donor to attribute work units to. # Settings in fahclient_config take precedence. # fahclient_team (str): Default: "11743" (FreeBSD Team) # Team to attribute work units to. # Settings in fahclient_config take precedence. # fahclient_pidfile (str): Default: "%%FAHCLIENT_WORK_DIR%%/fahclient.pid" # Path to PID file. # fahclient_logfile (str): Default: "%%FAHCLIENT_WORK_DIR%%/log.txt" # Path to log file. Takes precedence over # settings in fahclient_config. # fahclient_flags (str): Default: "" # Extra flags passed to start command *before* # other options. # fahclient_extra_flags (str): Defaults to "" # Extra flags passed to start command *after* # other options. . /etc/rc.subr name='fahclient' rcvar='fahclient_enable' load_rc_config 'fahclient' # Default settings. : "${fahclient_enable:=NO}" : "${fahclient_user:=fahclient}" : "${fahclient_chdir:=%%FAHCLIENT_WORK_DIR%%}" : "${fahclient_donor:=Anonymous}" : "${fahclient_team:=11743}" : "${fahclient_pidfile:=%%FAHCLIENT_WORK_DIR%%/fahclient.pid}" : "${fahclient_config:=%%ETCDIR%%/config.xml}" : "${fahclient_logfile:=%%FAHCLIENT_WORK_DIR%%/log.txt}" pidfile="${fahclient_pidfile}" -command='%%FAHCLIENT_PROGRAM%%' +procname="%%FAHCLIENT_PROGRAM%%" +command="/usr/sbin/daemon" +command_args="-o ${fahclient_logfile} -p ${pidfile} -- ${procname}" # Some notes on the specified options: # - fahclient_flags are passed in before other options by the rc # framework. # - --user sets the donor work units are attributed to (config file takes # precedence). # - --team sets the team work units are attributed to (cfg file takes # precedence). # - --config is necessary to point the program to the correct configuration # file. -# - --log sets the log file location (takes precedence over config file), -# log is special in this respect. # - --chdir is used to switch to a desired work directory. The program is going # to create a lot of files in its current working directory so should not be # just any directory on the system. -# - --pid-file specifies the location for the PID file. -# - --daemon is to detach the program from the terminal and run it -# in the background. # - fahclient_extra_flags are passed in after all other options. - -command_args="${command_args} --user=${fahclient_donor}" -command_args="${command_args} --team=${fahclient_team}" -command_args="${command_args} --config=${fahclient_config}" -command_args="${command_args} --log=${fahclient_logfile}" -command_args="${command_args} --chdir=${fahclient_chdir}" -command_args="${command_args} --pid-file=${pidfile} --daemon" -command_args="${command_args} ${fahclient_extra_flags}" +_fahclient_command_args= +_fahclient_command_args="${_fahclient_command_args} --user=${fahclient_donor}" +_fahclient_command_args="${_fahclient_command_args} --team=${fahclient_team}" +_fahclient_command_args="${_fahclient_command_args} --config=${fahclient_config}" +_fahclient_command_args="${_fahclient_command_args} --chdir=${fahclient_chdir}" +_fahclient_command_args="${_fahclient_command_args} ${fahclient_extra_flags}" +command_args="${command_args} ${_fahclient_command_args}" extra_commands="log showconfig" log_cmd="tail -F -- ${fahclient_logfile}" -showconfig_cmd="${command} ${fahclient_flags} ${command_args} --print" +showconfig_cmd="${procname} ${fahclient_flags} ${_fahclient_command_args} --print" if [ -n "$fahclient_user" ]; then showconfig_cmd="su -m $fahclient_user -c 'sh -c \"$showconfig_cmd\"'" fi required_modules='linprocfs linsysfs linux64:linux64elf' run_rc_command "$1"