Code

Removed obsolete patches
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 10 Jul 2007 08:17:59 +0000 (08:17 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 10 Jul 2007 08:17:59 +0000 (08:17 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6796 594d385d-05f5-0310-b6e9-bd551577e9d8

contrib/patches/imap-2001a-quota.patch [deleted file]
contrib/patches/php4-imap-getacl.patch [deleted file]

diff --git a/contrib/patches/imap-2001a-quota.patch b/contrib/patches/imap-2001a-quota.patch
deleted file mode 100644 (file)
index 304488d..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur imap-2001a/src/c-client/imap4r1.c imap-2001a.patched/src/c-client/imap4r1.c
---- imap-2001a/src/c-client/imap4r1.c  Wed Nov 14 23:50:55 2001
-+++ imap-2001a.patched/src/c-client/imap4r1.c  Wed May 21 09:54:35 2003
-@@ -2358,10 +2358,12 @@
-       do {                    /* for each list item */
-       *s++ = c;               /* write prefix character */
-       if (list) {             /* sigh, QUOTA has bizarre syntax! */
--        for (t = (char *) list->text.data; *t; *s++ = *t++);
--        sprintf (s," %lu",list->text.size);
--        s += strlen (s);
--        c = ' ';              /* prefix character for subsequent strings */
-+        if (list->text.size != 0){
-+          for (t = (char *) list->text.data; *t; *s++ = *t++);
-+          sprintf (s," %lu",list->text.size);
-+          s += strlen (s);
-+          c = ' ';            /* prefix character for subsequent strings */
-+        }
-       }
-       }
-       while (list = list->next);
diff --git a/contrib/patches/php4-imap-getacl.patch b/contrib/patches/php4-imap-getacl.patch
deleted file mode 100644 (file)
index ae3a235..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
---- php-imap-4.3.9/php_imap.c.fix      2004-08-06 15:04:17 +0400
-+++ php-imap-4.3.9/php_imap.c  2004-08-06 15:11:43 +0400
-@@ -138,6 +138,7 @@ function_entry imap_functions[] = {
-       PHP_FE(imap_get_quotaroot,                                              NULL)
-       PHP_FE(imap_set_quota,                                                  NULL)
-       PHP_FE(imap_setacl,                                                             NULL)
-+        PHP_FE(imap_getacl,                                                             NULL)
- #endif
-       PHP_FE(imap_mail,                                                               NULL)
-@@ -377,6 +378,22 @@ void mail_getquota(MAILSTREAM *stream, c
- /* }}} */
- #endif
-+/* {{{ mail_getquota 
-+ *
-+ * Mail GET_ACL callback
-+ * Called via the mail_parameter function in c-client:src/c-client/mail.c
-+ */
-+void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist)
-+{
-+      TSRMLS_FETCH();
-+
-+      /* walk through the ACLLIST */
-+      for (; alist; alist = alist->next)
-+      {
-+              add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1);
-+      }
-+}
-+/* }}} */
- /* {{{ php_imap_init_globals
-  */
-@@ -402,6 +419,7 @@ static void php_imap_init_globals(zend_i
-       imap_globals->folderlist_style = FLIST_ARRAY;
- #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-       imap_globals->quota_return = NULL;
-+        imap_globals->imap_acl_list = NIL;
- #endif
- }
- /* }}} */
-@@ -985,6 +1003,37 @@ PHP_FUNCTION(imap_setacl)
- }
- /* }}} */
-+/* {{{ proto array imap_get_quota(int stream_id, string mailbox)
-+      Gets the ACL for a given mailbox */
-+PHP_FUNCTION(imap_getacl)
-+{
-+      zval **streamind, **mailbox;
-+      pils *imap_le_struct;
-+
-+      if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) {
-+              ZEND_WRONG_PARAM_COUNT();
-+      }
-+
-+      ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
-+
-+      convert_to_string_ex(mailbox);
-+
-+    /* initializing the special array for the return values */
-+    array_init(return_value);
-+
-+    IMAPG(imap_acl_list) = return_value;
-+
-+      /* set the callback for the GET_ACL function */
-+      mail_parameters(NIL, SET_ACL, (void *) mail_getacl);
-+      if(!imap_getacl(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) {
-+              php_error(E_WARNING, "c-client imap_getacl failed");
-+              RETURN_FALSE;
-+      }
-+
-+    IMAPG(imap_acl_list) = NIL;
-+}
-+/* }}} */
-+
- #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
---- php-imap-4.3.9/php_imap.h.fix      2004-08-06 15:09:33 +0400
-+++ php-imap-4.3.9/php_imap.h  2004-08-06 15:10:42 +0400
-@@ -172,6 +172,7 @@ PHP_FUNCTION(imap_get_quota);
- PHP_FUNCTION(imap_get_quotaroot);
- PHP_FUNCTION(imap_set_quota);
- PHP_FUNCTION(imap_setacl);
-+PHP_FUNCTION(imap_getacl);
- #endif
-@@ -202,6 +203,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap)
-       unsigned long status_uidvalidity;
- #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-       zval **quota_return;
-+        pval *imap_acl_list;
- #endif
- ZEND_END_MODULE_GLOBALS(imap)