SOURCES: dovecot-pop3-undeleted.patch - up for 1.0rc19

aredridel aredridel at pld-linux.org
Thu Feb 1 07:36:25 CET 2007


Author: aredridel                    Date: Thu Feb  1 06:36:25 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 1.0rc19

---- Files affected:
SOURCES:
   dovecot-pop3-undeleted.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/dovecot-pop3-undeleted.patch
diff -u SOURCES/dovecot-pop3-undeleted.patch:1.4 SOURCES/dovecot-pop3-undeleted.patch:1.5
--- SOURCES/dovecot-pop3-undeleted.patch:1.4	Thu Feb  1 07:20:21 2007
+++ SOURCES/dovecot-pop3-undeleted.patch	Thu Feb  1 07:36:20 2007
@@ -1,7 +1,7 @@
-diff -ur dovecot-1.0.rc15-o/src/master/mail-process.c dovecot-1.0.rc15/src/master/mail-process.c
---- dovecot-1.0.rc15-o/src/master/mail-process.c	2006-10-17 04:50:31.000000000 -0600
-+++ dovecot-1.0.rc15/src/master/mail-process.c	2007-01-31 22:42:50.000000000 -0700
-@@ -243,6 +243,8 @@
+diff -ur dovecot-1.0.rc19-o/src/master/mail-process.c dovecot-1.0.rc19/src/master/mail-process.c
+--- dovecot-1.0.rc19-o/src/master/mail-process.c	2007-01-12 16:38:21.000000000 -0700
++++ dovecot-1.0.rc19/src/master/mail-process.c	2007-01-31 23:23:33.000000000 -0700
+@@ -247,6 +247,8 @@
  		env_put("POP3_NO_FLAG_UPDATES=1");
  	if (set->pop3_reuse_xuidl)
  		env_put("POP3_REUSE_XUIDL=1");
@@ -10,18 +10,11 @@
  	if (set->pop3_enable_last)
  		env_put("POP3_ENABLE_LAST=1");
  	if (set->pop3_lock_session)
-diff -ur dovecot-1.0.rc15-o/src/master/master-settings.c dovecot-1.0.rc15/src/master/master-settings.c
---- dovecot-1.0.rc15-o/src/master/master-settings.c	2006-11-12 10:56:07.000000000 -0700
-+++ dovecot-1.0.rc15/src/master/master-settings.c	2007-01-31 22:42:50.000000000 -0700
-@@ -154,6 +154,7 @@
- 	DEF(SET_BOOL, pop3_enable_last),
- 	DEF(SET_BOOL, pop3_reuse_xuidl),
- 	DEF(SET_BOOL, pop3_lock_session),
-+	DEF(SET_BOOL, pop3_ignore_deleted),
- 	DEF(SET_STR, pop3_uidl_format),
- 	DEF(SET_STR, pop3_client_workarounds),
- 	DEF(SET_STR, pop3_logout_format),
-@@ -366,6 +367,7 @@
+Only in dovecot-1.0.rc19/src/master: mail-process.c.orig
+diff -ur dovecot-1.0.rc19-o/src/master/master-settings.c dovecot-1.0.rc19/src/master/master-settings.c
+--- dovecot-1.0.rc19-o/src/master/master-settings.c	2007-01-18 09:50:24.000000000 -0700
++++ dovecot-1.0.rc19/src/master/master-settings.c	2007-01-31 23:23:33.000000000 -0700
+@@ -258,6 +258,7 @@
  	MEMBER(pop3_enable_last) FALSE,
  	MEMBER(pop3_reuse_xuidl) FALSE,
  	MEMBER(pop3_lock_session) FALSE,
@@ -29,10 +22,24 @@
  	MEMBER(pop3_uidl_format) "",
  	MEMBER(pop3_client_workarounds) "",
  	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
