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

updated to 2.3.13

Browse Source
This commit is contained in:
Michal Hlavinka 2009-01-13 19:26:24 +00:00
parent 7e19a5239d
commit 2bab04fe5f
6 changed files with 1105 additions and 1120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,3 +1,3 @@
cyrus-imapd-2.3.13.tar.gz
cyrus-imapd-2.3.13.tar.gz.sig
cyrus_sharedbackup-0.1.tar.gz cyrus_sharedbackup-0.1.tar.gz
cyrus-imapd-2.3.12p2.tar.gz
cyrus-imapd-2.3.12p2.tar.gz.sig

48
cyrus-imapd-2.3.1-authid_normalize.patch
View File

@ -1,7 +1,17 @@
diff -Naur cyrus-imapd-2.3.1.orig/lib/auth_unix.c cyrus-imapd-2.3.1/lib/auth_unix.c --- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize 2008-07-30 18:03:39.000000000 +0200
--- cyrus-imapd-2.3.1.orig/lib/auth_unix.c Wed Feb 16 22:06:50 2005 +++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h 2009-01-13 11:41:59.000000000 +0100
+++ cyrus-imapd-2.3.1/lib/auth_unix.c Wed Dec 21 13:50:05 2005 @@ -100,6 +100,8 @@
@@ -157,10 +157,12 @@ CYRUSOPT_BERKELEY_TXNS_MAX,
/* RFC 2086 right which allows DELETE ("c") */
CYRUSOPT_DELETERIGHT,
+ /* Lowercase uid and strip leading and trailing blanks (OFF) */
+ CYRUSOPT_NORMALIZEUID,
/* SQL database */
CYRUSOPT_SQL_DATABASE,
/* SQL engine ("mysql") */
--- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize 2009-01-13 11:38:08.000000000 +0100
+++ cyrus-imapd-2.3.13/lib/auth_unix.c 2009-01-13 11:38:08.000000000 +0100
@@ -155,10 +155,12 @@
size_t len; size_t len;
{ {
static char retbuf[81]; static char retbuf[81];
@ -37,10 +47,9 @@ diff -Naur cyrus-imapd-2.3.1.orig/lib/auth_unix.c cyrus-imapd-2.3.1/lib/auth_uni
return retbuf; return retbuf;
} }
diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapoptions --- cyrus-imapd-2.3.13/lib/imapoptions.authid_normalize 2009-01-13 11:38:08.000000000 +0100
--- cyrus-imapd-2.3.1.orig/lib/imapoptions Tue Dec 13 20:36:11 2005 +++ cyrus-imapd-2.3.13/lib/imapoptions 2009-01-13 11:38:08.000000000 +0100
+++ cyrus-imapd-2.3.1/lib/imapoptions Wed Dec 21 13:50:05 2005 @@ -1182,6 +1182,11 @@
@@ -990,6 +990,11 @@
interface, otherwise the user is assumed to be in the default interface, otherwise the user is assumed to be in the default
domain (if set). */ domain (if set). */
@ -52,12 +61,11 @@ diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapopti
/* /*
.SH SEE ALSO .SH SEE ALSO
.PP .PP
diff -Naur cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.c cyrus-imapd-2.3.1/lib/libcyr_cfg.c --- cyrus-imapd-2.3.13/lib/libcyr_cfg.c.authid_normalize 2008-07-30 18:03:38.000000000 +0200
--- cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.c Tue Dec 13 20:36:12 2005 +++ cyrus-imapd-2.3.13/lib/libcyr_cfg.c 2009-01-13 11:38:08.000000000 +0100
+++ cyrus-imapd-2.3.1/lib/libcyr_cfg.c Wed Dec 21 13:50:05 2005 @@ -150,6 +150,11 @@
@@ -127,6 +127,11 @@ CFGVAL(long, 0),
CFGVAL(const char *, "c"), CYRUS_OPT_SWITCH },
CYRUS_OPT_STRING },
+ { CYRUSOPT_NORMALIZEUID, + { CYRUSOPT_NORMALIZEUID,
+ CFGVAL(long, 1), + CFGVAL(long, 1),
@ -67,15 +75,3 @@ diff -Naur cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.c cyrus-imapd-2.3.1/lib/libcyr_
{ CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT } { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
}; };
diff -Naur cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.h cyrus-imapd-2.3.1/lib/libcyr_cfg.h
--- cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.h Tue Dec 13 20:36:12 2005
+++ cyrus-imapd-2.3.1/lib/libcyr_cfg.h Wed Dec 21 13:51:37 2005
@@ -101,6 +101,8 @@
CYRUSOPT_BERKELEY_TXNS_MAX,
/* RFC 2086 right which allows DELETE ("c") */
CYRUSOPT_DELETERIGHT,
+ /* Lowercase uid and strip leading and trailing blanks (OFF) */
+ CYRUSOPT_NORMALIZEUID,
CYRUSOPT_LAST

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

