# HG changeset patch
# User Heiko Schlittermann (I24) <hs@schlittermann.de>
# Date 1305641662 -7200
# Node ID 9b0dcedaddc2b2fc4eb5c33cfc43ca09d6c09876
# Parent  053ea8d7305d26e2524160b126c3b43c470d8cdf
changed to 4.76

diff -r 053ea8d7305d -r 9b0dcedaddc2 doc.maildir_tag
--- a/doc.maildir_tag	Wed Apr 13 12:23:23 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# HG changeset patch
-# Parent 2d381cd1efafa5ef9eeafb57be6b6b170ba3dd78
-
-diff -r 2d381cd1efaf doc/spec.txt
---- a/doc/spec.txt	Fri Apr 01 12:04:37 2011 +0200
-+++ b/doc/spec.txt	Fri Apr 01 14:06:49 2011 +0200
-@@ -18409,6 +18409,8 @@
- file name (even though maildir_tag puts it there) because maildir MUAs
- sometimes add other information onto the ends of message file names.
- 
-+Section 26.7 contains further information.
-+
- +-------------------------------------------------------------------+
- |quota_warn_message|Use: appendfile|Type: string*|Default: see below|
- +-------------------------------------------------------------------+
-@@ -18794,6 +18796,18 @@
- empty, it is ignored. If it starts with an alphanumeric character, a leading
- colon is inserted.
- 
-+Please note, that normally you want to use 
-+
-+	maildir_tag = ,S=${message_size}
-+
-+The default prefix choosen (a colon) may be misinterpreted by other maildir
-+clients. Please check their documentation about the expected format of
-+the filename.
-+
-+If Exim should use this tag, you need to set the quota_size_regex as
-+described above. Otherwise Exim will do expensive stat() calls each time
-+the sizes need to be known.
-+
- 26.7Â Using a maildirsize file
- 
- If maildir_use_size_file is true, Exim implements the maildir++ rules for
diff -r 053ea8d7305d -r 9b0dcedaddc2 series
--- a/series	Wed Apr 13 12:23:23 2011 +0200
+++ b/series	Tue May 17 16:14:22 2011 +0200
@@ -1,8 +1,6 @@
-doc.maildir_tag #+4.74
 build.Makefile #+4.74
 src.bail-out-on-BOM #+4.74
 src.maildir_use_size_file #+4.74
-src.fixed_ensure_maildirsize #+4.74
 src.quota-no-check #+4.74
 src.lock_maildirsize #+4.74
 src.overquota #+4.74
diff -r 053ea8d7305d -r 9b0dcedaddc2 src.fixed_ensure_maildirsize
--- a/src.fixed_ensure_maildirsize	Wed Apr 13 12:23:23 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# HG changeset patch
-# Parent ecfe290806fda71edb54f4280f4e831e8c2cec7a
-
-diff -r ecfe290806fd src/transports/tf_maildir.c
---- a/src/transports/tf_maildir.c	Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/tf_maildir.c	Fri Apr 01 14:06:51 2011 +0200
-@@ -584,7 +584,7 @@
-       "a later subdirectory modification\n");
-     (void)Uunlink(filename);
-     (void)close(fd);
--    fd = -1;
-+    fd = -2;
-     }
-   }
- 
diff -r 053ea8d7305d -r 9b0dcedaddc2 src.maildir_use_size_file
--- a/src.maildir_use_size_file	Wed Apr 13 12:23:23 2011 +0200
+++ b/src.maildir_use_size_file	Tue May 17 16:14:22 2011 +0200
@@ -1,30 +1,30 @@
 # HG changeset patch
-# Parent 552ee33e550b77bb1567594e9e816087a79f0c7e
+# Parent 9fc8e53fb68fff284664976ef3b4d7a9ca190b1c
 
-diff -r 552ee33e550b doc/spec.txt
---- a/doc/spec.txt	Fri Apr 01 14:06:50 2011 +0200
-+++ b/doc/spec.txt	Fri Apr 01 14:06:51 2011 +0200
-@@ -18179,11 +18179,12 @@
+diff -r 9fc8e53fb68f doc/spec.txt
+--- a/doc/spec.txt	Tue May 17 15:44:39 2011 +0200
++++ b/doc/spec.txt	Tue May 17 15:50:31 2011 +0200
+@@ -18741,11 +18741,12 @@
  This option applies only to deliveries in maildir format, and is described in
  section 26.5 below.
  
--+------------------------------------------------------------------+
+-+---------------------+---------------+-------------+--------------+
 -|maildir_use_size_file|Use: appendfile|Type: boolean|Default: false|
--+------------------------------------------------------------------+
+-+---------------------+---------------+-------------+--------------+
 -
 -Setting this option true enables support for maildirsize files. Exim creates a
-++-------------------------------------------------------------------+
+++---------------------+---------------+--------------+--------------+
 +|maildir_use_size_file|Use: appendfile|Type: boolean*|Default: false|
