Kolab Groupware OBS

cyrus-imapd.spec Changed

0001-Always-quote-SETMETADATA-values.patch Added

@@ -0,0 +1,27 @@
+From 2d3fd722e89d579cbbd1fe1006e7b8a7d19891a4 Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Fri, 19 May 2023 10:58:27 +0200
+Subject: PATCH Always quote SETMETADATA values
+
+the value can be NUL, a quoted string or a literal, but NOT an atom.
+Per RFC and parsing implementation.
+---
+ imap/imap_proxy.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imap/imap_proxy.c b/imap/imap_proxy.c
+index dd7c608b2..7d6dc4335 100644
+--- a/imap/imap_proxy.c
++++ b/imap/imap_proxy.c
+@@ -1497,7 +1497,7 @@ int annotate_store_proxy(const char *server, const char *mbox_pat,
+             /* Print the entry-value pair */
+             prot_printamap(be->out, entrybuf.s, entrybuf.len);
+             prot_putc(' ', be->out);
+-            prot_printamap(be->out, av->value.s, av->value.len);
++            prot_printmap(be->out, av->value.s, av->value.len);
+ 
+             if (av->next) prot_putc(' ', be->out);
+         }
+-- 
+2.40.0
+

0001-Quote-values-when-proxying-SETMETADATA.patch Deleted

@@ -1,33 +0,0 @@
-From aef13b60b3911b29aefc2d657091b8b40bd41fa5 Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Thu, 18 May 2023 13:53:21 +0200
-Subject: PATCH 1/2 Quote values when proxying SETMETADATA
-
-The value event.default was not quoted, which fails to be parsed (I'm
-not actually sure it needs to be quoted according to rfc).
-We now simply always quote key and value, which seems to do the trick.
----
- imap/imap_proxy.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/imap/imap_proxy.c b/imap/imap_proxy.c
-index a622d4a74..14de79732 100644
---- a/imap/imap_proxy.c
-+++ b/imap/imap_proxy.c
-@@ -1491,9 +1491,13 @@ int annotate_store_proxy(const char *server, const char *mbox_pat,
-             buf_appendcstr(&entrybuf, e->entry);
- 
-             /* Print the entry-value pair */
-+            prot_putc('"', be->out);
-             prot_printamap(be->out, entrybuf.s, entrybuf.len);
-+            prot_putc('"', be->out);
-             prot_putc(' ', be->out);
-+            prot_putc('"', be->out);
-             prot_printamap(be->out, av->value.s, av->value.len);
-+            prot_putc('"', be->out);
- 
-             if (av->next) prot_putc(' ', be->out);
-         }
--- 
-2.40.0
-

Changes of Revision 16