Request 1056 (accepted)

Overview

Request 1056 (accepted)

Applied fix for cyr_expire (delayed expunge).

Created by dhoffend over 8 years ago
In state accepted

Submit cyrus-imapd

Submit package home:dhoffend...b:3.4:Updates / cyrus-imapd to package Kolab:3.4:Updates / cyrus-imapd

cyrus-imapd.spec Changed

@@ -38,7 +38,7 @@
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
 Version:            2.5
-Release:            0.2.dev20150213.gite9158f38%{?dist}
+Release:            0.3.dev20150213.gite9158f38%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
@@ -68,6 +68,7 @@
 ##
 
 Patch0001:          cyrus-imapd-2.5-ctl_mboxlist-mbtype.patch
+Patch0002:          cyrus-imapd-2.5-cyr_expire.patch
 
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -264,6 +265,7 @@
 %setup -q -n %{_name}-%{real_version}%{?dot_snapshot_version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 %if 0%{?with_bdb} < 1
 sed -i -e 's/,berkeley//g' cunit/db.testc
@@ -748,6 +750,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Fri Dec  9 2015 Danie Hoffend <dh@dotlan.net> - 2.5.12-1.git
+- Applied patch 24c597fac to fix the expunge error in cyr_expire
+
 * Fri Feb 13 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-12.git
 - New snapshot

cyrus-imapd-2.5-cyr_expire.patch Added

@@ -0,0 +1,97 @@
+From 24c597fac9a464940eb6c4fc5131df0b39d5c86a Mon Sep 17 00:00:00 2001
+From: Bron Gondwana <brong@fastmail.fm>
+Date: Wed, 25 Feb 2015 17:29:57 +1100
+Subject: cyr_expire: seriously, didn't I already fix this?
+
+
+diff --git a/imap/cyr_expire.c b/imap/cyr_expire.c
+index b9a213e..7faab0d 100644
+--- a/imap/cyr_expire.c
++++ b/imap/cyr_expire.c
+@@ -332,46 +332,39 @@ done:
+     return 0;
+ }
+ 
+-static int delete(char *name,
+-		  int matchlen __attribute__((unused)),
+-		  int maycreate __attribute__((unused)),
+-		  void *rock)
++static int delete(void *rock, const char *key, size_t keylen,
++			      const char *data, size_t datalen)
+ {
+     mbentry_t *mbentry = NULL;
+     struct delete_rock *drock = (struct delete_rock *) rock;
+-    int r;
+     time_t timestamp;
+ 
+     if (sigquit) {
++	/* don't care if we leak some memory, we are shutting down */
+ 	return 1;
+     }
+ 
+-    /* check if this is a mailbox we want to examine */
+-    if (!mboxname_isdeletedmailbox(name, &timestamp))
+-	return 0;
++    if (mboxlist_parse_entry(&mbentry, key, keylen, data, datalen))
++	goto done; /* xxx - syslog? */
+ 
+     /* Skip remote mailboxes */
+-    r = mboxlist_lookup(name, &mbentry, NULL);
+-    if (r) {
+-	if (verbose) {
+-	    printf("error looking up %s: %s\n", name, error_message(r));
+-	}
+-	return 1;
+-    }
++    if (mbentry->mbtype & MBTYPE_REMOTE)
++	goto done;
+ 
+-    if (mbentry->mbtype & MBTYPE_REMOTE) {
+-	mboxlist_entry_free(&mbentry);
+-	return 0;
+-    }
+-    mboxlist_entry_free(&mbentry);
++    /* check if this is a mailbox we want to examine */
++    if (!mboxname_isdeletedmailbox(mbentry->name, &timestamp))
++	goto done;
+ 
+     if ((timestamp == 0) || (timestamp > drock->delete_mark))
+-	return 0;
++	goto done;
+ 
+     /* Add this mailbox to list of mailboxes to delete */
+-    strarray_append(&drock->to_delete, name);
++    strarray_append(&drock->to_delete, mbentry->name);
+ 
+-    return(0);
++done:
++    mboxlist_entry_free(&mbentry);
++
++    return 0;
+ }
+ 
+ static void sighandler (int sig __attribute((unused)))
+@@ -389,7 +382,7 @@ int main(int argc, char *argv[])
+     int delete_seconds = -1;
+     int expire_seconds = 0;
+     char *alt_config = NULL;
+-    const char *find_prefix = "*";
++    const char *find_prefix = "";
+     const char *do_user = NULL;
+     struct expire_rock erock;
+     struct delete_rock drock;
+@@ -565,7 +558,10 @@ int main(int argc, char *argv[])
+ 
+ 	drock.delete_mark = time(0) - delete_seconds;
+ 
+-	mboxlist_findall(NULL, find_prefix, 1, 0, 0, delete, &drock);
++	if (do_user)
++	    mboxlist_allusermbox(do_user, delete, &drock, /*include_deleted*/1);
++	else
++	    mboxlist_allmbox(find_prefix, delete, &drock, /*include_deleted*/1);
+ 
+ 	for (i = 0 ; i < drock.to_delete.count ; i++) {
+ 	    char *name = drock.to_delete.data[i];
+-- 
+cgit v0.10.2
+

cyrus-imapd.dsc Changed

debian.changelog Changed

debian.rules Changed

@@ -10,6 +10,10 @@
 # DebHelper control
 export DH_ALWAYS_EXCLUDE=CVS
 
+# This is the debhelper compatibility version to use.
+export DH_VERBOSE=1
+export DH_COMPAT=9
+
 export MAINPKG=cyrus-imapd
 export TMPPKG := $(CURDIR)/debian/tmp
 export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
@@ -64,7 +68,7 @@
 	#
 	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
 	# DBENGINE AT THE TOP OF THIS MAKEFILE!
-	./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+	PERL_MM_OPT="INSTALLDIRS=vendor" ./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
 		--enable-event-notification \
 		--enable-idled \
 		--enable-gssapi --with-gss_impl=heimdal \
@@ -114,7 +118,7 @@
 build-arch-stamp: configure-stamp
 	dh_testdir
 	#
-	PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
+	$(MAKE)
 	# store database configuration for possible automatic
 	# upgrading later
 	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
@@ -163,10 +167,6 @@
 	$(MAKE) install DESTDIR=$(TMPPKG)
 	mv $(TMPPKG)/usr/lib/cyrus-imapd/master $(TMPPKG)/usr/lib/cyrus-imapd/cyrus-master
 
-	# Move the perl crap to a saner place
-	mkdir -p $(TMPPKG)/usr/lib
-	mkdir -p $(TMPPKG)/usr/share/perl5
-
 	# Default configuration
 	mkdir -p $(TMPPKG)/etc
 	install -p -m 644 debian/imapd.conf $(TMPPKG)/etc
@@ -226,6 +226,9 @@
 		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
 		install -p -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
 	done
+	# the old debian package format doesn't support file modes
+	# maybe switch to quilt soon(tm)
+	chmod 755 debian/cyrus-imapd.install
 	dh_install -a --sourcedir=$(TMPPKG)
 	touch install-arch-stamp

debian.series Changed

debian.tar.gz/compat Changed

debian.tar.gz/cyrus-imapd.install Changed

Build Results
RPM Lint

Refresh

Comments for request 1056 0

Request History

dhoffend created request over 8 years ago

Applied fix for cyr_expire (delayed expunge).

timotheus accepted request over 8 years ago

looks good to me