From brong at andrew.cmu.edu Wed Nov 4 19:19:20 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Wed, 04 Nov 2009 19:19:20 EST Subject: [Cyrus-CVS] src/cyrus/lib by brong Message-ID: <200911050019.nA50JKRP030013@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib Modified Files: prot.c Log Message: Rewrite compression handling to support older zlib versions This variant of the compression code is based on work by both Ken and myself, and uses only the most basic zlib API. It also detects compression boundaries more accurately. --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/prot.c.diff?r1=1.97&r2=1.98 From brong at andrew.cmu.edu Wed Nov 4 19:20:10 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Wed, 04 Nov 2009 19:20:10 EST Subject: [Cyrus-CVS] src/cyrus/man by brong Message-ID: <200911050020.nA50KAJt030046@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/man In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/man Modified Files: cyr_expire.8 Log Message: Add "-x" option to cyr_expire to disable expunge Delayed expunge is great and all, but it causes a LOT of IO because you need to stat every mailbox's meta files, and you need to read all of every cyrus.expunge file. That's not something you might want to do every time you want to clean out the duplicate delivery database. Change cyr_expire to add a "-x" option. Ideally I'd like to just have not specifying a "-X" mean don't do it, but I think it might be too late for that. It would make disks fill up with junk at too many sites. --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/man/cyr_expire.8.diff?r1=1.8&r2=1.9 From brong at andrew.cmu.edu Wed Nov 4 19:20:09 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Wed, 04 Nov 2009 19:20:09 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911050020.nA50K9qC030040@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: cyr_expire.c Log Message: Add "-x" option to cyr_expire to disable expunge Delayed expunge is great and all, but it causes a LOT of IO because you need to stat every mailbox's meta files, and you need to read all of every cyrus.expunge file. That's not something you might want to do every time you want to clean out the duplicate delivery database. Change cyr_expire to add a "-x" option. Ideally I'd like to just have not specifying a "-X" mean don't do it, but I think it might be too late for that. It would make disks fill up with junk at too many sites. --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/cyr_expire.c.diff?r1=1.23&r2=1.24 From brong at andrew.cmu.edu Wed Nov 4 07:38:30 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Wed, 04 Nov 2009 07:38:30 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911041238.nA4CcUYL019230@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: statuscache_db.c Log Message: statuscache: don't fatal() on missing database Thanks to Cyril Servant , who said: I wonder why is a "fatal" function called when the statuscache backend can't be opened. This makes the process terminate (then fork again, then terminate, then...). This is not logical, because statuscache is... a cache ! Cyrus should work fine without (and actually, it does, with the patch attached). As we use an sql backend for statuscache, when the sql server is not available, we prefer that cyrus-imapd works without cache than a total breakdown. --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/statuscache_db.c.diff?r1=1.6&r2=1.7 From brong at andrew.cmu.edu Mon Nov 9 23:16:47 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 09 Nov 2009 23:16:47 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911100416.nAA4GloE025469@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: mboxname.c Log Message: mboxname: stop multiple '@'s in mailbox name We had a user manage to create a folder INBOX.foo at bar despite having virtdomains switched on, and figured that they actually issued: tag CREATE INBOX.foo at bar@domain.com This patch puts a stop to this pathological edgecase! --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/mboxname.c.diff?r1=1.47&r2=1.48 From brong at andrew.cmu.edu Mon Nov 16 22:25:43 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:25:43 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911170325.nAH3Phfx013385@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: mailbox.c Log Message: Fix typo in date field --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/mailbox.c.diff?r1=1.196&r2=1.197 From brong at andrew.cmu.edu Mon Nov 16 22:30:56 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:30:56 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911170330.nAH3UusL014159@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: imapd.c Log Message: Complete rewrite of charset handling, using Perl --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/imapd.c.diff?r1=1.569&r2=1.570 From brong at andrew.cmu.edu Mon Nov 16 22:30:57 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:30:57 EST Subject: [Cyrus-CVS] src/cyrus/lib by brong Message-ID: <200911170330.nAH3UvMp014165@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib Modified Files: Makefile.in charset.c charset.h chartable.h Added Files: mkchartable.pl Removed Files: mkchartable.c Log Message: Complete rewrite of charset handling, using Perl --- links to diffs follow --- ADDED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/mkchartable.pl http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/Makefile.in.diff?r1=1.72&r2=1.73 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset.c.diff?r1=1.51&r2=1.52 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset.h.diff?r1=1.21&r2=1.22 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/chartable.h.diff?r1=1.6&r2=1.7 DELETED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/mkchartable.c From brong at andrew.cmu.edu Mon Nov 16 22:30:57 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:30:57 EST Subject: [Cyrus-CVS] src/cyrus/lib/charset by brong Message-ID: <200911170330.nAH3UvCH014171@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib/charset In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib/charset Modified Files: iso-2022-jp.t iso-2022-kr.t Log Message: Complete rewrite of charset handling, using Perl --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-2022-jp.t.diff?r1=1.6&r2=1.7 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-2022-kr.t.diff?r1=1.2&r2=1.3 From brong at andrew.cmu.edu Mon Nov 16 22:31:45 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:31:45 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911170331.nAH3Vjrm014192@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: message.c message.h Log Message: Pass a pre-utf-8-encoded body to sieve for tests --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/message.c.diff?r1=1.114&r2=1.115 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/message.h.diff?r1=1.10&r2=1.11 From brong at andrew.cmu.edu Mon Nov 16 22:32:16 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:32:16 EST Subject: [Cyrus-CVS] src/cyrus/lib/charset by brong Message-ID: <200911170332.nAH3WGgZ014218@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib/charset In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib/charset Added Files: iso-8859-10.t iso-8859-11.t iso-8859-13.t iso-8859-14.t iso-8859-16.t Log Message: Add iso-8859-{10,11,13,14,16} charset support --- links to diffs follow --- ADDED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-8859-10.t ADDED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-8859-11.t ADDED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-8859-13.t ADDED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-8859-14.t ADDED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-8859-16.t From brong at andrew.cmu.edu Mon Nov 16 22:32:16 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:32:16 EST Subject: [Cyrus-CVS] src/cyrus/lib by brong Message-ID: <200911170332.nAH3WGnM014224@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib Modified Files: mkchartable.pl Log Message: Add iso-8859-{10,11,13,14,16} charset support --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/mkchartable.pl.diff?r1=1.1&r2=1.2 From brong at andrew.cmu.edu Mon Nov 16 22:32:50 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:32:50 EST Subject: [Cyrus-CVS] src/cyrus/lib by brong Message-ID: <200911170332.nAH3WoUo014246@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib Modified Files: charset.c chartable.h mkchartable.pl Log Message: Fix iso-2202-kr and support euc-kr as well --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset.c.diff?r1=1.52&r2=1.53 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/chartable.h.diff?r1=1.7&r2=1.8 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/mkchartable.pl.diff?r1=1.2&r2=1.3 From brong at andrew.cmu.edu Mon Nov 16 22:32:51 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:32:51 EST Subject: [Cyrus-CVS] src/cyrus/lib/charset by brong Message-ID: <200911170332.nAH3WpwC014252@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib/charset In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib/charset Modified Files: iso-2022-kr.t Log Message: Fix iso-2202-kr and support euc-kr as well --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/iso-2022-kr.t.diff?r1=1.3&r2=1.4 From brong at andrew.cmu.edu Mon Nov 16 22:33:28 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:33:28 EST Subject: [Cyrus-CVS] src/cyrus/lib by brong Message-ID: <200911170333.nAH3XSA5014276@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib Modified Files: Makefile.in Log Message: Convert to unicode 5.2 --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/Makefile.in.diff?r1=1.73&r2=1.74 From brong at andrew.cmu.edu Mon Nov 16 22:33:30 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:33:30 EST Subject: [Cyrus-CVS] src/cyrus/lib/charset by brong Message-ID: <200911170333.nAH3XUQX014282@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib/charset In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib/charset Added Files: unidata5_2.txt Removed Files: unidata2.txt Log Message: Convert to unicode 5.2 --- links to diffs follow --- ADDED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/unidata5_2.txt DELETED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/charset/unidata2.txt From brong at andrew.cmu.edu Mon Nov 16 22:34:18 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:34:18 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911170334.nAH3YI5L014303@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: mboxlist.c mboxlist.h Log Message: Add mboxlist_count_inferiors interface --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/mboxlist.c.diff?r1=1.270&r2=1.271 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/mboxlist.h.diff?r1=1.46&r2=1.47 From brong at andrew.cmu.edu Mon Nov 16 22:34:30 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:34:30 EST Subject: [Cyrus-CVS] src/cyrus/imap by brong Message-ID: <200911170334.nAH3YUJH014324@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/imap In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/imap Modified Files: mboxlist.c Log Message: Limit User Folders A user managed to synchronise our server with their UWash IMAP server's view of a very busy home directory, creating tens of thousands of folders and showing that there's a DOS risk against mailboxes.db here. This patch creates a new config variable user_folder_limit which, if set, returns IMAP_PERMISSION_DENIED to any further attempts to create a folder if the user has too many folders already. --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/mboxlist.c.diff?r1=1.271&r2=1.272 From brong at andrew.cmu.edu Mon Nov 16 22:34:31 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:34:31 EST Subject: [Cyrus-CVS] src/cyrus/lib by brong Message-ID: <200911170334.nAH3YVeP014330@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/cyrus/lib In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/lib Modified Files: imapoptions Log Message: Limit User Folders A user managed to synchronise our server with their UWash IMAP server's view of a very busy home directory, creating tens of thousands of folders and showing that there's a DOS risk against mailboxes.db here. This patch creates a new config variable user_folder_limit which, if set, returns IMAP_PERMISSION_DENIED to any further attempts to create a folder if the user has too many folders already. --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/lib/imapoptions.diff?r1=1.68&r2=1.69 From brong at andrew.cmu.edu Mon Nov 16 22:39:25 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:39:25 EST Subject: [Cyrus-CVS] src/sieve by brong Message-ID: <200911170339.nAH3dPLR014427@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/sieve In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/sieve Modified Files: bc_eval.c script.c sieve_interface.h Log Message: Use UTF-8 decoding for searches and notify messages Fixes Bug #1721, Bug #1722 --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/bc_eval.c.diff?r1=1.15&r2=1.16 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/script.c.diff?r1=1.69&r2=1.70 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/sieve_interface.h.diff?r1=1.21&r2=1.22 From brong at andrew.cmu.edu Mon Nov 16 22:39:51 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 22:39:51 EST Subject: [Cyrus-CVS] src/sieve by brong Message-ID: <200911170339.nAH3dpM4014448@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/sieve In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/sieve Modified Files: bc_eval.c sieve.y Log Message: Use UTF8 comparison functions if PCRE is enabled --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/bc_eval.c.diff?r1=1.16&r2=1.17 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/sieve.y.diff?r1=1.41&r2=1.42 From brong at andrew.cmu.edu Mon Nov 16 23:01:29 2009 From: brong at andrew.cmu.edu (brong at andrew.cmu.edu) Date: Mon, 16 Nov 2009 23:01:29 EST Subject: [Cyrus-CVS] src/sieve by brong Message-ID: <200911170401.nAH41TDr027209@cyrus-devel-01.andrew.cmu.edu> Update of /afs/andrew.cmu.edu/system/cvs/src/sieve In directory cyrus-devel-01.andrew.cmu.edu:/afs/andrew.cmu.edu/usr3/brong/src/cyrus/sieve Modified Files: bc_eval.c sieve.y Log Message: Check for REG_UTF8 explicitly It appears the version of pcreposix on the CMU servers is somewhat more ancient than the ones I was using, and doesn't have the REG_UTF8 flag. Check for it explicitly instead --- links to diffs follow --- http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/bc_eval.c.diff?r1=1.17&r2=1.18 http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/sieve.y.diff?r1=1.42&r2=1.43