Hello community,
here is the log from the commit of package cyrus-imapd
checked in at Tue Feb 5 14:45:59 CET 2008.
--------
--- cyrus-imapd/cyrus-imapd.changes 2008-02-01 15:33:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes 2008-02-05 14:00:55.000000000 +0100
@@ -1,0 +2,25 @@
+Tue Feb 5 13:58:25 CET 2008 - rhafer@suse.de
+
+- cleanups in %post scriptlet (bnc#357950, bnc#357946)
+- Update to 2.3.11. From the changelog:
+ * Fixed several skiplist bugs -- courtesy of Fastmail.fm.
+ * Add robustness to skiplist recovery -- courtesy of Fastmail.fm.
+ * Added support for modification sequences to replication protocol
+ (for CONDSTORE) -- courtesy of David Carter.
+ * Fixed delayed delete replication -- courtesy of Fastmail.fm.
+ * Allow [un]deleting of user INBOXes (renaming to/from deleted
+ hierarchy) to work when using delayed delete -- courtesy of Simon
+ Matter.
+ * Fixed interaction with removal of rights and implicitownerrights.
+ * Fixed parsing of single FETCH item when using FETCH modifiers.
+ * Prevented SSL_accept() from blocking indefinitely when using
+ TLS/SSL. This should eliminate a lot of hung SSL-wrapped processes.
+ * Allow STARTTLS to be used to externally preauth'd LMTP connections.
+ * Allow a TLS client certificate to be sufficient authentication for
+ LMTP.
+ * timsieved now automatically sends CAPABILITY response after
+ STARTTLS. This code was reintroduced after being mistakenly removed
+ as part of bug #1338.
+ * Fixed miscellaneous bugs and build issues.
+
+-------------------------------------------------------------------
Old:
----
cyrus-imapd-2.3.10.tar.bz2
cyrus-imapd-2.3.9-autocreate-0.10-0.diff
New:
----
cyrus-imapd-2.3.11-autocreate-0.10-0.diff
cyrus-imapd-2.3.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.y27560/_old 2008-02-05 14:45:45.000000000 +0100
+++ /var/tmp/diff_new_pack.y27560/_new 2008-02-05 14:45:45.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cyrus-imapd (Version 2.3.10)
+# spec file for package cyrus-imapd (Version 2.3.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,11 +19,11 @@
Conflicts: imap courier-imap
AutoReqProv: on
Summary: An IMAP and POP Mail Server
-Version: 2.3.10
-Release: 22
+Version: 2.3.11
+Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: cyrus-imapd-rc.tar.gz
-Patch1: cyrus-imapd-2.3.9-autocreate-0.10-0.diff
+Patch1: cyrus-imapd-2.3.11-autocreate-0.10-0.diff
Patch2: authid_normalize.patch
Patch4: luser_relay.patch
Patch5: cyrus-imapd-perl.patch
@@ -231,14 +231,6 @@
%stop_on_removal cyrus
%post
-test -e var/lib/imap/mailboxes.db && {
- db_verify var/lib/imap/mailboxes.db 2> /dev/null && {
- echo "Converting mailboxes.db to skiplist backend"
- cp -p --remove-destination var/lib/imap/mailboxes.db var/lib/imap/mailboxes.db.bak
- rm -f var/lib/imap/mailboxes.db
- chroot . su - cyrus -c 'cvt_cyrusdb /var/lib/imap/mailboxes.db.bak db3 /var/lib/imap/mailboxes.db skiplist'
- }
-}
grep -E "^sieve" etc/services >/dev/null || {
echo "Adding sieve service to /etc/services"
CFBAK=services.`date +%Y-%m-%d`
@@ -272,19 +264,6 @@
rm -rf var/lib/imap
ln -sf ../imap /var/lib/imap
}
-CYRUSCF=etc/cyrus.conf
-TMPCYRUSCF=etc/cyrus.conf.tmp
-rm -f $TMPCYRUSCF
-sed -e 's/^[[:space:]]*delprune.*/ delprune cmd="cyr_expire -E 3" at=0400/' $CYRUSCF > $TMPCYRUSCF
-if ! cmp -s $CYRUSCF $TMPCYRUSCF; then
- CFBAK=etc/cyrus.conf.$(date +%Y-%m-%d)
- echo "Backing up old $CYRUSCF as $CFBAK"
- cp --remove-destination $CYRUSCF $CFBAK
- echo "updating $CYRUSCF"
- mv $TMPCYRUSCF $CYRUSCF
-else
- rm -f $TMPCYRUSCF
-fi
%{fillup_and_insserv cyrus}
%postun
@@ -349,6 +328,28 @@
%doc %{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz
%changelog
+* Tue Feb 05 2008 rhafer@suse.de
+- cleanups in %%post scriptlet (bnc#357950, bnc#357946)
+- Update to 2.3.11. From the changelog:
+ * Fixed several skiplist bugs -- courtesy of Fastmail.fm.
+ * Add robustness to skiplist recovery -- courtesy of Fastmail.fm.
+ * Added support for modification sequences to replication protocol
+ (for CONDSTORE) -- courtesy of David Carter.
+ * Fixed delayed delete replication -- courtesy of Fastmail.fm.
+ * Allow [un]deleting of user INBOXes (renaming to/from deleted
+ hierarchy) to work when using delayed delete -- courtesy of Simon
+ Matter.
+ * Fixed interaction with removal of rights and implicitownerrights.
+ * Fixed parsing of single FETCH item when using FETCH modifiers.
+ * Prevented SSL_accept() from blocking indefinitely when using
+ TLS/SSL. This should eliminate a lot of hung SSL-wrapped processes.
+ * Allow STARTTLS to be used to externally preauth'd LMTP connections.
+ * Allow a TLS client certificate to be sufficient authentication for
+ LMTP.
+ * timsieved now automatically sends CAPABILITY response after
+ STARTTLS. This code was reintroduced after being mistakenly removed
+ as part of bug #1338.
+ * Fixed miscellaneous bugs and build issues.
* Fri Feb 01 2008 rhafer@suse.de
- create backups files in /var/adm/backup/imap instead of
/var/lib/imap (bnc#355146, bnc#355914)
++++++ cyrus-imapd-2.3.9-autocreate-0.10-0.diff -> cyrus-imapd-2.3.11-autocreate-0.10-0.diff ++++++
--- cyrus-imapd/cyrus-imapd-2.3.9-autocreate-0.10-0.diff 2007-10-30 11:23:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd-2.3.11-autocreate-0.10-0.diff 2008-02-05 13:22:39.000000000 +0100
@@ -1,7 +1,6 @@
-Index: cyrus-imapd-2.3.10/README.autocreate
-===================================================================
---- /dev/null
-+++ cyrus-imapd-2.3.10/README.autocreate
+diff -Naur cyrus-imapd-2.3.11/README.autocreate cyrus-imapd-2.3.11-autocreate.uncompiled/README.autocreate
+--- cyrus-imapd-2.3.11/README.autocreate 1970-01-01 02:00:00.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/README.autocreate 2007-12-12 13:29:49.000000000 +0200
@@ -0,0 +1,211 @@
+Cyrus IMAP autocreate Inbox patch
+----------------------------------
@@ -214,11 +213,10 @@
+
+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autocreate
+
-Index: cyrus-imapd-2.3.10/imap/Makefile.in
-===================================================================
---- cyrus-imapd-2.3.10.orig/imap/Makefile.in
-+++ cyrus-imapd-2.3.10/imap/Makefile.in
-@@ -102,7 +102,7 @@ LOBJS= append.o mailbox.o mboxlist.o mup
+diff -Naur cyrus-imapd-2.3.11/imap/Makefile.in cyrus-imapd-2.3.11-autocreate.uncompiled/imap/Makefile.in
+--- cyrus-imapd-2.3.11/imap/Makefile.in 2007-10-18 21:48:02.000000000 +0300
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/Makefile.in 2007-12-12 13:29:49.000000000 +0200
+@@ -101,7 +101,7 @@
convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
imapparse.o telemetry.o user.o notify.o protocol.o idle.o quota_db.o \
@@ -227,7 +225,16 @@
IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
-@@ -183,9 +183,9 @@ mupdate_err.c: mupdate_err.et
+@@ -117,7 +117,7 @@
+ fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
+ cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
+ ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
+- unexpunge @IMAP_PROGS@
++ unexpunge compile_sieve @IMAP_PROGS@
+
+ BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \
+ lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \
+@@ -182,9 +182,9 @@
mupdate_err.h: mupdate_err.c
### Services
@@ -239,7 +246,7 @@
lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-@@ -199,158 +199,162 @@ lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS)
+@@ -198,158 +198,162 @@
$(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
@@ -470,11 +477,10 @@
### Other Misc Targets
-Index: cyrus-imapd-2.3.10/imap/autosieve.c
-===================================================================
---- /dev/null
-+++ cyrus-imapd-2.3.10/imap/autosieve.c
-@@ -0,0 +1,587 @@
+diff -Naur cyrus-imapd-2.3.11/imap/autosieve.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/autosieve.c
+--- cyrus-imapd-2.3.11/imap/autosieve.c 1970-01-01 02:00:00.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/autosieve.c 2007-12-12 13:29:49.000000000 +0200
+@@ -0,0 +1,590 @@
+#include
+#include
+#include
@@ -496,6 +502,9 @@
+
+#include "global.h"
+#include "util.h"
++#include "xmalloc.h"
++#include "xstrlcpy.h"
++#include "xstrlcat.h"
+#include "mailbox.h"
+#include "imap_err.h"
+#include "sieve_interface.h"
@@ -509,7 +518,7 @@
+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
+int autoadd_sieve(char *userid, const char *source_script);
+
-+static void fatal(const char *s, int code);
++//static void fatal(const char *s, int code);
+static void foo(void);
+static int sieve_notify(void *ac __attribute__((unused)),
+ void *interp_context __attribute__((unused)),
@@ -915,11 +924,11 @@
+ return 0;
+}
+
-+static void fatal(const char *s, int code)
++/*static void fatal(const char *s, int code)
+{
+ printf("Fatal error: %s (%d)\r\n", s, code);
+ exit(1);
-+}
++}*/
+
+/* to make larry's stupid functions happy :) */
+static void foo(void)
@@ -1062,11 +1071,10 @@
+ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present
+ */
+
-Index: cyrus-imapd-2.3.10/imap/compile_sieve.c
-===================================================================
---- /dev/null
-+++ cyrus-imapd-2.3.10/imap/compile_sieve.c
-@@ -0,0 +1,364 @@
+diff -Naur cyrus-imapd-2.3.11/imap/compile_sieve.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/compile_sieve.c
+--- cyrus-imapd-2.3.11/imap/compile_sieve.c 1970-01-01 02:00:00.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/compile_sieve.c 2007-12-12 13:29:49.000000000 +0200
+@@ -0,0 +1,365 @@
+/* This tool compiles the sieve script from a command
+line so that it can be used wby the autoadd patch */
+#include
@@ -1089,6 +1097,9 @@
+#include "global.h"
+
+#include "util.h"
++#include "xmalloc.h"
++#include "xstrlcpy.h"
++#include "xstrlcat.h"
+#include "mailbox.h"
+#include "imap_err.h"
+#include "sieve_interface.h"
@@ -1105,12 +1116,12 @@
+
+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
+
-+static void fatal(const char *s, int code)
++/*static void fatal(const char *s, int code)
+{
+ printf("Fatal error: %s (%d)\r\n", s, code);
+
+ exit(1);
-+}
++}*/
+
+void usage(void)
+{
@@ -1127,11 +1138,9 @@
+ bytecode_info_t *bc = NULL;
+ char *err = NULL;
+ FILE *in_stream;
-+ int out_fd,r, k, opt;
++ int out_fd, opt;
+ char *source_script = NULL;
+ char *compiled_source_script = NULL;
-+ mode_t oldmask;
-+ struct stat statbuf;
+ char *alt_config = NULL;
+ extern char *optarg;
+ char sieve_tmpname[MAX_MAILBOX_NAME+1];
@@ -1208,7 +1217,7 @@
+
+ if(!in_stream) {
+ fprintf(stderr,"Unable to open %s source sieve script\n",source_script);
-+ return;
++ return 1;
+ }
+
+ /*
@@ -1242,7 +1251,7 @@
+ unlink(sieve_tmpname);
+ fclose(in_stream);
+ close(out_fd);
-+ return;
++ return 1;
+ }
+
+
@@ -1254,7 +1263,7 @@
+ sieve_script_free(&s);
+ fclose(in_stream);
+ close(out_fd);
-+ return;
++ return 1;
+ }
+ if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) {
+ fprintf(stderr, "Error occured while emitting sieve script\n");
@@ -1263,7 +1272,7 @@
+ sieve_script_free(&s);
+ fclose(in_stream);
+ close(out_fd);
-+ return;
++ return 1;
+ }
+
+ /* clean up the memory */
@@ -1431,11 +1440,10 @@
+
+
+
-Index: cyrus-imapd-2.3.10/imap/imapd.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/imap/imapd.c
-+++ cyrus-imapd-2.3.10/imap/imapd.c
-@@ -216,6 +216,7 @@ static const int max_monthdays[] = {
+diff -Naur cyrus-imapd-2.3.11/imap/imapd.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/imapd.c
+--- cyrus-imapd-2.3.11/imap/imapd.c 2007-11-27 17:31:28.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/imapd.c 2007-12-12 13:29:49.000000000 +0200
+@@ -205,6 +205,7 @@
void motd_file(int fd);
void shut_down(int code);
void fatal(const char *s, int code);
@@ -1443,7 +1451,7 @@
void cmdloop(void);
void cmd_login(char *tag, char *user);
-@@ -1985,6 +1986,43 @@ void cmdloop()
+@@ -1907,6 +1908,43 @@
}
/*
@@ -1487,7 +1495,7 @@
* Perform a LOGIN command
*/
void cmd_login(char *tag, char *user)
-@@ -2157,6 +2195,9 @@ void cmd_login(char *tag, char *user)
+@@ -2074,6 +2112,9 @@
strcspn(imapd_userid, "@") : 0);
freebuf(&passwdbuf);
@@ -1497,7 +1505,7 @@
return;
}
-@@ -2320,6 +2361,8 @@ cmd_authenticate(char *tag, char *authty
+@@ -2232,6 +2273,8 @@
config_virtdomains ?
strcspn(imapd_userid, "@") : 0);
@@ -1506,11 +1514,10 @@
return;
}
-Index: cyrus-imapd-2.3.10/imap/lmtpd.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/imap/lmtpd.c
-+++ cyrus-imapd-2.3.10/imap/lmtpd.c
-@@ -117,6 +117,8 @@ void shut_down(int code);
+diff -Naur cyrus-imapd-2.3.11/imap/lmtpd.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/lmtpd.c
+--- cyrus-imapd-2.3.11/imap/lmtpd.c 2007-10-12 15:54:23.000000000 +0300
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/lmtpd.c 2007-12-12 13:29:49.000000000 +0200
+@@ -117,6 +117,8 @@
static FILE *spoolfile(message_data_t *msgdata);
static void removespool(message_data_t *msgdata);
@@ -1519,7 +1526,7 @@
/* current namespace */
static struct namespace lmtpd_namespace;
-@@ -956,6 +958,86 @@ void shut_down(int code)
+@@ -956,6 +958,86 @@
exit(code);
}
@@ -1606,7 +1613,7 @@
static int verify_user(const char *user, const char *domain, char *mailbox,
long quotacheck, struct auth_state *authstate)
{
-@@ -999,6 +1081,15 @@ static int verify_user(const char *user,
+@@ -999,6 +1081,15 @@
*/
r = mlookup(namebuf, &server, &acl, NULL);
@@ -1622,7 +1629,7 @@
if (r == IMAP_MAILBOX_NONEXISTENT && !user &&
config_getswitch(IMAPOPT_LMTP_FUZZY_MAILBOX_MATCH) &&
/* see if we have a mailbox whose name is close */
-@@ -1025,6 +1116,7 @@ static int verify_user(const char *user,
+@@ -1025,6 +1116,7 @@
aclcheck, (quotacheck < 0)
|| config_getswitch(IMAPOPT_LMTP_STRICT_QUOTA) ?
quotacheck : 0);
@@ -1630,10 +1637,9 @@
}
}
-Index: cyrus-imapd-2.3.10/imap/mboxlist.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/imap/mboxlist.c
-+++ cyrus-imapd-2.3.10/imap/mboxlist.c
+diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.c
+--- cyrus-imapd-2.3.11/imap/mboxlist.c 2007-11-27 17:31:29.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.c 2007-12-12 13:29:49.000000000 +0200
@@ -84,6 +84,12 @@
#include "quota.h"
#include "sync_log.h"
@@ -1647,7 +1653,7 @@
#define DB config_mboxlist_db
#define SUBDB config_subscription_db
-@@ -101,11 +107,29 @@ static int mboxlist_rmquota(const char *
+@@ -101,11 +107,29 @@
static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
void *rock);
@@ -1677,9 +1683,9 @@
#define FNAME_SUBSSUFFIX ".sub"
/*
-@@ -3399,3 +3423,349 @@ int mboxlist_in_deletedhierarchy(const c
- return ((!strncmp(mailboxname + domainlen, deletedprefix, deletedprefix_len) &&
- mailboxname[domainlen + deletedprefix_len] == '.') ? 1 : 0);
+@@ -3380,3 +3404,349 @@
+
+ return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
}
+
+/*
@@ -2027,26 +2033,22 @@
+ return r;
+}
+
-Index: cyrus-imapd-2.3.10/imap/mboxlist.h
-===================================================================
---- cyrus-imapd-2.3.10.orig/imap/mboxlist.h
-+++ cyrus-imapd-2.3.10/imap/mboxlist.h
-@@ -210,6 +210,10 @@ void mboxlist_done(void);
- int mboxlist_commit(struct txn *tid);
+diff -Naur cyrus-imapd-2.3.11/imap/mboxlist.h cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.h
+--- cyrus-imapd-2.3.11/imap/mboxlist.h 2007-11-27 17:31:29.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/mboxlist.h 2007-12-12 13:30:27.000000000 +0200
+@@ -211,4 +211,8 @@
int mboxlist_abort(struct txn *tid);
-+int mboxlist_autocreateinbox(struct namespace *namespace,
-+ char *userid,
-+ struct auth_state *auth_state,
-+ char *mailboxname, int autocreatequota);
int mboxlist_delayed_delete_isenabled(void);
- int mboxlist_in_deletedhierarchy(const char *mailboxname);
++int mboxlist_autocreateinbox(struct namespace *namespace,char *userid,
++ struct auth_state *auth_state, char *mailboxname,
++ int autocreatequota);
++
#endif
-Index: cyrus-imapd-2.3.10/imap/pop3d.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/imap/pop3d.c
-+++ cyrus-imapd-2.3.10/imap/pop3d.c
-@@ -163,6 +163,8 @@ static void bitpipe(void);
+diff -Naur cyrus-imapd-2.3.11/imap/pop3d.c cyrus-imapd-2.3.11-autocreate.uncompiled/imap/pop3d.c
+--- cyrus-imapd-2.3.11/imap/pop3d.c 2007-11-26 22:23:06.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/imap/pop3d.c 2007-12-12 13:29:49.000000000 +0200
+@@ -159,6 +159,8 @@
static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* */
static void cmd_apop(char *response);
@@ -2055,7 +2057,7 @@
static void cmd_auth(char *arg);
static void cmd_capa(void);
static void cmd_pass(char *pass);
-@@ -1235,6 +1237,7 @@ void cmd_user(char *user)
+@@ -1227,6 +1229,7 @@
popd_userid = xstrdup(userbuf);
prot_printf(popd_out, "+OK Name is a valid mailbox\r\n");
}
@@ -2063,7 +2065,7 @@
}
void cmd_pass(char *pass)
-@@ -1533,6 +1536,43 @@ void cmd_auth(char *arg)
+@@ -1525,6 +1528,43 @@
}
/*
@@ -2107,7 +2109,7 @@
* Complete the login process by opening and locking the user's inbox
*/
int openinbox(void)
-@@ -1561,6 +1601,12 @@ int openinbox(void)
+@@ -1553,6 +1593,12 @@
if (!r) r = mboxlist_detail(inboxname, &type, NULL, NULL,
&server, &acl, NULL);
@@ -2120,11 +2122,10 @@
if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) &&
(!acl ||
!((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) {
-Index: cyrus-imapd-2.3.10/lib/auth.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/lib/auth.c
-+++ cyrus-imapd-2.3.10/lib/auth.c
-@@ -117,3 +117,11 @@ struct auth_state *auth_state;
+diff -Naur cyrus-imapd-2.3.11/lib/auth.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.c
+--- cyrus-imapd-2.3.11/lib/auth.c 2006-11-30 19:11:22.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.c 2007-12-12 13:29:49.000000000 +0200
+@@ -117,3 +117,11 @@
auth->freestate(auth_state);
}
@@ -2136,11 +2137,10 @@
+ return auth->auth_canonuser(auth_state);
+}
+
-Index: cyrus-imapd-2.3.10/lib/auth.h
-===================================================================
---- cyrus-imapd-2.3.10.orig/lib/auth.h
-+++ cyrus-imapd-2.3.10/lib/auth.h
-@@ -54,6 +54,7 @@ struct auth_mech {
+diff -Naur cyrus-imapd-2.3.11/lib/auth.h cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.h
+--- cyrus-imapd-2.3.11/lib/auth.h 2006-11-30 19:11:22.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth.h 2007-12-12 13:29:49.000000000 +0200
+@@ -54,6 +54,7 @@
const char *identifier);
struct auth_state *(*newstate)(const char *identifier);
void (*freestate)(struct auth_state *auth_state);
@@ -2148,18 +2148,17 @@
};
extern struct auth_mech *auth_mechs[];
-@@ -76,5 +77,6 @@ int auth_memberof(struct auth_state *aut
+@@ -76,5 +77,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 */
-Index: cyrus-imapd-2.3.10/lib/auth_krb.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/lib/auth_krb.c
-+++ cyrus-imapd-2.3.10/lib/auth_krb.c
-@@ -338,6 +338,15 @@ struct auth_state *auth_state;
+diff -Naur cyrus-imapd-2.3.11/lib/auth_krb.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb.c
+--- cyrus-imapd-2.3.11/lib/auth_krb.c 2007-09-27 23:02:45.000000000 +0300
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb.c 2007-12-12 13:29:49.000000000 +0200
+@@ -338,6 +338,15 @@
free((char *)auth_state);
}
@@ -2175,7 +2174,7 @@
#else /* HAVE_KRB */
static int mymemberof(
-@@ -369,6 +378,13 @@ static void myfreestate(
+@@ -369,6 +378,13 @@
fatal("Authentication mechanism (krb) not compiled in", EC_CONFIG);
}
@@ -2189,17 +2188,16 @@
#endif
struct auth_mech auth_krb =
-@@ -379,4 +395,5 @@ struct auth_mech auth_krb =
+@@ -379,4 +395,5 @@
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-Index: cyrus-imapd-2.3.10/lib/auth_krb5.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/lib/auth_krb5.c
-+++ cyrus-imapd-2.3.10/lib/auth_krb5.c
-@@ -197,6 +197,14 @@ static void myfreestate(struct auth_stat
+diff -Naur cyrus-imapd-2.3.11/lib/auth_krb5.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb5.c
+--- cyrus-imapd-2.3.11/lib/auth_krb5.c 2007-09-27 23:02:45.000000000 +0300
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_krb5.c 2007-12-12 13:29:49.000000000 +0200
+@@ -197,6 +197,14 @@
free(auth_state);
}
@@ -2214,7 +2212,7 @@
#else /* HAVE_GSSAPI_H */
static int mymemberof(
-@@ -228,6 +236,12 @@ static void myfreestate(
+@@ -228,6 +236,12 @@
fatal("Authentication mechanism (krb5) not compiled in", EC_CONFIG);
}
@@ -2227,17 +2225,16 @@
#endif
struct auth_mech auth_krb5 =
-@@ -238,4 +252,5 @@ struct auth_mech auth_krb5 =
+@@ -238,4 +252,5 @@
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-Index: cyrus-imapd-2.3.10/lib/auth_pts.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/lib/auth_pts.c
-+++ cyrus-imapd-2.3.10/lib/auth_pts.c
-@@ -511,6 +511,14 @@ static void myfreestate(struct auth_stat
+diff -Naur cyrus-imapd-2.3.11/lib/auth_pts.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_pts.c
+--- cyrus-imapd-2.3.11/lib/auth_pts.c 2007-09-27 23:02:45.000000000 +0300
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_pts.c 2007-12-12 13:29:49.000000000 +0200
+@@ -511,6 +511,14 @@
free(auth_state);
}
@@ -2252,17 +2249,16 @@
struct auth_mech auth_pts =
{
"pts", /* name */
-@@ -519,4 +527,5 @@ struct auth_mech auth_pts =
+@@ -519,4 +527,5 @@
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-Index: cyrus-imapd-2.3.10/lib/auth_unix.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/lib/auth_unix.c
-+++ cyrus-imapd-2.3.10/lib/auth_unix.c
-@@ -317,6 +317,16 @@ struct auth_state *auth_state;
+diff -Naur cyrus-imapd-2.3.11/lib/auth_unix.c cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_unix.c
+--- cyrus-imapd-2.3.11/lib/auth_unix.c 2007-10-31 12:42:18.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/auth_unix.c 2007-12-12 13:29:49.000000000 +0200
+@@ -314,6 +314,16 @@
free((char *)auth_state);
}
@@ -2279,17 +2275,16 @@
struct auth_mech auth_unix =
{
-@@ -326,4 +336,5 @@ struct auth_mech auth_unix =
+@@ -323,4 +333,5 @@
&mymemberof,
&mynewstate,
&myfreestate,
+ &mycanonuser,
};
-Index: cyrus-imapd-2.3.10/lib/imapoptions
-===================================================================
---- cyrus-imapd-2.3.10.orig/lib/imapoptions
-+++ cyrus-imapd-2.3.10/lib/imapoptions
-@@ -177,6 +177,55 @@ are listed with ``<none>''.
+diff -Naur cyrus-imapd-2.3.11/lib/imapoptions cyrus-imapd-2.3.11-autocreate.uncompiled/lib/imapoptions
+--- cyrus-imapd-2.3.11/lib/imapoptions 2007-10-18 21:14:48.000000000 +0300
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/lib/imapoptions 2007-12-12 13:29:49.000000000 +0200
+@@ -177,6 +177,55 @@
/* Number of seconds to wait before returning a timeout failure when
performing a client connection (e.g. in a murder environment) */
@@ -2345,11 +2340,10 @@
{ "configdirectory", NULL, STRING }
/* The pathname of the IMAP configuration directory. This field is
required. */
-Index: cyrus-imapd-2.3.10/notifyd/Makefile.in
-===================================================================
---- cyrus-imapd-2.3.10.orig/notifyd/Makefile.in
-+++ cyrus-imapd-2.3.10/notifyd/Makefile.in
-@@ -69,10 +69,11 @@ NOTIFYD_LIBS = @NOTIFYD_LIBS@
+diff -Naur cyrus-imapd-2.3.11/notifyd/Makefile.in cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/Makefile.in
+--- cyrus-imapd-2.3.11/notifyd/Makefile.in 2006-11-30 19:11:23.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/Makefile.in 2007-12-12 13:29:49.000000000 +0200
+@@ -69,10 +69,11 @@
SERVICE=../master/service.o
IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
@@ -2362,11 +2356,10 @@
PURIFY=/usr/local/bin/purify
PUREOPT=-best-effort
-Index: cyrus-imapd-2.3.10/notifyd/notifyd.c
-===================================================================
---- cyrus-imapd-2.3.10.orig/notifyd/notifyd.c
-+++ cyrus-imapd-2.3.10/notifyd/notifyd.c
-@@ -97,7 +97,7 @@ char *fetch_arg(char *head, char* tail)
+diff -Naur cyrus-imapd-2.3.11/notifyd/notifyd.c cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/notifyd.c
+--- cyrus-imapd-2.3.11/notifyd/notifyd.c 2006-11-30 19:11:23.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/notifyd/notifyd.c 2007-12-12 13:29:49.000000000 +0200
+@@ -97,7 +97,7 @@
#define NOTIFY_MAXSIZE 8192
@@ -2375,11 +2368,10 @@
{
struct sockaddr_un sun_data;
socklen_t sunlen = sizeof(sun_data);
-Index: cyrus-imapd-2.3.10/ptclient/Makefile.in
-===================================================================
---- cyrus-imapd-2.3.10.orig/ptclient/Makefile.in
-+++ cyrus-imapd-2.3.10/ptclient/Makefile.in
-@@ -57,10 +57,11 @@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(
+diff -Naur cyrus-imapd-2.3.11/ptclient/Makefile.in cyrus-imapd-2.3.11-autocreate.uncompiled/ptclient/Makefile.in
+--- cyrus-imapd-2.3.11/ptclient/Makefile.in 2006-11-30 19:11:24.000000000 +0200
++++ cyrus-imapd-2.3.11-autocreate.uncompiled/ptclient/Makefile.in 2007-12-12 13:29:49.000000000 +0200
+@@ -57,10 +57,11 @@
AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@
AFS_LIBS = @AFS_LIBS@
IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
++++++ cyrus-imapd-2.3.10.tar.bz2 -> cyrus-imapd-2.3.11.tar.bz2 ++++++
++++ 4228 lines of diff (skipped)
++++++ impl_decl.patch ++++++
--- /var/tmp/diff_new_pack.y27560/_old 2008-02-05 14:45:50.000000000 +0100
+++ /var/tmp/diff_new_pack.y27560/_new 2008-02-05 14:45:50.000000000 +0100
@@ -46,15 +46,6 @@
#include "script.h"
#define TIMSIEVE_FAIL -1
-@@ -438,7 +438,7 @@ int autoadd_sieve(char *userid, const ch
- return 0;
- }
-
--static void fatal(const char *s, int code)
-+void fatal(const char *s, int code)
- {
- printf("Fatal error: %s (%d)\r\n", s, code);
- exit(1);
Index: cyrus-imapd-2.3.10/imap/index.c
===================================================================
--- cyrus-imapd-2.3.10.orig/imap/index.c
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org