[pkg-kolab] Bug#414038: kolab-resource-handlers: Proposed patch

[Mathieu Parent]

Package: kolab-resource-handlers
Followup-For: Bug #414038

This should be OK (only changelog lacking).

-- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-4-686
Locale: LANG=fr_FR at euro, LC_CTYPE=fr_FR at euro (charmap=ISO-8859-15)
-------------- next part --------------
Index: control
===================================================================
--- control	(r?vision 580)
+++ control	(copie de travail)
@@ -9,7 +9,7 @@
 
 Package: kolab-resource-handlers
 Architecture: all
-Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php4, php4-ldap, php4-domxml, ssl-cert
+Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php4 | php4-cgi, php4-ldap, php4-domxml, ssl-cert
 Description: Kolab free/busy scripts
  This package contains scripts for the free/busy feature of the Kolab
  groupware server.
Index: postinst
===================================================================
--- postinst	(r?vision 580)
+++ postinst	(copie de travail)
@@ -19,7 +19,7 @@
 }
 
 configure_apache() {
-	for mod in rewrite ssl php4 ldap; do
+	for mod in rewrite ssl ldap; do
 		a2enmod $mod >/dev/null
 	done
 
Index: apache.conf
===================================================================
--- apache.conf	(r?vision 580)
+++ apache.conf	(copie de travail)
@@ -15,6 +15,22 @@
 
 	# Options for freebusy
 	<Directory /usr/share/kolab-resource-handlers/freebusy>
+		<IfModule !mod_php4.c>
+		<IfModule !mod_fastcgi.c>
+		<IfModule !mod_fcgid.c>
+		<IfModule mod_actions.c>
+		<IfModule mod_cgi.c>
+			AddType application/x-httpd-php .php
+			Action application/x-httpd-php /cgi-bin/php
+		</IfModule>
+		<IfModule mod_cgid.c>
+			AddType application/x-httpd-php .php
+			Action application/x-httpd-php /cgi-bin/php
+		</IfModule>
+		</IfModule>
+		</IfModule>
+		</IfModule>
+		</IfModule>
 		Options Indexes FollowSymLinks 
 		Order allow,deny
 		Allow from all