gunnar: server/patches/horde-webmail/1.2.0/tg series, 1.6, 1.7 t_COPYRIGHT2.diff, 1.1, 1.2 t_COPYRIGHT3.diff, 1.1, 1.2 t_KOLAB.diff, 1.1, 1.2 t_Kolab__Storage_HK_GW_SuppressTriggering.diff, 1.1, 1.2 t_imp_H_GW_DefaultLoginView.diff, 1.1, 1.2 t_imp_H_GW_LoginRetries.diff, 1.1, 1.2 t_imp_H_JS_bug7739.diff, 1.1, 1.2 t_imp_H_MS_bug7438.diff, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Mon Mar 9 00:26:38 CET 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv23480/patches/horde-webmail/1.2.0/tg
Modified Files:
series t_COPYRIGHT2.diff t_COPYRIGHT3.diff t_KOLAB.diff
t_Kolab__Storage_HK_GW_SuppressTriggering.diff
t_imp_H_GW_DefaultLoginView.diff t_imp_H_GW_LoginRetries.diff
t_imp_H_JS_bug7739.diff t_imp_H_MS_bug7438.diff
Log Message:
Reorder patch series so that the combined path applies and remove some stray files. Release notes follow on wednesday.
Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/series,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- series 8 Mar 2009 21:04:44 -0000 1.6
+++ series 8 Mar 2009 23:26:35 -0000 1.7
@@ -6,10 +6,6 @@
t_framework_HK_GW_Prefs__KolabImapApplicationTag.diff -p1
t_framework_HK_GW_horde_conf__xmlUpdates.diff -p1
t_kronolith_HK_GW_AuthenticatedFreeBusy.diff -p1
-t_kronolith_HK_SB_SaveEventAttendees.diff -p1
-t_kronolith_HK_SB_ExtraParameters.diff -p1
-t_kronolith_HK_GW_FbviewRelevance.diff -p1
-t_kronolith_HK_GW_XfbAccess.diff -p1
t_nag_H_MR_Bug__7400.diff -p1
t_GLOBAL_HK_GW_Config.diff -p1
t_GLOBAL_HK_GW_ConfigOpenPKG.diff -p1
Index: t_COPYRIGHT2.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_COPYRIGHT2.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_COPYRIGHT2.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_COPYRIGHT2.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -9,44 +9,25 @@
---
horde-webmail/lib/Horde/Kolab/IMAP.php | 4 +-
- horde-webmail/lib/Horde/Kolab/IMAP.php.orig | 139 +++
horde-webmail/lib/Horde/Kolab/IMAP/cclient.php | 4 +-
- .../lib/Horde/Kolab/IMAP/cclient.php.orig | 778 +++++++++++++++
horde-webmail/lib/Horde/Kolab/IMAP/pear.php | 4 +-
- horde-webmail/lib/Horde/Kolab/IMAP/pear.php.orig | 520 ++++++++++
horde-webmail/lib/Horde/Kolab/IMAP/test.php | 4 +-
- horde-webmail/lib/Horde/Kolab/IMAP/test.php.orig | 728 ++++++++++++++
horde-webmail/lib/Horde/Kolab/Server.php | 4 +-
[...6837 lines suppressed...]
-+ register_shutdown_function(array(&$session, 'shutdown'));
-+
-+ return $session;
-+ }
-+
-+ /**
-+ * Stores the object in the session cache.
-+ *
-+ * @return NULL
-+ */
-+ function shutdown()
-+ {
-+ require_once 'Horde/SessionObjects.php';
-+ $session = &Horde_SessionObjects::singleton();
-+ $session->overwrite('kolab_session', $this, false);
-+ }
-+
-+}
--
tg: (7a64fc0..) t/COPYRIGHT2 (depends on: t/Kolab_Server/HK/GW/FixNotics)
Index: t_COPYRIGHT3.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_COPYRIGHT3.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_COPYRIGHT3.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_COPYRIGHT3.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -8,21 +8,14 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- horde-webmail/lib/Horde/Kolab/Deprecated.php | 4 +-
- horde-webmail/lib/Horde/Kolab/Deprecated.php.orig | 878 +++++++++++
- horde-webmail/lib/Horde/Kolab/Storage.php | 4 +-
- horde-webmail/lib/Horde/Kolab/Storage.php.orig | 146 ++
- horde-webmail/lib/Horde/Kolab/Storage/Cache.php | 4 +-
- .../lib/Horde/Kolab/Storage/Cache.php.orig | 286 ++++
- horde-webmail/lib/Horde/Kolab/Storage/Data.php | 4 +-
- .../lib/Horde/Kolab/Storage/Data.php.orig | 646 ++++++++
[...4613 lines suppressed...]
-+ }
-+
-+ /**
-+ * Finds out if the user has the specified rights to the given object.
-+ *
-+ * @param string $user The user to check for.
-+ * @param integer $perm The permission level that needs to be checked
-+ * for.
-+ * @param string $creator The creator of the shared object.
-+ *
-+ * @return boolean True if the user has the specified permissions.
-+ */
-+ function hasPermission($user, $perm, $creator = null)
-+ {
-+ return ($this->getPermissions($user, $creator) & $perm);
-+ }
-+}
--
-tg: (d7fd24c..) t/COPYRIGHT3 (depends on: t/Kolab_Storage/HK/GW/SuppressTriggering)
+tg: (b79b990..) t/COPYRIGHT3 (depends on: t/Kolab_Storage/HK/GW/SuppressTriggering)
Index: t_KOLAB.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_KOLAB.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_KOLAB.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_KOLAB.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -7,8 +7,8 @@
---
Makefile | 3 +++
- STATUS | 7 +++++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
+ STATUS | 11 ++++++++++-
+ 2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index d548ecd..51a8cec 100644
@@ -22,10 +22,16 @@
+missing:
+ for PATCH in `git branch | sed 's/^[* ] //'`;do A=`grep $$PATCH STATUS`;if [ "x$$A" == "x" ]; then echo "MISSING: $$PATCH";fi;done
diff --git a/STATUS b/STATUS
-index 2804dd2..f5e0ba0 100644
+index 2804dd2..2ea5ef6 100644
--- a/STATUS
+++ b/STATUS
-@@ -55,12 +55,19 @@ MERGED t/Kolab_Storage/HK/GW/MultipleListCaches
+@@ -1,5 +1,4 @@
+ SYSTEM master
+-SYSTEM t/KOLAB
+ MERGED t/nag/H/MR/Bug_7400
+ MERGED t/framework/HK/GW/Prefs_KolabImapApplicationTag
+ MERGED t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch
+@@ -55,12 +54,16 @@ MERGED t/Kolab_Storage/HK/GW/MultipleListCaches
MERGED t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes
MERGED t/framework/HK/GW/Kolab_Storage/ShareIdFix
MERGED t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering
@@ -36,14 +42,24 @@
+SUBMIT t/imp/H/GW/DefaultLoginView
PRIORITY t/dimp/HK/GW/ItipHandling
HACK t/Prefs/HK/GW/FixLDAPAuthForIngo
-+HACK t/dimp/H/GW/AclView
-+HACK t/dimp/H/GW/FoldersView
-+HACK t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView
CONFIG t/GLOBAL/HK/GW/Config
CONFIG t/GLOBAL/HK/GW/ConfigOpenPKG
+CONFIG t/imp/H/GW/LoginRetries
t/imp/HideGroupwareFolders
t/kronolith/HK/GW/AuthenticatedFreeBusy
t/kronolith/HK/GW/FbviewRelevance
+@@ -72,6 +75,12 @@ CONFIG t/GLOBAL/HK/GW/ConfigOpenPKG
+ t/turba/HK/GW/FixAddressbookDeletion
+ t/turba/HK/GW/FixSyncMLAttributeDeletion
+ t/turba/HK/GW/SyncMLrefresh
++SYSTEM t/KOLAB
++
++
++HACK t/dimp/H/GW/AclView
++HACK t/dimp/H/GW/FoldersView
++HACK t/kronolith/H/GW/UseDayHourStartEndAlsoInFBView
+
+
+ Available categories
--
-tg: (7540b6d..) t/KOLAB (depends on: t/Prefs/HK/GW/FixLDAPAuthForIngo t/Text/Filter/SC/CH/Xss t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling t/framework/HK/GW/Prefs_KolabImapApplicationTag t/framework/HK/GW/horde/conf_xmlUpdates t/kronolith/HK/GW/AuthenticatedFreeBusy t/kronolith/HK/GW/XfbAccess t/nag/H/MR/Bug_7400 t/GLOBAL/HK/GW/ConfigOpenPKG t/kronolith/HK/GW/SyncMLrefresh t/turba/HK/GW/FixAddressbookDeletion t/turba/HK/GW/SyncMLrefresh t/imp/HideGroupwareFolders t/imp/SC/CH/SecIssues20090128 t/horde/SC/CH/SecIssues20090128 t/dimp/H/MS/FixBrokenFolderImages t/dimp/HK/GW/ItipHandling t/imp/H/GW/LoginRetries)
+tg: (82ed6bb..) t/KOLAB (depends on: t/Prefs/HK/GW/FixLDAPAuthForIngo t/Text/Filter/SC/CH/Xss t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling t/framework/HK/GW/Prefs_KolabImapApplicationTag t/framework/HK/GW/horde/conf_xmlUpdates t/kronolith/HK/GW/AuthenticatedFreeBusy t/nag/H/MR/Bug_7400 t/GLOBAL/HK/GW/ConfigOpenPKG t/kronolith/HK/GW/SyncMLrefresh t/turba/HK/GW/FixAddressbookDeletion t/turba/HK/GW/SyncMLrefresh t/imp/HideGroupwareFolders t/imp/SC/CH/SecIssues20090128 t/horde/SC/CH/SecIssues20090128 t/dimp/H/MS/FixBrokenFolderImages t/dimp/HK/GW/ItipHandling t/kronolith/HK/GW/XfbAccess)
Index: t_Kolab__Storage_HK_GW_SuppressTriggering.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_Kolab__Storage_HK_GW_SuppressTriggering.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_Kolab__Storage_HK_GW_SuppressTriggering.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_Kolab__Storage_HK_GW_SuppressTriggering.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -40,4 +40,4 @@
$options['timeout'] = 5;
$options['allowRedirects'] = true;
--
-tg: (9e9b402..) t/Kolab_Storage/HK/GW/SuppressTriggering (depends on: t/COPYRIGHT2)
+tg: (31b7419..) t/Kolab_Storage/HK/GW/SuppressTriggering (depends on: t/COPYRIGHT2)
Index: t_imp_H_GW_DefaultLoginView.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_imp_H_GW_DefaultLoginView.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_imp_H_GW_DefaultLoginView.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_imp_H_GW_DefaultLoginView.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -59,4 +59,4 @@
$views[] = array('sel' => $view_cookie == 'imp',
'val' => 'imp', 'name' => _("Traditional"));
--
-tg: (5c6b3e5..) t/imp/H/GW/DefaultLoginView (depends on: t/imp/H/JS/bug7739)
+tg: (3a70f58..) t/imp/H/GW/DefaultLoginView (depends on: t/imp/H/JS/bug7739)
Index: t_imp_H_GW_LoginRetries.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_imp_H_GW_LoginRetries.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_imp_H_GW_LoginRetries.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_imp_H_GW_LoginRetries.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -30,4 +30,4 @@
);
}
--
-tg: (7504fa3..) t/imp/H/GW/LoginRetries (depends on: t/imp/H/GW/DefaultLoginView)
+tg: (4f99941..) t/imp/H/GW/LoginRetries (depends on: t/imp/H/GW/DefaultLoginView)
Index: t_imp_H_JS_bug7739.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_imp_H_JS_bug7739.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_imp_H_JS_bug7739.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_imp_H_JS_bug7739.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -87,4 +87,4 @@
if (!$GLOBALS['prefs']->getValue('use_vinbox')) {
--
-tg: (42660a8..) t/imp/H/JS/bug7739 (depends on: t/imp/H/MS/bug7438)
+tg: (38b4949..) t/imp/H/JS/bug7739 (depends on: t/imp/H/MS/bug7438)
Index: t_imp_H_MS_bug7438.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_imp_H_MS_bug7438.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_imp_H_MS_bug7438.diff 8 Mar 2009 21:04:44 -0000 1.1
+++ t_imp_H_MS_bug7438.diff 8 Mar 2009 23:26:35 -0000 1.2
@@ -10,33 +10,10 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- ...h%2Fimp.php&r1=1.16.6.19&r2=1.16.6.20&t=unified | 16 ++++++++++++++++
- horde-webmail/imp/lib/Auth/imp.php | 2 +-
- horde-webmail/imp/redirect.php | 6 ++----
- 3 files changed, 19 insertions(+), 5 deletions(-)
+ horde-webmail/imp/lib/Auth/imp.php | 2 +-
+ horde-webmail/imp/redirect.php | 6 ++----
+ 2 files changed, 3 insertions(+), 5 deletions(-)
-diff --git a/diff.php?f=imp%2Flib%2FAuth%2Fimp.php&r1=1.16.6.19&r2=1.16.6.20&t=unified b/diff.php?f=imp%2Flib%2FAuth%2Fimp.php&r1=1.16.6.19&r2=1.16.6.20&t=unified
-new file mode 100644
-index 0000000..e8bfe9d
---- /dev/null
-+++ b/diff.php?f=imp%2Flib%2FAuth%2Fimp.php&r1=1.16.6.19&r2=1.16.6.20&t=unified
-@@ -0,0 +1,16 @@
-+===================================================================
-+RCS file: /horde/cvs/imp/lib/Auth/imp.php,v
-+retrieving revision 1.16.6.19
-+retrieving revision 1.16.6.20
-+diff -p --unified=3 -r1.16.6.19 -r1.16.6.20
-+--- imp.php 2008/03/24 13:11:05 1.16.6.19
-++++ imp.php 2008/10/08 07:35:41 1.16.6.20
-+@@ -142,7 +142,7 @@ class Auth_imp extends Auth {
-+ if (isset($prefs)) {
-+ $prefs->cleanup(true);
-+ }
-+- $this->_setAuthError(AUTH_REASON_FAILED);
-++ $this->_setAuthError(AUTH_REASON_BADLOGIN);
-+ return false;
-+ }
-+
diff --git a/horde-webmail/imp/lib/Auth/imp.php b/horde-webmail/imp/lib/Auth/imp.php
index c94b0b1..6b55015 100644
--- a/horde-webmail/imp/lib/Auth/imp.php
@@ -70,4 +47,4 @@
/* No session, and no login attempt. Just go to the login page. */
--
-tg: (199f021..) t/imp/H/MS/bug7438 (depends on: t/COPYRIGHT3)
+tg: (461f8df..) t/imp/H/MS/bug7438 (depends on: t/COPYRIGHT3)
More information about the commits
mailing list