diff options
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/kolabd/ChangeLog | 3 | ||||
| -rw-r--r-- | net-mail/kolabd/Manifest | 3 | ||||
| -rw-r--r-- | net-mail/kolabd/files/70_mod_php5.conf.2.1.template | 31 |
3 files changed, 4 insertions, 33 deletions
diff --git a/net-mail/kolabd/ChangeLog b/net-mail/kolabd/ChangeLog index 8d6703e..e37f874 100644 --- a/net-mail/kolabd/ChangeLog +++ b/net-mail/kolabd/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 May 2008; wrobel@gentoo.org -files/70_mod_php5.conf.2.1.template: + Remove problematic 70_mod_php5. This is being deliverd by php anyhow. + 01 May 2008; wrobel@gentoo.org kolabd-2.1.ebuild: PHP in the portage tree now supports kolab. diff --git a/net-mail/kolabd/Manifest b/net-mail/kolabd/Manifest index 6b46480..ff97d6d 100644 --- a/net-mail/kolabd/Manifest +++ b/net-mail/kolabd/Manifest @@ -2,7 +2,6 @@ AUX 00_kolab.conf.2.1.template 3124 RMD160 23d555b1693fa4e6ab9e448d091f47a040617 AUX 11_kolab_domain.conf.2.1.template 4533 RMD160 d344487756da64886d2d0a04c8a008a7f79fa66b SHA1 d72ffcab81fcd9c90552c9548f7e25f977087dbc SHA256 c7d25368caf10baba4d3e13a0fa5a8d4f6751312ebf4883f45463a5e700e2251 AUX 12_kolab_vhosts.conf.2.1.template 1700 RMD160 50e290109f1ea5103c5b23d75da3db88f4dd4c98 SHA1 ec922a13cac58c8defe7fb5d4116391a53e14cdc SHA256 d1d4ae8b69a173d33449893d38c3261422c8704ff26055ff73037e35d5d35a5f AUX 13_kolab_example.conf.2.1.template 6474 RMD160 5eebdc0b87cbb196baa7610b24890135f6b0c181 SHA1 b673ebac378fa85ae4bb49098a8ed193171007e5 SHA256 f87a47f69daced468fe58bce0d73ff82da12e938566657d376231f2ce85cffc7 -AUX 70_mod_php5.conf.2.1.template 909 RMD160 298a3b06aa6f1a7b835ce89db3c74d128d660f62 SHA1 9960cc5d942280634bf716cbc1d2641806b2de0c SHA256 0752b91435216796e5f0244bc1a4ee35bcab5b50765c3ca36eb52f8b9969a1fe AUX access.2.1.postfix 971 RMD160 b86b158dbdf80401e486ebdc2f087733c4c1e0a4 SHA1 924c0963c490c9db6dfc1ba242de407184b7f592 SHA256 ad5435f3a800463a58706257003e8d598301bd8a81ba1ec869279d72ea7b1902 AUX admin.service 29 RMD160 231c94400d675b2568c965738db327dd85f9b4d0 SHA1 526eadadf37286c703b4a39c6892725fd7232259 SHA256 925aa7c6896134401410548db058d3e127e38fc0f1461e5622699ff1a32945ec AUX aliases.2.1.postfix 833 RMD160 23d32eb4aa8d8b545fc36a3c873ffdecc4707423 SHA1 7b3afe13feb592d72bc420c728ccab5cde60664b SHA256 80a1f5ac6e8879121e932ac360f2314c58b7dffd2adf1794c976a4cfe6371222 @@ -52,5 +51,5 @@ AUX relocated.2.1.postfix 457 RMD160 eb16b0af4f8ba7e7edf7cf748fa0498e15533bbe SH AUX v310.pre.use-spam-2.1.template 2503 RMD160 4c7db951eefb456f00085c190b6e93737a708ae7 SHA1 b99db01963519929b477448b59249ddb2cd7e9a8 SHA256 4c5b8e60ef1795ad9259a9b957b0cbd79d802226da8a82f558853454d004b73a DIST kolabd-2.1-gentoo-20070510.tar.bz2 156622 RMD160 589b75593436a5057c17b286e68dd9a1453df572 SHA1 2544ce056a8c459963e9bf9828f9b4659ab905c3 SHA256 f320b597a379539ae734d6833bd957bd306cdbc784ca5de1009e68a921ec88ce EBUILD kolabd-2.1.ebuild 12255 RMD160 890729d29917b038a06be3665655bb766b84a1cc SHA1 d9492798344994bffb9f1ac6e8df1bd27c969cc2 SHA256 c622227f92bf2837f90bd73740ddc632c8b4c94bd60e5284b1592439fd7f6fd2 -MISC ChangeLog 1335 RMD160 62bb26b599000da5b09eb70b86e89446912ee1b1 SHA1 c8c5aea1e59b905ff68922952e9edabedb16eea9 SHA256 75c513b92981a38f984bdefa21005ebd1562ba5535c1f8ca668a7c03c3cb62eb +MISC ChangeLog 1479 RMD160 16d42d42b06976d656da051cb25dc23e3729bc1c SHA1 ac38bc09838f541470efd359354f8e19e29874ab SHA256 45231fea401b92a6a238ff3b594177abab3920885920470743ea8eda2fdbceb9 MISC metadata.xml 255 RMD160 00d1bf05efc8050697b679c64d4992fae7bf6145 SHA1 5988787daa740dee18325bf78b25c044877e25a2 SHA256 1d7904c945fbe3d9946d23bcd9f1b00ac8c94700c9121955d71a0301016cb968 diff --git a/net-mail/kolabd/files/70_mod_php5.conf.2.1.template b/net-mail/kolabd/files/70_mod_php5.conf.2.1.template deleted file mode 100644 index c6e562f..0000000 --- a/net-mail/kolabd/files/70_mod_php5.conf.2.1.template +++ /dev/null @@ -1,31 +0,0 @@ -KOLAB_META_START -TARGET=/etc/apache2/modules.d/70_mod_php5.conf -PERMISSIONS=0640 -OWNERSHIP=root:root -KOLAB_META_END -<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-php .php - AddType application/x-httpd-php .phtml - AddType application/x-httpd-php .php3 - AddType application/x-httpd-php .php4 - AddType application/x-httpd-php .php5 - AddType application/x-httpd-php-source .phps - </IfModule> - AddDirectoryIndex index.php index.phtml -</IfDefine> - - -# handler for PHP 5 scripts -<IfDefine PHP5CGI> - ScriptAlias /php5-cgi /usr/lib/php5/bin/php-cgi - Action php5-cgi /php5-cgi - AddHandler php5-cgi .php5 .php - AddDirectoryIndex index.php index.phtml -</IfDefine> |