1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/davical/davical.patch Mon Nov 22 12:39:58 2010 +0100 1.3 @@ -0,0 +1,121 @@ 1.4 +Index: davical-0.9.9.3/dba/appuser_permissions.txt 1.5 +--- davical-0.9.9.3/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 1.6 ++++ davical-0.9.9.3/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 1.7 +@@ -17,49 +17,53 @@ 1.8 + # 1.9 + 1.10 + GRANT SELECT,INSERT,UPDATE,DELETE 1.11 +- ON collection 1.12 +- ON caldav_data 1.13 +- ON calendar_item 1.14 +- ON relationship 1.15 +- ON locks 1.16 +- ON property 1.17 +- ON freebusy_ticket 1.18 +- ON usr 1.19 +- ON usr_setting 1.20 +- ON roles 1.21 +- ON role_member 1.22 +- ON session 1.23 +- ON tmp_password 1.24 +- ON group_member 1.25 +- ON principal 1.26 +- ON relationship_type 1.27 +- ON sync_tokens 1.28 +- ON sync_changes 1.29 +- ON grants 1.30 +- ON dav_principal 1.31 +- ON access_ticket 1.32 +- ON dav_binding 1.33 +- ON calendar_alarm 1.34 +- ON calendar_attendee 1.35 +- ON addressbook_resource 1.36 +- ON addressbook_address_adr 1.37 +- ON addressbook_address_tel 1.38 +- ON addressbook_address_email 1.39 ++ ON collection, 1.40 ++ caldav_data, 1.41 ++ calendar_item, 1.42 ++ relationship, 1.43 ++ locks, 1.44 ++ property, 1.45 ++ freebusy_ticket, 1.46 ++ usr, 1.47 ++ usr_setting, 1.48 ++ roles, 1.49 ++ role_member, 1.50 ++ session, 1.51 ++ tmp_password, 1.52 ++ group_member, 1.53 ++ principal, 1.54 ++ relationship_type, 1.55 ++ sync_tokens, 1.56 ++ sync_changes, 1.57 ++ grants, 1.58 ++ dav_principal, 1.59 ++ access_ticket, 1.60 ++ dav_binding, 1.61 ++ calendar_alarm, 1.62 ++ calendar_attendee, 1.63 ++ addressbook_resource, 1.64 ++ addressbook_address_adr, 1.65 ++ addressbook_address_tel, 1.66 ++ addressbook_address_email 1.67 ++ TO davical; 1.68 + 1.69 + GRANT SELECT,UPDATE 1.70 +- ON relationship_type_rt_id_seq 1.71 +- ON dav_id_seq 1.72 +- ON usr_user_no_seq 1.73 +- ON roles_role_no_seq 1.74 +- ON session_session_id_seq 1.75 +- ON principal_type_principal_type_id_seq 1.76 +- ON sync_tokens_sync_token_seq 1.77 ++ ON relationship_type_rt_id_seq, 1.78 ++ dav_id_seq, 1.79 ++ usr_user_no_seq, 1.80 ++ roles_role_no_seq, 1.81 ++ session_session_id_seq, 1.82 ++ principal_type_principal_type_id_seq, 1.83 ++ sync_tokens_sync_token_seq 1.84 ++ TO davical; 1.85 + 1.86 + GRANT SELECT,INSERT 1.87 + ON time_zone 1.88 ++ TO davical; 1.89 + 1.90 + GRANT SELECT 1.91 +- ON supported_locales 1.92 +- ON awl_db_revision 1.93 +- ON principal_type 1.94 ++ ON supported_locales, 1.95 ++ awl_db_revision, 1.96 ++ principal_type 1.97 ++ TO davical; 1.98 + 1.99 +Index: davical-0.9.9.3/inc/always.php.in 1.100 +--- davical-0.9.9.3/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 1.101 ++++ davical-0.9.9.3/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 1.102 +@@ -117,20 +117,8 @@ 1.103 + * too early. 1.104 + */ 1.105 + ob_start( ); 1.106 +-if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { 1.107 +- include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); 1.108 +-} 1.109 +-else if ( @file_exists('/etc/davical/config.php') ) { 1.110 +- include('/etc/davical/config.php'); 1.111 +-} 1.112 +-else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { 1.113 +- include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); 1.114 +-} 1.115 +-else if ( @file_exists('/usr/local/etc/davical/config.php') ) { 1.116 +- include('/usr/local/etc/davical/config.php'); 1.117 +-} 1.118 +-else if ( @file_exists('../config/config.php') ) { 1.119 +- include('../config/config.php'); 1.120 ++if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { 1.121 ++ include_once("@l_prefix@/etc/davical/davical-config.php"); 1.122 + } 1.123 + else if ( @file_exists('config/config.php') ) { 1.124 + include('config/config.php');