-++-------------------------------------------------------------------+
+++---------------------+---------------+--------------+--------------+
 +
 +The result of string expansion for this option must be a valid boolean value.
 +If it is true, it enables support for maildirsize files. Exim creates a
- maildirsize file in a maildir if one does not exist, taking the quota from the
- quota option of the transport. If quota is unset, the value is zero. See
+ maildirsize file in a maildir if one does not exist, taking the quota from the 
+ quota option of the transport. If quota is unset, the value is zero. See 
  maildir_quota_directory_regex above and section 26.5 below for further details.
-diff -r 552ee33e550b src/transports/appendfile.c
---- a/src/transports/appendfile.c	Fri Apr 01 14:06:50 2011 +0200
-+++ b/src/transports/appendfile.c	Fri Apr 01 14:06:51 2011 +0200
+diff -r 9fc8e53fb68f src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Tue May 17 15:44:39 2011 +0200
++++ b/src/transports/appendfile.c	Tue May 17 15:50:31 2011 +0200
 @@ -38,6 +38,10 @@
  opt_public flag. */
  
@@ -64,9 +64,9 @@
  /* Loop for quota, quota_filecount, quota_warn_threshold, mailbox_size,
  mailbox_filecount */
  
-diff -r 552ee33e550b src/transports/appendfile.h
---- a/src/transports/appendfile.h	Fri Apr 01 14:06:50 2011 +0200
-+++ b/src/transports/appendfile.h	Fri Apr 01 14:06:51 2011 +0200
+diff -r 9fc8e53fb68f src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Tue May 17 15:44:39 2011 +0200
++++ b/src/transports/appendfile.h	Tue May 17 15:50:31 2011 +0200
 @@ -23,6 +23,7 @@
    uschar *quota_warn_threshold;
    uschar *mailbox_size_string;
diff -r 053ea8d7305d -r 9b0dcedaddc2 src.quota-no-check
--- a/src.quota-no-check	Wed Apr 13 12:23:23 2011 +0200
+++ b/src.quota-no-check	Tue May 17 16:14:22 2011 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 124a35dbf1399ba64efa3391306e18d9971d3d8b
+# Parent 094efc6f5bac18d49a1b5873257b0e729241dc55
 
-diff -r 124a35dbf139 doc/spec.txt
---- a/doc/spec.txt	Wed Apr 13 12:08:14 2011 +0200
-+++ b/doc/spec.txt	Wed Apr 13 12:08:31 2011 +0200
-@@ -18340,6 +18340,9 @@
+diff -r 094efc6f5bac doc/spec.txt
+--- a/doc/spec.txt	Tue May 17 15:50:31 2011 +0200
++++ b/doc/spec.txt	Tue May 17 15:55:42 2011 +0200
+@@ -18902,6 +18902,9 @@
  large file support (Linux and FreeBSD have this), mailboxes larger than 2G can
  be handled.
  
@@ -14,19 +14,19 @@
  Note: A value of zero is interpreted as "no quota".
  
  The expansion happens while Exim is running as root, before it changes uid for
-@@ -18378,6 +18381,9 @@
+@@ -18940,6 +18943,9 @@
  failure causes delivery to be deferred. A value of zero is interpreted as "no
  quota".
  
 +If there is "/no_check" appended, then quota updating is done as usual, but the
 +over quota condition does not prevent the delivery.
 +
- +--------------------------------------------------------------+
+ +------------------+---------------+-------------+-------------+
  |quota_is_inclusive|Use: appendfile|Type: boolean|Default: true|
- +--------------------------------------------------------------+
-diff -r 124a35dbf139 src/transports/appendfile.c
---- a/src/transports/appendfile.c	Wed Apr 13 12:08:14 2011 +0200
-+++ b/src/transports/appendfile.c	Wed Apr 13 12:08:31 2011 +0200
+ +------------------+---------------+-------------+-------------+
+diff -r 094efc6f5bac src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Tue May 17 15:50:31 2011 +0200
++++ b/src/transports/appendfile.c	Tue May 17 15:55:42 2011 +0200
 @@ -236,7 +236,9 @@
    FALSE,          /* mailstore_format */
    FALSE,          /* mbx_format */
@@ -97,7 +97,7 @@
      ob->quota_warn_threshold_value,
      ob->quota_warn_threshold_is_percent? "%" : "",
      isdirectory? "directory" : "file",
-@@ -2748,18 +2764,31 @@
+@@ -2751,18 +2767,31 @@
      }
    if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value)
      {
@@ -139,9 +139,9 @@
      }
    }
  
-diff -r 124a35dbf139 src/transports/appendfile.h
---- a/src/transports/appendfile.h	Wed Apr 13 12:08:14 2011 +0200
-+++ b/src/transports/appendfile.h	Wed Apr 13 12:08:31 2011 +0200
+diff -r 094efc6f5bac src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Tue May 17 15:50:31 2011 +0200
++++ b/src/transports/appendfile.h	Tue May 17 15:55:42 2011 +0200
 @@ -72,6 +72,8 @@
    BOOL  mbx_format;
    BOOL  quota_warn_threshold_is_percent;