www-apache/mod_flvx: Resolve AddHandler (bug #544572)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 44 insertions, 10 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/Manifest b/www-apache/mod_flvx/Manifest
index 62cb666c8e68..1df6d20187fb 100644
--- a/www-apache/mod_flvx/Manifest
+++ b/www-apache/mod_flvx/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 20_mod_flvx.conf 127 SHA256 83944a2c9ea60efd2e0c234b5c70b75c23234e6e571376c705a2ab79fc02c401 SHA512 3b1f3c251c77964a9e96e1df97c0104ac25fe496974660ef8259d7ac4d29f14cf0d73290b475b777b26ab9170189526b04a973d958f278099b56c16452a76f46 WHIRLPOOL 3ef76e89cd09b4392640719118106209fcf36cc00954c08b241e5ac1081f355e15613636051071d80a777638907bacfb373ccca1ea066c69a665729d6dea6a7f
+AUX 20_mod_flvx.conf 260 SHA256 7157391e2cfbd493b47b27e2483965085c253db13fbc34d7a9b8480ecef4a4b9 SHA512 ae10683106b50f0b0cbf6c911260829923618a0438c662c671d1efcb1c2b533e1c0ada91881e0023d7cf04156d5bf290021aba8e6bd9d28e6c3c001cd6ba3a28 WHIRLPOOL e5f7ac620b1ce2597de3d822e6d91060ae6b5600cf106cdea06377f6504c61752b923c96f450705353825bc6769dcb0613a069bb1139ac65861a49b6b99ccf30
 DIST mod_flvx-0.0.1.tar.bz2 1636 SHA256 bfcd82f5782f86577124ab88339762fe08e3e5a108e80bb56a20e12a6cc951c2
+EBUILD mod_flvx-0.0.1-r1.ebuild 598 SHA256 9935a86923bdf5a1047cd278841d56fdb9700bcb1a1a011a3fae57472cbd2f54 SHA512 0e7a6f86c95818528c0dca64eea3583e912838894eae354eebfb95195cc3d10208ad7dad55d33daeba7495f50fd05a0ebb0d8d8870587f35435750998e57675b WHIRLPOOL 525b611d16668c52d1fc4b90b0f1a7b800482766d5f9f2895a9724ca5f18bc6a4d9ef3627652bb255c7de2cf69684f656792312f59af2a27cf0532c61eaf0b21
 EBUILD mod_flvx-0.0.1.ebuild 596 SHA256 0b7cf9b04260455a8d123861a74e3a3b660d6612daafd4d29ce1bd9870d56acb SHA512 45c7c22783323354e818211b88b813b7e208a6a6beacec170ad6d36ebf562e7e700dd305bba4e2e54b73c3abe959e6b35823db78ab110952df4346c37fae2e68 WHIRLPOOL b7ad6ed9baf71249cceadf012864cb28b1de4a6cda944eb1df0940af4294aab4e8e42a6940ee4b885118b5c4002b4af05de10c40a22a363dfe6a3f8ba5aa4e47
-MISC ChangeLog 529 SHA256 a9c408e700f1d2c2c49df1c777c4b1d91b07299c0ae4551bc7f962e3bee392b8 SHA512 ed97d19dfccea9305aff4880dd92f1bf7f85e64131ddf7d36c349845ffc4ca64eefd7a3ad5769de1dee1c47c847c4561c1e359d2f3c5907c452ef598b9628607 WHIRLPOOL f030ba89be2f863f5fc8bc90da9e16bac2a7560e6f52c5c4219c53616660f13087d8fa0da607a2eb57a9e98e7cd971d589b113707ed5e72a983b22730438e901
+MISC ChangeLog 724 SHA256 af7db208361b1765b4f7f3ee70a924433a2ab21d25453f56d82a8ab560a29227 SHA512 bc2cb615e412f809e67c09bbb387efdc161e0e89ebc0fd822f70e2ac1ab8c012c4bfd64ee8fbab42650a7b3b781c63e213bb9ae4d83d1c8cb94fdc341ff19dc9 WHIRLPOOL 783b59b2264b0ffb65bab9c7fbe5b90c347fc4185bdc803bc39d53eea9a2de37d45b0eb52d4442e519f031f92bb826dc5c2d7e278c33c15a13f5833412bd946c
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlC1EfQACgkQCaWpQKGI+9R3zQCfRj1EH2oj2+ylBrkxFtELhU6B
-C4UAn1O4FZtF39LOVwvQbYsfNBEoMe6R
-=QHpX
+iEYEAREIAAYFAlUUqwMACgkQsAvGakAaFgAKTwCeKaR4NyKJgPP5Icc56PmPHzmF
+dNUAn2+ScewqyheFGAcDe+XpYZOtlfZh
+=lY1C
 -----END PGP SIGNATURE-----
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