[SVN] r340 - in /trunk/cyrus-imapd-2.2/debian/patches:
61-64bit-quota.dpatch 65-sieveshell-enhancements.dpatch
debian at incase.de
debian at incase.de
Fri Mar 31 20:49:59 UTC 2006
Author: sven
Date: Fri Mar 31 22:49:58 2006
New Revision: 340
URL: https://mail.incase.de/viewcvs?rev=340&root=cyrus22&view=rev
Log:
And update the remaining to patches to v2.2.13
Modified:
trunk/cyrus-imapd-2.2/debian/patches/61-64bit-quota.dpatch
trunk/cyrus-imapd-2.2/debian/patches/65-sieveshell-enhancements.dpatch
Modified: trunk/cyrus-imapd-2.2/debian/patches/61-64bit-quota.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/debian/patches/61-64bit-quota.dpatch?rev=340&root=cyrus22&r1=339&r2=340&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/debian/patches/61-64bit-quota.dpatch (original)
+++ trunk/cyrus-imapd-2.2/debian/patches/61-64bit-quota.dpatch Fri Mar 31 22:49:58 2006
@@ -5,9 +5,9 @@
## DP: Add support for 64-bit quotas
@DPATCH@
-diff -urN cyrus-imapd-2.2.12~/configure.in cyrus-imapd-2.2.12/configure.in
---- cyrus-imapd-2.2.12~/configure.in 2005-01-19 00:46:00.000000000 +0100
-+++ cyrus-imapd-2.2.12/configure.in 2005-08-30 12:09:28.000000000 +0200
+diff -urNad cyrus-imapd-2.2/configure.in /tmp/dpep.9eBPYl/cyrus-imapd-2.2/configure.in
+--- cyrus-imapd-2.2/configure.in 2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/configure.in 2006-03-31 22:23:20.307966043 +0200
@@ -107,6 +107,15 @@
dnl fi
AC_C_INLINE
@@ -24,9 +24,9 @@
CMU_C___ATTRIBUTE__
CMU_C_FPIC
-diff -urN cyrus-imapd-2.2.12~/imap/append.c cyrus-imapd-2.2.12/imap/append.c
---- cyrus-imapd-2.2.12~/imap/append.c 2004-05-22 05:45:48.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/append.c 2005-08-30 12:09:28.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/append.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/append.c
+--- cyrus-imapd-2.2/imap/append.c 2006-03-31 20:11:45.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/append.c 2006-03-31 22:23:20.308965945 +0200
@@ -140,7 +140,7 @@
if (!r) {
if (m.quota.limit >= 0 && quotacheck >= 0 &&
@@ -45,10 +45,10 @@
quota_abort(&as->tid);
mailbox_close(&as->m);
r = IMAP_QUOTA_EXCEEDED;
-diff -urN cyrus-imapd-2.2.12~/imap/imapd.c cyrus-imapd-2.2.12/imap/imapd.c
---- cyrus-imapd-2.2.12~/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/imapd.c 2005-08-30 12:09:28.000000000 +0200
-@@ -2716,10 +2716,10 @@
+diff -urNad cyrus-imapd-2.2/imap/imapd.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/imapd.c
+--- cyrus-imapd-2.2/imap/imapd.c 2006-03-31 22:23:12.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/imapd.c 2006-03-31 22:23:20.311965650 +0200
+@@ -2659,10 +2659,10 @@
*/
int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
@@ -62,7 +62,7 @@
if (usage >= 100.0) {
prot_printf(imapd_out, "* NO [ALERT] %s\r\n",
error_message(IMAP_NO_OVERQUOTA));
-@@ -4722,7 +4722,7 @@
+@@ -4660,7 +4660,7 @@
printastring(name);
prot_printf(imapd_out, " (");
if (quota.limit >= 0) {
@@ -71,7 +71,7 @@
quota.used/QUOTA_UNITS, quota.limit);
}
prot_printf(imapd_out, ")\r\n");
-@@ -4784,7 +4784,7 @@
+@@ -4722,7 +4722,7 @@
printastring(mailboxname);
prot_printf(imapd_out, " (");
if (mailbox.quota.limit >= 0) {
@@ -80,9 +80,9 @@
mailbox.quota.used/QUOTA_UNITS,
mailbox.quota.limit);
}
-diff -urN cyrus-imapd-2.2.12~/imap/mailbox.c cyrus-imapd-2.2.12/imap/mailbox.c
---- cyrus-imapd-2.2.12~/imap/mailbox.c 2005-02-14 07:39:57.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/mailbox.c 2005-08-30 13:30:55.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/mailbox.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.c
+--- cyrus-imapd-2.2/imap/mailbox.c 2006-03-31 20:11:45.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.c 2006-03-31 22:23:20.313965453 +0200
@@ -84,6 +84,7 @@
#include "seen.h"
#include "util.h"
@@ -155,7 +155,7 @@
unsigned numansweredflag = 0;
unsigned numdeletedflag = 0;
unsigned numflaggedflag = 0;
-@@ -1829,8 +1856,13 @@
+@@ -1835,8 +1862,13 @@
*((bit32 *)(buf+OFFSET_FLAGGED)) = htonl(newflagged);
/* Fix up quota_mailbox_used */
@@ -169,7 +169,7 @@
/* Fix up start offset if necessary */
if (mailbox->start_offset < INDEX_HEADER_SIZE) {
*((bit32 *)(buf+OFFSET_START_OFFSET)) = htonl(INDEX_HEADER_SIZE);
-@@ -1862,7 +1894,7 @@
+@@ -1868,7 +1900,7 @@
if (!r) quota_commit(&tid);
else {
syslog(LOG_ERR,
@@ -178,7 +178,7 @@
quotadeleted, mailbox->quota.root);
}
}
-@@ -2132,7 +2164,7 @@
+@@ -2138,7 +2170,7 @@
r = quota_write(&mailbox->quota, &tid);
if (r) {
syslog(LOG_ERR,
@@ -187,7 +187,7 @@
mailbox->quota_mailbox_used, mailbox->quota.root);
}
else
-@@ -2250,7 +2282,7 @@
+@@ -2256,7 +2288,7 @@
strcmp(oldmailbox->quota.root, newmailbox->quota.root) != 0) {
if (!r && newmailbox->quota.limit >= 0 &&
newmailbox->quota.used + oldmailbox->quota_mailbox_used >
@@ -196,7 +196,7 @@
r = IMAP_QUOTA_EXCEEDED;
}
}
-@@ -2464,7 +2496,7 @@
+@@ -2470,7 +2502,7 @@
strcmp(oldmailbox.quota.root, newmailbox.quota.root) != 0) {
if (!r && newmailbox.quota.limit >= 0 &&
newmailbox.quota.used + oldmailbox.quota_mailbox_used >
@@ -205,7 +205,7 @@
r = IMAP_QUOTA_EXCEEDED;
}
}
-@@ -2617,7 +2649,7 @@
+@@ -2623,7 +2655,7 @@
else if (r2 == IMAP_QUOTAROOT_NONEXISTENT) r2 = 0;
if (r2) {
syslog(LOG_ERR,
@@ -214,9 +214,9 @@
newmailbox.quota_mailbox_used, newmailbox.quota.root);
}
}
-diff -urN cyrus-imapd-2.2.12~/imap/mailbox.h cyrus-imapd-2.2.12/imap/mailbox.h
---- cyrus-imapd-2.2.12~/imap/mailbox.h 2004-01-22 22:17:09.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/mailbox.h 2005-08-30 12:09:28.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/mailbox.h /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.h
+--- cyrus-imapd-2.2/imap/mailbox.h 2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mailbox.h 2006-03-31 22:23:20.313965453 +0200
@@ -45,6 +45,7 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -256,9 +256,9 @@
#define OFFSET_POP3_LAST_LOGIN 40
#define OFFSET_UIDVALIDITY 44
#define OFFSET_DELETED 48 /* added for ACAP */
-diff -urN cyrus-imapd-2.2.12~/imap/mbdump.c cyrus-imapd-2.2.12/imap/mbdump.c
---- cyrus-imapd-2.2.12~/imap/mbdump.c 2004-05-22 05:45:51.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/mbdump.c 2005-08-30 12:09:28.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/mbdump.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbdump.c
+--- cyrus-imapd-2.2/imap/mbdump.c 2006-03-31 22:23:12.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbdump.c 2006-03-31 22:23:20.314965354 +0200
@@ -507,7 +507,7 @@
{
struct buf file, data;
@@ -268,9 +268,9 @@
int r = 0;
int curfile = -1;
const char *userid = NULL;
-diff -urN cyrus-imapd-2.2.12~/imap/mbexamine.c cyrus-imapd-2.2.12/imap/mbexamine.c
---- cyrus-imapd-2.2.12~/imap/mbexamine.c 2004-12-17 17:32:16.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/mbexamine.c 2005-08-30 12:11:23.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/mbexamine.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbexamine.c
+--- cyrus-imapd-2.2/imap/mbexamine.c 2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mbexamine.c 2006-03-31 22:23:20.314965354 +0200
@@ -266,7 +266,7 @@
printf(" Minor Version: %d\n", mailbox.minor_version);
printf(" Header Size: %ld bytes Record Size: %ld bytes\n",
@@ -280,9 +280,9 @@
mailbox.exists, mailbox.quota_mailbox_used);
printf(" Last Append Date: (%ld) %s", mailbox.last_appenddate,
ctime(&mailbox.last_appenddate));
-diff -urN cyrus-imapd-2.2.12~/imap/mboxlist.c cyrus-imapd-2.2.12/imap/mboxlist.c
---- cyrus-imapd-2.2.12~/imap/mboxlist.c 2004-07-26 20:08:03.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/mboxlist.c 2005-08-30 12:09:28.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/mboxlist.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mboxlist.c
+--- cyrus-imapd-2.2/imap/mboxlist.c 2006-03-31 20:11:45.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/mboxlist.c 2006-03-31 22:23:20.316965158 +0200
@@ -2540,7 +2540,7 @@
r = quota_write(&mailbox.quota, tid);
if (r) {
@@ -292,10 +292,10 @@
mailbox.quota_mailbox_used, mailbox.quota.root);
}
free(mailbox.quota.root);
-diff -urN cyrus-imapd-2.2.12~/imap/quota.c cyrus-imapd-2.2.12/imap/quota.c
---- cyrus-imapd-2.2.12~/imap/quota.c 2004-06-30 21:23:26.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/quota.c 2005-08-30 12:09:28.000000000 +0200
-@@ -120,7 +120,7 @@
+diff -urNad cyrus-imapd-2.2/imap/quota.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.c
+--- cyrus-imapd-2.2/imap/quota.c 2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.c 2006-03-31 22:23:20.316965158 +0200
+@@ -107,7 +107,7 @@
struct quota quota;
int refcount;
int deleted;
@@ -303,17 +303,8 @@
+ uquota_t newused;
};
- #define QUOTAGROW 300
-@@ -251,7 +251,7 @@
- }
- memset("a[quota_num], 0, sizeof(struct quotaentry));
- quota[quota_num].quota.root = xstrndup(key, keylen);
-- sscanf(data, "%lu %d",
-+ sscanf(data, UQUOTA_T_FMT " %d",
- "a[quota_num].quota.used, "a[quota_num].quota.limit);
-
- quota_num++;
-@@ -422,7 +422,7 @@
+ /* forward declarations */
+@@ -473,7 +473,7 @@
(*count)++;
}
if (quota[thisquota].quota.used != quota[thisquota].newused) {
@@ -322,7 +313,7 @@
quota[thisquota].quota.used, quota[thisquota].newused);
quota[thisquota].quota.used = quota[thisquota].newused;
r = quota_write("a[thisquota].quota, tid);
-@@ -489,12 +489,12 @@
+@@ -539,12 +539,12 @@
int i;
char buf[MAX_MAILBOX_PATH+1];
@@ -337,7 +328,7 @@
((quota[i].quota.used / QUOTA_UNITS) * 100) / quota[i].quota.limit);
}
else if (quota[i].quota.limit == 0) {
-@@ -507,6 +507,6 @@
+@@ -557,6 +557,6 @@
(*quota_namespace.mboxname_toexternal)("a_namespace,
quota[i].quota.root,
"cyrus", buf);
@@ -345,30 +336,9 @@
+ printf(" " QUOTA_REPORT_FMT " %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
}
}
-diff -urN cyrus-imapd-2.2.12~/imap/quota_db.c cyrus-imapd-2.2.12/imap/quota_db.c
---- cyrus-imapd-2.2.12~/imap/quota_db.c 2004-05-22 05:45:52.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/quota_db.c 2005-08-30 12:09:28.000000000 +0200
-@@ -89,7 +89,7 @@
-
- switch (r) {
- case CYRUSDB_OK:
-- sscanf(data, "%lu %d", "a->used, "a->limit);
-+ sscanf(data, UQUOTA_T_FMT " %d", "a->used, "a->limit);
- break;
-
- case CYRUSDB_AGAIN:
-@@ -151,7 +151,7 @@
- if (!qrlen) return IMAP_QUOTAROOT_NONEXISTENT;
-
- len = snprintf(buf, sizeof(buf) - 1,
-- "%lu %d", quota->used, quota->limit);
-+ UQUOTA_T_FMT " %d", quota->used, quota->limit);
- r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
-
- switch (r) {
-diff -urN cyrus-imapd-2.2.12~/imap/quota.h cyrus-imapd-2.2.12/imap/quota.h
---- cyrus-imapd-2.2.12~/imap/quota.h 2004-02-27 18:44:56.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/quota.h 2005-08-30 12:10:37.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/quota.h /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.h
+--- cyrus-imapd-2.2/imap/quota.h 2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota.h 2006-03-31 22:23:20.317965059 +0200
@@ -45,18 +45,37 @@
#define INCLUDED_QUOTA_H
@@ -408,9 +378,30 @@
int limit; /* in QUOTA_UNITS */
};
-diff -urN cyrus-imapd-2.2.12~/imap/reconstruct.c cyrus-imapd-2.2.12/imap/reconstruct.c
---- cyrus-imapd-2.2.12~/imap/reconstruct.c 2004-10-11 16:01:24.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/reconstruct.c 2005-08-30 12:09:28.000000000 +0200
+diff -urNad cyrus-imapd-2.2/imap/quota_db.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota_db.c
+--- cyrus-imapd-2.2/imap/quota_db.c 2006-03-31 18:52:05.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/quota_db.c 2006-03-31 22:23:20.317965059 +0200
+@@ -89,7 +89,7 @@
+
+ switch (r) {
+ case CYRUSDB_OK:
+- sscanf(data, "%lu %d", "a->used, "a->limit);
++ sscanf(data, UQUOTA_T_FMT " %d", "a->used, "a->limit);
+ break;
+
+ case CYRUSDB_AGAIN:
+@@ -151,7 +151,7 @@
+ if (!qrlen) return IMAP_QUOTAROOT_NONEXISTENT;
+
+ len = snprintf(buf, sizeof(buf) - 1,
+- "%lu %d", quota->used, quota->limit);
++ UQUOTA_T_FMT " %d", quota->used, quota->limit);
+ r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
+
+ switch (r) {
+diff -urNad cyrus-imapd-2.2/imap/reconstruct.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/reconstruct.c
+--- cyrus-imapd-2.2/imap/reconstruct.c 2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/imap/reconstruct.c 2006-03-31 22:23:20.318964961 +0200
@@ -93,6 +93,7 @@
#include "retry.h"
#include "convert_code.h"
@@ -444,9 +435,30 @@
*((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox.pop3_last_login);
*((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox.uidvalidity);
*((bit32 *)(buf+OFFSET_DELETED)) = htonl(new_deleted);
-diff -urN cyrus-imapd-2.2.12~/lib/byteorder64.c cyrus-imapd-2.2.12/lib/byteorder64.c
---- cyrus-imapd-2.2.12~/lib/byteorder64.c 1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.2.12/lib/byteorder64.c 2005-08-30 12:19:49.000000000 +0200
+diff -urNad cyrus-imapd-2.2/lib/Makefile.in /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/Makefile.in
+--- cyrus-imapd-2.2/lib/Makefile.in 2006-03-31 22:23:11.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/Makefile.in 2006-03-31 22:23:20.318964961 +0200
+@@ -85,7 +85,7 @@
+ $(srcdir)/lsort.h $(srcdir)/stristr.h \
+ $(srcdir)/util.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
+ $(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
+- $(srcdir)/libcyr_cfg.h
++ $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h
+
+ LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
+ libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
+@@ -93,7 +93,7 @@
+ chartable.o imapurl.o nonblock_ at WITH_NONBLOCK@.o lock_ at WITH_LOCK@.o \
+ gmtoff_ at WITH_GMTOFF@.o map_ at WITH_MAP@.o $(ACL) $(AUTH) \
+ @LIBOBJS@ @CYRUSDB_OBJS@ \
+- iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o
++ iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o byteorder64.o
+
+ LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h \
+ $(srcdir)/strhash.o $(srcdir)/libconfig.h \
+diff -urNad cyrus-imapd-2.2/lib/byteorder64.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.c
+--- cyrus-imapd-2.2/lib/byteorder64.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.c 2006-03-31 22:23:20.318964961 +0200
@@ -0,0 +1,95 @@
+/* byteorder64.c -- convert 64-bit values between host and network byte order
+ *
@@ -543,9 +555,9 @@
+}
+
+#endif /* defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN) */
-diff -urN cyrus-imapd-2.2.12~/lib/byteorder64.h cyrus-imapd-2.2.12/lib/byteorder64.h
---- cyrus-imapd-2.2.12~/lib/byteorder64.h 1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.2.12/lib/byteorder64.h 2005-08-30 12:19:13.000000000 +0200
+diff -urNad cyrus-imapd-2.2/lib/byteorder64.h /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.h
+--- cyrus-imapd-2.2/lib/byteorder64.h 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/byteorder64.h 2006-03-31 22:23:20.319964862 +0200
@@ -0,0 +1,65 @@
+/* byteorder64.h -- convert 64-bit values between host and network byte order
+ *
@@ -612,30 +624,9 @@
+#endif /* WORDS_BIGENDIAN */
+#endif /* HAVE_LONG_LONG_INT */
+#endif /* _BYTEORDER64_H */
-diff -urN cyrus-imapd-2.2.12~/lib/Makefile.in cyrus-imapd-2.2.12/lib/Makefile.in
---- cyrus-imapd-2.2.12~/lib/Makefile.in 2004-05-28 20:03:04.000000000 +0200
-+++ cyrus-imapd-2.2.12/lib/Makefile.in 2005-08-30 12:09:28.000000000 +0200
-@@ -85,7 +85,7 @@
- $(srcdir)/lsort.h $(srcdir)/stristr.h \
- $(srcdir)/util.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
- $(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
-- $(srcdir)/libcyr_cfg.h
-+ $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h
-
- LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
- libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
-@@ -93,7 +93,7 @@
- chartable.o imapurl.o nonblock_ at WITH_NONBLOCK@.o lock_ at WITH_LOCK@.o \
- gmtoff_ at WITH_GMTOFF@.o map_ at WITH_MAP@.o $(ACL) $(AUTH) \
- @LIBOBJS@ @CYRUSDB_OBJS@ \
-- iptostring.o xmalloc.o wildmat.o
-+ iptostring.o xmalloc.o wildmat.o byteorder64.o
-
- LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
- $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
-diff -urN cyrus-imapd-2.2.12~/lib/prot.c cyrus-imapd-2.2.12/lib/prot.c
---- cyrus-imapd-2.2.12~/lib/prot.c 2004-02-27 23:08:56.000000000 +0100
-+++ cyrus-imapd-2.2.12/lib/prot.c 2005-08-30 12:09:28.000000000 +0200
+diff -urNad cyrus-imapd-2.2/lib/prot.c /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/prot.c
+--- cyrus-imapd-2.2/lib/prot.c 2006-03-31 18:52:04.000000000 +0200
++++ /tmp/dpep.9eBPYl/cyrus-imapd-2.2/lib/prot.c 2006-03-31 22:23:20.319964862 +0200
@@ -871,6 +871,11 @@
char buf[30];
va_start(pvar, fmt);
Modified: trunk/cyrus-imapd-2.2/debian/patches/65-sieveshell-enhancements.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2/debian/patches/65-sieveshell-enhancements.dpatch?rev=340&root=cyrus22&r1=339&r2=340&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2/debian/patches/65-sieveshell-enhancements.dpatch (original)
+++ trunk/cyrus-imapd-2.2/debian/patches/65-sieveshell-enhancements.dpatch Fri Mar 31 22:49:58 2006
@@ -5,19 +5,19 @@
## DP: Adds some enhancements to sieveshell and fixes some paths.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm
---- cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2006-01-12 16:03:50.000000000 +0100
-+++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2006-01-12 16:06:24.305462117 +0100
+diff -urNad cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm
+--- cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm 2006-03-31 22:44:20.000000000 +0200
++++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm 2006-03-31 22:49:09.179194218 +0200
@@ -126,7 +126,7 @@
[\&_sc_info, '[mailbox]',
'display mailbox/server metadata'],
mboxcfg =>
-- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
+- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat] value',
+ [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
'configure mailbox'],
mboxconfig => 'mboxcfg',
reconstruct =>
-@@ -429,7 +429,7 @@
+@@ -437,7 +437,7 @@
# programs, as opposed to things expected from within a program.)
sub shell {
my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) =
@@ -26,7 +26,7 @@
"$ENV{HOME}/.cyradmrc.pl", 1, undef, undef);
GetOptions('user|u=s' => \$auth,
'authz|z=s' => \$authz,
-@@ -459,7 +459,7 @@
+@@ -467,7 +467,7 @@
-rock => \$cyradm});
$cyradm->authenticate(-authz => $authz, -user => $auth,
-mechanism => $mech, -password => $pw)
@@ -35,27 +35,82 @@
}
my $fstk = [*STDIN, *STDOUT, *STDERR];
if ($dorc && $systemrc ne '' && -f $systemrc) {
-@@ -1339,7 +1339,7 @@
+@@ -1400,7 +1400,7 @@
while (defined ($opt = shift(@argv))) {
last if $opt eq '--';
if ($opt =~ /^-/) {
-- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+- die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
+ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
}
else {
push(@nargv, $opt);
-@@ -1348,7 +1348,7 @@
+@@ -1409,7 +1409,7 @@
}
push(@nargv, @argv);
if (@nargv < 2) {
-- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+- die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
+ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
}
if (!$cyrref || !$$cyrref) {
die "mboxconfig: no connection to server\n";
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/lib/request.c /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c
---- cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2006-01-12 16:03:50.000000000 +0100
-+++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2006-01-12 16:06:24.305462117 +0100
+diff -urNad cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej
+--- cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej 2006-03-31 22:44:20.000000000 +0200
++++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,51 +0,0 @@
+-***************
+-*** 126,132 ****
+- [\&_sc_info, '[mailbox]',
+- 'display mailbox/server metadata'],
+- mboxcfg =>
+-- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
+- 'configure mailbox'],
+- mboxconfig => 'mboxcfg',
+- reconstruct =>
+---- 126,132 ----
+- [\&_sc_info, '[mailbox]',
+- 'display mailbox/server metadata'],
+- mboxcfg =>
+-+ [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
+- 'configure mailbox'],
+- mboxconfig => 'mboxcfg',
+- reconstruct =>
+-***************
+-*** 1347,1353 ****
+- while (defined ($opt = shift(@argv))) {
+- last if $opt eq '--';
+- if ($opt =~ /^-/) {
+-- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+- }
+- else {
+- push(@nargv, $opt);
+---- 1347,1353 ----
+- while (defined ($opt = shift(@argv))) {
+- last if $opt eq '--';
+- if ($opt =~ /^-/) {
+-+ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+- }
+- else {
+- push(@nargv, $opt);
+-***************
+-*** 1356,1362 ****
+- }
+- push(@nargv, @argv);
+- if (@nargv < 2) {
+-- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+- }
+- if (!$cyrref || !$$cyrref) {
+- die "mboxconfig: no connection to server\n";
+---- 1356,1362 ----
+- }
+- push(@nargv, @argv);
+- if (@nargv < 2) {
+-+ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+- }
+- if (!$cyrref || !$$cyrref) {
+- die "mboxconfig: no connection to server\n";
+diff -urNad cyrus-imapd-2.2/perl/sieve/lib/request.c /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/lib/request.c
+--- cyrus-imapd-2.2/perl/sieve/lib/request.c 2006-03-31 22:44:20.000000000 +0200
++++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/lib/request.c 2006-03-31 22:44:28.734855670 +0200
@@ -560,7 +560,6 @@
char **refer_to, char **errstrp)
{
@@ -64,9 +119,9 @@
mystring_t *errstr=NULL;
lexstate_t state;
int ret = 0;
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
---- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2006-01-12 16:06:23.000000000 +0100
-+++ /tmp/dpep.bevuJ1/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2006-01-12 16:06:24.306462019 +0100
+diff -urNad cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl 2006-03-31 22:44:21.000000000 +0200
++++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl 2006-03-31 22:44:28.734855670 +0200
@@ -60,7 +60,9 @@
my $username = $ENV{USER};
my $authname = $ENV{USER};
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list