summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2015-03-27 00:57:33 +0000
committerSebastian Pipping <sping@gentoo.org>2015-03-27 00:57:33 +0000
commitec90da7498f69fe1ab3ebc602871a20c2429f735 (patch)
tree27ff6e9ee394d656e972b782fd80d530e9c84ac9
parentVersion bump. Remove old. (diff)
downloadgentoo-2-ec90da7498f69fe1ab3ebc602871a20c2429f735.tar.gz
gentoo-2-ec90da7498f69fe1ab3ebc602871a20c2429f735.tar.bz2
gentoo-2-ec90da7498f69fe1ab3ebc602871a20c2429f735.zip
www-apache/mod_flvx: Resolve AddHandler (bug #544572)
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
-rw-r--r--www-apache/mod_flvx/ChangeLog10
-rw-r--r--www-apache/mod_flvx/files/20_mod_flvx.conf9
-rw-r--r--www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild22
3 files changed, 37 insertions, 4 deletions
diff --git a/www-apache/mod_flvx/ChangeLog b/www-apache/mod_flvx/ChangeLog
index 1d56ffc519a0..ebfd012f85f5 100644
--- a/www-apache/mod_flvx/ChangeLog
+++ b/www-apache/mod_flvx/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-apache/mod_flvx
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_flvx/ChangeLog,v 1.2 2012/11/27 19:18:11 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_flvx/ChangeLog,v 1.3 2015/03/27 00:57:33 sping Exp $
+
+*mod_flvx-0.0.1-r1 (27 Mar 2015)
+
+ 27 Mar 2015; Sebastian Pipping <sping@gentoo.org> +mod_flvx-0.0.1-r1.ebuild,
+ files/20_mod_flvx.conf:
+ Resolve use of AddHandler for security (bug #544572)
27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Drop apache herd as discussed in http://www.gossamer-
diff --git a/www-apache/mod_flvx/files/20_mod_flvx.conf b/www-apache/mod_flvx/files/20_mod_flvx.conf
index f4b4ebff28ea..72096ca68e38 100644
--- a/www-apache/mod_flvx/files/20_mod_flvx.conf
+++ b/www-apache/mod_flvx/files/20_mod_flvx.conf
@@ -1,6 +1,11 @@
<IfDefine FLVX>
-LoadModule flvx_module modules/mod_flvx.so
-AddHandler flv-stream .flv
+ LoadModule flvx_module modules/mod_flvx.so
+
+ # Avoiding AddHandler directive for security
+ # https://bugs.gentoo.org/show_bug.cgi?id=544572
+ <FilesMatch "\.flv$">
+ SetHandler flv-stream
+ </FilesMatch>
</IfDefine>
# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild b/www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild
new file mode 100644
index 000000000000..d44e792fb011
--- /dev/null
+++ b/www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild,v 1.1 2015/03/27 00:57:33 sping Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="mod_flvx allows to seek inside FLV files for streaming purposes"
+HOMEPAGE="http://journal.paul.querna.org/articles/2006/07/11/mod_flvx/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_DEFINE="FLVX"
+
+need_apache2