Update patches for the 2.4.17+caldav~beta9 release
Ondřej Surý
10 years ago
| 17 | 17 | srcdir = @srcdir@ |
| 18 | 18 | --- cyrus-imapd-2.4.orig/imap/Makefile.in |
| 19 | 19 | +++ cyrus-imapd-2.4/imap/Makefile.in |
| 20 | @@ -77,8 +77,8 @@ LIB_WRAP = @LIB_WRAP@ | |
| 20 | @@ -78,8 +78,8 @@ LIB_WRAP = @LIB_WRAP@ | |
| 21 | 21 | LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) |
| 22 | 22 | DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ |
| 23 | 23 |
| 7 | 7 | @DPATCH@ |
| 8 | 8 | --- cyrus-imapd-2.4.orig/imap/global.c |
| 9 | 9 | +++ cyrus-imapd-2.4/imap/global.c |
| 10 | @@ -110,6 +110,9 @@ int session_id_count = 0; | |
| 10 | @@ -111,6 +111,9 @@ int session_id_count = 0; | |
| 11 | 11 | |
| 12 | 12 | strarray_t *suppressed_capabilities = NULL; |
| 13 | 13 | |
| 17 | 17 | /* Called before a cyrus application starts (but after command line parameters |
| 18 | 18 | * are read) */ |
| 19 | 19 | int cyrus_init(const char *alt_config, const char *ident, unsigned flags) |
| 20 | @@ -137,7 +140,9 @@ int cyrus_init(const char *alt_config, c | |
| 20 | @@ -138,7 +141,9 @@ int cyrus_init(const char *alt_config, c | |
| 21 | 21 | |
| 22 | 22 | /* xxx we lose here since we can't have the prefix until we load the |
| 23 | 23 | * config file */ |
| 13 | 13 | |
| 14 | 14 | --- cyrus-imapd-2.4.orig/configure.in |
| 15 | 15 | +++ cyrus-imapd-2.4/configure.in |
| 16 | @@ -1561,7 +1561,11 @@ enum { | |
| 16 | @@ -1571,7 +1571,11 @@ enum { | |
| 17 | 17 | SQUAT_ENGINE = 1, |
| 18 | 18 | |
| 19 | 19 | /* should we have long LMTP error messages? */ |
| 16 | 16 | |
| 17 | 17 | --- cyrus-imapd-2.4.orig/imap/global.c |
| 18 | 18 | +++ cyrus-imapd-2.4/imap/global.c |
| 19 | @@ -224,6 +224,8 @@ int cyrus_init(const char *alt_config, c | |
| 19 | @@ -227,6 +227,8 @@ int cyrus_init(const char *alt_config, c | |
| 20 | 20 | config_getswitch(IMAPOPT_UNIX_GROUP_ENABLE)); |
| 21 | 21 | libcyrus_config_setswitch(CYRUSOPT_USERNAME_TOLOWER, |
| 22 | 22 | config_getswitch(IMAPOPT_USERNAME_TOLOWER)); |
| 65 | 65 | |
| 66 | 66 | --- cyrus-imapd-2.4.orig/lib/imapoptions |
| 67 | 67 | +++ cyrus-imapd-2.4/lib/imapoptions |
| 68 | @@ -1572,6 +1572,11 @@ product version in the capabilities */ | |
| 69 | the special use flag "\Drafts" added. Later versions of Cyrus | |
| 70 | have a much more flexible RFC 6154 compatible system. */ | |
| 68 | @@ -1579,6 +1579,11 @@ product version in the capabilities */ | |
| 69 | /* The absolute path to the zoneinfo db file. If not specified, | |
| 70 | will be confdir/zoneinfo.db */ | |
| 71 | 71 | |
| 72 | 72 | +{ "normalizeuid", 0, SWITCH } |
| 73 | 73 | +/* Lowercase uid and strip leading and trailing blanks. It is recommended |