diff options
-rw-r--r-- | debian/changelog | 56 | ||||
-rw-r--r-- | debian/control | 79 | ||||
-rw-r--r-- | debian/copyright | 15 | ||||
-rw-r--r-- | debian/gbp.conf | 6 | ||||
-rw-r--r-- | debian/interimap.NEWS | 14 | ||||
-rw-r--r-- | debian/interimap.docs | 5 | ||||
-rw-r--r-- | debian/interimap.install | 3 | ||||
-rw-r--r-- | debian/interimap.manpages | 1 | ||||
-rw-r--r-- | debian/libinterimap.install | 1 | ||||
-rw-r--r-- | debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch | 46 | ||||
-rw-r--r-- | debian/patches/Skip-randomized-tests.patch | 57 | ||||
-rw-r--r-- | debian/patches/series | 2 | ||||
-rw-r--r-- | debian/pullimap.docs | 1 | ||||
-rw-r--r-- | debian/pullimap.install | 2 | ||||
-rw-r--r-- | debian/pullimap.manpages | 1 | ||||
-rwxr-xr-x | debian/rules | 7 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/source/lintian-overrides | 2 |
18 files changed, 299 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..62d0515 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,56 @@ +interimap (0.5.1-2) unstable; urgency=medium + + * d/rules: Pass '--no-enable' to dh_installsystemduser(1). Not enabling the + units on install makes sense as interimap resp. pullimap will refuse to + create the database when started with '--watch=' resp. '--idle='. + + -- Guilhem Moulin <guilhem@debian.org> Sun, 05 Jul 2020 23:49:56 +0200 + +interimap (0.5.1-1) unstable; urgency=medium + + * d/control: Annotate some Build-Depends with <!nocheck>. + * d/control: Bump debhelper compatibility level to 13. + * d/patches/Ignore-custom-lib-PATH.patch: Remove patch, applied upstream. + * Adapt d/*.docs, d/*.install and d/*.manpages to the current upstream + Makefile. + + -- Guilhem Moulin <guilhem@debian.org> Thu, 02 Jul 2020 00:16:07 +0200 + +interimap (0.5-1) unstable; urgency=medium + + * New upstream release. Closes: #946727. + * d/control: Bump Standards-Version to 4.5.0 (no changes necessary). + * d/patches: Remove patches applied upstream. + * d/patches: Avoid running randomized tests on the build daemons. + + -- Guilhem Moulin <guilhem@debian.org> Wed, 29 Jan 2020 13:22:16 +0100 + +interimap (0.5~rc-2) experimental; urgency=low + + * Apply patches from master to make the test suite pass on the buildds. + + -- Guilhem Moulin <guilhem@debian.org> Sun, 15 Dec 2019 03:44:27 +0100 + +interimap (0.5~rc-1) experimental; urgency=low + + * New upstream release. Closes: #942725, #944812, #944859. + * debian/control: + + New Build-Depends for the test-suite: dovecot-imapd, dovecot-lmtpd, + libconfig-tiny-perl, libdbd-sqlite3-perl, libnet-ssleay-perl, openssl, + procps, sqlite3, and xxd. + + interimap: no longer depends on 'libdbi-perl' (pulled by DBD::SQLite). + + interimap: now suggests dovecot-imapd. + + Bump debhelper compatibility level to 12 and set debhelper-compat + version in Build-Depends. + + Add Homepage field, pointing to https://guilhem.org/interimap . + + Bump Standards-Version to 4.4.1 (no changes necessary). + + Set 'Rules-Requires-Root: no'. + * Rename debian/source.lintian-overrides to debian/source/lintian-overrides. + + -- Guilhem Moulin <guilhem@debian.org> Sat, 14 Dec 2019 19:41:21 +0100 + +interimap (0.4-1) unstable; urgency=low + + * Initial release. Closes: #919904, #919906, #919908. + + -- Guilhem Moulin <guilhem@debian.org> Sun, 20 Jan 2019 21:25:54 +0100 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..0f07c0d --- /dev/null +++ b/debian/control @@ -0,0 +1,79 @@ +Source: interimap +Section: mail +Priority: optional +Maintainer: Guilhem Moulin <guilhem@debian.org> +Build-Depends: debhelper-compat (= 13), + dovecot-imapd (>= 2~) <!nocheck>, + dovecot-lmtpd (>= 2~) <!nocheck>, + jq, + libconfig-tiny-perl <!nocheck>, + libdbd-sqlite3-perl <!nocheck>, + libnet-ssleay-perl (>= 1.73~) <!nocheck>, + openssl <!nocheck>, + pandoc (>= 2.1~), + procps <!nocheck>, + sqlite3 <!nocheck>, + xxd <!nocheck> +Rules-Requires-Root: no +Standards-Version: 4.5.0 +Homepage: https://guilhem.org/interimap +Vcs-Git: https://git.guilhem.org/interimap +Vcs-Browser: https://git.guilhem.org/interimap + +Package: interimap +Architecture: all +Depends: libdbd-sqlite3-perl, + libinterimap (>= ${source:Upstream-Version}~), + ${misc:Depends}, + ${perl:Depends} +Suggests: dovecot-imapd (>= 2~) +Description: Fast bidirectional synchronization for QRESYNC-capable IMAP servers + InterIMAP performs stateful bi-directional synchronization between two + IMAP4rev1 servers. Compared to the so-called "full" synchronization + solutions, InterIMAP is both much faster and parsimonious in network + traffic. + . + Stateful synchronization is made possible by the QRESYNC extension from + [RFC7162]; for convenience reasons servers must also support LIST-EXTENDED + [RFC5258], LIST-STATUS [RFC5819] and UIDPLUS [RFC4315]. + . + Furthermore, while InterIMAP can work with servers lacking support for + LITERAL+ [RFC2088] and MULTIAPPEND [RFC3502], these extensions greatly + improve performance by reducing the number of required round trips and it + thus strongly recommended to use a server supporting these. + . + InterIMAP supports the COMPRESS=DEFLATE extension from [RFC4978]. It is + enabled by default on remote servers advertising it, in order to reduce + network traffic, especially for long-lived connections. + +Package: pullimap +Architecture: all +Depends: libinterimap (>= ${source:Upstream-Version}~), + ${misc:Depends}, + ${perl:Depends} +Description: Pull mails from an IMAP mailbox and deliver them via SMTP or LMTP + PullIMAP retrieves messages from an IMAP mailbox and deliver them to an + SMTP or LMTP transmission channel. It can also remove old messages after + a configurable retention period. + . + A statefile is used to keep track of the mailbox's UIDVALIDITY and UIDNEXT + values. While PullIMAP is running, the statefile is also used to keep + track of UIDs being delivered, which avoids duplicate deliveries if the + process is interrupted. + . + PullIMAP supports the COMPRESS=DEFLATE extension from [RFC4978]. It is + enabled by default on servers advertising it, in order to reduce network + traffic, especially for long-lived connections (when IDLE commands are + enabled.) + +Package: libinterimap +Architecture: all +Depends: libconfig-tiny-perl, + libnet-ssleay-perl (>= 1.73~), + ${misc:Depends}, + ${perl:Depends} +Description: Net::IMAP::InterIMAP library and utils + Net::IMAP::InterIMAP is a minimal IMAP4rev1 client for QRESYNC-capable + servers, used by interimap. It can also be used with non QRESYNC-capable + servers, but doing so can be unsafe as the client does not store any + in-session mapping between message sequence numbers and UIDs. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..12704ee --- /dev/null +++ b/debian/copyright @@ -0,0 +1,15 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://git.guilhem.org/interimap/ + +Files: * +Copyright: © 2015-2018 Guilhem Moulin <guilhem@fripost.org> +License: GPL-3+ + +License: GPL-3+ + This package is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3 of the License, or (at your + option) any later version. + . + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in file "/usr/share/common-licenses/GPL-3". diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..4daf79f --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +upstream-branch = master +debian-branch = debian +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = False diff --git a/debian/interimap.NEWS b/debian/interimap.NEWS new file mode 100644 index 0000000..a662b0a --- /dev/null +++ b/debian/interimap.NEWS @@ -0,0 +1,14 @@ +interimap (0.5~rc-1) experimental; urgency=low + + This release introduces a new database schema; the next interimap(1) run + will automatically upgrade its existing DB. + + The hierarchy delimiter SHOULD NOT be hardcoded in the configuration file + anymore. Null characters, escaped as '\0' or '\x00', should be used + instead. This is a MUST NOT for the "ignore-mailbox" setting, as "^foo/" + won't match the children of mailbox "foo" anymore, even when the hierarchy + delimiter is '/'. Use "ignore-mailbox = ^foo(?:\x00|$)" instead in order + to exclude mailbox "foo" as well as its descendants (regardless of which + hierarchy delimiter is used). + + -- Guilhem Moulin <guilhem@debian.org> Sat, 14 Dec 2019 19:41:16 +0100 diff --git a/debian/interimap.docs b/debian/interimap.docs new file mode 100644 index 0000000..bc0d414 --- /dev/null +++ b/debian/interimap.docs @@ -0,0 +1,5 @@ +share/doc/interimap/README +share/doc/interimap/getting-started.md +share/doc/interimap/multi-account.md +share/doc/interimap/interimap.sample +share/doc/interimap/getting-started.md diff --git a/debian/interimap.install b/debian/interimap.install new file mode 100644 index 0000000..dc47f19 --- /dev/null +++ b/debian/interimap.install @@ -0,0 +1,3 @@ +bin/interimap /usr/bin +lib/systemd/user/interimap.service usr/lib/systemd/user +lib/systemd/user/interimap@.service usr/lib/systemd/user diff --git a/debian/interimap.manpages b/debian/interimap.manpages new file mode 100644 index 0000000..faa1e84 --- /dev/null +++ b/debian/interimap.manpages @@ -0,0 +1 @@ +share/man/man1/interimap.1 diff --git a/debian/libinterimap.install b/debian/libinterimap.install new file mode 100644 index 0000000..c446f51 --- /dev/null +++ b/debian/libinterimap.install @@ -0,0 +1 @@ +share/perl5/Net/IMAP/InterIMAP.pm /usr/share/perl5/Net/IMAP diff --git a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch new file mode 100644 index 0000000..a5f429c --- /dev/null +++ b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch @@ -0,0 +1,46 @@ +From: Guilhem Moulin <guilhem@debian.org> +Date: Sun, 20 Jan 2019 21:09:43 +0100 +Subject: Mention the Debian BTS in the manpages. + +--- + doc/interimap.1.md | 10 +++++++++- + doc/pullimap.1.md | 6 ++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +--- a/doc/interimap.1.md ++++ b/doc/interimap.1.md +@@ -535,10 +535,18 @@ Standards + and Quick Mailbox Resynchronization (`QRESYNC`)_, + [RFC 7162], May 2014. + ++Bugs and feedback ++================= ++ ++Bugs or feature requests for `interimap` should be filed with the ++Debian project's bug tracker at <<https://www.debian.org/Bugs/>>. ++ + See also + ======== + +-A _getting started_ guide is available [there](getting-started.html). ++A _getting started_ guide is available locally at ++<<file:///usr/share/doc/interimap/getting-started.md.gz>>, and ++online at <<https://guilhem.org/interimap/getting-started.html>>. + + [RFC 7162]: https://tools.ietf.org/html/rfc7162 + [RFC 5258]: https://tools.ietf.org/html/rfc5258 +--- a/doc/pullimap.1.md ++++ b/doc/pullimap.1.md +@@ -353,6 +353,12 @@ Standards + * J. Klensin, _Simple Mail Transfer Protocol_, + [RFC 5321], October 2008. + ++Bugs and feedback ++================= ++ ++Bugs or feature requests for `pullimap` should be filed with the ++Debian project's bug tracker at <<https://www.debian.org/Bugs/>>. ++ + [RFC 4315]: https://tools.ietf.org/html/rfc4315 + [RFC 2177]: https://tools.ietf.org/html/rfc2177 + [RFC 2595]: https://tools.ietf.org/html/rfc2595 diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch new file mode 100644 index 0000000..dd7623f --- /dev/null +++ b/debian/patches/Skip-randomized-tests.patch @@ -0,0 +1,57 @@ +commit 5bc242612a514d5091b1a05e5a087d54454e390a +Author: Guilhem Moulin <guilhem@debian.org> +Date: Wed Jan 29 13:49:10 2020 +0100 + +Avoid running randomized tests on the build daemons + +These tests are racy and can fail in subtle ways depending on the +machine load and speed. Basically `interimap --watch=1` is spawnedin +the background, then random events (new messages, deletions, flag +changes, etc.) are sent for for one minute, and the background process +is later terminated and the mail stores compared. The problem is how to +stop the background process after the loop. What's done right now is it +waits for 5 seconds and sends a SIGTERM; unfortunately $n sec is +arbitrary and might not be enough, depending on the machine and load. +Ideally a SIGUSR1 would cause it to continue until a clean state is +reached, then stop. + +These tests most sense in the context of upstream development, so for +now we skip them in the Debian context. + +--- + tests/list | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/tests/list ++++ b/tests/list +@@ -40,8 +40,8 @@ repair --repair + auth-noplaintext abort when STARTTLS is not offered + + compress COMPRESS=DEFLATE +-condstore CONDSTORE +-split-set Split large sets to avoid extra-long command lines ++#condstore CONDSTORE ++#split-set Split large sets to avoid extra-long command lines + + . SSL/TLS + starttls-logindisabled LOGINDISABLED STARTTLS +@@ -51,11 +51,11 @@ split-set Split large sets to avoid ex + tls-pin-fingerprint pubkey fingerprint pinning + tls-protocols force TLS protocol versions + +-. Live synchronization (60s) +- sync-live local/remote simulation +- sync-live-crippled local/remote simulation (crippled remote) +- sync-live-tls local/remote simulation (TLS remote) +- sync-live-multi local/remote1+remote2+remote3 simulation (3 local namespaces) +- +-. pullimap +- ... pullimap ++#. Live synchronization (60s) ++# sync-live local/remote simulation ++# sync-live-crippled local/remote simulation (crippled remote) ++# sync-live-tls local/remote simulation (TLS remote) ++# sync-live-multi local/remote1+remote2+remote3 simulation (3 local namespaces) ++# ++#. pullimap ++# ... pullimap diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e237c35 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +Mention-the-Debian-BTS-in-the-manpages.patch +Skip-randomized-tests.patch diff --git a/debian/pullimap.docs b/debian/pullimap.docs new file mode 100644 index 0000000..c368061 --- /dev/null +++ b/debian/pullimap.docs @@ -0,0 +1 @@ +share/doc/pullimap/pullimap.sample diff --git a/debian/pullimap.install b/debian/pullimap.install new file mode 100644 index 0000000..88dbf02 --- /dev/null +++ b/debian/pullimap.install @@ -0,0 +1,2 @@ +bin/pullimap /usr/bin +lib/systemd/user/pullimap@.service usr/lib/systemd/user diff --git a/debian/pullimap.manpages b/debian/pullimap.manpages new file mode 100644 index 0000000..c620789 --- /dev/null +++ b/debian/pullimap.manpages @@ -0,0 +1 @@ +share/man/man1/pullimap.1 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..5b2e51b --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_installsystemduser: + dh_installsystemduser --no-enable diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..264ad5e --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +# this repository is also upstream +debian-watch-file-is-missing |