[SVN] r697 - in /trunk/cyrus-imapd-2.2.13/debian: changelog
patches/61-64bit-quota.dpatch
debian at incase.de
debian at incase.de
Sat Feb 24 18:54:56 CET 2007
Author: sven
Date: Sat Feb 24 18:54:55 2007
New Revision: 697
URL: https://mail.incase.de/viewcvs?rev=697&root=cyrus22&view=rev
Log:
Fix a number of small issues with the 64bit quota patch (taken from ubuntu)
Modified:
trunk/cyrus-imapd-2.2.13/debian/changelog
trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch
Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=697&root=cyrus22&r1=696&r2=697&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Sat Feb 24 18:54:55 2007
@@ -5,9 +5,10 @@
when postrm is called.
Assume removal of spools is not desired if debconf isn't available (least
surprise / least chance of data loss principle).
- * Add Xs-Vcs-Browser and Xs-Vcs-Svn control fields for the PTS
-
- -- Sven Mueller <sven at debian.org> Fri, 23 Feb 2007 14:15:27 +0100
+ * Add Xs-Vcs-Browser and Xs-Vcs-Svn control fields for the PTS
+ * Fix a number of small issues with the 64bit quota patch
+
+ -- Sven Mueller <sven at debian.org> Sat, 24 Feb 2007 18:53:19 +0100
cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch?rev=697&root=cyrus22&r1=696&r2=697&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch Sat Feb 24 18:54:55 2007
@@ -5,9 +5,9 @@
## DP: Add support for 64-bit quotas
@DPATCH@
-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
+diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/configure.in
+--- cyrus-imapd-2.2.13/configure.in 2007-02-24 18:46:32.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/configure.in 2007-02-24 18:46:35.598277322 +0100
@@ -107,6 +107,15 @@
dnl fi
AC_C_INLINE
@@ -24,9 +24,9 @@
CMU_C___ATTRIBUTE__
CMU_C_FPIC
-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
+diff -urNad cyrus-imapd-2.2.13/imap/append.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/append.c
+--- cyrus-imapd-2.2.13/imap/append.c 2006-11-13 19:21:27.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/append.c 2007-02-24 18:46:35.599277223 +0100
@@ -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 -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 @@
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c 2007-02-24 18:46:32.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/imapd.c 2007-02-24 18:46:35.602276928 +0100
+@@ -2664,10 +2664,10 @@
*/
int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
@@ -80,9 +80,9 @@
mailbox.quota.used/QUOTA_UNITS,
mailbox.quota.limit);
}
-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
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c 2007-02-24 18:46:31.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.c 2007-02-24 18:46:35.604276731 +0100
@@ -84,6 +84,7 @@
#include "seen.h"
#include "util.h"
@@ -112,26 +112,6 @@
- *((bit32 *)(buf+OFFSET_QUOTA_RESERVED_FIELD)) = htonl(0); /* RESERVED */
+
+ /* quotas may be 64bit now */
-+#ifdef HAVE_LONG_LONG_INT
-+ *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
-+ htonll(mailbox->quota_mailbox_used);
-+#else
-+ /* zero the unused 32bits */
-+ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0)
- *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
- htonl(mailbox->quota_mailbox_used);
-+#endif
-+
- *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
- *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
- *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
-@@ -1430,9 +1447,18 @@
- *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
- *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
- *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
-- /* OFFSET_QUOTA_RESERVED_FIELD left as zero */
-+
-+ /* newer versions may use 64bit quotas */
+#ifdef HAVE_LONG_LONG_INT
+ *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
+ htonll(mailbox->quota_mailbox_used);
@@ -145,7 +125,27 @@
*((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
*((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
*((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
-@@ -1608,7 +1634,8 @@
+@@ -1433,9 +1450,18 @@
+ *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
+ *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
+ *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
+- /* OFFSET_QUOTA_RESERVED_FIELD left as zero */
++
++ /* newer versions may use 64bit quotas */
++#ifdef HAVE_LONG_LONG_INT
++ *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
++ htonll(mailbox->quota_mailbox_used);
++#else
++ /* zero the unused 32bits */
++ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
+ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
+ htonl(mailbox->quota_mailbox_used);
++#endif
++
+ *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
+ *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
+ *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
+@@ -1611,7 +1637,8 @@
size_t fnamebuf_len;
FILE *newindex = NULL, *newcache = NULL;
unsigned long *deleted;
@@ -155,7 +155,7 @@
unsigned numansweredflag = 0;
unsigned numdeletedflag = 0;
unsigned numflaggedflag = 0;
-@@ -1835,8 +1862,13 @@
+@@ -1838,8 +1865,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);
-@@ -1868,7 +1900,7 @@
+@@ -1871,7 +1903,7 @@
if (!r) quota_commit(&tid);
else {
syslog(LOG_ERR,
@@ -178,7 +178,7 @@
quotadeleted, mailbox->quota.root);
}
}
-@@ -2138,7 +2170,7 @@
+@@ -2146,7 +2178,7 @@
r = quota_write(&mailbox->quota, &tid);
if (r) {
syslog(LOG_ERR,
@@ -187,7 +187,7 @@
mailbox->quota_mailbox_used, mailbox->quota.root);
}
else
-@@ -2256,7 +2288,7 @@
+@@ -2265,7 +2297,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;
}
}
-@@ -2470,7 +2502,7 @@
+@@ -2479,7 +2511,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;
}
}
-@@ -2623,7 +2655,7 @@
+@@ -2632,7 +2664,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 -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
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.h
+--- cyrus-imapd-2.2.13/imap/mailbox.h 2006-11-13 19:21:27.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.h 2007-02-24 18:46:35.604276731 +0100
@@ -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 -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
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbdump.c
+--- cyrus-imapd-2.2.13/imap/mbdump.c 2007-02-24 18:46:32.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbdump.c 2007-02-24 18:46:35.605276633 +0100
@@ -507,7 +507,7 @@
{
struct buf file, data;
@@ -268,9 +268,9 @@
int r = 0;
int curfile = -1;
const char *userid = NULL;
-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
+diff -urNad cyrus-imapd-2.2.13/imap/mbexamine.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbexamine.c
+--- cyrus-imapd-2.2.13/imap/mbexamine.c 2006-11-13 19:21:27.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbexamine.c 2007-02-24 18:46:35.605276633 +0100
@@ -266,7 +266,7 @@
printf(" Minor Version: %d\n", mailbox.minor_version);
printf(" Header Size: %ld bytes Record Size: %ld bytes\n",
@@ -280,10 +280,10 @@
mailbox.exists, mailbox.quota_mailbox_used);
printf(" Last Append Date: (%ld) %s", mailbox.last_appenddate,
ctime(&mailbox.last_appenddate));
-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 @@
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mboxlist.c
+--- cyrus-imapd-2.2.13/imap/mboxlist.c 2007-02-24 18:46:31.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mboxlist.c 2007-02-24 18:46:35.606276534 +0100
+@@ -2536,7 +2536,7 @@
r = quota_write(&mailbox.quota, tid);
if (r) {
syslog(LOG_ERR,
@@ -292,9 +292,9 @@
mailbox.quota_mailbox_used, mailbox.quota.root);
}
free(mailbox.quota.root);
-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
+diff -urNad cyrus-imapd-2.2.13/imap/quota.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.c
+--- cyrus-imapd-2.2.13/imap/quota.c 2007-02-24 18:46:31.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.c 2007-02-24 18:46:35.607276436 +0100
@@ -107,7 +107,7 @@
struct quota quota;
int refcount;
@@ -336,9 +336,9 @@
+ printf(" " QUOTA_REPORT_FMT " %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
}
}
-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
+diff -urNad cyrus-imapd-2.2.13/imap/quota.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.h
+--- cyrus-imapd-2.2.13/imap/quota.h 2006-11-13 19:21:27.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.h 2007-02-24 18:46:35.607276436 +0100
@@ -45,18 +45,37 @@
#define INCLUDED_QUOTA_H
@@ -378,9 +378,9 @@
int limit; /* in QUOTA_UNITS */
};
-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
+diff -urNad cyrus-imapd-2.2.13/imap/quota_db.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota_db.c
+--- cyrus-imapd-2.2.13/imap/quota_db.c 2006-11-13 19:21:27.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota_db.c 2007-02-24 18:46:35.608276338 +0100
@@ -89,7 +89,7 @@
switch (r) {
@@ -399,9 +399,9 @@
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
+diff -urNad cyrus-imapd-2.2.13/imap/reconstruct.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/reconstruct.c
+--- cyrus-imapd-2.2.13/imap/reconstruct.c 2007-02-24 18:46:31.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/reconstruct.c 2007-02-24 18:46:35.608276338 +0100
@@ -93,6 +93,7 @@
#include "retry.h"
#include "convert_code.h"
@@ -423,22 +423,21 @@
*((bit32 *)(buf+OFFSET_EXISTS)) = htonl(new_exists);
*((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox.last_appenddate);
*((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox.last_uid);
-- *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(new_quota);
+
+ /* quotas may be 64bit now */
+#ifdef HAVE_LONG_LONG_INT
+ *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonll(new_quota);
+#else
-+ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED32)) = htonl(new_quota);
+ *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(new_quota);
+#endif
+
*((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 -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 @@
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/Makefile.in
+--- cyrus-imapd-2.2.13/lib/Makefile.in 2007-02-24 18:46:32.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/Makefile.in 2007-02-24 18:46:35.609276239 +0100
+@@ -87,7 +87,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 \
@@ -447,7 +446,7 @@
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 @@
+@@ -95,7 +95,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@ \
@@ -456,9 +455,9 @@
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
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.c
+--- cyrus-imapd-2.2.13/lib/byteorder64.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.c 2007-02-24 18:46:35.609276239 +0100
@@ -0,0 +1,95 @@
+/* byteorder64.c -- convert 64-bit values between host and network byte order
+ *
@@ -555,9 +554,9 @@
+}
+
+#endif /* defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN) */
-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
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.h
+--- cyrus-imapd-2.2.13/lib/byteorder64.h 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.h 2007-02-24 18:46:35.609276239 +0100
@@ -0,0 +1,65 @@
+/* byteorder64.h -- convert 64-bit values between host and network byte order
+ *
@@ -624,9 +623,9 @@
+#endif /* WORDS_BIGENDIAN */
+#endif /* HAVE_LONG_LONG_INT */
+#endif /* _BYTEORDER64_H */
-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
+diff -urNad cyrus-imapd-2.2.13/lib/prot.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/prot.c
+--- cyrus-imapd-2.2.13/lib/prot.c 2006-11-13 19:21:27.000000000 +0100
++++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/prot.c 2007-02-24 18:46:35.610276141 +0100
@@ -871,6 +871,11 @@
char buf[30];
va_start(pvar, fmt);
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list