rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- updated to 2.4.6

Browse Source 
- "autocreate" and "autosieve" features were removed
This commit is contained in:
Michal Hlavinka 2011-02-10 14:56:53 +01:00
parent 365d195afe
commit eaf31cffbd
4 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cyrus-imapd-2.1.3-flock.patch
View File

@ -1,9 +1,10 @@
--- cyrus-imapd-2.1.3/lib/lock_flock.c Tue Oct 2 16:08:13 2001
+++ cyrus-imapd-2.1.3-patched/lib/lock_flock.c Tue Apr 16 09:44:58 2002
@@ -51,6 +51,10 @@
diff -up cyrus-imapd-2.4.6/lib/lock_flock.c.flock cyrus-imapd-2.4.6/lib/lock_flock.c
--- cyrus-imapd-2.4.6/lib/lock_flock.c.flock 2010-12-20 14:15:49.000000000 +0100
+++ cyrus-imapd-2.4.6/lib/lock_flock.c 2011-02-10 12:56:45.262786102 +0100
@@ -52,6 +52,10 @@
#endif
#include "lock.h"
#include "cyr_lock.h"
+#include <syslog.h>
+
+/* Locking timeout parameter */
@ -11,7 +12,7 @@
const char *lock_method_desc = "flock";
@@ -69,6 +73,18 @@
@@ -68,6 +72,18 @@ const char *lock_method_desc = "flock";
* 'failaction' is provided, it is filled in with a pointer to a fixed
* string naming the action that failed.
*
@ -30,7 +31,7 @@
*/
int lock_reopen(fd, filename, sbuf, failaction)
int fd;
@@ -79,17 +95,29 @@
@@ -78,17 +94,29 @@ const char **failaction;
int r;
struct stat sbuffile, sbufspare;
int newfd;
@ -65,7 +66,7 @@
fstat(fd, sbuf);
r = stat(filename, &sbuffile);
if (r == -1) {
@@ -97,9 +125,7 @@
@@ -96,9 +124,7 @@ const char **failaction;
flock(fd, LOCK_UN);
return -1;
}

32
cyrus-imapd-2.3.1-make_md5_defaults.patch
View File

