svn commit: r563810 - in branches/2021Q1/multimedia/get_iplayer: . files

[Jason E. Hale]

Author: jhale
Date: Tue Feb  2 14:17:15 2021
New Revision: 563810
URL: https://svnweb.freebsd.org/changeset/ports/563810

Log:
  MFH: r563809
  
  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 at catflap.org> (maintainer)
  Reported by:	Niels Bakker <niels=freebsd at bakker.net>

Modified:
  branches/2021Q1/multimedia/get_iplayer/Makefile
  branches/2021Q1/multimedia/get_iplayer/files/get_iplayer.in
  branches/2021Q1/multimedia/get_iplayer/pkg-message
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/multimedia/get_iplayer/Makefile
==============================================================================
--- branches/2021Q1/multimedia/get_iplayer/Makefile	Tue Feb  2 14:15:42 2021	(r563809)
+++ branches/2021Q1/multimedia/get_iplayer/Makefile	Tue Feb  2 14:17:15 2021	(r563810)
@@ -3,6 +3,7 @@
 PORTNAME=	get_iplayer
 PORTVERSION=	3.26
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 
 MAINTAINER=	jamie at catflap.org

Modified: branches/2021Q1/multimedia/get_iplayer/files/get_iplayer.in
==============================================================================
--- branches/2021Q1/multimedia/get_iplayer/files/get_iplayer.in	Tue Feb  2 14:15:42 2021	(r563809)
+++ branches/2021Q1/multimedia/get_iplayer/files/get_iplayer.in	Tue Feb  2 14:17:15 2021	(r563810)
@@ -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: branches/2021Q1/multimedia/get_iplayer/pkg-message
==============================================================================
--- branches/2021Q1/multimedia/get_iplayer/pkg-message	Tue Feb  2 14:15:42 2021	(r563809)
+++ branches/2021Q1/multimedia/get_iplayer/pkg-message	Tue Feb  2 14:17:15 2021	(r563810)
@@ -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: