rpms/cyrus-imapd/F-10 .cvsignore, 1.12, 1.13 cyrus-imapd-2.3.1-authid_normalize.patch, 1.1, 1.2 cyrus-imapd-2.3.1-make_md5_defaults.patch, 1.2, 1.3 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.1, 1.2 cyrus-imapd.spec, 1.44, 1.45 sources, 1.14, 1.15
Michal Hlavinka
mhlavink at fedoraproject.org
Tue Jan 13 19:33:01 UTC 2009
- Previous message (by thread): rpms/cyrus-imapd/devel .cvsignore, 1.12, 1.13 cyrus-imapd-2.3.1-authid_normalize.patch, 1.1, 1.2 cyrus-imapd-2.3.1-make_md5_defaults.patch, 1.2, 1.3 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.1, 1.2 cyrus-imapd.spec, 1.44, 1.45 sources, 1.14, 1.15
- Next message (by thread): rpms/php-pecl-memcache/devel .cvsignore, 1.7, 1.8 php-pecl-memcache.spec, 1.7, 1.8 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mhlavink
Update of /cvs/extras/rpms/cyrus-imapd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13535
Modified Files:
.cvsignore cyrus-imapd-2.3.1-authid_normalize.patch
cyrus-imapd-2.3.1-make_md5_defaults.patch
cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff cyrus-imapd.spec
sources
Log Message:
updated to 2.3.13
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 1 Sep 2008 11:50:44 -0000 1.12
+++ .cvsignore 13 Jan 2009 19:32:30 -0000 1.13
@@ -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-imapd-2.3.12p2.tar.gz
-cyrus-imapd-2.3.12p2.tar.gz.sig
cyrus-imapd-2.3.1-authid_normalize.patch:
Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.1-authid_normalize.patch 28 Feb 2006 20:04:01 -0000 1.1
+++ cyrus-imapd-2.3.1-authid_normalize.patch 13 Jan 2009 19:32:30 -0000 1.2
@@ -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.1.orig/lib/auth_unix.c Wed Feb 16 22:06:50 2005
-+++ cyrus-imapd-2.3.1/lib/auth_unix.c Wed Dec 21 13:50:05 2005
-@@ -157,10 +157,12 @@
+--- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize 2008-07-30 18:03:39.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h 2009-01-13 11:41:59.000000000 +0100
+@@ -100,6 +100,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,
+ /* 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;
{
static char retbuf[81];
@@ -37,10 +47,9 @@
return retbuf;
}
-diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapoptions
---- cyrus-imapd-2.3.1.orig/lib/imapoptions Tue Dec 13 20:36:11 2005
-+++ cyrus-imapd-2.3.1/lib/imapoptions Wed Dec 21 13:50:05 2005
-@@ -990,6 +990,11 @@
+--- cyrus-imapd-2.3.13/lib/imapoptions.authid_normalize 2009-01-13 11:38:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/imapoptions 2009-01-13 11:38:08.000000000 +0100
+@@ -1182,6 +1182,11 @@
interface, otherwise the user is assumed to be in the default
domain (if set). */
@@ -52,12 +61,11 @@
/*
.SH SEE ALSO
.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.1.orig/lib/libcyr_cfg.c Tue Dec 13 20:36:12 2005
-+++ cyrus-imapd-2.3.1/lib/libcyr_cfg.c Wed Dec 21 13:50:05 2005
-@@ -127,6 +127,11 @@
- CFGVAL(const char *, "c"),
- CYRUS_OPT_STRING },
+--- cyrus-imapd-2.3.13/lib/libcyr_cfg.c.authid_normalize 2008-07-30 18:03:38.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/libcyr_cfg.c 2009-01-13 11:38:08.000000000 +0100
+@@ -150,6 +150,11 @@
+ CFGVAL(long, 0),
+ CYRUS_OPT_SWITCH },
+ { CYRUSOPT_NORMALIZEUID,
+ CFGVAL(long, 1),
@@ -67,15 +75,3 @@
{ 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
-
cyrus-imapd-2.3.1-make_md5_defaults.patch:
Index: cyrus-imapd-2.3.1-make_md5_defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.1-make_md5_defaults.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd-2.3.1-make_md5_defaults.patch 1 Sep 2008 09:41:02 -0000 1.2
+++ cyrus-imapd-2.3.1-make_md5_defaults.patch 13 Jan 2009 19:32:30 -0000 1.3
@@ -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.11.orig/imap/make_md5.c 2007-10-01 20:35:59.000000000 +0200
-+++ cyrus-imapd-2.3.11/imap/make_md5.c 2008-09-01 11:16:50.000000000 +0200
-@@ -814,7 +814,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)
@@ -10,10 +9,9 @@
if (max_children == 0) {
/* 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.11.orig/lib/imapoptions 2007-10-18 20:14:48.000000000 +0200
-+++ cyrus-imapd-2.3.11/lib/imapoptions 2008-09-01 11:16:50.000000000 +0200
-@@ -557,10 +557,14 @@
+--- 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 @@
mailspool, but each have their own "replicated" copy of
mailboxes.db. */
@@ -21,11 +19,11 @@
+{ "md5_dir", "/var/lib/imap/md5", STRING }
/* Top level directory for MD5 store manipulated by make_md5. File
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
-+ userid (e.g: /var/lib/imap/md5/d/dpc22).
-+.PP
-+ Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default
++ userid (e.g., /var/imap/md5/d/dpc22).
++.PP
++ 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. */
{ "md5_user_map", NULL, STRING }
cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
Index: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 1 Sep 2008 11:50:44 -0000 1.1
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff 13 Jan 2009 19:32:30 -0000 1.2
@@ -1,485 +1,426 @@
-diff -Naur cyrus-imapd-2.3.12p2/README.autocreate cyrus-imapd-2.3.12p2-autocreate.uncompiled/README.autocreate
---- cyrus-imapd-2.3.12p2/README.autocreate 1970-01-01 02:00:00.000000000 +0200
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/README.autocreate 2008-05-06 14:48:41.000000000 +0300
-@@ -0,0 +1,211 @@
-+Cyrus IMAP autocreate Inbox patch
-+----------------------------------
+--- cyrus-imapd-2.3.13/notifyd/notifyd.c.autocreate 2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.13/notifyd/notifyd.c 2009-01-13 11:14:09.000000000 +0100
+@@ -96,7 +96,7 @@
+
+ #define NOTIFY_MAXSIZE 8192
+
+-int do_notify()
++static int do_notify()
+ {
+ struct sockaddr_un sun_data;
+ socklen_t sunlen = sizeof(sun_data);
+--- cyrus-imapd-2.3.13/notifyd/Makefile.in.autocreate 2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.13/notifyd/Makefile.in 2009-01-13 11:14:09.000000000 +0100
+@@ -71,10 +71,11 @@
+ SERVICE=../master/service.o
+
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
+ LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
+-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+
+ PURIFY=/usr/local/bin/purify
+ PUREOPT=-best-effort
+--- cyrus-imapd-2.3.13/imap/mboxlist.c.autocreate 2008-10-08 17:47:08.000000000 +0200
++++ cyrus-imapd-2.3.13/imap/mboxlist.c 2009-01-13 11:14:09.000000000 +0100
+@@ -83,6 +83,12 @@
+ #include "quota.h"
+ #include "sync_log.h"
+
++#ifdef USE_SIEVE
++extern int autoadd_sieve(char *userid,
++ const char *source_script);
++#endif
+
-+NOTE : This patch has been created at the University of Athens. For more info, as well
-+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr/
+
-+The design of Cyrus IMAP server does not predict the automatic creation of users'
-+INBOX folders. The creation of a user's INBOX is considered to be an external task,
-+that has to be completed as part of the user email account creation procedure.
-+Hence, to create a new email account the site administrator has to:
+ #define DB config_mboxlist_db
+ #define SUBDB config_subscription_db
+
+@@ -100,11 +106,29 @@
+ static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
+ void *rock);
+
++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
++ void *rock);
+
-+ a) Include the new account in the user database for the authentication procedure
-+ (e.g. sasldb, shadow, mysql, ldap).
-+ b) Create the corresponding INBOX folder.
++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
++ char *userid, char *auth_userid,
++ struct auth_state *auth_state);
+
-+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder,
-+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf).
-+Unlike what not careful readers may think, enabling the "autocreatequota" option, doesn't
-+lead to the automatic INBOX folder creation by Cyrus IMAP server.
-+In fact, "autocreate" means that the IMAP clients are allowed to automatically create
-+the user INBOX.
+ struct change_rock {
+ struct quota *quota;
+ struct txn **tid;
+ };
+
++/*
++ * Struct needed to be passed as void *rock to
++ * mboxlist_autochangesub();
++ */
++struct changesub_rock_st {
++ char *userid;
++ char *auth_userid;
++ struct auth_state *auth_state;
++};
+
-+This patch adds the functionality of automatic creation of the users' INBOX folders into
-+the Cyrus IMAP server. It is implemented as two features, namely the "create on login"
-+and "create on post".
-+
+
+ #define FNAME_SUBSSUFFIX ".sub"
+
+ /*
+@@ -3383,3 +3407,349 @@
+
+ return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
+ }
+
-+Create on login
-+===============
-+This feauture provides automatic creation of a user's INBOX folder when all of the
-+following requirements are met:
++/*
++ * Automatically subscribe user to *ALL* shared folders,
++ * one has permissions to be subscribed to.
++ * INBOX subfolders are excluded.
++ */
++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
++ void *rock) {
+
-+i) The user has succesfully passed the authentication procedure.
++ struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
++ char *userid = changesub_rock->userid;
++ char *auth_userid = changesub_rock->auth_userid;
++ struct auth_state *auth_state = changesub_rock->auth_state;
++ int r;
+
-+ii) The user's authorisation ID (typically the same as the user's
-+authentication ID) doesn't belong to the imap_admins or admins
-+accounts (see imapd.conf).
+
-+iii) The "autocreatequota" option in the imap configuration file
-+has been set to a non zero value.
++ if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
++ (strlen(name) > 5 && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
++ (strlen(name) > 4 && !strncmp(name, "user.", 5))) /* Exclude other users' folders */
++ return 0;
+
-+iv) The corresponding to the user's authorisation ID INBOX folder
-+does not exist.
++
++ r = mboxlist_changesub(name, userid, auth_state, 1, 0);
+
-+The user's first login is the most typical case when all four requirements are met.
-+Note that if the authenticated ID is allowed to proxy to another account for which
-+all of the above requirements are met, the corresponding INBOX folder for that account
-+will be created.
++ if (r) {
++ syslog(LOG_WARNING,
++ "autosubscribe: User %s to folder %s, subscription failed: %s",
++ auth_userid, name, error_message(r));
++ } else {
++ syslog(LOG_NOTICE,
++ "autosubscribe: User %s to folder %s, subscription succeeded",
++ auth_userid, name);
++ }
+
++ return 0;
++}
+
++#define SEP '|'
+
-+Create on post
-+==============
-+This feauture provides automatic creation of a user's INBOX folder when all of the
-+following requirements are met.
++/*
++ * Automatically subscribe user to a shared folder.
++ * Subscription is done successfully, if the shared
++ * folder exists and the user has the necessary
++ * permissions.
++ */
++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
++ char *userid, char *auth_userid,
++ struct auth_state *auth_state) {
++
++ const char *sub ;
++ char *p, *q, *next_sub;
++ char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1];
++ int len;
++ int r = 0;
++ int subscribe_all_sharedfolders = 0;
+
-+i) An email message addressed to the user has been received.
++ subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS);
+
-+ii) The recipient is not any of the imap_admins or admins accounts.
-+Note that passing emails to admins or imap_admins accounts from
-+the MTA to LMTP should be avoided in any case.
++ /*
++ * If subscribeallsharedfolders is set to yes in imapd.conf, then
++ * subscribe user to every shared folder one has the apropriate
++ * permissions.
++ */
++ if(subscribe_all_sharedfolders) {
++ char pattern[MAX_MAILBOX_PATH+1];
++ struct changesub_rock_st changesub_rock;
+
[...1873 lines suppressed...]
}
@@ -2194,46 +2212,8 @@
&myfreestate,
+ &mycanonuser,
};
-diff -Naur cyrus-imapd-2.3.12p2/lib/auth_krb5.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb5.c
---- cyrus-imapd-2.3.12p2/lib/auth_krb5.c 2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_krb5.c 2008-05-06 14:48:41.000000000 +0300
-@@ -199,6 +199,14 @@
- free(auth_state);
- }
-
-+static char *mycanonuser(struct auth_state *auth_state)
-+{
-+ if (auth_state)
-+ return auth_state->userid;
-+
-+ return NULL;
-+}
-+
- #else /* HAVE_GSSAPI_H */
-
- static int mymemberof(
-@@ -230,6 +238,12 @@
- fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
- }
-
-+static char *mycanonuser(
-+ struct auth_state *auth_state __attribute__((unused)))
-+{
-+ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
-+}
-+
- #endif
-
- struct auth_mech auth_krb5 =
-@@ -240,4 +254,5 @@
- &mymemberof,
- &mynewstate,
- &myfreestate,
-+ &mycanonuser,
- };
-diff -Naur cyrus-imapd-2.3.12p2/lib/auth_pts.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_pts.c
---- cyrus-imapd-2.3.12p2/lib/auth_pts.c 2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_pts.c 2008-05-06 14:48:41.000000000 +0300
+--- cyrus-imapd-2.3.13/lib/auth_pts.c.autocreate 2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_pts.c 2009-01-13 11:14:09.000000000 +0100
@@ -512,6 +512,14 @@
free(auth_state);
}
@@ -2255,38 +2235,64 @@
&myfreestate,
+ &mycanonuser,
};
-diff -Naur cyrus-imapd-2.3.12p2/lib/auth_unix.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_unix.c
---- cyrus-imapd-2.3.12p2/lib/auth_unix.c 2008-03-24 19:43:08.000000000 +0200
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/auth_unix.c 2008-05-06 14:48:41.000000000 +0300
-@@ -312,6 +312,16 @@
- free((char *)auth_state);
+--- cyrus-imapd-2.3.13/lib/auth.h.autocreate 2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth.h 2009-01-13 11:14:09.000000000 +0100
+@@ -55,6 +55,7 @@
+ const char *identifier);
+ struct auth_state *(*newstate)(const char *identifier);
+ void (*freestate)(struct auth_state *auth_state);
++ char *(*auth_canonuser)(struct auth_state *auth_state);
+ };
+
+ extern struct auth_mech *auth_mechs[];
+@@ -77,5 +78,6 @@
+ const char *identifier);
+ struct auth_state *auth_newstate(const char *identifier);
+ void auth_freestate(struct auth_state *auth_state);
++char *auth_canonuser(struct auth_state *auth_state);
+
+ #endif /* INCLUDED_AUTH_H */
+--- cyrus-imapd-2.3.13/lib/auth_krb5.c.autocreate 2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_krb5.c 2009-01-13 11:14:09.000000000 +0100
+@@ -199,6 +199,14 @@
+ free(auth_state);
}
-+static char *mycanonuser(auth_state)
-+ struct auth_state *auth_state;
++static char *mycanonuser(struct auth_state *auth_state)
+{
+ if (auth_state)
-+ return auth_state->userid;
++ return auth_state->userid;
+
+ return NULL;
+}
+
+ #else /* HAVE_GSSAPI_H */
+
+ static int mymemberof(
+@@ -230,6 +238,12 @@
+ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
+ }
+
++static char *mycanonuser(
++ struct auth_state *auth_state __attribute__((unused)))
++{
++ fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
++}
+
+ #endif
- struct auth_mech auth_unix =
- {
-@@ -321,4 +331,5 @@
+ struct auth_mech auth_krb5 =
+@@ -240,4 +254,5 @@
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-diff -Naur cyrus-imapd-2.3.12p2/lib/imapoptions cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/imapoptions
---- cyrus-imapd-2.3.12p2/lib/imapoptions 2008-04-11 23:07:00.000000000 +0300
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/lib/imapoptions 2008-05-06 14:48:41.000000000 +0300
+--- cyrus-imapd-2.3.13/lib/imapoptions.autocreate 2008-10-08 19:18:12.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/imapoptions 2009-01-13 11:14:09.000000000 +0100
@@ -198,6 +198,55 @@
/* Number of seconds to wait before returning a timeout failure when
- performing a client connection (e.g. in a murder environment) */
+ performing a client connection (e.g., in a murder environment) */
+{ "createonpost", 0, SWITCH }
+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist,
@@ -2340,47 +2346,28 @@
{ "configdirectory", NULL, STRING }
/* The pathname of the IMAP configuration directory. This field is
required. */
-diff -Naur cyrus-imapd-2.3.12p2/notifyd/Makefile.in cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/Makefile.in
---- cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-03-24 21:59:32.000000000 +0200
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/Makefile.in 2008-05-06 14:48:41.000000000 +0300
-@@ -71,10 +71,11 @@
- SERVICE=../master/service.o
-
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
- LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
--DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-
- PURIFY=/usr/local/bin/purify
- PUREOPT=-best-effort
-diff -Naur cyrus-imapd-2.3.12p2/notifyd/notifyd.c cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/notifyd.c
---- cyrus-imapd-2.3.12p2/notifyd/notifyd.c 2008-03-24 21:59:32.000000000 +0200
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/notifyd/notifyd.c 2008-05-06 14:48:41.000000000 +0300
-@@ -96,7 +96,7 @@
+--- cyrus-imapd-2.3.13/lib/auth_unix.c.autocreate 2008-08-26 21:20:39.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/auth_unix.c 2009-01-13 11:14:09.000000000 +0100
+@@ -314,6 +314,16 @@
+ free((char *)auth_state);
+ }
- #define NOTIFY_MAXSIZE 8192
++static char *mycanonuser(auth_state)
++ struct auth_state *auth_state;
++{
++ if (auth_state)
++ return auth_state->userid;
++
++ return NULL;
++}
++
++
--int do_notify()
-+static int do_notify()
+ struct auth_mech auth_unix =
{
- struct sockaddr_un sun_data;
- socklen_t sunlen = sizeof(sun_data);
-diff -Naur cyrus-imapd-2.3.12p2/ptclient/Makefile.in cyrus-imapd-2.3.12p2-autocreate.uncompiled/ptclient/Makefile.in
---- cyrus-imapd-2.3.12p2/ptclient/Makefile.in 2008-03-24 20:34:22.000000000 +0200
-+++ cyrus-imapd-2.3.12p2-autocreate.uncompiled/ptclient/Makefile.in 2008-05-06 14:48:41.000000000 +0300
-@@ -57,10 +57,11 @@
- AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
- AFS_LIBS = @AFS_LIBS@
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
-+SIEVE_LIBS = @SIEVE_LIBS@
- LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
- LIB_SASL = @LIB_SASL@
- LIB_WRAP = @LIB_WRAP@
--DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
-
- LDAP_LIBS=@LDAP_LIBS@
+@@ -323,4 +333,5 @@
+ &mymemberof,
+ &mynewstate,
+ &myfreestate,
++ &mycanonuser,
+ };
Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cyrus-imapd.spec 26 Sep 2008 11:39:02 -0000 1.44
+++ cyrus-imapd.spec 13 Jan 2009 19:32:30 -0000 1.45
@@ -1,7 +1,7 @@
-%define upstream_ver 2.3.12p2
+%define upstream_ver 2.3.13
Name: cyrus-imapd
-Version: 2.3.12p2
-Release: 3%{?dist}
+Version: 2.3.13
+Release: 1%{?dist}
# ********************** BUILD TIME OPTIONS START **********************
@@ -704,6 +704,7 @@
%attr(0755,root,root) %{_cyrexecdir}/reconstruct
%attr(0755,root,root) %{_cyrexecdir}/rehash
%attr(0755,root,root) %{_cyrexecdir}/sievec
+%attr(0755,root,root) %{_cyrexecdir}/sieved
%attr(0755,root,root) %{_cyrexecdir}/smmapd
%attr(0755,root,root) %{_cyrexecdir}/squatter
%attr(0755,root,root) %{_cyrexecdir}/timsieved
@@ -785,6 +786,9 @@
%{_mandir}/man1/*
%changelog
+* Tue Jan 13 2009 Michal Hlavinka <mhlavink at 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
- better fix for linking with recent db4.x
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 1 Sep 2008 11:50:44 -0000 1.14
+++ sources 13 Jan 2009 19:32:30 -0000 1.15
@@ -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
-ee2c300687994e4982c6af6aa154c742 cyrus-imapd-2.3.12p2.tar.gz
-a04fd37f1e47cfbed3394758ac2e4981 cyrus-imapd-2.3.12p2.tar.gz.sig
- Previous message (by thread): rpms/cyrus-imapd/devel .cvsignore, 1.12, 1.13 cyrus-imapd-2.3.1-authid_normalize.patch, 1.1, 1.2 cyrus-imapd-2.3.1-make_md5_defaults.patch, 1.2, 1.3 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.1, 1.2 cyrus-imapd.spec, 1.44, 1.45 sources, 1.14, 1.15
- Next message (by thread): rpms/php-pecl-memcache/devel .cvsignore, 1.7, 1.8 php-pecl-memcache.spec, 1.7, 1.8 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list