app-eselect/eselect-php: Move from AddHandler to FilesMatch/SetHandler for security (bug #538822)

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

4 files changed, 79 insertions, 12 deletions

diff --git a/app-eselect/eselect-php/ChangeLog b/app-eselect/eselect-php/ChangeLog
index de4ab8fcbcf5..bbb19bdf2ff4 100644
--- a/app-eselect/eselect-php/ChangeLog
+++ b/app-eselect/eselect-php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-eselect/eselect-php
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-php/ChangeLog,v 1.1 2015/03/31 16:53:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-php/ChangeLog,v 1.2 2015/04/05 23:12:19 sping Exp $
+
+*eselect-php-0.7.1-r4 (05 Apr 2015)
+
+  05 Apr 2015; Sebastian Pipping <sping@gentoo.org>
+  +eselect-php-0.7.1-r4.ebuild, +files/70_mod_php5.conf-apache2-r1:
+  Move from AddHandler to FilesMatch/SetHandler for security (bug #538822)
 
 *eselect-php-0.7.1-r1 (31 Mar 2015)
 
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 19947d73247a..259b85ffbf57 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
+AUX 70_mod_php5.conf-apache2-r1 486 SHA256 83c041f18919c04ec31c2bf7491fbf9465a5c3201161601afe246060af3041a7 SHA512 d912aee2a08a7cf13562a479e35376c15179a1205d56431b6ecd1bbe8a5a28663afaeeda94f90aaf2ad960b359a8460ab25990181bdacc26e83c05b1501b1f9c WHIRLPOOL 2f12ecd7d54b4a686d7223707ebb3a8660ecbd90f9660b1cdb8f7832c57737a89d97a68ac420cccdb5609e86a5ce9dfa5fd15f17d5be223260ed83ece4cc6349
 AUX php-fpm-launcher 134 SHA256 d7e944a016a8a282b9a684de1820c8e5c00791c27471a528b1ee8dc620eb83e8 SHA512 4304ea6df7093af06f1b7df5bf5d8ed7692403cc64a5c4c516e49d36fa866b33e4815876d28cc365f5ccb1e301ef7ce9b57e15ed959a41c91fb25af7236fed29 WHIRLPOOL f6123fb338a10e23f21616ab1bbfa385289748cff9523c2a1d39e82f53f104eacc0f3b088794a12b678551b7d8ef1b6262480882b62ce38067e923e7592b4629
 AUX php-fpm-r1.init 1199 SHA256 7995c172a6169c3fee78be78f00eda2342d1be2a28d6faefccae74f9bb43ef27 SHA512 97c18933ddcb7c4a18a4cedf9f52234889e5777d3cc5a4b9f6912d86f52879260cc2eb9593217c68f6ed81293b852a1232dfd45db773fc2ef3ba6985b1d5ed0e WHIRLPOOL c50bb4c01e288efd33cfe4d9e7962abfa6db739f12940b7787b47b4a8f6c106f75a1169120a40b2dfec7400f6909d8f5ccc161d2d8e03dd5fcc67cd19ba3a9d6
 AUX php-fpm.conf 29 SHA256 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5 SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f WHIRLPOOL 0979fc3fc9e2ac53fef2f5efa9de745b9e97aeccfd045e23778a4e7bd8f8bc0a69d19fcbccb482cc210e6cb291ff9c6150c2b73fbc20991c64d1990c735366e9
@@ -13,20 +14,14 @@ EBUILD eselect-php-0.6.2.ebuild 662 SHA256 b74c00e2cc723e59b9d82d003321771905ae4
 EBUILD eselect-php-0.7.1-r1.ebuild 1387 SHA256 f1f4fb90530aa70506ce29f1a99c96194523ae1a109fc9ce9c4b7b7f05636fbf SHA512 eac3a2add60694a9feca77edef2567e9d6c5eac04b3d51bd85736bd2573daa42cc9cd980323301e5c0464d4097374e4eb4f138007a00e5357f414b8fd6006d98 WHIRLPOOL b867adc39a624f0a3d7f76c67dccfff889cc8abd335f1808c7a8204858309b51d8a36d5096215d6959786eb13bbd30f87714d61dde9956936029d0e48161298d
 EBUILD eselect-php-0.7.1-r2.ebuild 1390 SHA256 15e096a78689199ab189b15874562fd59cae8f065ce8ed51943dbce936ed3dd7 SHA512 9a109e2c6068953ac713f71e66574acca9f648f8a14ea29ee877f4f70ba044c961eebbc97aa506b0af2f35050980288415fdef106cd2d44e47de9d6e13af9ae1 WHIRLPOOL e3d0111dc6109ce068205ef1c33672ab363af9db32361b7a285820fe1929c07f02428a46b155ff6f482f976a4d0f6a53212f89aac791f99de7adff1e69cad827
 EBUILD eselect-php-0.7.1-r3.ebuild 1318 SHA256 509d132253f02a74163372ed3d1c72e32820246a9625a6f83af846a184581151 SHA512 8a2da4224b1392ff6c85a67622c4be75f23a93ac54be4f86897b7814ac5aa311c8741be0b2030687ca80c2048f2249f9a93f7f2ddc00722f58591b074b0774ac WHIRLPOOL e93a1deaf7d6817b13fad86b8ca47f2593fe117eb6a53d1a6e7bc88d3485cf3e098125652b3356878ef1e822aa9732308dbe57606d90131fd3fee4f29bd12adc
+EBUILD eselect-php-0.7.1-r4.ebuild 1332 SHA256 e20cb1360f0028086d61c83452f759046bf5029622413f9dd465ff677125278e SHA512 3a70f2bdd14609a7f7559e272630b36b7914aa59c6441872d325de9c736a51db75697bc0a117eb2fd3338188910e7e9e7f607e6c075ace8bb4e2104f17df60fd WHIRLPOOL 4fb718e2876748165591e4576068d4e6a1a64619744cd1158b9e49ae9ec35430b47bd6379d1f752f7d316fbc55dddcbfdbd4fa5039306133b53127e0fc12d634
 EBUILD eselect-php-0.7.1.ebuild 1184 SHA256 d29eecff7c340d9bd6a564d95f7a96f321d2fec9f3e91d38ce987a464a3f78b1 SHA512 396138c569c583e1e6b0ca2f5060d9c28cef853c3abddcd94ce70b7317a65c7fc9e471574d966e8e1f8214b623428a7381ecfc1092857d921e14481dfaa449da WHIRLPOOL 6e21893fc16c666a0717959b9bee184047984f2e4817a9694b480e1f55000648ab05db8c18a72f31bdf29a7184c870677a71c28732d294878da425d0ebbd5f98
-MISC ChangeLog 8406 SHA256 60d29e3b642a5c822ab5c27a6b1536f3028b6075bdda72aa3d3479696413c227 SHA512 45e8bb3ca32807e9a3dc079e0941771fd1b0259415b74b70bf3bf934c365aa7708a6e8e4043ec3dd4430e54a18c1e60d02d725d1bd473c23289db19e80a163dc WHIRLPOOL 5ae9589f2075dd8d7c84896cc039c5918e55ec8d65947bd6593e9e5e86a3319c4dcb41c7e9b09b9d87bbfc117f94dcc1662df890ef4082330c7f660c01e58a49
+MISC ChangeLog 8641 SHA256 390efcd893744768949ca4e833dbba3761514416040c8ff7fc1edb7d4a273442 SHA512 4c363653260e202a877f26daf87c7dc7095c8452391bec9587b7f9a32376cd0533cdcc3fdc6bd1d1d8173edaca44eb24f1568bdc942fe6a150eb2b2a2b11113b WHIRLPOOL c0445b9c5b293ea06a8b5a31b530ca00f09f62d11c8f71ec418ca247e90634f3fd5e9e32f32a7350c8f8e4bffb8822faa1640f36077f804c80ac4e5c57cc6735
 MISC metadata.xml 306 SHA256 007582443454394a0817ca5100a5bf091e027ddcc8d2639b8666fd264166e201 SHA512 661dd3eaea921697e52084355592a93158c63ca15bbb43c35ea62df8f864c5edee04d521f63d4b9a831ee82ff616203096bc9e50834a0f2550895c3cfcc770a3 WHIRLPOOL 5111e517b0c290c2294858d5391ff775825a045242b582f732b80b7434f9ee56630a84e6e97e978810dca268b5a4a62ccef582003276db4f21181a269fc8f777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVGtEiAAoJEJQzkH1pP7W4z6EL/1cK8MGGKZXdKwd1DVd3SBAY
-DoXgye1icWFiJb9ZZpENVCaC5zUMTrhWwJyyzWPAHS/BN4qFqnSnThtIyDVWPJP5
-XMVJJuT/035NgQyKedv7jc1HJnK/e6LIvOXWcpwgqvIefezOC1NDjwKfYqzscmjb
-X1+4Mbmz0p9CrdT9d3SLvKbKAYOCaIw34rZyVlnr2HQEF8GMK65RfHVnu9eTFGcP
-msQOK5r8kivukw5vK07vAT8wdMu9zsOXmOQUn3bhAHC8RkoLmJyNVwAb8sYc+oTw
-GgqbbazkvNTCBqzfHDIGdxRqTNSM3u72U4ODAgwHQXfB3wqEqWIV0GGNXmEKBVn4
-06prXVV8BW839EY/11ZyMxdKyowfXbgWWyQ26tE0WWWzuC2zmCybHgDuiWkFz2EI
-BSHKueKNLxk7ZRu0UG7COIvVorsNWuxSCWfkIzITCUKoRO5jcGpHK3JWjq79YPMq
-ZxDCdjnA8oWazKtQjHxn2YT2tqaXB0DDkYgoFLvZ1g==
-=YhmM
+iEYEAREIAAYFAlUhwVQACgkQsAvGakAaFgDBFQCfVvauKJwsf6fOt+FrsF90DSy8
+cFQAn2FsoBtNetnYW1Qc7QGG5ydI/4LX
+=h7Hj
 -----END PGP SIGNATURE-----
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild
new file mode 100644
index 000000000000..dc0ebd353013
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild,v 1.1 2015/04/05 23:12:19 sping Exp $
+
+EAPI=5
+
+inherit depend.apache systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+DEPEND=">=app-admin/eselect-1.2.4
+		!<dev-lang/php-5.3.23-r1:5.3
+		!<dev-lang/php-5.4.13-r1:5.4
+		!<dev-lang/php-5.5.0_beta1-r2:5.5
+		"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+want_apache
+
+src_install() {
+	mv eselect-php-${PV} php.eselect
+	insinto /usr/share/eselect/modules/
+	doins php.eselect
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+		newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" \
+			"70_mod_php5.conf"
+	fi
+
+	if use fpm ; then
+		dodir "/etc/init.d"
+		insinto "/etc/init.d"
+		newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm"
+		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+		exeinto /usr/libexec
+		doexe "${FILESDIR}/php-fpm-launcher"
+	fi
+}
diff --git a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 b/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1
new file mode 100644
index 000000000000..05deeb6e80f6
--- /dev/null
+++ b/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1
@@ -0,0 +1,18 @@
+<IfDefine PHP5>
+	# Load the module first
+	<IfModule !mod_php5.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	# NOTE: Avoiding AddHandler/AddType for security (bug #538822)
+	# NOTE: Please read the related news item!
+	<FilesMatch "\.(php|php5|phtml)$">
+		SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch "\.phps$">
+		SetHandler application/x-httpd-php-source
+	</FilesMatch>
+
+	DirectoryIndex index.php index.phtml
+</IfDefine>