OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 11-Jul-2009 23:12:19
Branch: HEAD Handle: 2009071122121900
Modified files:
openpkg-src/davical davical-setup.sh davical.patch davical.spec
Log:
fix database schema creation
Summary:
Revision Changes Path
1.2 +8 -0 openpkg-src/davical/davical-setup.sh
1.2 +96 -1 openpkg-src/davical/davical.patch
1.5 +1 -0 openpkg-src/davical/davical.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical-setup.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 davical-setup.sh
--- openpkg-src/davical/davical-setup.sh 11 Jul 2009 18:28:41 -0000
1.1
+++ openpkg-src/davical/davical-setup.sh 11 Jul 2009 21:12:19 -0000
1.2
@@ -44,6 +44,14 @@
-f "@l_prefix@/lib/davical/davical/dba/davical.sql" 2>&1 | grep
-v NOTICE
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
-f "@l_prefix@/lib/davical/davical/dba/base-data.sql" 2>&1 |
grep -v NOTICE
+ PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
+ -f "@l_prefix@/lib/davical/davical/dba/supported_locales.sql"
2>&1 | grep -v NOTICE
+ PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
+ -f "@l_prefix@/lib/davical/davical/dba/caldav_functions.sql"
2>&1 | egrep -v '(NOTICE|ERROR)'
+ PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" -A -t \
+ -f "@l_prefix@/lib/davical/davical/dba/rrule_functions.sql" 2>&1
| egrep -v '(NOTICE|ERROR)'
+ PGPASSWORD="$db_spass" @l_prefix@/bin/psql -q -U "$db_suser" -d
"$db_name" -A -t \
+ -f "@l_prefix@/lib/davical/davical/dba/appuser_permissions.txt"
2>&1 | grep -v NOTICE
PGPASSWORD="$db_pass" @l_prefix@/bin/psql -q -U "$db_user" -d
"$db_name" \
-c "UPDATE usr SET password = '**davical' WHERE user_no = 1;"
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 davical.patch
--- openpkg-src/davical/davical.patch 11 Jul 2009 18:28:41 -0000 1.1
+++ openpkg-src/davical/davical.patch 11 Jul 2009 21:12:19 -0000 1.2
@@ -1,6 +1,101 @@
+Index: davical-0.9.7-0/dba/appuser_permissions.txt
+--- davical-0.9.7-0/dba/appuser_permissions.txt.orig 2009-06-22 11:09:57
+0200
++++ davical-0.9.7-0/dba/appuser_permissions.txt 2009-07-11 23:09:37
+0200
+@@ -1,57 +1,44 @@
+-#
+-# This file is used by update-rscds-database to set the correct
+-# permissions for the application user. In newer installations
+-# the application user will probably be called app_davical (and
+-# the administrative user will be called dba_davical) but in
+-# older installations the application user was called 'general'
+-# and the administrative user was probably 'postgres'.
+-#
+-# See the wiki topic 'Database/Users' for more discussion.
+-#
+-# This file includes lines like:
+-# GRANT SELECT,...
+-# which define what gets granted to the following lines like:
+-# ON table1, table2, sequence1, function 3, view4, ...
+-# no user-serviceable parts inside, all whitespace is ignored,
+-# your mileage should not vary :-)
+-#
+
+ 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 dav_resource
+- ON group_member
+- ON principal
+- ON privilege
+- ON relationship_type
++ ON collection,
++ caldav_data,
++ calendar_item,
++ relationship,
++ locks,
++ property,
++ freebusy_ticket,
++ usr,
++ usr_setting,
++ roles,
++ role_member,
++ session,
++ tmp_password,
++ dav_resource,
++ group_member,
++ principal,
++ privilege,
++ relationship_type
++ 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 dav_resource_type_resource_type_id_seq
+- ON principal_principal_id_seq
+- ON principal_type_principal_type_id_seq
++ ON relationship_type_rt_id_seq,
++ dav_id_seq,
++ usr_user_no_seq,
++ roles_role_no_seq,
++ session_session_id_seq,
++ dav_resource_type_resource_type_id_seq,
++ principal_principal_id_seq,
++ principal_type_principal_type_id_seq
++ TO davical;
+
+ GRANT SELECT,INSERT
+ ON time_zone
++ TO davical;
+
+ GRANT SELECT
+- ON supported_locales
+- ON awl_db_revision
+- ON dav_resource_type
+- ON principal_type
++ ON supported_locales,
++ awl_db_revision,
++ dav_resource_type,
++ principal_type
++ TO davical;
+
Index: davical-0.9.7-0/inc/always.php
--- davical-0.9.7-0/inc/always.php.orig 2009-06-22 11:09:57 +0200
-+++ davical-0.9.7-0/inc/always.php 2009-07-11 17:46:28 +0200
++++ davical-0.9.7-0/inc/always.php 2009-07-11 23:08:50 +0200
@@ -67,17 +67,8 @@
* access which could break DAViCal completely by causing output to start
* too early.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 davical.spec
--- openpkg-src/davical/davical.spec 11 Jul 2009 20:45:30 -0000 1.4
+++ openpkg-src/davical/davical.spec 11 Jul 2009 21:12:19 -0000 1.5
@@ -100,6 +100,7 @@
$RPM_BUILD_ROOT%{l_prefix}/var/davical/log
# install program components
+ find . -name "*.orig" -print | xargs rm -f
cp -r \
awl-%{V_awl}/dba \
awl-%{V_awl}/inc \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
