Attachment 216184 Details for Bug 247750 – cd /usr/ports/multimedia/get_iplayer && patch < <patch-filename>

[patch] cd /usr/ports/multimedia/get_iplayer && patch < <patch-filename>

patch-multimedia_get__iplayer (text/plain), 4.37 KB, created by Jamie Landeg-Jones on 2020-07-03 23:13:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jamie Landeg-Jones

Created: 2020-07-03 23:13:17 UTC

Size: 4.37 KB

patch

obsolete

>diff -ur ../get_iplayer.orig/Makefile ./Makefile
>--- ../get_iplayer.orig/Makefile	2020-05-24 13:54:33.000000000 +0100
>+++ ./Makefile	2020-07-01 14:46:42.000000000 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/multimedia/get_iplayer/Makefile 536396 2020-05-24 12:54:33Z tagattie $
> 
> PORTNAME=	get_iplayer
>-PORTVERSION=	3.25
>+PORTVERSION=	3.26
> DISTVERSIONPREFIX=	v
> CATEGORIES=	multimedia net
> 
>@@ -37,6 +37,7 @@
> PORTDOCS=	CHANGELOG.md README.md
> 
> OPTIONS_DEFINE=	DOCS FFMPEG ATOMICPARSLEY
>+OPTIONS_DEFAULT=	FFMPEG ATOMICPARSLEY
> FFMPEG_DESC=	Enable file conversion using FFmpeg
> FFMPEG_RUN_DEPENDS=	ffmpeg>=0:multimedia/ffmpeg
> ATOMICPARSLEY_DESC=	Enable tagging of media files
>diff -ur ../get_iplayer.orig/distinfo ./distinfo
>--- ../get_iplayer.orig/distinfo	2020-05-24 07:20:38.000000000 +0100
>+++ ./distinfo	2020-07-01 13:27:07.000000000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589850320
>-SHA256 (get-iplayer-get_iplayer-v3.25_GH0.tar.gz) = 2ae278a812494d6289224e6d347c8761ec815ad84f4daf41fd0a4f62832b7d63
>-SIZE (get-iplayer-get_iplayer-v3.25_GH0.tar.gz) = 146625
>+TIMESTAMP = 1593606427
>+SHA256 (get-iplayer-get_iplayer-v3.26_GH0.tar.gz) = 2ec105ccb47910d7f3ff7124ecaa839a8778837c12881358e627a132ba027b06
>+SIZE (get-iplayer-get_iplayer-v3.26_GH0.tar.gz) = 148415
>diff -ur ../get_iplayer.orig/files/get_iplayer.in ./files/get_iplayer.in
>--- ../get_iplayer.orig/files/get_iplayer.in	2018-08-28 20:39:38.000000000 +0100
>+++ ./files/get_iplayer.in	2020-07-02 04:35:11.000000000 +0100
>@@ -9,12 +9,17 @@
> # Add the following lines to /etc/rc.conf or /etc/rc.conf.local to
> # enable get_iplayer:
> # get_iplayer_enable (bool):	Set to "NO" by default.
>-# get_iplayer_chdir (string):	Set to "/tmp" by default; this is where
>-#				downloaded files are stored. Should be writable
>-#				by get_iplayer user.
> # get_iplayer_flags (string):	Set to "" by default.
>-# get_iplayer_bind_port (number):	Set to 9370 by default.
>-# get_iplayer_listen_address (IP address):	Set to 127.0.0.1 by default.
>+# get_iplayer_logfile (string):	Server info messages logfile. Set to ""
>+#				(no logging) by default.
>+# get_iplayer_chdir (string):	Set to the "get_iplayer" home directory
>+#				by default; this is where downloaded
>+#				files are stored. It should be
>+#				writeable by the get_iplayer user.
>+# get_iplayer_listen_address
>+#               (IP address):	Set to 127.0.0.1 by default.
>+# get_iplayer_bind_port
>+#              (number):	Set to 9370 by default.
> #
> ##########################################################
> ## WARNING:
>@@ -34,13 +39,19 @@
> load_rc_config $name
> 
> : ${get_iplayer_enable:=NO}
>-: ${get_iplayer_bind_port=9370}
>+: ${get_iplayer_flags=""}
>+: ${get_iplayer_chdir="$(pw usershow get_iplayer | awk -F: '{print $9}')"}
> : ${get_iplayer_listen_address=127.0.0.1}
>-: ${get_iplayer_chdir=/tmp}
>+: ${get_iplayer_bind_port=9370}
> 
>+get_iplayer_logfile="${get_iplayer_logfile:+"-o $get_iplayer_logfile"}"
>+
> command=/usr/sbin/daemon
>-command_args="-f -u ${name} -p /var/run/${name}/${name}.pid %%WWWDIR%%/${name}.cgi -p ${get_iplayer_bind_port} -l ${get_iplayer_listen_address} --getiplayer %%WWWDIR%%/${name}"
>-procname=/usr/bin/perl
>+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
> pidfile=/var/run/${name}/${name}.pid
> 
> start_precmd="install -d -o ${name} -m755 /var/run/${name}"
>diff -ur ../get_iplayer.orig/pkg-message ./pkg-message
>--- ../get_iplayer.orig/pkg-message	2019-08-14 09:48:50.000000000 +0100
>+++ ./pkg-message	2020-07-02 04:35:31.000000000 +0100
>@@ -1,8 +1,16 @@
> [
> { type: install
>   message: <<EOM
>-You must be in the UK, or use a UK proxy, to gain
>-access to most iPlayer content.
>+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.
>+
>+In the latter case you can set the home directory to (eg) '/home/get_iplayer", with:
>+
>+pw usermod get_iplayer -m -M 750 -k /var/empty -d /home/get_iplayer
> EOM
> }
> ]

Actions: View | Diff

Attachments on bug 247750: 216184