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: 08-Oct-2009 22:34:42
Branch: HEAD Handle: 2009100821344100
Modified files:
openpkg-src/davical davical.patch davical.spec
Log:
upgrading package: davical 0.9.7.2 -> 0.9.7.4
Summary:
Revision Changes Path
1.4 +9 -11 openpkg-src/davical/davical.patch
1.9 +3 -3 openpkg-src/davical/davical.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 davical.patch
--- openpkg-src/davical/davical.patch 15 Sep 2009 17:29:10 -0000 1.3
+++ openpkg-src/davical/davical.patch 8 Oct 2009 20:34:41 -0000 1.4
@@ -1,6 +1,6 @@
-Index: davical-0.9.7.2/dba/appuser_permissions.txt
---- davical-0.9.7.2/dba/appuser_permissions.txt.orig 2009-06-22 11:09:57
+0200
-+++ davical-0.9.7.2/dba/appuser_permissions.txt 2009-07-11 23:09:37
+0200
+Index: davical-0.9.7.4/dba/appuser_permissions.txt
+--- davical-0.9.7.4/dba/appuser_permissions.txt.orig 2009-09-13 05:16:08
+0200
++++ davical-0.9.7.4/dba/appuser_permissions.txt 2009-10-08 22:27:36
+0200
@@ -1,57 +1,44 @@
-#
-# This file is used by update-rscds-database to set the correct
@@ -93,26 +93,24 @@
+ principal_type
+ TO davical;
-Index: davical-0.9.7.2/inc/always.php
---- davical-0.9.7.2/inc/always.php.orig 2009-06-22 11:09:57 +0200
-+++ davical-0.9.7.2/inc/always.php 2009-07-11 23:08:50 +0200
-@@ -67,17 +67,8 @@
+Index: davical-0.9.7.4/inc/always.php
+--- davical-0.9.7.4/inc/always.php.orig 2009-10-08 02:10:04 +0200
++++ davical-0.9.7.4/inc/always.php 2009-10-08 22:31:37 +0200
+@@ -79,15 +79,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");
-}
--else if ( @file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") )
{
-- include_once("/etc/rscds/".$_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");
+-}
+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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/davical/davical.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 davical.spec
--- openpkg-src/davical/davical.spec 15 Sep 2009 17:29:10 -0000 1.8
+++ openpkg-src/davical/davical.spec 8 Oct 2009 20:34:41 -0000 1.9
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 0.9.7.2
-%define V_davical 0.9.7.2
+%define V_opkg 0.9.7.4
+%define V_davical 0.9.7.4
%define V_awl 0.37
# package information
@@ -37,7 +37,7 @@
Group: Network
License: GPL
Version: %{V_opkg}
-Release: 20090915
+Release: 20091008
# package options
%define with_ssl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
