davical/davical.patch@52571005077f (annotated)
davical/davical.patch
Mon, 22 Nov 2010 12:41:49 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 22 Nov 2010 12:41:49 +0100
- changeset 291
- 52571005077f
- child 294
- 88d9122d2641
- permissions
- -rw-r--r--
Backport RPM boilerplate logic required by legacy OpenPKG scripts.
| michael@290 | 1 | Index: davical-0.9.9.3/dba/appuser_permissions.txt |
| michael@290 | 2 | --- davical-0.9.9.3/dba/appuser_permissions.txt.orig 2010-04-19 02:32:58.000000000 +0200 |
| michael@290 | 3 | +++ davical-0.9.9.3/dba/appuser_permissions.txt 2010-09-21 17:32:46.000000000 +0200 |
| michael@290 | 4 | @@ -17,49 +17,53 @@ |
| michael@290 | 5 | # |
| michael@290 | 6 | |
| michael@290 | 7 | GRANT SELECT,INSERT,UPDATE,DELETE |
| michael@290 | 8 | - ON collection |
| michael@290 | 9 | - ON caldav_data |
| michael@290 | 10 | - ON calendar_item |
| michael@290 | 11 | - ON relationship |
| michael@290 | 12 | - ON locks |
| michael@290 | 13 | - ON property |
| michael@290 | 14 | - ON freebusy_ticket |
| michael@290 | 15 | - ON usr |
| michael@290 | 16 | - ON usr_setting |
| michael@290 | 17 | - ON roles |
| michael@290 | 18 | - ON role_member |
| michael@290 | 19 | - ON session |
| michael@290 | 20 | - ON tmp_password |
| michael@290 | 21 | - ON group_member |
| michael@290 | 22 | - ON principal |
| michael@290 | 23 | - ON relationship_type |
| michael@290 | 24 | - ON sync_tokens |
| michael@290 | 25 | - ON sync_changes |
| michael@290 | 26 | - ON grants |
| michael@290 | 27 | - ON dav_principal |
| michael@290 | 28 | - ON access_ticket |
| michael@290 | 29 | - ON dav_binding |
| michael@290 | 30 | - ON calendar_alarm |
| michael@290 | 31 | - ON calendar_attendee |
| michael@290 | 32 | - ON addressbook_resource |
| michael@290 | 33 | - ON addressbook_address_adr |
| michael@290 | 34 | - ON addressbook_address_tel |
| michael@290 | 35 | - ON addressbook_address_email |
| michael@290 | 36 | + ON collection, |
| michael@290 | 37 | + caldav_data, |
| michael@290 | 38 | + calendar_item, |
| michael@290 | 39 | + relationship, |
| michael@290 | 40 | + locks, |
| michael@290 | 41 | + property, |
| michael@290 | 42 | + freebusy_ticket, |
| michael@290 | 43 | + usr, |
| michael@290 | 44 | + usr_setting, |
| michael@290 | 45 | + roles, |
| michael@290 | 46 | + role_member, |
| michael@290 | 47 | + session, |
| michael@290 | 48 | + tmp_password, |
| michael@290 | 49 | + group_member, |
| michael@290 | 50 | + principal, |
| michael@290 | 51 | + relationship_type, |
| michael@290 | 52 | + sync_tokens, |
| michael@290 | 53 | + sync_changes, |
| michael@290 | 54 | + grants, |
| michael@290 | 55 | + dav_principal, |
| michael@290 | 56 | + access_ticket, |
| michael@290 | 57 | + dav_binding, |
| michael@290 | 58 | + calendar_alarm, |
| michael@290 | 59 | + calendar_attendee, |
| michael@290 | 60 | + addressbook_resource, |
| michael@290 | 61 | + addressbook_address_adr, |
| michael@290 | 62 | + addressbook_address_tel, |
| michael@290 | 63 | + addressbook_address_email |
| michael@290 | 64 | + TO davical; |
| michael@290 | 65 | |
| michael@290 | 66 | GRANT SELECT,UPDATE |
| michael@290 | 67 | - ON relationship_type_rt_id_seq |
| michael@290 | 68 | - ON dav_id_seq |
| michael@290 | 69 | - ON usr_user_no_seq |
| michael@290 | 70 | - ON roles_role_no_seq |
| michael@290 | 71 | - ON session_session_id_seq |
| michael@290 | 72 | - ON principal_type_principal_type_id_seq |
| michael@290 | 73 | - ON sync_tokens_sync_token_seq |
| michael@290 | 74 | + ON relationship_type_rt_id_seq, |
| michael@290 | 75 | + dav_id_seq, |
| michael@290 | 76 | + usr_user_no_seq, |
| michael@290 | 77 | + roles_role_no_seq, |
| michael@290 | 78 | + session_session_id_seq, |
| michael@290 | 79 | + principal_type_principal_type_id_seq, |
| michael@290 | 80 | + sync_tokens_sync_token_seq |
| michael@290 | 81 | + TO davical; |
| michael@290 | 82 | |
| michael@290 | 83 | GRANT SELECT,INSERT |
| michael@290 | 84 | ON time_zone |
| michael@290 | 85 | + TO davical; |
| michael@290 | 86 | |
| michael@290 | 87 | GRANT SELECT |
| michael@290 | 88 | - ON supported_locales |
| michael@290 | 89 | - ON awl_db_revision |
| michael@290 | 90 | - ON principal_type |
| michael@290 | 91 | + ON supported_locales, |
| michael@290 | 92 | + awl_db_revision, |
| michael@290 | 93 | + principal_type |
| michael@290 | 94 | + TO davical; |
| michael@290 | 95 | |
| michael@290 | 96 | Index: davical-0.9.9.3/inc/always.php.in |
| michael@290 | 97 | --- davical-0.9.9.3/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 |
| michael@290 | 98 | +++ davical-0.9.9.3/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 |
| michael@290 | 99 | @@ -117,20 +117,8 @@ |
| michael@290 | 100 | * too early. |
| michael@290 | 101 | */ |
| michael@290 | 102 | ob_start( ); |
| michael@290 | 103 | -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| michael@290 | 104 | - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| michael@290 | 105 | -} |
| michael@290 | 106 | -else if ( @file_exists('/etc/davical/config.php') ) { |
| michael@290 | 107 | - include('/etc/davical/config.php'); |
| michael@290 | 108 | -} |
| michael@290 | 109 | -else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| michael@290 | 110 | - include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| michael@290 | 111 | -} |
| michael@290 | 112 | -else if ( @file_exists('/usr/local/etc/davical/config.php') ) { |
| michael@290 | 113 | - include('/usr/local/etc/davical/config.php'); |
| michael@290 | 114 | -} |
| michael@290 | 115 | -else if ( @file_exists('../config/config.php') ) { |
| michael@290 | 116 | - include('../config/config.php'); |
| michael@290 | 117 | +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { |
| michael@290 | 118 | + include_once("@l_prefix@/etc/davical/davical-config.php"); |
| michael@290 | 119 | } |
| michael@290 | 120 | else if ( @file_exists('config/config.php') ) { |
| michael@290 | 121 | include('config/config.php'); |
