On Wed, Mar 23, 2016, at 22:02, Adam D. Barratt wrote:
> On Wed, 2016-02-03 at 20:33 +0000, Adam D. Barratt wrote:
> > Hi,
> >
> > On Mon, 2016-02-01 at 17:19 +0100, Ondřej Surý wrote:
> > > Control: retitle -1 jessie-pu: package
> > > cyrus-imapd-2.4/2.4.17+nocaldav-0~deb8u1
> > >
> > > So, it looks like the security queue is quite stalled, so I will use
> > > your offer to p-u.
> > >
> > > Just changed s/jessie-security/jessie/ and preparing the rebuild.
> > > debdiff should be same as already attached except this change.
> >
> > I have to admit that I'm slightly confused by the uploaded diff:
> >
> > - is it intentional that doc/man/*.html disappear?
> > - what are the changes to e.g. imap/{annotate,arbitron,backend}.c about?
>
> Ping?
Thanks for the ping and sorry to throw this update at your head(s) as
raw as it was...
I split the debdiff into several parts for easier understanding:
The main difference is that cyrus-imapd-2.4.17 source tarball doesn't
include generated files and that create confusion, hence:
~~~~~~~~~~
*
cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-generated-autotools-generated.diff
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-generated-doc-man.diff
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-generated-doc-text.diff
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-generated-upstream.diff
contains just files that are generated as part of autotools or 'make
dist'; this also includes all the doc/man/*.html and doc/text files.
~~~~~~~~~~~
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-caldav-changelog.diff
Just changelog entries.
~~~~~~~~~~
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-debian.diff
Changes to Debian packaging, as mentioned before this also includes
these changes:
* [CVE-2015-8077,CVE-2015-8077,CVE-2015-8078]: fix urlfetch range
handling flaw in Cyrus IMAP
* Remove the experimental caldav support
* Replication got unbroken with caldav support removal (Closes:
#799724)
* Always disable SSLv3 and TLS compression
* Workaround subshell losing variables in while loop (Closes:
#803976)
* Don't fail when database type disappears, just warn the user
(Closes: #803965)
~~~~~~~~~~
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-caldav-doc.diff
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-manpages.diff
Contains documentation changes related to caldav support
~~~~~~~~~~
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-upstream-caldav.diff
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-upstream-index_uids.pl.diff
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-upstream-misc-lib.diff
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-vzic.diff
Contains just CalDAV/CardDAV extra files, not present in 2.4.17+nocaldav
~~~~~~~~~~
* cyrus-imapd-2.4_2.4.17+nocaldav-0~deb8u1-upstream-simple.diff
So this is the main diff that applies to existing source code. Mostly it
contains changes needed to store DAV information on top of IMAP folders
and to add a synchronization support for the DAV parts of the
cyrus-imapd.
According to the git log it also contains some changes related to the
code cleanup.
I understand this is still horrible, but if you exclude code moves
between sync_clinet.c, sync_server.c and sync_support.c then it starts
to be reasonable. We are still just moving from the unstable upstream
caldav branch I was hoping they would finish to stable 2.4.17 upstream
release (with some security patches in d/patches on top of it).
imap/annotate.c | 46
imap/arbitron.c | 34
imap/backend.c | 498 ++-----
imap/backend.h | 6
imap/deliver.c | 26
imap/dlist.c | 30
imap/global.c | 5
imap/global.h | 1
imap/idle.c | 35
imap/idle.h | 2
imap/idled.c | 2
imap/imap_err.et | 3
imap/imap_proxy.c | 41
imap/imap_proxy.h | 3
imap/imapd.c | 856 +-----------
imap/index.c | 21
imap/lmtpd.c | 35
imap/mailbox.c | 284 ----
imap/mailbox.h | 10
imap/mbdump.c | 24
imap/mboxlist.c | 125 -
imap/mboxlist.h | 23
imap/mboxname.c | 73 -
imap/mboxname.h | 12
imap/message.c | 410 -----
imap/message.h | 3
imap/mupdate-client.c | 24
imap/nntpd.c | 109 +
imap/pop3d.c | 22
imap/protocol.h | 34
imap/proxy.c | 2
imap/reconstruct.c | 8
imap/spool.c | 17
imap/spool.h | 3
imap/statuscache_db.c | 10
imap/sync_client.c | 2089 +++++++++++++++++++++++++++--
imap/sync_reset.c | 11
imap/sync_server.c | 2210 +++++++++++++++++++++++++++++++
imap/sync_support.c | 3224
----------------------------------------------
imap/sync_support.h | 112 -
imap/tls.c | 117 -
imap/upgrade_index.c | 3
imap/user.c | 20
imtest/imtest.c | 16
lib/charset.c | 62
lib/charset.h | 5
lib/cyrusdb_flat.c | 2
lib/cyrusdb_quotalegacy.c | 8
lib/cyrusdb_sql.c | 13
lib/hash.c | 15
lib/hash.h | 4
lib/imapoptions | 189 --
lib/libconfig.c | 2
lib/prot.c | 52
lib/prot.h | 3
lib/util.c | 211 ---
lib/util.h | 23
lib/wildmat.c | 54
lib/wildmat.h | 7
master/conf/normal.conf | 4
master/conf/prefork.conf | 4
perl/sieve/lib/lex.c | 13
perl/sieve/lib/lex.h | 11
perl/sieve/lib/request.c | 4
sieve/test.c | 8
timsieved/parser.c | 25
66 files changed, 4972 insertions(+), 6386 deletions(-)
O.
--
Ondřej Surý <ond...@sury.org>
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server
