Update PHP ebuilds, fix various (security) issues.

Package-Manager: portage-2.1.1_pre2-r6

8 files changed, 58 insertions, 6 deletions

diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
new file mode 100644
index 000000000000..f95db6f1b60c
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
@@ -0,0 +1,17 @@
+<IfDefine PHP5>
+
+	# Load the module first
+	<IfModule !mod_php5.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	<IfModule mod_mime.c>
+		AddType application/x-httpd-php5 .php
+		AddType application/x-httpd-php5 .phtml
+		AddType application/x-httpd-php5 .php5
+		AddType application/x-httpd-php5-source .phps
+	</IfModule>
+
+	AddDirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php_concurr.conf-apache2
new file mode 100644
index 000000000000..64f5b91eb47f
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php_concurr.conf-apache2
@@ -0,0 +1,15 @@
+<IfDefine PHP4>
+
+	# Load the module first
+	<IfModule !sapi_apache2.c>
+		LoadModule php4_module    modules/libphp4.so
+	</IfModule>
+
+	# Set it to handle the files
+	<IfModule mod_mime.c>
+		AddType application/x-httpd-php4 .php3
+		AddType application/x-httpd-php4 .php4
+	</IfModule>
+
+	AddDirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/dev-lang/php/files/digest-php-4.3.11-r5 b/dev-lang/php/files/digest-php-4.3.11-r5
index 62d6b2d1a466..4bbbf0463d9b 100644
--- a/dev-lang/php/files/digest-php-4.3.11-r5
+++ b/dev-lang/php/files/digest-php-4.3.11-r5
@@ -4,9 +4,9 @@ SHA256 103e80cb39fc1a5b6b93e9d5faf9842ea1e1a7847cfc868369325f80421d29c7 hardenin
 MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 php-4.3.11.tar.bz2 4012575
 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5 php-4.3.11.tar.bz2 4012575
-MD5 31c7af83657e23387116b2407aaf796c php-patchset-4.3.11-r2.tar.bz2 27051
-RMD160 0c0fa32570cd79eb0ce59b308fdb38c68c58280a php-patchset-4.3.11-r2.tar.bz2 27051
-SHA256 4235ac9ac8104fdcd39d11774de6c24493e6e94df7f840f69925430fec3b0d39 php-patchset-4.3.11-r2.tar.bz2 27051
+MD5 9fc7aed0586ccfee807af49762f71774 php-patchset-4.3.11-r3.tar.bz2 27977
+RMD160 a99c2eecca8e6e51cdb2f66e7da2d0a446fb8d50 php-patchset-4.3.11-r3.tar.bz2 27977
+SHA256 4b93cdebc3034e81d9c589e90fdf93e84ea67712a56afaad5b0b299edfe6d76b php-patchset-4.3.11-r3.tar.bz2 27977
 MD5 33be24619f3a10953f9e1e32beeee97a php-pcrelib-new-secpatch.tar.bz2 357619
 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 php-pcrelib-new-secpatch.tar.bz2 357619
 SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19 php-pcrelib-new-secpatch.tar.bz2 357619