@ -1,7 +1,6 @@
diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/imap/make_md5.c cyrus-imapd-2.3.11/imap/make_md5.c --- cyrus-imapd-2.3.13/imap/make_md5.c.make_md5_defaults 2008-10-02 16:05:44.000000000 +0200
--- cyrus-imapd-2.3.11.orig/imap/make_md5.c 2007-10-01 20:35:59.000000000 +0200 +++ cyrus-imapd-2.3.13/imap/make_md5.c 2009-01-13 11:44:24.000000000 +0100
+++ cyrus-imapd-2.3.11/imap/make_md5.c 2008-09-01 11:16:50.000000000 +0200 @@ -857,7 +857,7 @@
@@ -814,7 +814,7 @@
if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR); if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR);
if (!md5_dir) if (!md5_dir)
@ -10,10 +9,9 @@ diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/imap/make_md5.c cyrus-imapd-2.3.11/
if (max_children == 0) { if (max_children == 0) {
/* Simple case */ /* Simple case */
diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/lib/imapoptions --- cyrus-imapd-2.3.13/lib/imapoptions.make_md5_defaults 2009-01-13 11:44:24.000000000 +0100
--- cyrus-imapd-2.3.11.orig/lib/imapoptions 2007-10-18 20:14:48.000000000 +0200 +++ cyrus-imapd-2.3.13/lib/imapoptions 2009-01-13 14:17:35.000000000 +0100
+++ cyrus-imapd-2.3.11/lib/imapoptions 2008-09-01 11:16:50.000000000 +0200 @@ -634,10 +634,14 @@
@@ -557,10 +557,14 @@
mailspool, but each have their own "replicated" copy of mailspool, but each have their own "replicated" copy of
mailboxes.db. */ mailboxes.db. */
@ -21,11 +19,11 @@ diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/
+{ "md5_dir", "/var/lib/imap/md5", STRING } +{ "md5_dir", "/var/lib/imap/md5", STRING }
/* Top level directory for MD5 store manipulated by make_md5. File /* Top level directory for MD5 store manipulated by make_md5. File
structure within this directory is one file for each user on the system, structure within this directory is one file for each user on the system,
- hashed on the first letter of the userid (e.g: /var/imap/md5/d/dpc22). */ - hashed on the first letter of the userid (e.g., /var/imap/md5/d/dpc22). */
+ hashed on the first letter of the + hashed on the first letter of the
+ userid (e.g: /var/lib/imap/md5/d/dpc22). + userid (e.g., /var/imap/md5/d/dpc22).
+.PP +.PP
+ Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default + Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default
+ instead of \fI/var/imap/md5\fR for \fBmd5_dir\fR. */ + instead of \fI/var/imap/md5\fR for \fBmd5_dir\fR. */
{ "md5_user_map", NULL, STRING } { "md5_user_map", NULL, STRING }

2137
cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
View File

File diff suppressed because it is too large Load Diff

10
cyrus-imapd.spec
View File

@ -1,7 +1,7 @@
%define upstream_ver 2.3.12p2 %define upstream_ver 2.3.13
Name: cyrus-imapd Name: cyrus-imapd
Version: 2.3.12p2 Version: 2.3.13
Release: 3%{?dist} Release: 1%{?dist}
# ********************** BUILD TIME OPTIONS START ********************** # ********************** BUILD TIME OPTIONS START **********************
@ -704,6 +704,7 @@ fi
%attr(0755,root,root) %{_cyrexecdir}/reconstruct %attr(0755,root,root) %{_cyrexecdir}/reconstruct
%attr(0755,root,root) %{_cyrexecdir}/rehash %attr(0755,root,root) %{_cyrexecdir}/rehash
%attr(0755,root,root) %{_cyrexecdir}/sievec %attr(0755,root,root) %{_cyrexecdir}/sievec
%attr(0755,root,root) %{_cyrexecdir}/sieved
%attr(0755,root,root) %{_cyrexecdir}/smmapd %attr(0755,root,root) %{_cyrexecdir}/smmapd
%attr(0755,root,root) %{_cyrexecdir}/squatter %attr(0755,root,root) %{_cyrexecdir}/squatter
%attr(0755,root,root) %{_cyrexecdir}/timsieved %attr(0755,root,root) %{_cyrexecdir}/timsieved
@ -785,6 +786,9 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Tue Jan 13 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.13-1
- updated to 2.3.13
* Fri Sep 26 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-3 * Fri Sep 26 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-3
- better fix for linking with recent db4.x - better fix for linking with recent db4.x

4
sources
View File

@ -1,3 +1,3 @@
7dc48324c3a99e210bf777ea74aae694 cyrus-imapd-2.3.13.tar.gz
6b58bb8dd2c47af02b45c5a426b1335c cyrus-imapd-2.3.13.tar.gz.sig
8f7a26b0556369827bb5c8084a3e3ea1 cyrus_sharedbackup-0.1.tar.gz 8f7a26b0556369827bb5c8084a3e3ea1 cyrus_sharedbackup-0.1.tar.gz
ee2c300687994e4982c6af6aa154c742 cyrus-imapd-2.3.12p2.tar.gz
a04fd37f1e47cfbed3394758ac2e4981 cyrus-imapd-2.3.12p2.tar.gz.sig