[SVN] r474 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch patches/00list

[debian at incase.de]

Author: sven
Date: Thu Jun  1 21:02:21 2006
New Revision: 474

URL: https://mail.incase.de/viewcvs?rev=474&root=cyrus22&view=rev
Log:
Add upstream patch to allow reporting of mailbox sizes above 4GB

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=474&root=cyrus22&r1=473&r2=474&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Thu Jun  1 21:02:21 2006
@@ -19,12 +19,13 @@
   * Add upstream patch to fix a small issue with linking and libRSAglue
   * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther
     <guenther at sendmail.com>)
+  * Add upstream patch to allow reporting of mailbox sizes above 4GB
 
   [ Benjamin Seidenberg ]
   * Fix typos in UPGRADE.Debian (Closes: #368675)
   * Fix link in doc/html/readme.html (Closes: #368676)
 
- -- Benjamin Seidenberg <astronut at dlgeek.net>  Wed, 24 May 2006 16:21:58 -0400
+ -- Sven Mueller <debian at incase.de>  Thu,  1 Jun 2006 20:51:34 +0200
 
 cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high
 

Added: trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch?rev=474&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch Thu Jun  1 21:02:21 2006
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0012-upstream-allow-report-above-4GB-mboxsize by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream patch to allow reporting of mailbox sizes above 4GB
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/annotate.c /tmp/dpep.a5esoJ/cyrus-imapd-2.2.13/imap/annotate.c
+--- cyrus-imapd-2.2.13/imap/annotate.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.a5esoJ/cyrus-imapd-2.2.13/imap/annotate.c	2006-06-01 20:49:42.246066629 +0200
+@@ -703,7 +703,13 @@
+     struct mailbox mailbox;
+     struct index_record record;
+     int r = 0, msg;
++#ifdef HAVE_LONG_LONG_INT
++    unsigned long long totsize = 0;
++# define SUZE_FMT "%llu"
++#else 
+     unsigned long totsize = 0;
++# define SIZE_FMT "%lu"
++#endif
+     char value[21];
+     struct annotation_data attrib;
+ 
+@@ -735,7 +741,7 @@
+ 
+     mailbox_close(&mailbox);
+ 
+-    if (r || snprintf(value, sizeof(value), "%lu", totsize) == -1)
++    if (r || snprintf(value, sizeof(value), SIZE_FMT, totsize) == -1)
+ 	return;
+ 
+     memset(&attrib, 0, sizeof(attrib));

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=474&root=cyrus22&r1=473&r2=474&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Thu Jun  1 21:02:21 2006
@@ -10,6 +10,7 @@
 0010-upstream-fix-libRSAglue-linkage.dpatch
 0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
+0013-upstream-allow-report-above-4GB-mboxsize.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch