diff -r 1ff6f25dc4d9 -r 731574048d85 davical/davical.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/davical/davical.patch Mon Nov 22 12:39:58 2010 +0100 @@ -0,0 +1,121 @@ +Index: davical-0.9.9.3/dba/appuser_permissions.txt +--- davical-0.9.9.3/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 ++++ davical-0.9.9.3/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 +@@ -17,49 +17,53 @@ + # + + GRANT SELECT,INSERT,UPDATE,DELETE +- ON collection +- ON caldav_data +- ON calendar_item +- ON relationship +- ON locks +- ON property +- ON freebusy_ticket +- ON usr +- ON usr_setting +- ON roles +- ON role_member +- ON session +- ON tmp_password +- ON group_member +- ON principal +- ON relationship_type +- ON sync_tokens +- ON sync_changes +- ON grants +- ON dav_principal +- ON access_ticket +- ON dav_binding +- ON calendar_alarm +- ON calendar_attendee +- ON addressbook_resource +- ON addressbook_address_adr +- ON addressbook_address_tel +- ON addressbook_address_email ++ ON collection, ++ caldav_data, ++ calendar_item, ++ relationship, ++ locks, ++ property, ++ freebusy_ticket, ++ usr, ++ usr_setting, ++ roles, ++ role_member, ++ session, ++ tmp_password, ++ group_member, ++ principal, ++ relationship_type, ++ sync_tokens, ++ sync_changes, ++ grants, ++ dav_principal, ++ access_ticket, ++ dav_binding, ++ calendar_alarm, ++ calendar_attendee, ++ addressbook_resource, ++ addressbook_address_adr, ++ addressbook_address_tel, ++ addressbook_address_email ++ TO davical; + + GRANT SELECT,UPDATE +- ON relationship_type_rt_id_seq +- ON dav_id_seq +- ON usr_user_no_seq +- ON roles_role_no_seq +- ON session_session_id_seq +- ON principal_type_principal_type_id_seq +- ON sync_tokens_sync_token_seq ++ ON relationship_type_rt_id_seq, ++ dav_id_seq, ++ usr_user_no_seq, ++ roles_role_no_seq, ++ session_session_id_seq, ++ principal_type_principal_type_id_seq, ++ sync_tokens_sync_token_seq ++ TO davical; + + GRANT SELECT,INSERT + ON time_zone ++ TO davical; + + GRANT SELECT +- ON supported_locales +- ON awl_db_revision +- ON principal_type ++ ON supported_locales, ++ awl_db_revision, ++ principal_type ++ TO davical; + +Index: davical-0.9.9.3/inc/always.php.in +--- davical-0.9.9.3/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 ++++ davical-0.9.9.3/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 +@@ -117,20 +117,8 @@ + * too early. + */ + ob_start( ); +-if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { +- include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); +-} +-else if ( @file_exists('/etc/davical/config.php') ) { +- include('/etc/davical/config.php'); +-} +-else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { +- include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); +-} +-else if ( @file_exists('/usr/local/etc/davical/config.php') ) { +- include('/usr/local/etc/davical/config.php'); +-} +-else if ( @file_exists('../config/config.php') ) { +- include('../config/config.php'); ++if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { ++ include_once("@l_prefix@/etc/davical/davical-config.php"); + } + else if ( @file_exists('config/config.php') ) { + include('config/config.php');