diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/gbp.conf | 3 | ||||
| -rw-r--r-- | debian/interimap.docs | 3 | ||||
| -rw-r--r-- | debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch | 14 | ||||
| -rw-r--r-- | debian/patches/Skip-randomized-tests.patch | 17 |
7 files changed, 47 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index 4cd7cca..562d4dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +interimap (0.5.5-1) unstable; urgency=medium + + * New upstream release. Highlights include: + + The 'SSL_protocols' option is now deprecated, and replaced by the + combination of 'SSL_protocol_min' and 'SSL_protocol_max'. + + Use default locations for trusted CA certificates (respectively + /etc/ssl/certs/ca-certificates.crt and /etc/ssl/certs on Debian systems) + when neither CAfile nor CApath are set. + + SSL/TLS connections now require OpenSSL 1.1.0 or later. + + New option SSL_ciphersuites to set the TLSv1.3 ciphersuites. + (SSL_cipherlist only apply to TLSv1.2 and below.) + * d/control: pin exact libinterimap version in interimap & pullimap's + depends. The components are tightly tied together and libinterimap makes + no promise of API stability. + * d/control: Bump dovecot-imapd version to >=2.3 in Build-Depends for the + test suite. + * d/.gitattributes: New file to merge d/changelog with + dpkg-mergechangelogs(1). + + -- Guilhem Moulin <guilhem@debian.org> Sat, 26 Dec 2020 23:57:56 +0100 + interimap (0.5.4-1~bpo10+1) buster-backports; urgency=medium * Rebuild for buster-backports. diff --git a/debian/control b/debian/control index f969966..2cad992 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: mail Priority: optional Maintainer: Guilhem Moulin <guilhem@debian.org> Build-Depends: debhelper-compat (= 13), - dovecot-imapd (>= 1:2.2.31~) <!nocheck>, + dovecot-imapd (>= 1:2.3~) <!nocheck>, dovecot-lmtpd (>= 1:2~) <!nocheck>, jq, libconfig-tiny-perl <!nocheck>, @@ -23,7 +23,7 @@ Vcs-Browser: https://salsa.debian.org/debian/interimap Package: interimap Architecture: all Depends: libdbd-sqlite3-perl, - libinterimap (>= ${source:Upstream-Version}~), + libinterimap (= ${binary:Version}), ${misc:Depends}, ${perl:Depends} Suggests: dovecot-imapd (>= 1:2~) @@ -48,9 +48,7 @@ Description: Fast bidirectional synchronization for QRESYNC-capable IMAP servers Package: pullimap Architecture: all -Depends: libinterimap (>= ${source:Upstream-Version}~), - ${misc:Depends}, - ${perl:Depends} +Depends: libinterimap (= ${binary: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 diff --git a/debian/copyright b/debian/copyright index 12704ee..599b277 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ 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> +Copyright: © 2015-2020 Guilhem Moulin <guilhem@fripost.org> License: GPL-3+ License: GPL-3+ diff --git a/debian/gbp.conf b/debian/gbp.conf index ec669a5..aabb629 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,3 +4,6 @@ debian-branch = debian/buster-backports upstream-tag = v%(version)s debian-tag = debian/%(version)s pristine-tar = False + +[pq] +patch-numbers = False diff --git a/debian/interimap.docs b/debian/interimap.docs index bc0d414..724f6e5 100644 --- a/debian/interimap.docs +++ b/debian/interimap.docs @@ -1,5 +1,4 @@ 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 +share/doc/interimap/multi-account.md diff --git a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch index 89469c6..fefcf37 100644 --- a/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch +++ b/debian/patches/Mention-the-Debian-BTS-in-the-manpages.patch @@ -1,16 +1,18 @@ From: Guilhem Moulin <guilhem@debian.org> Date: Sun, 20 Jan 2019 21:09:43 +0100 Subject: Mention the Debian BTS in the manpages. -Forwarded: not-needed +Forwarded: not-needed --- - doc/interimap.1.md | 10 +++++++++- - doc/pullimap.1.md | 6 ++++++ + doc/interimap.1.md | 10 +++++++++- + doc/pullimap.1.md | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) +diff --git a/doc/interimap.1.md b/doc/interimap.1.md +index 2d588ae..03adbf5 100644 --- a/doc/interimap.1.md +++ b/doc/interimap.1.md -@@ -555,10 +555,18 @@ Standards +@@ -574,10 +574,18 @@ Standards and Quick Mailbox Resynchronization (`QRESYNC`)_, [RFC 7162], May 2014. @@ -30,9 +32,11 @@ Forwarded: not-needed [RFC 7162]: https://tools.ietf.org/html/rfc7162 [RFC 5258]: https://tools.ietf.org/html/rfc5258 +diff --git a/doc/pullimap.1.md b/doc/pullimap.1.md +index 89969b2..900221a 100644 --- a/doc/pullimap.1.md +++ b/doc/pullimap.1.md -@@ -372,6 +372,12 @@ Standards +@@ -391,6 +391,12 @@ Standards * J. Klensin, _Simple Mail Transfer Protocol_, [RFC 5321], October 2008. diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch index 837cbfc..14b4ba0 100644 --- a/debian/patches/Skip-randomized-tests.patch +++ b/debian/patches/Skip-randomized-tests.patch @@ -1,8 +1,6 @@ -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 +From: Guilhem Moulin <guilhem@debian.org> +Date: Wed, 29 Jan 2020 13:49:10 +0100 +Subject: 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 @@ -18,10 +16,13 @@ reached, then stop. These tests most sense in the context of upstream development, so for now we skip them in the Debian context. +Forwarded: not-needed --- - tests/list | 20 ++++++++++---------- + tests/list | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) +diff --git a/tests/list b/tests/list +index d1058ba..d6b3ec0 100644 --- a/tests/list +++ b/tests/list @@ -41,8 +41,8 @@ repair --repair @@ -35,9 +36,9 @@ now we skip them in the Debian context. . SSL/TLS starttls-logindisabled LOGINDISABLED STARTTLS -@@ -55,11 +55,11 @@ split-set Split large sets to avoid ex - tls-sni TLS servername extension (SNI) +@@ -56,11 +56,11 @@ split-set Split large sets to avoid extra-long command lines tls-protocols force TLS protocol versions + tls-ciphers force TLS cipher list/suites -. Live synchronization (60s) - sync-live local/remote simulation |