Date: Thu, 5 Aug 2010 07:20:08 GMT From: Douglas Carmichael <dcarmich@dcarmichael.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/149305: Small security fix and transcoding profile fix to net/mediatomb port Message-ID: <201008050720.o757K8d4026939@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/149305; it has been noted by GNATS.
From: Douglas Carmichael <dcarmich@dcarmichael.net>
To: bug-followup@FreeBSD.org, dcarmich@dcarmichael.net
Cc:
Subject: Re: ports/149305: Small security fix and transcoding profile fix to net/mediatomb port
Date: Thu, 5 Aug 2010 02:05:05 -0500
--Apple-Mail-20--110488705
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=us-ascii
I have made some changes to the patch, including adding an xmp (Extended =
Module Player) profile that outputs in raw audio format.
The changes are attached.
--Apple-Mail-20--110488705
Content-Disposition: attachment;
filename=mediatomb-0.12.1.new.diff.txt
Content-Type: text/plain;
x-unix-mode=0644;
name="mediatomb-0.12.1.new.diff.txt"
Content-Transfer-Encoding: quoted-printable
diff -ruN mediatomb.orig/Makefile mediatomb/Makefile
--- mediatomb.orig/Makefile 2010-08-04 20:02:43.000000000 -0500
+++ mediatomb/Makefile 2010-08-04 19:48:57.000000000 -0500
@@ -185,6 +185,9 @@
@if [ ! -f ${PREFIX}/etc/mediatomb/config.xml ]; then \
${CP} -p ${PREFIX}/etc/mediatomb/config.xml.dist =
${PREFIX}/etc/mediatomb/config.xml ; \
fi
+ @${CHGRP} ${MEDIATOMB_GROUP} ${PREFIX}/bin/mediatomb
+ @${CHMOD} a-x ${PREFIX}/bin/mediatomb
+ @${CHMOD} g+x ${PREFIX}/bin/mediatomb
@${MKDIR} -m ${MEDIATOMB_MASK} -p ${MEDIATOMB_DIR}
@${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${MEDIATOMB_DIR}
=20
diff -ruN mediatomb.orig/files/config.xml.dist.in =
mediatomb/files/config.xml.dist.in
--- mediatomb.orig/files/config.xml.dist.in 2010-08-04 =
20:02:43.000000000 -0500
+++ mediatomb/files/config.xml.dist.in 2010-08-05 02:02:27.000000000 =
-0500
@@ -67,6 +67,16 @@
<map from=3D"m3u" to=3D"audio/x-mpegurl"/>
<map from=3D"pls" to=3D"audio/x-scpls"/>
<map from=3D"flv" to=3D"video/x-flv"/>
+ <!-- Uncomment the lines below for music MODule transcoding =
using xmp -->
+ <!-- <map from=3D"mod" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"669" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"s3m" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"xm" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"it" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"stm" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"st" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"mtm" to=3D"audio/x-mod"/> -->
+ <!-- <map from=3D"med" to=3D"audio/x-mod"/> -->
<!-- Uncomment the line below for PS3 divx support -->
<!-- <map from=3D"avi" to=3D"video/divx"/> -->
<!-- Uncomment the line below for D-Link DSM / ZyXEL DMA-1000 =
-->
@@ -91,27 +101,61 @@
</import>
<transcoding enabled=3D"no">
<mimetype-profile-mappings>
- <transcode mimetype=3D"video/x-flv" using=3D"vlcmpeg"/>
- <transcode mimetype=3D"application/ogg" using=3D"vlcmpeg"/>
- <transcode mimetype=3D"application/ogg" using=3D"oggflac2raw"/>
- <transcode mimetype=3D"audio/x-flac" using=3D"oggflac2raw"/>
+ <transcode mimetype=3D"video/x-flv" using=3D"video-common"/>
+ <transcode mimetype=3D"application/ogg" using=3D"video-common"/>
+ <transcode mimetype=3D"application/ogg" =
using=3D"audio-ffmpeg-wav"/>
+ <transcode mimetype=3D"audio/x-flac" using=3D"audio-ffmpeg-wav"/>
+ <!-- Uncomment one of the lines below for music MODule =
transcoding using xmp -->
+ <!-- transcode mimetype=3D"audio/x-mod" =
using=3D"audio-mod-xmp-wav"/> -->
+ <!-- transcode mimetype=3D"audio/x-mod" =
using=3D"audio-mod-xmp-raw"/> -->
</mimetype-profile-mappings>
- <profiles>
- <profile name=3D"oggflac2raw" enabled=3D"no" type=3D"external">
+ <profiles>=20
+ <!-- Set this to "yes" if the Extended Module Player (xmp) is =
installed -->
+ <profile name=3D"audio-mod-xmp-wav" enabled=3D"no" =
type=3D"external">
+ <mimetype>audio/x-wav</mimetype>
+ <accept-url>no</accept-url>
+ <first-resource>no</first-resource>
+ <hide-original-resource>yes</hide-original-resource>
+ <agent command=3D"/usr/local/bin/xmp" arguments=3D"-d wav -o =
%out %in"/>
+ <buffer size=3D"1048576" chunk-size=3D"131072" =
fill-size=3D"262144"/>
+ </profile>
+ <!-- Set this to "yes" if the Extended Module Player (xmp) is =
installed -->
+ <profile name=3D"audio-mod-xmp-raw" enabled=3D"no" =
type=3D"external">
<mimetype>audio/L16</mimetype>
<accept-url>no</accept-url>
+ <first-resource>no</first-resource>
+ <hide-original-resource>yes</hide-original-resource>
+ <sample-frequency>44100</sample-frequency>
+ <channels>2</channels>
+ <agent command=3D"/usr/local/bin/xmp" arguments=3D"-d file =
-Dbig-endian -b 16 -f 44100 -o %out %in"/>
+ <buffer size=3D"1048576" chunk-size=3D"131072" =
fill-size=3D"262144"/>
+ </profile> =20
+ <profile name=3D"audio-ffmpeg-wav" enabled=3D"yes" =
type=3D"external">
+ <mimetype>audio/x-wav</mimetype>
+ <accept-url>no</accept-url>
+ <first-resource>no</first-resource> =20
+ <hide-original-resource>yes</hide-original-resource>
+ <agent command=3D"/usr/local/bin/ffmpeg" arguments=3D"-i %in -f =
wav -y %out"/>
+ <buffer size=3D"1048576" chunk-size=3D"131072" =
fill-size=3D"262144"/>
+ </profile>
+ <profile name=3D"audio-ffmpeg-raw" enabled=3D"no" =
type=3D"external">
+ <mimetype>audio/L16</mimetype>
<first-resource>yes</first-resource>
- <accept-ogg-theora>no</accept-ogg-theora>
- <agent command=3D"ogg123" arguments=3D"-d raw -f %out %in"/>
+ <accept-url>no</accept-url>
+ <sample-frequency>44100</sample-frequency>
+ <audio-channels>2</audio-channels>
+ <hide-original-resource>yes</hide-original-resource>
+ <agent command=3D"/usr/local/bin/ffmpeg" arguments=3D"-i %in =
-ac 2 -ar 44100 -y -f s16be %out"/>
<buffer size=3D"1048576" chunk-size=3D"131072" =
fill-size=3D"262144"/>
</profile>
- <profile name=3D"vlcmpeg" enabled=3D"no" type=3D"external">
+ <profile name=3D"video-common" enabled=3D"yes" type=3D"external">
<mimetype>video/mpeg</mimetype>
- <accept-url>yes</accept-url>
+ <accept-url>no</accept-url>
<first-resource>yes</first-resource>
+ <hide-original-resource>yes</hide-original-resource>
<accept-ogg-theora>yes</accept-ogg-theora>
- <agent command=3D"vlc" arguments=3D"-I dummy %in --sout =
#transcode{venc=3Dffmpeg,vcodec=3Dmp2v,vb=3D4096,fps=3D25,aenc=3Dffmpeg,ac=
odec=3Dmpga,ab=3D192,samplerate=3D44100,channels=3D2}:standard{access=3Dfi=
le,mux=3Dps,dst=3D%out} vlc:quit"/>
- <buffer size=3D"14400000" chunk-size=3D"512000" =
fill-size=3D"120000"/>
+ <agent command=3D"/usr/local/bin/ffmpeg" arguments=3D"-i %in -f =
mpegts -sameq -vb 4096k -r 25 -ac 2 -ar 48000 -ab 192k -async 2 -threads =
2 -y %out"/>
+ <buffer size=3D"10485760" chunk-size=3D"262144" =
fill-size=3D"524288"/>
</profile>
</profiles>
</transcoding>
--Apple-Mail-20--110488705--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008050720.o757K8d4026939>