# HG changeset patch
# User Heiko Schlittermann (I24) <hs@schlittermann.de>
# Date 1306443919 -7200
# Node ID 45696d13651f32c3dc12ecc4e5d079480688538c
# Parent  1a5f0c5987d076f88887857a728aa0ff0d4bcd9a
we can't easily expand mailbox_size and mailbox_filecount
they are counted in the subprocess doing the delivery.

diff -r 1a5f0c5987d0 -r 45696d13651f build.Makefile
--- a/build.Makefile	Tue May 17 16:19:46 2011 +0200
+++ b/build.Makefile	Thu May 26 23:05:19 2011 +0200
@@ -1,9 +1,9 @@
 # HG changeset patch
-# Parent 000bec5641ad0bb85fec4120a5a609ea15b6fdd6
+# Parent 89b2140f5dd79299467a56e0e878da7854227efd
 
-diff -r 000bec5641ad Makefile
---- a/Makefile	Fri Apr 01 14:06:49 2011 +0200
-+++ b/Makefile	Fri Apr 01 14:06:50 2011 +0200
+diff -r 89b2140f5dd7 Makefile
+--- a/Makefile	Tue May 17 15:19:58 2011 +0200
++++ b/Makefile	Tue May 24 13:56:18 2011 +0200
 @@ -68,7 +68,8 @@
  # The installation commands are kept in a separate script, which expects
  # to be run from inside the build directory.
@@ -14,9 +14,9 @@
  		build=$(build) $(SHELL) ../scripts/exim_install $(INSTALL_ARG)
  
  # Tidy-up targets
-diff -r 000bec5641ad OS/Makefile-Base
---- a/OS/Makefile-Base	Fri Apr 01 14:06:49 2011 +0200
-+++ b/OS/Makefile-Base	Fri Apr 01 14:06:50 2011 +0200
+diff -r 89b2140f5dd7 OS/Makefile-Base
+--- a/OS/Makefile-Base	Tue May 17 15:19:58 2011 +0200
++++ b/OS/Makefile-Base	Tue May 24 13:56:18 2011 +0200
 @@ -640,43 +640,43 @@
  # The lookups library.
  
diff -r 1a5f0c5987d0 -r 45696d13651f src.overquota
--- a/src.overquota	Tue May 17 16:19:46 2011 +0200
+++ b/src.overquota	Thu May 26 23:05:19 2011 +0200
@@ -1,9 +1,9 @@
 # HG changeset patch
-# Parent f28044d5dcaf4418eb3c92fd325ce439c57cbab4
+# Parent c61873df44aedd71ff4e40bc1067f8f03f6afd5b
 
-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
+diff -r c61873df44ae doc/spec.txt
+--- a/doc/spec.txt	Tue May 17 16:24:29 2011 +0200
++++ b/doc/spec.txt	Fri May 20 11:48:11 2011 +0200
 @@ -4,6 +4,16 @@
  
  Copyright (c) 2011 University of Cambridge
@@ -21,9 +21,9 @@
  +-----------------------------------------------------------------------------+
  +-------------------------------------+--------------------------------+------+
  |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
+diff -r c61873df44ae src/transports/appendfile.c
+--- a/src/transports/appendfile.c	Tue May 17 16:24:29 2011 +0200
++++ b/src/transports/appendfile.c	Fri May 20 11:48:11 2011 +0200
 @@ -104,6 +104,8 @@
  #ifdef SUPPORT_MAILDIR
    { "maildir_format",    opt_bool,
@@ -41,15 +41,7 @@
    US"^(?:cur|new|\\..*)$",  /* maildir_dir_regex */
    NULL,           /* maildir_tag */
    NULL,           /* maildirfolder_create_regex */
-@@ -308,6 +311,7 @@
-   ob->maildir_use_size_file = expand_check_condition(ob->expand_maildir_use_size_file, 
-     US"`maildir_use_size_file` in transport", tblock->name);
- 
-+//debug_printf("***>>>>>>>>>>>>> %s\n", ob->maildir_use_size_file);
- /* Loop for quota, quota_filecount, quota_warn_threshold, mailbox_size,
- mailbox_filecount */
- 
-@@ -2778,9 +2782,10 @@
+@@ -2778,9 +2781,10 @@
  is for the mailbox already being over quota (i.e. the current message is not
  included in the check). */
  
@@ -62,7 +54,7 @@
      {
      debug_printf("Exim quota = " OFF_T_FMT " old size = " OFF_T_FMT
        " this message = %d (%sincluded)\n",
-@@ -2791,31 +2796,62 @@
+@@ -2791,31 +2795,62 @@
      }
    if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value)
      {
@@ -140,9 +132,9 @@
      }
    }
  
-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
+diff -r c61873df44ae src/transports/appendfile.h
+--- a/src/transports/appendfile.h	Tue May 17 16:24:29 2011 +0200
++++ b/src/transports/appendfile.h	Fri May 20 11:48:11 2011 +0200
 @@ -24,6 +24,7 @@
    uschar *mailbox_size_string;
    uschar *mailbox_filecount_string;