dovecot-pop3-undeleted.patch

   1 diff -ur dovecot-1.0.rc19-o/src/master/mail-process.c dovecot-1.0.rc19/src/master/mail-process.c
   2 --- dovecot-1.0.rc19-o/src/master/mail-process.c        2007-01-12 16:38:21.000000000 -0700
   3 +++ dovecot-1.0.rc19/src/master/mail-process.c  2007-01-31 23:23:33.000000000 -0700
   4 @@ -247,6 +247,8 @@
   5                 env_put("POP3_NO_FLAG_UPDATES=1");
   6         if (set->pop3_reuse_xuidl)
   7                 env_put("POP3_REUSE_XUIDL=1");
   8 +       if (set->pop3_ignore_deleted)
   9 +               env_put("POP3_IGNORE_DELETED=1");
  10         if (set->pop3_enable_last)
  11                 env_put("POP3_ENABLE_LAST=1");
  12         if (set->pop3_lock_session)
  13 Only in dovecot-1.0.rc19/src/master: mail-process.c.orig
  14 diff -ur dovecot-1.0.rc19-o/src/master/master-settings.c dovecot-1.0.rc19/src/master/master-settings.c
  15 --- dovecot-1.0.rc19-o/src/master/master-settings.c     2007-01-18 09:50:24.000000000 -0700
  16 +++ dovecot-1.0.rc19/src/master/master-settings.c       2007-01-31 23:23:33.000000000 -0700
  17 @@ -258,6 +258,7 @@
  18         MEMBER(pop3_enable_last) FALSE,
  19         MEMBER(pop3_reuse_xuidl) FALSE,
  20         MEMBER(pop3_lock_session) FALSE,
  21 +       MEMBER(pop3_ignore_deleted) FALSE,
  22         MEMBER(pop3_uidl_format) "",
  23         MEMBER(pop3_client_workarounds) "",
  24         MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
  25 Only in dovecot-1.0.rc19/src/master: master-settings.c.orig
  26 Only in dovecot-1.0.rc19/src/master: master-settings.c.rej
  27 diff -ur dovecot-1.0.rc19-o/src/master/master-settings-defs.c dovecot-1.0.rc19/src/master/master-settings-defs.c
  28 --- dovecot-1.0.rc19-o/src/master/master-settings-defs.c        2006-12-28 09:27:46.000000000 -0700
  29 +++ dovecot-1.0.rc19/src/master/master-settings-defs.c  2007-01-31 23:25:32.000000000 -0700
  30 @@ -107,6 +107,7 @@
  31         DEF(SET_BOOL, pop3_enable_last),
  32         DEF(SET_BOOL, pop3_reuse_xuidl),
  33         DEF(SET_BOOL, pop3_lock_session),
  34 +       DEF(SET_BOOL, pop3_ignore_deleted),
  35         DEF(SET_STR, pop3_uidl_format),
  36         DEF(SET_STR, pop3_client_workarounds),
  37         DEF(SET_STR, pop3_logout_format),
  38 Only in dovecot-1.0.rc19/src/master: master-settings-defs.c~
  39 diff -ur dovecot-1.0.rc19-o/src/master/master-settings.h dovecot-1.0.rc19/src/master/master-settings.h
  40 --- dovecot-1.0.rc19-o/src/master/master-settings.h     2007-01-18 09:50:24.000000000 -0700
  41 +++ dovecot-1.0.rc19/src/master/master-settings.h       2007-01-31 23:23:34.000000000 -0700
  42 @@ -115,6 +115,7 @@
  43         bool pop3_enable_last;
  44         bool pop3_reuse_xuidl;
  45         bool pop3_lock_session;
  46 +       bool pop3_ignore_deleted;
  47         const char *pop3_uidl_format;
  48         const char *pop3_client_workarounds;
  49         const char *pop3_logout_format;
  50 Only in dovecot-1.0.rc19/src/master: master-settings.h.orig
  51 diff -ur dovecot-1.0.rc19-o/src/pop3/client.c dovecot-1.0.rc19/src/pop3/client.c
  52 --- dovecot-1.0.rc19-o/src/pop3/client.c        2006-08-10 16:26:41.000000000 -0600
  53 +++ dovecot-1.0.rc19/src/pop3/client.c  2007-01-31 23:23:34.000000000 -0700
  54 @@ -64,7 +64,12 @@
  55         message_sizes_buf = buffer_create_dynamic(default_pool, 512);
  56
  57         memset(&search_arg, 0, sizeof(search_arg));
  58 -       search_arg.type = SEARCH_ALL;
  59 +       if(ignore_deleted_messages) {
  60 +               search_arg.type = SEARCH_DELETED;
  61 +               search_arg.not = 1;
  62 +       } else {
  63 +               search_arg.type = SEARCH_ALL;
  64 +       }
  65
  66         for (i = 0; i < 2; i++) {
  67                 if (sync_mailbox(client->mailbox, &status) < 0) {
  68 diff -ur dovecot-1.0.rc19-o/src/pop3/common.h dovecot-1.0.rc19/src/pop3/common.h
  69 --- dovecot-1.0.rc19-o/src/pop3/common.h        2006-04-27 06:29:14.000000000 -0600
  70 +++ dovecot-1.0.rc19/src/pop3/common.h  2007-01-31 23:23:34.000000000 -0700
  71 @@ -18,7 +18,7 @@
  72
  73  extern struct ioloop *ioloop;
  74  extern enum client_workarounds client_workarounds;
  75 -extern bool enable_last_command, no_flag_updates, reuse_xuidl, lock_session;
  76 +extern bool enable_last_command, no_flag_updates, reuse_xuidl, lock_session, ignore_deleted_messages;
  77  extern const char *uidl_format, *logout_format;
  78  extern enum uidl_keys uidl_keymask;
  79
  80 diff -ur dovecot-1.0.rc19-o/src/pop3/main.c dovecot-1.0.rc19/src/pop3/main.c
  81 --- dovecot-1.0.rc19-o/src/pop3/main.c  2006-12-19 22:08:46.000000000 -0700
  82 +++ dovecot-1.0.rc19/src/pop3/main.c    2007-01-31 23:23:34.000000000 -0700
  83 @@ -46,6 +46,7 @@
  84  bool no_flag_updates = FALSE;
  85  bool reuse_xuidl = FALSE;
  86  bool lock_session = FALSE;
  87 +bool ignore_deleted_messages = FALSE;
  88  const char *uidl_format, *logout_format;
  89  enum uidl_keys uidl_keymask;
  90
  91 @@ -218,6 +219,7 @@
  92         no_flag_updates = getenv("POP3_NO_FLAG_UPDATES") != NULL;
  93         reuse_xuidl = getenv("POP3_REUSE_XUIDL") != NULL;
  94         lock_session = getenv("POP3_LOCK_SESSION") != NULL;
  95 +       ignore_deleted_messages = getenv("POP3_IGNORE_DELETED") != NULL;
  96
  97         uidl_format = getenv("POP3_UIDL_FORMAT");
  98         if (uidl_format == NULL || *uidl_format == '\0')