Remove virtual_create_maildirsize setting, it's not needed as that's a subset of Maildir++ anyway.

Thanks to Tomas Macek for noticing this.

svn path=/; revision=40

1 files changed, 15 insertions, 22 deletions

diff --git a/vda/postfix-2.4.0-vda-ng.patch b/vda/postfix-2.4.0-vda-ng.patch
index af58bca..10a4fa2 100644
--- a/vda/postfix-2.4.0-vda-ng.patch
+++ b/vda/postfix-2.4.0-vda-ng.patch
@@ -1,7 +1,7 @@
 diff -Nru postfix-2.4.0/README_FILES/VDA_README postfix-2.4.0-vda/README_FILES/VDA_README
 --- postfix-2.4.0/README_FILES/VDA_README	1970-01-01 01:00:00.000000000 +0100
-+++ postfix-2.4.0-vda/README_FILES/VDA_README	2007-04-19 23:12:10.000000000 +0200
-@@ -0,0 +1,97 @@
++++ postfix-2.4.0-vda/README_FILES/VDA_README	2007-04-23 16:10:46.000000000 +0200
+@@ -0,0 +1,96 @@
 +Installation:
 +
 +1 - Get the Postfix source code ( http://www.postfix.org/ )
@@ -47,12 +47,11 @@ diff -Nru postfix-2.4.0/README_FILES/VDA_README postfix-2.4.0-vda/README_FILES/V
 +# Enable limits smaller than maximum message size
 +virtual_mailbox_limit_override = yes
 +
-+# Enable Courier-IMAP compatible filenames
++# Enable Maildir++ extensions for faster maildir quota calculation
++# (maildirsize file and ,S=<size> filename extension)
++# Needs Maildir++ compatible IMAP servers, like Courier-IMAP
 +virtual_maildir_extended = yes
 +
-+# Create maildirsize file if missing
-+virtual_create_maildirsize = yes
-+
 +# Always bounce the message when quota reached
 +virtual_overquota_bounce = yes
 +
@@ -101,8 +100,8 @@ diff -Nru postfix-2.4.0/README_FILES/VDA_README postfix-2.4.0-vda/README_FILES/V
 +More informations can be found at http://vda.sourceforge.net/
 diff -Nru postfix-2.4.0/src/global/mail_params.h postfix-2.4.0-vda/src/global/mail_params.h
 --- postfix-2.4.0/src/global/mail_params.h	2007-02-25 03:15:42.000000000 +0100
-+++ postfix-2.4.0-vda/src/global/mail_params.h	2007-04-19 23:13:39.000000000 +0200
-@@ -2099,6 +2099,58 @@
++++ postfix-2.4.0-vda/src/global/mail_params.h	2007-04-23 16:08:14.000000000 +0200
+@@ -2099,6 +2099,54 @@
  #define DEF_VIRT_GID_MAPS		""
  extern char *var_virt_gid_maps;
  
@@ -122,10 +121,6 @@ diff -Nru postfix-2.4.0/src/global/mail_params.h postfix-2.4.0-vda/src/global/ma
 +#define DEF_VIRT_MAILDIR_EXTENDED       0
 +extern bool var_virt_maildir_extended;
 +
-+#define VAR_VIRT_CREATE_MAILDIRSIZE     "virtual_create_maildirsize"
-+#define DEF_VIRT_CREATE_MAILDIRSIZE     0
-+extern bool var_virt_create_maildirsize;
-+
 +#define VAR_VIRT_OVERQUOTA_BOUNCE       "virtual_overquota_bounce"
 +#define DEF_VIRT_OVERQUOTA_BOUNCE       0
 +extern bool var_virt_overquota_bounce;
@@ -349,7 +344,7 @@ diff -Nru postfix-2.4.0/src/virtual/mailbox.c postfix-2.4.0-vda/src/virtual/mail
       * Cleanup.
 diff -Nru postfix-2.4.0/src/virtual/maildir.c postfix-2.4.0-vda/src/virtual/maildir.c
 --- postfix-2.4.0/src/virtual/maildir.c	2006-06-26 14:59:19.000000000 +0200
-+++ postfix-2.4.0-vda/src/virtual/maildir.c	2007-04-22 01:24:16.000000000 +0200
++++ postfix-2.4.0-vda/src/virtual/maildir.c	2007-04-23 16:07:19.000000000 +0200
 @@ -63,28 +63,382 @@
  #include <mbox_open.h>
  #include <dsn_util.h>
@@ -516,7 +511,7 @@ diff -Nru postfix-2.4.0/src/virtual/maildir.c postfix-2.4.0-vda/src/virtual/mail
 +    struct dirent *ent;
 +    struct stat statbuf;
 +
-+    if (!var_virt_mailbox_limit_inbox && var_virt_maildir_extended && var_virt_create_maildirsize && (sum = read_maildirsize(dirname, countptr))) {
++    if (!var_virt_mailbox_limit_inbox && var_virt_maildir_extended && (sum = read_maildirsize(dirname, countptr))) {
 +        if (msg_verbose)
 +            msg_info("%s: maildirsize used: dir=%s sum=%ld count=%ld", myname, dirname, sum, *countptr);
 +        return sum;
@@ -1113,7 +1108,7 @@ diff -Nru postfix-2.4.0/src/virtual/maildir.c postfix-2.4.0-vda/src/virtual/mail
 +                        mail_copy_status = MAIL_COPY_STAT_WRITE;
 +                    }
 +
-+                    if (var_virt_create_maildirsize) {
++                    if (var_virt_maildir_extended) {
 +                        time(&tm);
 +
 +                        if (*var_virt_maildir_suffix == 0) {
@@ -1247,8 +1242,8 @@ diff -Nru postfix-2.4.0/src/virtual/maildir.c postfix-2.4.0-vda/src/virtual/mail
  }
 diff -Nru postfix-2.4.0/src/virtual/virtual.c postfix-2.4.0-vda/src/virtual/virtual.c
 --- postfix-2.4.0/src/virtual/virtual.c	2007-03-27 02:07:43.000000000 +0200
-+++ postfix-2.4.0-vda/src/virtual/virtual.c	2007-04-19 23:20:06.000000000 +0200
-@@ -330,12 +330,29 @@
++++ postfix-2.4.0-vda/src/virtual/virtual.c	2007-04-23 16:09:05.000000000 +0200
+@@ -330,12 +330,28 @@
  int     var_virt_mailbox_limit;
  char   *var_mail_spool_dir;		/* XXX dependency fix */
  
@@ -1256,7 +1251,6 @@ diff -Nru postfix-2.4.0/src/virtual/virtual.c postfix-2.4.0-vda/src/virtual/virt
 +bool    var_virt_mailbox_limit_inbox;
 +bool    var_virt_mailbox_limit_override;
 +bool    var_virt_maildir_extended;
-+bool    var_virt_create_maildirsize;
 +bool    var_virt_overquota_bounce;
 +char   *var_virt_maildir_limit_message;
 +char   *var_virt_maildir_limit_message_maps;
@@ -1278,7 +1272,7 @@ diff -Nru postfix-2.4.0/src/virtual/virtual.c postfix-2.4.0-vda/src/virtual/virt
  
   /*
    * Bit masks.
-@@ -445,15 +462,24 @@
+@@ -445,15 +461,24 @@
       */
      virtual_mailbox_maps =
  	maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps,
@@ -1308,7 +1302,7 @@ diff -Nru postfix-2.4.0/src/virtual/virtual.c postfix-2.4.0-vda/src/virtual/virt
  
      virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
  }
-@@ -495,16 +521,34 @@
+@@ -495,16 +520,33 @@
  	VAR_VIRT_MAILBOX_LIMIT, DEF_VIRT_MAILBOX_LIMIT, &var_virt_mailbox_limit, 0, 0,
  	0,
      };
@@ -1325,7 +1319,6 @@ diff -Nru postfix-2.4.0/src/virtual/virtual.c postfix-2.4.0-vda/src/virtual/virt
 +        VAR_VIRT_MAILBOX_LIMIT_INBOX, DEF_VIRT_MAILBOX_LIMIT_INBOX, &var_virt_mailbox_limit_inbox,
 +        VAR_VIRT_MAILBOX_LIMIT_OVERRIDE, DEF_VIRT_MAILBOX_LIMIT_OVERRIDE, &var_virt_mailbox_limit_override,
 +        VAR_VIRT_MAILDIR_EXTENDED, DEF_VIRT_MAILDIR_EXTENDED, &var_virt_maildir_extended,
-+        VAR_VIRT_CREATE_MAILDIRSIZE, DEF_VIRT_CREATE_MAILDIRSIZE, &var_virt_create_maildirsize,
 +        VAR_VIRT_OVERQUOTA_BOUNCE, DEF_VIRT_OVERQUOTA_BOUNCE, &var_virt_overquota_bounce,
 +        VAR_VIRT_TRASH_COUNT, DEF_VIRT_TRASH_COUNT, &var_virt_trash_count,
 +        VAR_VIRT_MAILDIR_FILTER, DEF_VIRT_MAILDIR_FILTER, &var_virt_maildir_filter,
@@ -1351,7 +1344,7 @@ diff -Nru postfix-2.4.0/src/virtual/virtual.c postfix-2.4.0-vda/src/virtual/virt
      /*
       * Fingerprint executables and core dumps.
       */
-@@ -516,6 +560,7 @@
+@@ -516,6 +558,7 @@
  		       MAIL_SERVER_PRE_INIT, pre_init,
  		       MAIL_SERVER_POST_INIT, post_init,
  		       MAIL_SERVER_PRE_ACCEPT, pre_accept,