Fix AddDirectoryIndex syntax in files/4.3.11-r2/70_mod_php.conf.

Package-Manager: portage-2.0.51.20-r5

3 files changed, 49 insertions, 34 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 0b5ca6f3f6b3..c846c306833f 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.224 2005/04/23 23:28:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.225 2005/04/30 15:36:12 beu Exp $
+
+  30 Apr 2005; Elfyn McBratney <beu@gentoo.org>
+  files/4.3.11-r2/70_mod_php.conf:
+  Fix syntax in files/4.3.11-r2/70_mod_php.conf (arguments must be file names
+  not extensions).
 
   24 Apr 2005; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.11.ebuild:
   Stable on hppa.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 3e348357c1c8..6cad51fdfdee 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,47 +1,57 @@
-MD5 0ab7ecbeaafcf2ce6ab3b165e61078f6 ChangeLog 38832
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 ee8294251b178d776c61705a710347f1 mod_php-4.3.9_rc1.ebuild 6072
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 93afa9417917af1a31305b472ea8b70c mod_php-5.0.2-r1.ebuild 4177
+MD5 794be7f3942662541c6c0d25fb64161c mod_php-4.3.9.ebuild 6074
+MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995
 MD5 3b4db25bfe82d2967bc9c607cccdb12c mod_php-5.0.0-r1.ebuild 4179
+MD5 e8596be4890ec2f2223acfef53234af8 mod_php-5.0.3-r2.ebuild 2035
 MD5 8dcccea239186458cae823a2b62b80d0 mod_php-5.0.1.ebuild 4244
-MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995
-MD5 a431ba8439f0fced002aaf0f74a70e3f mod_php-4.3.8.ebuild 5963
-MD5 794be7f3942662541c6c0d25fb64161c mod_php-4.3.9.ebuild 6074
-MD5 3da695dab52a3e7eeea983bf1c493fa1 mod_php-5.0.2.ebuild 4257
-MD5 dc2b446cde6865cfbccaef4a94db4aa2 mod_php-4.3.10.ebuild 6134
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 a423281d6b97a9dc2a285cd87f080635 mod_php-4.3.11-r1.ebuild 6289
+MD5 b9c948760dd10ca702b32d8c19694405 ChangeLog 39010
 MD5 5357393f40a578f7be2663a74f23640f mod_php-5.0.3.ebuild 4378
-MD5 940874a8b88c3614970e9e501f1dafaf mod_php-4.3.10-r1.ebuild 6349
-MD5 93afa9417917af1a31305b472ea8b70c mod_php-5.0.2-r1.ebuild 4177
+MD5 4be14b2f74cac7450c1dd3db2f28a6ad mod_php-4.3.11.ebuild 6072
+MD5 dc2b446cde6865cfbccaef4a94db4aa2 mod_php-4.3.10.ebuild 6134
+MD5 3da695dab52a3e7eeea983bf1c493fa1 mod_php-5.0.2.ebuild 4257
+MD5 ee8294251b178d776c61705a710347f1 mod_php-4.3.9_rc1.ebuild 6072
+MD5 a431ba8439f0fced002aaf0f74a70e3f mod_php-4.3.8.ebuild 5963
 MD5 5f347443c2b80bb26a91346b99501aca mod_php-5.0.3-r1.ebuild 4296
-MD5 e8596be4890ec2f2223acfef53234af8 mod_php-5.0.3-r2.ebuild 2035
-MD5 a423281d6b97a9dc2a285cd87f080635 mod_php-4.3.11-r1.ebuild 6289
 MD5 70c46b3aaf750d6af4a7e3f4502373b7 mod_php-4.3.11-r2.ebuild 6289
-MD5 4be14b2f74cac7450c1dd3db2f28a6ad mod_php-4.3.11.ebuild 6072
-MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63
-MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
-MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63
+MD5 940874a8b88c3614970e9e501f1dafaf mod_php-4.3.10-r1.ebuild 6349
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 f7a7898637874593f519c336db79fa45 files/mod_php-5.0.3-missing-arches.patch 524
 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
-MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
+MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
-MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-mod_php-4.3.9 205
-MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63
 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10 206
-MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3 63
+MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10-r1 206
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63
-MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63
-MD5 f7a7898637874593f519c336db79fa45 files/mod_php-5.0.3-missing-arches.patch 524
-MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r2 63
+MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11-r2 206
+MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
+MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10-r1 206
 MD5 cd604ffae30af42fdc9248147efd0c4b files/php5-prefork.patch 850
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r2 63
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3 63
+MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-mod_php-4.3.9 205
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63
+MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
 MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11 206
 MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11-r1 206
-MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11-r2 206
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
+MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
 MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484
-MD5 4603a5ffdc23622c3acda6b171c49d4d files/4.3.11-r2/70_mod_php.conf 1100
+MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCc6YVjUHll2nfF60RAk3VAJ9oJ64kpLOuqwdm5AlS+D3sYemwSgCfU4fe
+CZiPMpaBL+/vzKHIfy2kDgs=
+=xCYz
+-----END PGP SIGNATURE-----
diff --git a/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf b/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf
index 04ed17cd5329..ceb4369a998d 100644
--- a/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf
+++ b/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf
@@ -16,7 +16,7 @@
 	</IfModule>
 
 	# post-adding DirectoryIndex'es
-	AddDirectoryIndex .php .php3 .php4 .phps .phtml
+	AddDirectoryIndex index.php index.php3 index.php4 index.phps index.phtml
 
 	# Fix some bugs
 	<Files *.php>