--- cyrus-imapd-2.2.12-64bit-quotas.patch	2007-07-22 10:47:07.000000000 +0200
+++ cyrus-imapd-2.2.13-64bit-quotas.patch	2007-07-22 11:36:33.000000000 +0200
@@ -179,8 +179,8 @@
  	chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
  	gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
  	@LIBOBJS@ @CYRUSDB_OBJS@ \
--	iptostring.o xmalloc.o wildmat.o
-+	iptostring.o xmalloc.o wildmat.o byteorder64.o
+-	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)/xmalloc.h \
  	$(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
@@ -498,15 +498,6 @@
  };
  
  #define QUOTAGROW 300
-@@ -251,7 +251,7 @@
-     }
-     memset(&quota[quota_num], 0, sizeof(struct quotaentry));
-     quota[quota_num].quota.root = xstrndup(key, keylen);
--    sscanf(data, "%lu %d",
-+    sscanf(data, UQUOTA_T_FMT " %d",
- 	   &quota[quota_num].quota.used, &quota[quota_num].quota.limit);
-   
-     quota_num++;
 @@ -422,7 +422,7 @@
  	(*count)++;
      }