@ -1,17 +1,7 @@
--- cyrus-imapd-2.3.13/imap/make_md5.c.make_md5_defaults 2008-10-02 16:05:44.000000000 +0200
+++ cyrus-imapd-2.3.13/imap/make_md5.c 2009-01-13 11:44:24.000000000 +0100
@@ -857,7 +857,7 @@
if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR);
if (!md5_dir)
- md5_dir = xstrdup("/var/imap/md5");
+ md5_dir = xstrdup("/var/lib/imap/md5");
if (max_children == 0) {
/* Simple case */
--- cyrus-imapd-2.3.13/lib/imapoptions.make_md5_defaults 2009-01-13 11:44:24.000000000 +0100
+++ cyrus-imapd-2.3.13/lib/imapoptions 2009-01-13 14:17:35.000000000 +0100
@@ -634,10 +634,14 @@
diff -up cyrus-imapd-2.4.6/lib/imapoptions.make_md5_defaults cyrus-imapd-2.4.6/lib/imapoptions
--- cyrus-imapd-2.4.6/lib/imapoptions.make_md5_defaults 2011-02-10 13:15:02.620914246 +0100
+++ cyrus-imapd-2.4.6/lib/imapoptions 2011-02-10 13:20:09.717498074 +0100
@@ -671,10 +671,14 @@ Blank lines and lines beginning with ``#
mailspool, but each have their own "replicated" copy of
mailboxes.db. */
@ -23,8 +13,20 @@
+ hashed on the first letter of the
+ userid (e.g., /var/imap/md5/d/dpc22).
+.PP
+ Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default
+ Note: This RPM build uses \fI/var/lib/imap/md5\fR by default
+ instead of \fI/var/imap/md5\fR for \fBmd5_dir\fR. */
{ "md5_user_map", NULL, STRING }
/* Map file (cdb) to allow partial make_md5 runs. Maps username to UID */
diff -up cyrus-imapd-2.4.6/lib/imapopts.c.make_md5_defaults cyrus-imapd-2.4.6/lib/imapopts.c
--- cyrus-imapd-2.4.6/lib/imapopts.c.make_md5_defaults 2010-12-20 14:20:42.000000000 +0100
+++ cyrus-imapd-2.4.6/lib/imapopts.c 2011-02-10 13:19:14.961641299 +0100
@@ -402,7 +402,7 @@ struct imapopt_s imapopts[] =
{ "replicated" , IMAP_ENUM_MUPDATE_CONFIG_REPLICATED },
{ NULL, IMAP_ENUM_ZERO } } },
{ IMAPOPT_MD5_DIR, "md5_dir", 0, OPT_STRING,
- {(void *)(NULL)},
+ {(void *)("/var/lib/imap/md5")},
{ { NULL, IMAP_ENUM_ZERO } } },
{ IMAPOPT_MD5_USER_MAP, "md5_user_map", 0, OPT_STRING,
{(void *)(NULL)},

24
cyrus-imapd-2.3.12p2-current-db.patch
View File

@ -1,11 +1,21 @@
--- cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4.orig 2008-09-12 07:46:46.000000000 +0200
+++ cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4 2008-09-12 07:47:10.000000000 +0200
@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
fi
diff -up cyrus-imapd-2.4.6/cmulocal/berkdb.m4.db4.7 cyrus-imapd-2.4.6/cmulocal/berkdb.m4
--- cyrus-imapd-2.4.6/cmulocal/berkdb.m4.db4.7 2010-12-20 14:15:49.000000000 +0100
+++ cyrus-imapd-2.4.6/cmulocal/berkdb.m4 2011-02-10 13:43:26.397438481 +0100
@@ -214,6 +214,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
saved_LIBS=$LIBS
- for dbname in ${with_bdb} db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ for dbname in ${with_bdb} db db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
do
for dbname in ${with_bdb} \
+ db \
db-4.8 db4.8 db48 \
db-4.7 db4.7 db47 \
db-4.6 db4.6 db46 \
@@ -226,8 +227,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
db-3.3 db3.3 db33 \
db-3.2 db3.2 db32 \
db-3.1 db3.1 db31 \
- db-3.0 db3.0 db30 db-3 db3 \
- db
+ db-3.0 db3.0 db30 db-3 db3
do
LIBS="$saved_LIBS -l$dbname"
AC_TRY_LINK([#include <stdio.h>

26
cyrus-imapd.spec
View File

@ -1,6 +1,6 @@
Name: cyrus-imapd
Version: 2.3.16
Release: 8%{?dist}
Version: 2.4.6
Release: 1%{?dist}
%define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
@ -30,8 +30,8 @@ Source10: cyrus-imapd.cron-daily
Source11: README.rpm
# inclusion requested:
# https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3182
# https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3212
# http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3182
# http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3212
Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.16/cyrus-imapd-2.3.16-autocreate-0.10-0.diff
# inclusion requested:
@ -51,9 +51,6 @@ Patch6: cyrus-imapd-2.3.12p2-current-db.patch
# temporary workaround, rhbz#553011, https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3206
Patch7: cyrus-imapd-2.3.16-nodenny.patch
# from upstream, rhbz#576652, for cyrus-imapd < 2.4
Patch8: cyrus-imapd-2.3.15-qos.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
@ -125,14 +122,12 @@ one running the server.
%prep
%setup -q
%patch1 -p1 -b .autocreate
%patch2 -p1 -b .autosieve
#%patch1 -p1 -b .autocreate
#%patch2 -p1 -b .autosieve
%patch3 -p1 -b .flock
%patch4 -p1 -b .authid_normalize
%patch5 -p1 -b .make_md5_defaults
%patch6 -p1 -b .db4.7
%patch7 -p1 -b .nodenny
%patch8 -p1 -b .qos
install -m 644 %{SOURCE4} %{SOURCE5} %{SOURCE11} doc/
@ -376,7 +371,9 @@ fi
%{_cyrexecdir}/cvt_cyrusdb
%{_cyrexecdir}/cyr_dbtool
%{_cyrexecdir}/cyr_expire
%{_cyrexecdir}/cyr_sequence
%{_cyrexecdir}/cyr_synclog
%{_cyrexecdir}/cyr_userseen
%{_cyrexecdir}/cyrdump
%{_cyrexecdir}/cyrus-master
%{_cyrexecdir}/deliver
@ -386,7 +383,6 @@ fi
%{_cyrexecdir}/ipurge
%{_cyrexecdir}/lmtpd
%{_cyrexecdir}/lmtpproxyd
%{_cyrexecdir}/make_sha1
%{_cyrexecdir}/masssievec
%{_cyrexecdir}/mbexamine
%{_cyrexecdir}/mbpath
@ -410,11 +406,9 @@ fi
%{_cyrexecdir}/upgradesieve
%{_cyrexecdir}/cvt_cyrusdb_all
%{_cyrexecdir}/idled
%{_cyrexecdir}/compile_sieve
%{_cyrexecdir}/mupdate
%{_cyrexecdir}/mupdate-loadgen.pl
%{_cyrexecdir}/proxyd
%{_cyrexecdir}/make_md5
%{_cyrexecdir}/sync_client
%{_cyrexecdir}/sync_reset
%{_cyrexecdir}/sync_server
@ -484,6 +478,10 @@ fi
%{_mandir}/man1/*
%changelog
* Fri Feb 10 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.6-1
- updated to 2.4.6
- "autocreate" and "autosieve" features were removed
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.16-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild