# HG changeset patch
# User Heiko Schlittermann (I24) <hs@schlittermann.de>
# Date 1305641986 -7200
# Node ID 1a5f0c5987d076f88887857a728aa0ff0d4bcd9a
# Parent  9b0dcedaddc2b2fc4eb5c33cfc43ca09d6c09876
updated *all* patches to 4.76, changed the guard to +4.76

diff -r 9b0dcedaddc2 -r 1a5f0c5987d0 series
--- a/series	Tue May 17 16:14:22 2011 +0200
+++ b/series	Tue May 17 16:19:46 2011 +0200
@@ -1,6 +1,6 @@
-build.Makefile #+4.74
-src.bail-out-on-BOM #+4.74
-src.maildir_use_size_file #+4.74
-src.quota-no-check #+4.74
-src.lock_maildirsize #+4.74
-src.overquota #+4.74
+build.Makefile #+4.76
+src.bail-out-on-BOM #+4.76
+src.maildir_use_size_file #+4.76
+src.quota-no-check #+4.76
+src.lock_maildirsize #+4.76
+src.overquota #+4.76
diff -r 9b0dcedaddc2 -r 1a5f0c5987d0 src.lock_maildirsize
--- a/src.lock_maildirsize	Tue May 17 16:14:22 2011 +0200
+++ b/src.lock_maildirsize	Tue May 17 16:19:46 2011 +0200
@@ -1,9 +1,9 @@
 # HG changeset patch
-# Parent 725ab374f90553e848d1c418c11003dab45ec07c
+# Parent 713d8d0301931a88aad6f7dec3adb838ac15f51f
 
-diff -r 725ab374f905 src/transports/appendfile.c
---- a/src/transports/appendfile.c	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/appendfile.c	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/appendfile.c	Tue May 17 16:17:21 2011 +0200
 @@ -13,6 +13,7 @@
  
  #ifdef SUPPORT_MAILDIR
@@ -71,7 +71,7 @@
  #ifdef SUPPORT_MBX
  /*************************************************
  *         Copy message into MBX mailbox          *
-@@ -2433,18 +2457,19 @@
+@@ -2433,15 +2457,15 @@
        {
        off_t size;
        int filecount;
@@ -89,12 +89,8 @@
 +        addr->message = excuse;
          return FALSE;
          }
- 
-+
-       if (mailbox_size < 0) mailbox_size = size;
-       if (mailbox_filecount < 0) mailbox_filecount = filecount;
-       }
-@@ -3154,6 +3179,12 @@
+       /* can also return -2, which means that the file was removed because of
+@@ -3171,6 +3195,12 @@
        uschar *renamename = newname;
        fd = -1;
  
@@ -107,7 +103,7 @@
        DEBUG(D_transport) debug_printf("renaming temporary file\n");
  
        /* If there is no rename name set, we are in a non-maildir, non-mailstore
-@@ -3274,6 +3305,7 @@
+@@ -3291,6 +3321,7 @@
            filename = dataname = NULL;   /* Prevents attempt to unlink at end */
            }
          }        /* maildir or mailstore */
@@ -115,7 +111,7 @@
        }          /* successful write + close */
      }            /* isdirectory */
    }              /* write success */
-@@ -3309,6 +3341,11 @@
+@@ -3326,6 +3357,11 @@
  detected, in order to get the file closed and the lock file tidied away. */
  
  RETURN:
@@ -127,9 +123,9 @@
  
  #ifdef SUPPORT_MBX
  if (mbx_lockfd >= 0)
-diff -r 725ab374f905 src/transports/appendfile.h
---- a/src/transports/appendfile.h	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/appendfile.h	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/appendfile.h	Tue May 17 16:17:21 2011 +0200
 @@ -97,5 +97,8 @@
  /* Function that is shared with tf_maildir.c */
  
@@ -139,9 +135,9 @@
 +
  
  /* End of transports/appendfile.h */
-diff -r 725ab374f905 src/transports/tf_maildir.c
---- a/src/transports/tf_maildir.c	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/tf_maildir.c	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/tf_maildir.c
+--- a/src/transports/tf_maildir.c	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/tf_maildir.c	Tue May 17 16:17:21 2011 +0200
 @@ -367,13 +367,16 @@
  
  Returns:           >=0  a file descriptor for an open maildirsize file
@@ -248,9 +244,9 @@
  DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT
    " filecount=%d\n", size, filecount);
  *returned_size = size;
-diff -r 725ab374f905 src/transports/tf_maildir.h
---- a/src/transports/tf_maildir.h	Wed Apr 13 12:08:31 2011 +0200
-+++ b/src/transports/tf_maildir.h	Wed Apr 13 12:08:39 2011 +0200
+diff -r 713d8d030193 src/transports/tf_maildir.h
+--- a/src/transports/tf_maildir.h	Tue May 17 15:55:42 2011 +0200
++++ b/src/transports/tf_maildir.h	Tue May 17 16:17:21 2011 +0200
 @@ -16,7 +16,7 @@
                  uschar *);
  extern int    maildir_ensure_sizefile(uschar *,
diff -r 9b0dcedaddc2 -r 1a5f0c5987d0 src.overquota
--- a/src.overquota	Tue May 17 16:14:22 2011 +0200
+++ b/src.overquota	Tue May 17 16:19:46 2011 +0200
@@ -1,12 +1,12 @@
 # HG changeset patch
-# Parent e5aaf8e99b1e7f5ff16649a4b8a69716b82b9cc2
+# Parent f28044d5dcaf4418eb3c92fd325ce439c57cbab4
 
-diff -r e5aaf8e99b1e doc/spec.txt
---- a/doc/spec.txt	Thu Apr 07 15:38:24 2011 +0200
-+++ b/doc/spec.txt	Thu Apr 07 16:05:46 2011 +0200
-@@ -18143,6 +18143,16 @@
- or not it ends with "/". This option is available only if SUPPORT_MAILDIR is
- present in Local/Makefile. See section 26.5 below for further details.
+diff -r f28044d5dcaf doc/spec.txt
+--- a/doc/spec.txt	Tue May 17 16:17:21 2011 +0200
++++ b/doc/spec.txt	Tue May 17 16:17:42 2011 +0200
+@@ -4,6 +4,16 @@
+ 
+ Copyright (c) 2011 University of Cambridge
  
 ++-------------------------------------------------------------------+
 +|maildir_overquota_file|Use: appendfile|Type: string*|Default: unset|
@@ -19,11 +19,11 @@
 +The filename is taken relative to the mailir directory.
 +
  +-----------------------------------------------------------------------------+
- |maildir_quota_directory_regex|Use: appendfile|Type: string|Default: See below|
- +-----------------------------------------------------------------------------+
-diff -r e5aaf8e99b1e src/transports/appendfile.c
---- a/src/transports/appendfile.c	Thu Apr 07 15:38:24 2011 +0200
-+++ b/src/transports/appendfile.c	Thu Apr 07 16:05:46 2011 +0200
+ +-------------------------------------+--------------------------------+------+
+ |Revision 4.76                        |06 May 2011                     |EM    |
+diff -r f28044d5dcaf src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Tue May 17 16:17:21 2011 +0200
++++ b/src/transports/appendfile.c	Tue May 17 16:17:42 2011 +0200
 @@ -104,6 +104,8 @@
  #ifdef SUPPORT_MAILDIR
    { "maildir_format",    opt_bool,
@@ -49,7 +49,7 @@
  /* Loop for quota, quota_filecount, quota_warn_threshold, mailbox_size,
  mailbox_filecount */
  
-@@ -2776,9 +2780,10 @@
+@@ -2778,9 +2782,10 @@
  is for the mailbox already being over quota (i.e. the current message is not
  included in the check). */
  
@@ -62,7 +62,7 @@
      {
      debug_printf("Exim quota = " OFF_T_FMT " old size = " OFF_T_FMT
        " this message = %d (%sincluded)\n",
-@@ -2789,31 +2794,62 @@
+@@ -2791,31 +2796,62 @@
      }
    if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value)
      {
@@ -140,9 +140,9 @@
      }
    }
  
-diff -r e5aaf8e99b1e src/transports/appendfile.h
---- a/src/transports/appendfile.h	Thu Apr 07 15:38:24 2011 +0200
-+++ b/src/transports/appendfile.h	Thu Apr 07 16:05:46 2011 +0200
+diff -r f28044d5dcaf src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Tue May 17 16:17:21 2011 +0200
++++ b/src/transports/appendfile.h	Tue May 17 16:17:42 2011 +0200
 @@ -24,6 +24,7 @@
    uschar *mailbox_size_string;
    uschar *mailbox_filecount_string;