Trying to update our experimental 2.3 branch to 2.3.15

[Duncan Gibb]

Henrique de Moraes Holschuh wrote:

HMH> I will now try to upgrade the cyrus23 branch to 2.3.15.
HMH> I will not commit

HMH> Well, I am sitting on a diff from our unpatched 2.3.14
HMH> against the upstream tarball, and they're not the same.
HMH> What gives?  No clues on the svn log or on debian/changelog...

HMH> Looks like lots of our stuff is older than upstream, or a
HMH> mix of 2.3.14 and older stuff.  There are many whitespace
HMH> changes too (at least those are easy to ignore).

Most of this is probably an artefact of going via the Sirius repo rather
than merging new releases directly from upstream.  I'll take a look at
it later and try to clean it up for you.

HMH> What worries me more is sieve/ and perl/sieve, that has a
HMH> lot of differences.  We have OLD code in cyrus23, two-years
HMH> older than what upstream shipped in the tarball, in fact.

HMH> Anyone knows what happened?

Most likely the merges of new upstream don't include stuff which comes
from in a different place in CMU's CVS (for sieve in particular I know
this is true).


Cheers


Duncan

-- 
Duncan Gibb - Technical Director
Sirius Corporation plc - control through freedom
http://www.siriusit.co.uk/ || t: +44 870 608 0063
Debian Cyrus Team - https://alioth.debian.org/projects/pkg-cyrus-imapd/

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.