changing AddDirectoryIndex to DirectoryIndex in apache configs per bug 139451

Package-Manager: portage-2.1.4

6 files changed, 25 insertions, 10 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 807a2ae3c0aa..f81a4d5ffb0d 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.220 2008/01/08 17:28:26 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.221 2008/01/31 16:34:14 hoffie Exp $
+
+  31 Jan 2008; Christian Hoffmann <hoffie@gentoo.org>
+  files/70_mod_php.conf-apache2, files/70_mod_php5_concurr.conf-apache2,
+  files/70_mod_php5.conf-apache2, files/70_mod_php_concurr.conf-apache2:
+  changing AddDirectoryIndex to DirectoryIndex in apache configs per bug 139451
 
 *php-4.4.8 (08 Jan 2008)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b846aa5aa377..e8ce07045e4c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,9 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20php4-envd 145 RMD160 fb57b2d202ab1031303e7525a8ef5b353dc04ef8 SHA1 34ef066d2de22f147fc86bbe884692af7631f726 SHA256 17cd1a952434988b4c2125e4d1eef1df7114809f404605d35f255674419dd5d5
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
-AUX 70_mod_php.conf-apache2 457 RMD160 3db748289c54547b815f6b2069cc02f4a18f16da SHA1 31f1ef36ad414beaf1dcbd99c3b41db7967c129d SHA256 03059ce0ece6c9b4db2d3bbf4b6352e0a4193a45843f3888ce3c37cc447748a1
-AUX 70_mod_php5.conf-apache2 493 RMD160 c4ace955ff65ca2ce964cf4c8d2b42f6a41e90ef SHA1 226e31837e28675addb82f48d12f05bb4e0a5e66 SHA256 9de8f6073983e0b2ff784271047563782870d981a241abdecbdda8a038b15033
-AUX 70_mod_php5_concurr.conf-apache2 417 RMD160 2f6bc0900fd2a94268f36254f7f6717b7a5fd649 SHA1 5490af6724ecdb5801ec12ed20ab80ac26d2f950 SHA256 f09cedf53f0355130f3a449920191fd4456f7303ebfcedaf57a636a2b18c29ba
-AUX 70_mod_php_concurr.conf-apache2 332 RMD160 e7691ce9ab686e32c48c7b204da339db098f3ef1 SHA1 fdfcebb517a25d78bc4373fec8756b147fd02fad SHA256 bb1764de57b950ca971d20a28a75ea98f907c11e2d8cc82996eda5eacd4baf7f
+AUX 70_mod_php.conf-apache2 454 RMD160 7e99b278a010c958d698454a2aa43e1a351c69e8 SHA1 895e986f880a1dee9b0a45fdcd99ccce44999a6b SHA256 dd7116f3439e06ef2d6126403360c2722355f8481552fdce0cb601af331f81ee
+AUX 70_mod_php5.conf-apache2 490 RMD160 745bdb5db622577f473703d5ee8dc7f3c66f8f0c SHA1 7daf9c9ec2e6d108f850981853f9f4f599be0b71 SHA256 5667d06cb7a18c30d11decd28d55b87e36287c76c4d3a450b1cb37271e7fdcd1
+AUX 70_mod_php5_concurr.conf-apache2 414 RMD160 1783b6c830119f021c3fb6cb35a631f43c4fa70c SHA1 09f9076f35bc84994fc8c687b4befc0400475f1a SHA256 ccc3bc073eafc83f98049679a411801e80f84620bd51c37c36de2b9ee9492aa2
+AUX 70_mod_php_concurr.conf-apache2 329 RMD160 364e071b494b84b78881c566b7c1b46261f62c19 SHA1 9d775784993b46a8be1a7e31f02a3482542385df SHA256 092178aa0cf3272b6411abc85b3820665322598932d249c284a8fa4108d5835a
 AUX php4-ldvs 22 RMD160 e70c565b3930d9d9e3253062b7c633346cb99a63 SHA1 8c66355dfb80e2ecc6ee6faae30bf7dbb1727651 SHA256 4aee18478b09cda7e925ccde157db6099ea0122b5c4efb0868e3761b65688dde
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
 DIST php-4.4.8.tar.bz2 4546525 RMD160 dedf4a1a853b19bd3fb91a6028a256facb2d3224 SHA1 fca6259fd3e8e3a7a37343e9a81651f5b6d4835c SHA256 30d8e281cf1b785301f0ce2ba6a803bda72fb229942d415ae601ef176b46d5c1
