From owner-svn-ports-head@freebsd.org Tue Feb 2 14:15:44 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27862533BB6; Tue, 2 Feb 2021 14:15:44 +0000 (UTC) (envelope-from jhale@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DVRg356jsz3LNB; Tue, 2 Feb 2021 14:15:43 +0000 (UTC) (envelope-from jhale@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 6A5197A10; Tue, 2 Feb 2021 14:15:43 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 112EFhma015061; Tue, 2 Feb 2021 14:15:43 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 112EFgjL015059; Tue, 2 Feb 2021 14:15:42 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <202102021415.112EFgjL015059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Tue, 2 Feb 2021 14:15:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563809 - in head/multimedia/get_iplayer: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/multimedia/get_iplayer: . files X-SVN-Commit-Revision: 563809 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 02 Feb 2021 14:15:44 -0000 Author: jhale Date: Tue Feb 2 14:15:42 2021 New Revision: 563809 URL: https://svnweb.freebsd.org/changeset/ports/563809 Log: multimedia/get_iplayer: Fix rc.d script and typo in pkg-message The latest version of get_iplayer (ports r541176) introduced the following code: export HOME="$get_iplayer_chdir" cd "$HOME" || exit 1 This is always executed irrespective of rcvar get_iplayer_enable. The default homedir for the get_iplayer user is /nonexistent. Therefore, upon each boot, the script would emit the following error: cd: /nonexistent: No such file or directory with no indication of the source of the error. PR: 251987 Submitted by: Jamie Landeg-Jones (maintainer) Reported by: Niels Bakker MFH: 2021Q1 Modified: head/multimedia/get_iplayer/Makefile head/multimedia/get_iplayer/files/get_iplayer.in head/multimedia/get_iplayer/pkg-message Modified: head/multimedia/get_iplayer/Makefile ============================================================================== --- head/multimedia/get_iplayer/Makefile Tue Feb 2 13:29:33 2021 (r563808) +++ head/multimedia/get_iplayer/Makefile Tue Feb 2 14:15:42 2021 (r563809) @@ -3,6 +3,7 @@ PORTNAME= get_iplayer PORTVERSION= 3.26 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia net MAINTAINER= jamie@catflap.org Modified: head/multimedia/get_iplayer/files/get_iplayer.in ============================================================================== --- head/multimedia/get_iplayer/files/get_iplayer.in Tue Feb 2 13:29:33 2021 (r563808) +++ head/multimedia/get_iplayer/files/get_iplayer.in Tue Feb 2 14:15:42 2021 (r563809) @@ -45,10 +45,9 @@ load_rc_config $name : ${get_iplayer_bind_port=9370} get_iplayer_logfile="${get_iplayer_logfile:+"-o $get_iplayer_logfile"}" +get_iplayer_env="HOME='${get_iplayer_chdir}'" command=/usr/sbin/daemon -export HOME="$get_iplayer_chdir" -cd "$HOME" || exit 1 command_args="-f ${get_iplayer_logfile} -u ${name} -p /var/run/${name}/${name}.pid %%WWWDIR%%/${name}.cgi -p ${get_iplayer_bind_port} -l ${get_iplayer_listen_address} --getiplayer %%WWWDIR%%/${name} ${get_iplayer_flags}" get_iplayer_flags="" # This is needed to stop the flags being applied to the 'daemon' program. procname=/usr/local/bin/perl Modified: head/multimedia/get_iplayer/pkg-message ============================================================================== --- head/multimedia/get_iplayer/pkg-message Tue Feb 2 13:29:33 2021 (r563808) +++ head/multimedia/get_iplayer/pkg-message Tue Feb 2 14:15:42 2021 (r563809) @@ -6,7 +6,7 @@ You must be in the UK, or use a UK proxy, to gain acce To use the web server cgi script, you must set "get_iplayer_enable="YES" in "/etc/rc.conf", and set "get_iplayer_chdir" to a valid directory to store configuration files and downloads. If "get_iplayer_chdir" is unset, the -"get_uplayer" home directory is used. +"get_iplayer" home directory is used. In the latter case you can set the home directory to (eg) '/home/get_iplayer", with: