diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2021-02-02 14:15:42 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2021-02-02 14:15:42 +0000 |
| commit | 075afc392d6fb99ad3dec91e98ca5290ec42cf90 (patch) | |
| tree | 1280543c4e377fac09c998429490990adee7976d /multimedia/get_iplayer | |
| parent | 88d7be2e19889bc7819e816254ae4be3434c673b (diff) | |
| download | ports-075afc392d6fb99ad3dec91e98ca5290ec42cf90.tar.gz ports-075afc392d6fb99ad3dec91e98ca5290ec42cf90.zip | |
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>
MFH: 2021Q1
Notes
Notes:
svn path=/head/; revision=563809
Diffstat (limited to 'multimedia/get_iplayer')
| -rw-r--r-- | multimedia/get_iplayer/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/get_iplayer/files/get_iplayer.in | 3 | ||||
| -rw-r--r-- | multimedia/get_iplayer/pkg-message | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/multimedia/get_iplayer/Makefile b/multimedia/get_iplayer/Makefile index a11808f8a059..47fa66028c10 100644 --- a/multimedia/get_iplayer/Makefile +++ b/multimedia/get_iplayer/Makefile @@ -3,6 +3,7 @@ PORTNAME= get_iplayer PORTVERSION= 3.26 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia net MAINTAINER= jamie@catflap.org diff --git a/multimedia/get_iplayer/files/get_iplayer.in b/multimedia/get_iplayer/files/get_iplayer.in index a43a7548b775..1809e96bf4bd 100644 --- a/multimedia/get_iplayer/files/get_iplayer.in +++ b/multimedia/get_iplayer/files/get_iplayer.in @@ -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 diff --git a/multimedia/get_iplayer/pkg-message b/multimedia/get_iplayer/pkg-message index 26cb793cdea6..4230aab1b81b 100644 --- a/multimedia/get_iplayer/pkg-message +++ b/multimedia/get_iplayer/pkg-message @@ -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: |