[SVN] r684 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch patches/00list

[debian at incase.de]

Author: sven
Date: Mon Nov 13 19:06:24 2006
New Revision: 684

URL: https://mail.incase.de/viewcvs?rev=684&root=cyrus22&view=rev
Log:
Add dpatch: Upstream change: applied RFC4314 READ-ONLY logic

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=684&root=cyrus22&r1=683&r2=684&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Mon Nov 13 19:06:24 2006
@@ -1,8 +1,9 @@
 cyrus-imapd-2.2 (2.2.13-10) UNRELEASED; urgency=low
 
   * Update README.Debian.simpleinstall (Closes: #395250)
-
- -- Sven Mueller <sven at debian.org>  Sun, 29 Oct 2006 23:32:39 +0100
+  * Upstream change: applied RFC4314 READ-ONLY logic
+
+ -- Sven Mueller <sven at debian.org>  Mon, 13 Nov 2006 19:01:21 +0100
 
 cyrus-imapd-2.2 (2.2.13-9) unstable; urgency=high
 

Added: trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch?rev=684&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch Mon Nov 13 19:06:24 2006
@@ -1,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: applied RFC4314 READ-ONLY logic (by murch)
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.PLlzZs/cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2006-11-13 19:04:59.000000000 +0100
++++ /tmp/dpep.PLlzZs/cyrus-imapd-2.2.13/imap/imapd.c	2006-11-13 19:05:01.057901214 +0100
+@@ -38,7 +38,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: imapd.c,v 1.500 2006/05/10 15:41:44 murch Exp $ */
++/* $Id: imapd.c,v 1.501 2006/11/13 16:17:52 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -2643,7 +2643,7 @@
+ 
+     /* Examine command puts mailbox in read-only mode */
+     if (cmd[0] == 'E') {
+-	imapd_mailbox->myrights &= ~(ACL_SEEN|ACL_WRITE|ACL_DELETE);
++	imapd_mailbox->myrights &= ~ACL_READ_WRITE;
+     }
+ 
+     if (imapd_mailbox->myrights & ACL_DELETE) {
+@@ -2682,7 +2682,7 @@
+     }
+ 
+     prot_printf(imapd_out, "%s OK [READ-%s] %s\r\n", tag,
+-	   (imapd_mailbox->myrights & (ACL_WRITE|ACL_DELETE)) ?
++	   (imapd_mailbox->myrights & ACL_READ_WRITE) ?
+ 		"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
+ 
+     proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
+diff -urNad cyrus-imapd-2.2.13/lib/acl.h /tmp/dpep.PLlzZs/cyrus-imapd-2.2.13/lib/acl.h
+--- cyrus-imapd-2.2.13/lib/acl.h	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.PLlzZs/cyrus-imapd-2.2.13/lib/acl.h	2006-11-13 19:04:46.949289329 +0100
+@@ -42,7 +42,7 @@
+  * Start Date: 6/28/93
+  */
+ 
+-/* $Id: acl.h,v 1.16 2004/03/05 19:19:21 rjs3 Exp $ */
++/* $Id: acl.h,v 1.17 2006/11/13 16:17:53 murch Exp $ */
+ 
+ #ifndef INCLUDED_ACL_H
+ #define INCLUDED_ACL_H
+@@ -75,6 +75,8 @@
+ #define ACL_USER9  0x40000L
+ #define ACL_FULL   0xFFFFFL
+ 
++#define ACL_READ_WRITE (ACL_SEEN|ACL_WRITE|ACL_INSERT|ACL_DELETE)
++
+ #define ACL_MODE_SET 0
+ #define ACL_MODE_ADD 1
+ #define ACL_MODE_REMOVE 2

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=684&root=cyrus22&r1=683&r2=684&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Mon Nov 13 19:06:24 2006
@@ -18,6 +18,7 @@
 0018-upstream-ntohl-instead-of-htonl.dpatch
 0019-upstream-sieve_allowreferrals.dpatch
 0020-upstream-client-literal-prefix.dpatch
+0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
 0090-fix-casts.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch