cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r563809

Browse Source 
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 <jamie@catflap.org> (maintainer)
Reported by:	Niels Bakker <niels=freebsd@bakker.net>
This commit is contained in:
Jason E. Hale 2021-02-02 14:17:15 +00:00
parent 756d6737ce
commit edf74814ef
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2021Q1/; revision=563810
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
multimedia/get_iplayer/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= get_iplayer
PORTVERSION= 3.26
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= multimedia net
MAINTAINER= jamie@catflap.org

3
multimedia/get_iplayer/files/get_iplayer.in
View File

@ -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

2
multimedia/get_iplayer/pkg-message
View File

@ -6,7 +6,7 @@ You must be in the UK, or use a UK proxy, to gain access to most iPlayer content
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: