[arch-commits] Commit in pigeonhole/trunk (PKGBUILD fix-sieve-synchronization.patch)

[Thore Bödecker]

    Date: Thursday, July 4, 2019 @ 11:28:53
  Author: foxxx0
Revision: 487425

upgpkg: pigeonhole 0.5.6-2

add patch to fix sieve replication

Added:
  pigeonhole/trunk/fix-sieve-synchronization.patch
Modified:
  pigeonhole/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   21 ++++++++++++++++++---
 fix-sieve-synchronization.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-04 09:44:34 UTC (rev 487424)
+++ PKGBUILD	2019-07-04 11:28:53 UTC (rev 487425)
@@ -13,7 +13,7 @@
 
 pkgname=pigeonhole
 pkgver=0.5.6
-pkgrel=1
+pkgrel=2
 
 pkgdesc='Sieve implementation for Dovecot'
 url='https://pigeonhole.dovecot.org/'
@@ -24,15 +24,30 @@
 
 conflicts=('dovecot-sieve' 'pigeonhole-hg')
 
-source=("https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${pkgver}.tar.gz"{,.sig})
+source=("https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${pkgver}.tar.gz"{,.sig}
+        'fix-sieve-synchronization.patch')
 
 sha256sums=('7c2fe7e23e732a8451172c00da5f19532448c95e03e44d47c61b123e8210f5b8'
-            'SKIP')
+            'SKIP'
+            '5a9b47531c1bf3b764bb4ac7691d6f18ac15575bff65e8c7f4557bc096658701')
 validpgpkeys=(
   '42F3CD50D4F25A41833BEE3704D62B1E3DFBB4F4' # Stephan Bosch <stephan at rename-it.nl>
   '2BE74AAB3EE754DFB9C80D3318A348AEED409DA1'
 )
 
+
+prepare() {
+  cd "dovecot-2.3-pigeonhole-${pkgver}"
+
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch ${filename##*/}"
+      patch -p1 -N -l -i "$srcdir/${filename##*/}"
+    fi
+  done
+}
+
 build() {
   cd "dovecot-2.3-pigeonhole-${pkgver}"
 

Added: fix-sieve-synchronization.patch
===================================================================
--- fix-sieve-synchronization.patch	                        (rev 0)
+++ fix-sieve-synchronization.patch	2019-07-04 11:28:53 UTC (rev 487425)
@@ -0,0 +1,28 @@
+From 0e91911d22d43621c820d7f5b28be671050fd290 Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tuomi at open-xchange.com>
+Date: Mon, 27 May 2019 09:43:25 +0300
+Subject: [PATCH] doveadm-sieve: Fix script synchronization
+
+When dsyncing, this codepath is always called with prefix "".
+There is no point checking the prefix at all.
+
+Broken in 479c5e57046dec76078597df844daccbfc0eb75f
+---
+ src/plugins/doveadm-sieve/doveadm-sieve-sync.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
+index 34bd18d4..069f20ab 100644
+--- a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
++++ b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
+@@ -606,9 +606,7 @@ sieve_attribute_iter_init(struct mailbox *box, enum mail_attribute_type type,
+        siter->iter.box = box;
+        siter->super = sbox->super.attribute_iter_init(box, type, prefix);
+
+-       if (box->storage->user->dsyncing &&
+-           type == MAIL_ATTRIBUTE_TYPE_PRIVATE &&
+-           str_begins(prefix, MAILBOX_ATTRIBUTE_PREFIX_SIEVE)) {
++       if (box->storage->user->dsyncing) {
+                if (sieve_attribute_iter_script_init(siter) < 0)
+                        siter->failed = TRUE;
+        }