@@ -22,5 +25,12 @@ EBUILD php-4.4.8.ebuild 14222 RMD160 b064509dad3b1f81f6a0d463f1130bb97216cfe0 SH
 EBUILD php-4.4.8_pre20070816.ebuild 14614 RMD160 55e737bce305755656fc278ebbfb3b16f136b1f9 SHA1 601880b68b314cfaae30f5c68eb023f563937f87 SHA256 baf230797ae737a6f207859f496224945a3f668a1f180409cbde5d476286f8a5
 EBUILD php-5.2.4_pre200708051230-r2.ebuild 14984 RMD160 2917bce24b7fa4fcf3030dfa9eae3858b0c76560 SHA1 8dc8fd9aaa61aad943ec7ff3f86e0e66d4baac2d SHA256 311806499c903291760652261c8bb7c8b129e5169e7e1d78076f81c39eed1ba5
 EBUILD php-5.2.5-r1.ebuild 14835 RMD160 cdcb33968c89bcc49746a9b0e1127aa0df41207b SHA1 726ee774a6b930af9160402f9f75de78f1cea981 SHA256 a256cb31564e9b0c1cf34ec480a84405de5f76cc4371b28bc8ebd4c32042173e
-MISC ChangeLog 40706 RMD160 09059a843108716bd0409d0e118feae79897a66c SHA1 b69c99382bddca4320768bf91adef0a09c93d340 SHA256 08bedfbb02d776db687d4feeb607420b4d103a7908c2fdfbd90d6b94b3aee85d
+MISC ChangeLog 40987 RMD160 020f99132536b9828643874ca0c138837194d53e SHA1 eacb34b3a9f3464c831068fb8a79f7520043d9c6 SHA256 9a962f406731b98543694c805b047220b528daf5acf17adbdd9e2ea82bb130bc
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHofiQJ9KLJlGHWYIRAgfjAKCnkSuTVFV23iJmW+N0J/I641DgXgCg8Een
+N87C0BPO0oxrPMUbYCtCYpE=
+=y0VK
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/70_mod_php.conf-apache2 b/dev-lang/php/files/70_mod_php.conf-apache2
index abf8377a8b2d..90cabfb02dcd 100644
--- a/dev-lang/php/files/70_mod_php.conf-apache2
+++ b/dev-lang/php/files/70_mod_php.conf-apache2
@@ -13,5 +13,5 @@
 		AddType application/x-httpd-php-source .phps
 	</IfModule>
 
-	AddDirectoryIndex index.php index.phtml
+	DirectoryIndex index.php index.phtml
 </IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
index fec800035b00..a8254359fa0c 100644
--- a/dev-lang/php/files/70_mod_php5.conf-apache2
+++ b/dev-lang/php/files/70_mod_php5.conf-apache2
@@ -14,5 +14,5 @@
 		AddType application/x-httpd-php-source .phps
 	</IfModule>
 
-	AddDirectoryIndex index.php index.phtml
+	DirectoryIndex index.php index.phtml
 </IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
index 90a6de68a006..710e21136b3a 100644
--- a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
+++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
@@ -12,5 +12,5 @@
 		AddType application/x-httpd-php5-source .phps
 	</IfModule>
 
-	AddDirectoryIndex index.php index.phtml
+	DirectoryIndex 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
index 00a1853149c1..fa73e7685ec1 100644
--- a/dev-lang/php/files/70_mod_php_concurr.conf-apache2
+++ b/dev-lang/php/files/70_mod_php_concurr.conf-apache2
@@ -10,5 +10,5 @@
 		AddType application/x-httpd-php4 .php4
 	</IfModule>
 
-	AddDirectoryIndex index.php index.phtml
+	DirectoryIndex index.php index.phtml
 </IfDefine>