davical/davical.patch@3b08e6396b45 (annotated)
davical/davical.patch
Tue, 28 Aug 2012 18:28:45 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:28:45 +0200
- changeset 528
- 3b08e6396b45
- parent 361
- 45eaa38991fd
- child 585
- 2dd48c9debd6
- permissions
- -rw-r--r--
Massively update from 5.1 to 5.5 release, completely changing from
autotools to cmake build configuration along with the corresponding
corrections. Correct some less important problems like typical german
english mistakes, as well as use parallel make for faster builds with
SMP and multicore architectures. Warning, the 5.5 releases of MySQL
seem to be equally bug ridden as the 5.1 are, for example building
the NDBCluster storage engine fails.
| michael@396 | 1 | Index: davical-0.9.9.7/dba/appuser_permissions.txt |
| michael@396 | 2 | --- davical-0.9.9.7/dba/appuser_permissions.txt.orig 2011-10-06 11:14:54.000000000 +0200 |
| michael@396 | 3 | +++ davical-0.9.9.7/dba/appuser_permissions.txt 2011-10-25 09:45:26.000000000 +0200 |
| michael@396 | 4 | @@ -1,66 +1,69 @@ |
| michael@294 | 5 | -# |
| michael@294 | 6 | -# This file is used by update-rscds-database to set the correct |
| michael@294 | 7 | -# permissions for the application user. In newer installations |
| michael@294 | 8 | -# the application user will probably be called app_davical (and |
| michael@294 | 9 | -# the administrative user will be called dba_davical) but in |
| michael@294 | 10 | -# older installations the application user was called 'general' |
| michael@294 | 11 | -# and the administrative user was probably 'postgres'. |
| michael@294 | 12 | -# |
| michael@294 | 13 | -# See the wiki topic 'Database/Users' for more discussion. |
| michael@294 | 14 | -# |
| michael@294 | 15 | -# This file includes lines like: |
| michael@294 | 16 | -# GRANT SELECT,... |
| michael@294 | 17 | -# which define what gets granted to the following lines like: |
| michael@294 | 18 | -# ON table1, table2, sequence1, function 3, view4, ... |
| michael@294 | 19 | -# no user-serviceable parts inside, all whitespace is ignored, |
| michael@294 | 20 | -# your mileage should not vary :-) |
| michael@294 | 21 | -# |
| michael@294 | 22 | +-- |
| michael@294 | 23 | +-- This file is used by update-rscds-database to set the correct |
| michael@294 | 24 | +-- permissions for the application user. In newer installations |
| michael@294 | 25 | +-- the application user will probably be called app_davical (and |
| michael@294 | 26 | +-- the administrative user will be called dba_davical) but in |
| michael@294 | 27 | +-- older installations the application user was called 'general' |
| michael@294 | 28 | +-- and the administrative user was probably 'postgres'. |
| michael@294 | 29 | +-- |
| michael@294 | 30 | +-- See the wiki topic 'Database/Users' for more discussion. |
| michael@294 | 31 | +-- |
| michael@294 | 32 | +-- This file includes lines like: |
| michael@294 | 33 | +-- GRANT SELECT,... |
| michael@294 | 34 | +-- which define what gets granted to the following lines like: |
| michael@294 | 35 | +-- ON table1, table2, sequence1, function 3, view4, ... |
| michael@294 | 36 | +-- no user-serviceable parts inside, all whitespace is ignored, |
| michael@294 | 37 | +-- your mileage should not vary :-) |
| michael@294 | 38 | +-- |
| michael@290 | 39 | |
| michael@290 | 40 | GRANT SELECT,INSERT,UPDATE,DELETE |
| michael@290 | 41 | - ON collection |
| michael@290 | 42 | - ON caldav_data |
| michael@290 | 43 | - ON calendar_item |
| michael@290 | 44 | - ON relationship |
| michael@290 | 45 | - ON locks |
| michael@290 | 46 | - ON property |
| michael@290 | 47 | - ON freebusy_ticket |
| michael@290 | 48 | - ON usr |
| michael@290 | 49 | - ON usr_setting |
| michael@290 | 50 | - ON roles |
| michael@290 | 51 | - ON role_member |
| michael@290 | 52 | - ON session |
| michael@290 | 53 | - ON tmp_password |
| michael@290 | 54 | - ON group_member |
| michael@290 | 55 | - ON principal |
| michael@290 | 56 | - ON relationship_type |
| michael@290 | 57 | - ON sync_tokens |
| michael@290 | 58 | - ON sync_changes |
| michael@290 | 59 | - ON grants |
| michael@290 | 60 | - ON dav_principal |
| michael@290 | 61 | - ON access_ticket |
| michael@290 | 62 | - ON dav_binding |
| michael@290 | 63 | - ON calendar_alarm |
| michael@290 | 64 | - ON calendar_attendee |
| michael@290 | 65 | - ON addressbook_resource |
| michael@290 | 66 | - ON addressbook_address_adr |
| michael@290 | 67 | - ON addressbook_address_tel |
| michael@290 | 68 | - ON addressbook_address_email |
| michael@396 | 69 | - ON timezones |
| michael@396 | 70 | - ON tz_aliases |
| michael@396 | 71 | - ON tz_localnames |
| michael@290 | 72 | + ON collection, |
| michael@290 | 73 | + caldav_data, |
| michael@290 | 74 | + calendar_item, |
| michael@290 | 75 | + relationship, |
| michael@290 | 76 | + locks, |
| michael@290 | 77 | + property, |
| michael@290 | 78 | + freebusy_ticket, |
| michael@290 | 79 | + usr, |
| michael@290 | 80 | + usr_setting, |
| michael@290 | 81 | + roles, |
| michael@290 | 82 | + role_member, |
| michael@290 | 83 | + session, |
| michael@290 | 84 | + tmp_password, |
| michael@290 | 85 | + group_member, |
| michael@290 | 86 | + principal, |
| michael@290 | 87 | + relationship_type, |
| michael@290 | 88 | + sync_tokens, |
| michael@290 | 89 | + sync_changes, |
| michael@290 | 90 | + grants, |
| michael@290 | 91 | + dav_principal, |
| michael@290 | 92 | + access_ticket, |
| michael@290 | 93 | + dav_binding, |
| michael@290 | 94 | + calendar_alarm, |
| michael@290 | 95 | + calendar_attendee, |
| michael@290 | 96 | + addressbook_resource, |
| michael@290 | 97 | + addressbook_address_adr, |
| michael@290 | 98 | + addressbook_address_tel, |
| michael@396 | 99 | + addressbook_address_email, |
| michael@396 | 100 | + timezones, |
| michael@396 | 101 | + tz_aliases, |
| michael@396 | 102 | + tz_localnames |
| michael@290 | 103 | + TO davical; |
| michael@290 | 104 | |
| michael@290 | 105 | GRANT SELECT,UPDATE |
| michael@396 | 106 | ON relationship_type_rt_id_seq |
| michael@290 | 107 | - ON dav_id_seq |
| michael@290 | 108 | - ON usr_user_no_seq |
| michael@290 | 109 | - ON roles_role_no_seq |
| michael@290 | 110 | - ON session_session_id_seq |
| michael@290 | 111 | - ON principal_type_principal_type_id_seq |
| michael@290 | 112 | - ON sync_tokens_sync_token_seq |
| michael@396 | 113 | - ON timezones_our_tzno_seq |
| michael@290 | 114 | + dav_id_seq, |
| michael@290 | 115 | + usr_user_no_seq, |
| michael@290 | 116 | + roles_role_no_seq, |
| michael@290 | 117 | + session_session_id_seq, |
| michael@290 | 118 | + principal_type_principal_type_id_seq, |
| michael@396 | 119 | + sync_tokens_sync_token_seq, |
| michael@396 | 120 | + timezones_our_tzno_seq |
| michael@290 | 121 | + TO davical; |
| michael@290 | 122 | |
| michael@290 | 123 | GRANT SELECT |
| michael@290 | 124 | - ON supported_locales |
| michael@290 | 125 | - ON awl_db_revision |
| michael@290 | 126 | - ON principal_type |
| michael@290 | 127 | + ON supported_locales, |
| michael@290 | 128 | + awl_db_revision, |
| michael@290 | 129 | + principal_type |
| michael@290 | 130 | + TO davical; |
| michael@290 | 131 | |
| michael@396 | 132 | Index: davical-0.9.9.7/dba/views/dav_principal.sql |
| michael@396 | 133 | --- davical-0.9.9.7/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 |
| michael@396 | 134 | +++ davical-0.9.9.7/dba/views/dav_principal.sql 2011-10-25 09:38:48.000000000 +0200 |
| michael@396 | 135 | @@ -2,7 +2,6 @@ |
| michael@396 | 136 | -- record 1:1 with the principal table |
| michael@396 | 137 | |
| michael@396 | 138 | |
| michael@396 | 139 | -DROP VIEW dav_principal CASCADE; |
| michael@396 | 140 | CREATE OR REPLACE VIEW dav_principal AS |
| michael@396 | 141 | SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, |
| michael@396 | 142 | username, password, fullname, email, |
| michael@396 | 143 | Index: davical-0.9.9.7/inc/always.php.in |
| michael@396 | 144 | --- davical-0.9.9.7/inc/always.php.in.orig 2011-09-25 11:04:29.000000000 +0200 |
| michael@396 | 145 | +++ davical-0.9.9.7/inc/always.php.in 2011-10-25 09:38:48.000000000 +0200 |
| michael@396 | 146 | @@ -58,6 +58,7 @@ |
| michael@396 | 147 | $c->images = $c->base_url . '/images'; |
| michael@396 | 148 | |
| michael@396 | 149 | // Add a default for newly created users |
| michael@396 | 150 | +date_default_timezone_set("UTC"); |
| michael@396 | 151 | $c->template_usr = array( 'active' => true, |
| michael@396 | 152 | 'locale' => 'en_GB', |
| michael@396 | 153 | 'date_format_type' => 'E', |
| michael@396 | 154 | @@ -125,20 +126,8 @@ |
| michael@290 | 155 | * too early. |
| michael@290 | 156 | */ |
| michael@290 | 157 | ob_start( ); |
| michael@290 | 158 | -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| michael@290 | 159 | - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| michael@290 | 160 | -} |
| michael@290 | 161 | -else if ( @file_exists('/etc/davical/config.php') ) { |
| michael@290 | 162 | - include('/etc/davical/config.php'); |
| michael@290 | 163 | -} |
| michael@290 | 164 | -else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| michael@290 | 165 | - include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| michael@290 | 166 | -} |
| michael@290 | 167 | -else if ( @file_exists('/usr/local/etc/davical/config.php') ) { |
| michael@290 | 168 | - include('/usr/local/etc/davical/config.php'); |
| michael@290 | 169 | -} |
| michael@290 | 170 | -else if ( @file_exists('../config/config.php') ) { |
| michael@290 | 171 | - include('../config/config.php'); |
| michael@290 | 172 | +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { |
| michael@290 | 173 | + include_once("@l_prefix@/etc/davical/davical-config.php"); |
| michael@290 | 174 | } |
| michael@290 | 175 | else if ( @file_exists('config/config.php') ) { |
| michael@290 | 176 | include('config/config.php'); |
