From owner-svn-ports-all@freebsd.org Sat Jul 4 08:40:28 2020 Return-Path: Delivered-To: svn-ports-all@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 A81CF365C87; Sat, 4 Jul 2020 08:40:28 +0000 (UTC) (envelope-from lwhsu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49zQJX3ybFz4MkF; Sat, 4 Jul 2020 08:40:28 +0000 (UTC) (envelope-from lwhsu@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 6B68119CA6; Sat, 4 Jul 2020 08:40:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0648eS7T007998; Sat, 4 Jul 2020 08:40:28 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0648eRJ1007995; Sat, 4 Jul 2020 08:40:27 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202007040840.0648eRJ1007995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sat, 4 Jul 2020 08:40:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541176 - in head/multimedia/get_iplayer: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/multimedia/get_iplayer: . files X-SVN-Commit-Revision: 541176 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jul 2020 08:40:28 -0000 Author: lwhsu Date: Sat Jul 4 08:40:27 2020 New Revision: 541176 URL: https://svnweb.freebsd.org/changeset/ports/541176 Log: Update to 3.26 PR: 247750 Submitted by: Jamie Landeg-Jones (maintainer) Modified: head/multimedia/get_iplayer/Makefile head/multimedia/get_iplayer/distinfo 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 Sat Jul 4 08:20:06 2020 (r541175) +++ head/multimedia/get_iplayer/Makefile Sat Jul 4 08:40:27 2020 (r541176) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= get_iplayer -PORTVERSION= 3.25 +PORTVERSION= 3.26 DISTVERSIONPREFIX= v CATEGORIES= multimedia net @@ -37,6 +37,7 @@ DATADIR= ${WWWDIR} 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 Modified: head/multimedia/get_iplayer/distinfo ============================================================================== --- head/multimedia/get_iplayer/distinfo Sat Jul 4 08:20:06 2020 (r541175) +++ head/multimedia/get_iplayer/distinfo Sat Jul 4 08:40:27 2020 (r541176) @@ -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 Modified: head/multimedia/get_iplayer/files/get_iplayer.in ============================================================================== --- head/multimedia/get_iplayer/files/get_iplayer.in Sat Jul 4 08:20:06 2020 (r541175) +++ head/multimedia/get_iplayer/files/get_iplayer.in Sat Jul 4 08:40:27 2020 (r541176) @@ -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 @@ desc="Server for fetching programs from iplayer and PV 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}" Modified: head/multimedia/get_iplayer/pkg-message ============================================================================== --- head/multimedia/get_iplayer/pkg-message Sat Jul 4 08:20:06 2020 (r541175) +++ head/multimedia/get_iplayer/pkg-message Sat Jul 4 08:40:27 2020 (r541176) @@ -1,8 +1,16 @@ [ { type: install message: <