diff --git a/dev-lang/php/files/digest-php-4.4.2-r6 b/dev-lang/php/files/digest-php-4.4.2-r6
new file mode 100644
index 000000000000..8b915b8daf0b
--- /dev/null
+++ b/dev-lang/php/files/digest-php-4.4.2-r6
@@ -0,0 +1,9 @@
+MD5 d53ac42b51ed80f8f23751a1d7113cfa hardening-patch-4.4.2-0.4.11-gentoo-r1.patch.gz 59709
+RMD160 6bd005bda596ff2690f5ee2563b2708671948c7c hardening-patch-4.4.2-0.4.11-gentoo-r1.patch.gz 59709
+SHA256 3e938f8f62322b061acbcc6f900c249b0dee0a8672557c7cbce3513c44f4dc04 hardening-patch-4.4.2-0.4.11-gentoo-r1.patch.gz 59709
+MD5 28051cd9ef43490dd9727a4d442011b5 php-4.4.2.tar.bz2 4371185
+RMD160 cbef0fa4e233529422bc0944dcfb79d866013f5e php-4.4.2.tar.bz2 4371185
+SHA256 a2024d665125a41611eb64451648d37a81e3579594c8810bb41ac8b2b63f81eb php-4.4.2.tar.bz2 4371185
+MD5 fad43ccccab8d21d962efcb03b03b236 php-patchset-4.4.2-r7.tar.bz2 24079
+RMD160 9bd72618cb3ac7584bcbf5f41c7c7926590bc85b php-patchset-4.4.2-r7.tar.bz2 24079
+SHA256 44c976ee3df7b99ed014a1579264cdd069e9bd57efa2757ee4e06112d073fc5b php-patchset-4.4.2-r7.tar.bz2 24079
diff --git a/dev-lang/php/files/digest-php-5.0.5-r5 b/dev-lang/php/files/digest-php-5.0.5-r5
index 17b526372619..a61252bffa1e 100644
--- a/dev-lang/php/files/digest-php-5.0.5-r5
+++ b/dev-lang/php/files/digest-php-5.0.5-r5
@@ -4,6 +4,6 @@ SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c hardenin
 MD5 b5d4ca75bbb11ee5b830fa67213d9f7f php-5.0.5.tar.bz2 4895556
 RMD160 6a9a892affba229770154407860cd1c2a098eaf9 php-5.0.5.tar.bz2 4895556
 SHA256 aa63e769059d2452b153db6d4e6b421228d0606cbe8b11ace00e4c1b5c2cdc4f php-5.0.5.tar.bz2 4895556
-MD5 6f9db1d66a81f95933ad6d9eb71c6f84 php-patchset-5.0.5-r2.tar.bz2 20314
-RMD160 2a929a6eb9f5e8a9e01c26b6304f7c60e4c1bf7d php-patchset-5.0.5-r2.tar.bz2 20314
-SHA256 46bfe8d324b28dbfc8c9399bf6c1f2ef3e44cca7b97e08a9083f986002482309 php-patchset-5.0.5-r2.tar.bz2 20314
+MD5 88f5caa59c695fc44384d83ef39ea213 php-patchset-5.0.5-r3.tar.bz2 20910
+RMD160 0f78808e3fe15568d5670ad852ed218589949aea php-patchset-5.0.5-r3.tar.bz2 20910
+SHA256 b4df50e7a857eea4072c0b7cde1585409eaebec8f64474d6c1611c5b9869c7f2 php-patchset-5.0.5-r3.tar.bz2 20910
diff --git a/dev-lang/php/files/digest-php-5.1.4-r4 b/dev-lang/php/files/digest-php-5.1.4-r4
new file mode 100644
index 000000000000..0ec44b224cd8
--- /dev/null
+++ b/dev-lang/php/files/digest-php-5.1.4-r4
@@ -0,0 +1,9 @@
+MD5 5c05d2abcc496454c17deb1889c6131c hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168
+RMD160 8fe4085261c939944567a796e4be8d0af9fc4a66 hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168
+SHA256 fd07ac145966e931f961c392ca087a2a7e93ba9c6bcc0ff382ca80d5019480d6 hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168
+MD5 66a806161d4a2d3b5153ebe4cd0f2e1c php-5.1.4.tar.bz2 6356171
+RMD160 d4ab11884a3a899f21eef777767a553cf81584ce php-5.1.4.tar.bz2 6356171
+SHA256 b55253e9557eceb901d83217ec192da22c28c7b2fdf714d3f151f1db663b5a32 php-5.1.4.tar.bz2 6356171
+MD5 1563ba29dae55380ef1b88be07fe39c6 php-patchset-5.1.4-r5.tar.bz2 21025
+RMD160 ebe867eff66440c1714ac2cb87c11ee17f15d8ea php-patchset-5.1.4-r5.tar.bz2 21025
+SHA256 8d682d0b26dcbd5ee420bc2c2e1483a68a34ede6eecf7ae83f1ea9ca36a6c57f php-patchset-5.1.4-r5.tar.bz2 21025
diff --git a/dev-lang/php/files/php4-ldvs b/dev-lang/php/files/php4-ldvs
new file mode 100644
index 000000000000..01b4eebed95f
--- /dev/null
+++ b/dev-lang/php/files/php4-ldvs
@@ -0,0 +1 @@
+PHP_4 { global: *; };
diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs
new file mode 100644
index 000000000000..783b0f63ac70
--- /dev/null
+++ b/dev-lang/php/files/php5-ldvs
@@ -0,0 +1 @@
+PHP_5 { global: *; };