davical/davical.patch@4ecfc2416fd8 (annotated)
davical/davical.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- parent 294
- 88d9122d2641
- child 361
- 45eaa38991fd
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
| 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@294 | 4 | @@ -1,65 +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@290 | 69 | + ON collection, |
| michael@290 | 70 | + caldav_data, |
| michael@290 | 71 | + calendar_item, |
| michael@290 | 72 | + relationship, |
| michael@290 | 73 | + locks, |
| michael@290 | 74 | + property, |
| michael@290 | 75 | + freebusy_ticket, |
| michael@290 | 76 | + usr, |
| michael@290 | 77 | + usr_setting, |
| michael@290 | 78 | + roles, |
| michael@290 | 79 | + role_member, |
| michael@290 | 80 | + session, |
| michael@290 | 81 | + tmp_password, |
| michael@290 | 82 | + group_member, |
| michael@290 | 83 | + principal, |
| michael@290 | 84 | + relationship_type, |
| michael@290 | 85 | + sync_tokens, |
| michael@290 | 86 | + sync_changes, |
| michael@290 | 87 | + grants, |
| michael@290 | 88 | + dav_principal, |
| michael@290 | 89 | + access_ticket, |
| michael@290 | 90 | + dav_binding, |
| michael@290 | 91 | + calendar_alarm, |
| michael@290 | 92 | + calendar_attendee, |
| michael@290 | 93 | + addressbook_resource, |
| michael@290 | 94 | + addressbook_address_adr, |
| michael@290 | 95 | + addressbook_address_tel, |
| michael@290 | 96 | + addressbook_address_email |
| michael@290 | 97 | + TO davical; |
| michael@290 | 98 | |
| michael@290 | 99 | GRANT SELECT,UPDATE |
| michael@290 | 100 | - ON relationship_type_rt_id_seq |
| michael@290 | 101 | - ON dav_id_seq |
| michael@290 | 102 | - ON usr_user_no_seq |
| michael@290 | 103 | - ON roles_role_no_seq |
| michael@290 | 104 | - ON session_session_id_seq |
| michael@290 | 105 | - ON principal_type_principal_type_id_seq |
| michael@290 | 106 | - ON sync_tokens_sync_token_seq |
| michael@290 | 107 | + ON relationship_type_rt_id_seq, |
| michael@290 | 108 | + dav_id_seq, |
| michael@290 | 109 | + usr_user_no_seq, |
| michael@290 | 110 | + roles_role_no_seq, |
| michael@290 | 111 | + session_session_id_seq, |
| michael@290 | 112 | + principal_type_principal_type_id_seq, |
| michael@290 | 113 | + sync_tokens_sync_token_seq |
| michael@290 | 114 | + TO davical; |
| michael@290 | 115 | |
| michael@290 | 116 | GRANT SELECT,INSERT |
| michael@290 | 117 | ON time_zone |
| michael@290 | 118 | + TO davical; |
| michael@290 | 119 | |
| michael@290 | 120 | GRANT SELECT |
| michael@290 | 121 | - ON supported_locales |
| michael@290 | 122 | - ON awl_db_revision |
| michael@290 | 123 | - ON principal_type |
| michael@290 | 124 | + ON supported_locales, |
| michael@290 | 125 | + awl_db_revision, |
| michael@290 | 126 | + principal_type |
| michael@290 | 127 | + TO davical; |
| michael@290 | 128 | |
| michael@290 | 129 | Index: davical-0.9.9.3/inc/always.php.in |
| michael@290 | 130 | --- davical-0.9.9.3/inc/always.php.in.orig 2010-09-21 03:40:44.000000000 +0200 |
| michael@290 | 131 | +++ davical-0.9.9.3/inc/always.php.in 2010-09-21 18:20:41.000000000 +0200 |
| michael@290 | 132 | @@ -117,20 +117,8 @@ |
| michael@290 | 133 | * too early. |
| michael@290 | 134 | */ |
| michael@290 | 135 | ob_start( ); |
| michael@290 | 136 | -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| michael@290 | 137 | - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| michael@290 | 138 | -} |
| michael@290 | 139 | -else if ( @file_exists('/etc/davical/config.php') ) { |
| michael@290 | 140 | - include('/etc/davical/config.php'); |
| michael@290 | 141 | -} |
| michael@290 | 142 | -else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { |
| michael@290 | 143 | - include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); |
| michael@290 | 144 | -} |
| michael@290 | 145 | -else if ( @file_exists('/usr/local/etc/davical/config.php') ) { |
| michael@290 | 146 | - include('/usr/local/etc/davical/config.php'); |
| michael@290 | 147 | -} |
| michael@290 | 148 | -else if ( @file_exists('../config/config.php') ) { |
| michael@290 | 149 | - include('../config/config.php'); |
| michael@290 | 150 | +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { |
| michael@290 | 151 | + include_once("@l_prefix@/etc/davical/davical-config.php"); |
| michael@290 | 152 | } |
| michael@290 | 153 | else if ( @file_exists('config/config.php') ) { |
| michael@290 | 154 | include('config/config.php'); |
| michael@296 | 155 | Index: davical-0.9.9.3/dba/views/dav_principal.sql |
| michael@296 | 156 | --- davical-0.9.9.3/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 |
| michael@296 | 157 | +++ davical-0.9.9.3/dba/views/dav_principal.sql 2010-11-22 14:33:59.832463699 +0100 |
| michael@296 | 158 | @@ -2,7 +2,7 @@ |
| michael@296 | 159 | -- record 1:1 with the principal table |
| michael@296 | 160 | |
| michael@296 | 161 | |
| michael@296 | 162 | -DROP VIEW dav_principal CASCADE; |
| michael@296 | 163 | +DROP VIEW IF EXISTS dav_principal CASCADE; |
| michael@296 | 164 | CREATE OR REPLACE VIEW dav_principal AS |
| michael@296 | 165 | SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, |
| michael@296 | 166 | username, password, fullname, email, |
