gunnar: server/patches/horde HK-JS-kronolith_2.2_RC1-Fix_library_import.patch, NONE, 1.1 HK-JS-nag_2.2_RC1-Fix_library_import.patch, NONE, 1.1 README_Fix_library_import.patch, NONE, 1.1 README_Fix_Prefs_for_Ingo.patch, 1.1, 1.2 README_Fix_editing_contacts.patch, 1.1, 1.2 README_Fix_share_id_change.patch, 1.1, 1.2 README_Ldap_read_only_fix.patch, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Thu Nov 29 10:55:40 CET 2007


Author: gunnar

Update of /kolabrepository/server/patches/horde
In directory doto:/tmp/cvs-serv11022/patches/horde

Modified Files:
	README_Fix_Prefs_for_Ingo.patch 
	README_Fix_editing_contacts.patch 
	README_Fix_share_id_change.patch 
	README_Ldap_read_only_fix.patch 
Added Files:
	HK-JS-kronolith_2.2_RC1-Fix_library_import.patch 
	HK-JS-nag_2.2_RC1-Fix_library_import.patch 
	README_Fix_library_import.patch 
Log Message:
Import a past-RC1 patch from upstream. Otherwise we can't edit our calendars and tasklists.

--- NEW FILE: HK-JS-kronolith_2.2_RC1-Fix_library_import.patch ---
Fixes a problem with importing the WebDAV library.

diff -r 56b552eb6b01 kronolith/calendars.php
--- a/kronolith/calendars.php	Wed Nov 28 17:00:34 2007 +0100
+++ b/kronolith/calendars.php	Thu Nov 29 09:54:49 2007 +0100
@@ -13,7 +13,9 @@
 @define('KRONOLITH_BASE', dirname(__FILE__));
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/RPC.php';
-require_once 'Horde/RPC/webdav.php';
+if (@include_once 'HTTP/WebDAV/Server.php') {
+    require_once 'Horde/RPC/webdav.php';
+}
 
 // Exit if this isn't an authenticated user.
 if (!Auth::getAuth()) {

--- NEW FILE: HK-JS-nag_2.2_RC1-Fix_library_import.patch ---
Fixes a problem with importing the WebDAV library.

diff -r 39ccfa2e6380 nag/tasklists.php
--- a/nag/tasklists.php	Thu Nov 29 09:54:49 2007 +0100
+++ b/nag/tasklists.php	Thu Nov 29 09:56:00 2007 +0100
@@ -14,7 +14,9 @@
 @define('NAG_BASE', dirname(__FILE__));
 require_once NAG_BASE . '/lib/base.php';
 require_once 'Horde/RPC.php';
-require_once 'Horde/RPC/webdav.php';
+if (@include_once 'HTTP/WebDAV/Server.php') {
+    require_once 'Horde/RPC/webdav.php';
+}
 
 /* Exit if this isn't an authenticated user. */
 if (!Auth::getAuth()) {

--- NEW FILE: README_Fix_library_import.patch ---
DESCRIPTION:

A commit shortly before the release of RC1 did break the share editing 
in kronolith and nag in case no Webdav PEAR package is available.

IMPACT:

You won't be able to edit calendars or tasklists.

REFERENCES:

Mercurial patch repository:

http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RC1/summary

HISTORY

Fix generated from an upstream commit after RC1.

Index: README_Fix_Prefs_for_Ingo.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/README_Fix_Prefs_for_Ingo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README_Fix_Prefs_for_Ingo.patch	1 Oct 2007 15:47:58 -0000	1.1
+++ README_Fix_Prefs_for_Ingo.patch	29 Nov 2007 09:55:38 -0000	1.2
@@ -34,9 +34,9 @@
 
 Mercurial patch repository:
 
-http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_ALPHA/summary
+http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RC1/summary
 
 HISTORY
 
 Submitted upstream and upstream rejected, explaining the problem with
-this patch.
\ No newline at end of file
+this patch.

Index: README_Fix_editing_contacts.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/README_Fix_editing_contacts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README_Fix_editing_contacts.patch	2 Oct 2007 14:21:34 -0000	1.1
+++ README_Fix_editing_contacts.patch	29 Nov 2007 09:55:38 -0000	1.2
@@ -10,8 +10,8 @@
 
 Mercurial patch repository:
 
-http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_ALPHA/summary
+http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RC1/summary
 
 HISTORY
 
-Horde issue # 5763
\ No newline at end of file
+Horde issue # 5763

Index: README_Fix_share_id_change.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/README_Fix_share_id_change.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README_Fix_share_id_change.patch	2 Oct 2007 14:21:34 -0000	1.1
+++ README_Fix_share_id_change.patch	29 Nov 2007 09:55:38 -0000	1.2
@@ -11,8 +11,8 @@
 
 Mercurial patch repository:
 
-http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_ALPHA/summary
+http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RC1/summary
 
 HISTORY
 
-Horde issue # 5762
\ No newline at end of file
+Horde issue # 5762

Index: README_Ldap_read_only_fix.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde/README_Ldap_read_only_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README_Ldap_read_only_fix.patch	2 Oct 2007 14:21:34 -0000	1.1
+++ README_Ldap_read_only_fix.patch	29 Nov 2007 09:55:38 -0000	1.2
@@ -11,9 +11,9 @@
 
 Mercurial patch repository:
 
-http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_ALPHA/summary
+http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RC1/summary
 
 HISTORY
 
 Is a bad patch since we currently don't have the permission
-system file based.
\ No newline at end of file
+system file based.





More information about the commits mailing list