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: 25-Dec-2009 10:29:17
Branch: HEAD Handle: 2009122509291600
Modified files:
openpkg-src/davical davical.patch davical.spec
Log:
upgrading package: davical 0.9.7.6 -> 0.9.8
Summary:
Revision Changes Path
1.7 +27 -28 openpkg-src/davical/davical.patch
1.12 +3 -3 openpkg-src/davical/davical.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 davical.patch
--- openpkg-src/davical/davical.patch 28 Oct 2009 09:27:50 -0000 1.6
+++ openpkg-src/davical/davical.patch 25 Dec 2009 09:29:16 -0000 1.7
@@ -1,6 +1,6 @@
-Index: davical-0.9.7.6/dba/appuser_permissions.txt
---- davical-0.9.7.6/dba/appuser_permissions.txt.orig 2009-09-13 05:16:08
+0200
-+++ davical-0.9.7.6/dba/appuser_permissions.txt 2009-10-08 22:27:36
+0200
+Index: davical-0.9.8/dba/appuser_permissions.txt
+--- davical-0.9.8/dba/appuser_permissions.txt.orig 2009-12-24 09:50:16
+0100
++++ davical-0.9.8/dba/appuser_permissions.txt 2009-12-25 10:24:46
+0100
@@ -1,57 +1,44 @@
-#
-# This file is used by update-rscds-database to set the correct
@@ -34,11 +34,13 @@
- ON role_member
- ON session
- ON tmp_password
-- ON dav_resource
- ON group_member
- ON principal
-- ON privilege
- ON relationship_type
+- ON sync_tokens
+- ON sync_changes
+- ON grants
+- ON dav_principal
+ ON collection,
+ caldav_data,
+ calendar_item,
@@ -52,11 +54,13 @@
+ role_member,
+ session,
+ tmp_password,
-+ dav_resource,
+ group_member,
+ principal,
-+ privilege,
-+ relationship_type
++ relationship_type,
++ sync_tokens,
++ sync_changes,
++ grants,
++ dav_principal
+ TO davical;
GRANT SELECT,UPDATE
@@ -65,17 +69,15 @@
- 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 sync_tokens_sync_token_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
++ principal_type_principal_type_id_seq,
++ sync_tokens_sync_token_seq
+ TO davical;
GRANT SELECT,INSERT
@@ -85,32 +87,29 @@
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.6/inc/always.php
---- davical-0.9.7.6/inc/always.php.orig 2009-10-08 02:10:04 +0200
-+++ davical-0.9.7.6/inc/always.php 2009-10-08 22:31:37 +0200
-@@ -79,15 +79,8 @@
+Index: davical-0.9.8/inc/always.php
+--- davical-0.9.8/inc/always.php.orig 2009-12-24 10:16:11 +0100
++++ davical-0.9.8/inc/always.php 2009-12-25 10:24:38 +0100
+@@ -88,14 +88,8 @@
* access which could break DAViCal completely by causing output to start
* too early.
*/
--if ( @file_exists("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php") ) {
-- include_once("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php");
+-if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
+- include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
-}
--else if ( @file_exists("/etc/davical/config.php") ) {
-- include_once("/etc/davical/config.php");
--}
--else if ( @file_exists("../config/config.php") ) {
-- include_once("../config/config.php");
+-else if ( @file_exists('/etc/davical/config.php') ) {
+- include('/etc/davical/config.php');
-}
+-else if ( @file_exists('../config/config.php') ) {
+- include('../config/config.php');
+if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) {
+ include_once("@l_prefix@/etc/davical/davical-config.php");
+ }
else {
- include_once("davical_configuration_missing.php");
- exit;
+ include('davical_configuration_missing.php');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 davical.spec
--- openpkg-src/davical/davical.spec 28 Oct 2009 09:27:50 -0000 1.11
+++ openpkg-src/davical/davical.spec 25 Dec 2009 09:29:16 -0000 1.12
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 0.9.7.6
-%define V_davical 0.9.7.6
+%define V_opkg 0.9.8
+%define V_davical 0.9.8
%define V_awl 0.37
# package information
@@ -37,7 +37,7 @@
Group: Network
License: GPL
Version: %{V_opkg}
-Release: 20091028
+Release: 20091225
# package options
%define with_ssl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