-diff -ur dovecot-1.0.rc15-o/src/master/master-settings.h dovecot-1.0.rc15/src/master/master-settings.h
---- dovecot-1.0.rc15-o/src/master/master-settings.h	2006-10-17 04:48:45.000000000 -0600
-+++ dovecot-1.0.rc15/src/master/master-settings.h	2007-01-31 22:42:50.000000000 -0700
-@@ -113,6 +113,7 @@
+Only in dovecot-1.0.rc19/src/master: master-settings.c.orig
+Only in dovecot-1.0.rc19/src/master: master-settings.c.rej
+diff -ur dovecot-1.0.rc19-o/src/master/master-settings-defs.c dovecot-1.0.rc19/src/master/master-settings-defs.c
+--- dovecot-1.0.rc19-o/src/master/master-settings-defs.c	2006-12-28 09:27:46.000000000 -0700
++++ dovecot-1.0.rc19/src/master/master-settings-defs.c	2007-01-31 23:25:32.000000000 -0700
+@@ -107,6 +107,7 @@
+ 	DEF(SET_BOOL, pop3_enable_last),
+ 	DEF(SET_BOOL, pop3_reuse_xuidl),
+ 	DEF(SET_BOOL, pop3_lock_session),
++ 	DEF(SET_BOOL, pop3_ignore_deleted),
+ 	DEF(SET_STR, pop3_uidl_format),
+ 	DEF(SET_STR, pop3_client_workarounds),
+ 	DEF(SET_STR, pop3_logout_format),
+Only in dovecot-1.0.rc19/src/master: master-settings-defs.c~
+diff -ur dovecot-1.0.rc19-o/src/master/master-settings.h dovecot-1.0.rc19/src/master/master-settings.h
+--- dovecot-1.0.rc19-o/src/master/master-settings.h	2007-01-18 09:50:24.000000000 -0700
++++ dovecot-1.0.rc19/src/master/master-settings.h	2007-01-31 23:23:34.000000000 -0700
+@@ -115,6 +115,7 @@
  	bool pop3_enable_last;
  	bool pop3_reuse_xuidl;
  	bool pop3_lock_session;
@@ -40,9 +47,10 @@
  	const char *pop3_uidl_format;
  	const char *pop3_client_workarounds;
  	const char *pop3_logout_format;
-diff -ur dovecot-1.0.rc15-o/src/pop3/client.c dovecot-1.0.rc15/src/pop3/client.c
---- dovecot-1.0.rc15-o/src/pop3/client.c	2006-08-10 16:26:41.000000000 -0600
-+++ dovecot-1.0.rc15/src/pop3/client.c	2007-01-31 22:42:50.000000000 -0700
+Only in dovecot-1.0.rc19/src/master: master-settings.h.orig
+diff -ur dovecot-1.0.rc19-o/src/pop3/client.c dovecot-1.0.rc19/src/pop3/client.c
+--- dovecot-1.0.rc19-o/src/pop3/client.c	2006-08-10 16:26:41.000000000 -0600
++++ dovecot-1.0.rc19/src/pop3/client.c	2007-01-31 23:23:34.000000000 -0700
 @@ -64,7 +64,12 @@
  	message_sizes_buf = buffer_create_dynamic(default_pool, 512);
  
@@ -57,9 +65,9 @@
  
  	for (i = 0; i < 2; i++) {
  		if (sync_mailbox(client->mailbox, &status) < 0) {
-diff -ur dovecot-1.0.rc15-o/src/pop3/common.h dovecot-1.0.rc15/src/pop3/common.h
---- dovecot-1.0.rc15-o/src/pop3/common.h	2006-04-27 06:29:14.000000000 -0600
-+++ dovecot-1.0.rc15/src/pop3/common.h	2007-01-31 22:55:11.000000000 -0700
+diff -ur dovecot-1.0.rc19-o/src/pop3/common.h dovecot-1.0.rc19/src/pop3/common.h
+--- dovecot-1.0.rc19-o/src/pop3/common.h	2006-04-27 06:29:14.000000000 -0600
++++ dovecot-1.0.rc19/src/pop3/common.h	2007-01-31 23:23:34.000000000 -0700
 @@ -18,7 +18,7 @@
  
  extern struct ioloop *ioloop;
@@ -69,9 +77,9 @@
  extern const char *uidl_format, *logout_format;
  extern enum uidl_keys uidl_keymask;
  
-diff -ur dovecot-1.0.rc15-o/src/pop3/main.c dovecot-1.0.rc15/src/pop3/main.c
---- dovecot-1.0.rc15-o/src/pop3/main.c	2006-08-10 12:38:04.000000000 -0600
-+++ dovecot-1.0.rc15/src/pop3/main.c	2007-01-31 22:42:50.000000000 -0700
+diff -ur dovecot-1.0.rc19-o/src/pop3/main.c dovecot-1.0.rc19/src/pop3/main.c
+--- dovecot-1.0.rc19-o/src/pop3/main.c	2006-12-19 22:08:46.000000000 -0700
++++ dovecot-1.0.rc19/src/pop3/main.c	2007-01-31 23:23:34.000000000 -0700
 @@ -46,6 +46,7 @@
  bool no_flag_updates = FALSE;
  bool reuse_xuidl = FALSE;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/dovecot-pop3-undeleted.patch?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list