From 09780a80653e341dc17e0027528c89817a71559b Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:41:47 +0100 Subject: Bump version number. --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bffe46f..f3eaad4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +interimap (0.5.5-1) UNRELEASED; 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.) + + -- Guilhem Moulin Sat, 26 Dec 2020 23:33:39 +0100 + interimap (0.5.4-1) unstable; urgency=medium * New upstream release. This bumps the minimum libnet-ssleay-perl version -- cgit v1.2.3 From 8bc0fac4758144a6fd30496922281a91ab0edcc9 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:43:10 +0100 Subject: 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. --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f3eaad4..e094552 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ interimap (0.5.5-1) UNRELEASED; urgency=medium + 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. -- Guilhem Moulin Sat, 26 Dec 2020 23:33:39 +0100 diff --git a/debian/control b/debian/control index f969966..3bf034e 100644 --- a/debian/control +++ b/debian/control @@ -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,7 +48,7 @@ Description: Fast bidirectional synchronization for QRESYNC-capable IMAP servers Package: pullimap Architecture: all -Depends: libinterimap (>= ${source:Upstream-Version}~), +Depends: libinterimap (= ${binary:Version}), ${misc:Depends}, ${perl:Depends} Description: Pull mails from an IMAP mailbox and deliver them via SMTP or LMTP -- cgit v1.2.3 From aa6e8a2fb590372b3adebc5b587d6b622bfe05e3 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:43:40 +0100 Subject: d/control: bump dovecot-imapd version to >=2.3 in Build-Depends. We're using ssl_min_protocol in the test suite, see feeb91998a29ca040f6e5dd103e09507a6355e32 . --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e094552..c333a18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ interimap (0.5.5-1) UNRELEASED; urgency=medium * 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. -- Guilhem Moulin Sat, 26 Dec 2020 23:33:39 +0100 diff --git a/debian/control b/debian/control index 3bf034e..8cd77b1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: mail Priority: optional Maintainer: Guilhem Moulin Build-Depends: debhelper-compat (= 13), - dovecot-imapd (>= 1:2.2.31~) , + dovecot-imapd (>= 1:2.3~) , dovecot-lmtpd (>= 1:2~) , jq, libconfig-tiny-perl , -- cgit v1.2.3 From 2c7472985716ddbf38c60dc6ba09efdf9b1ef027 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:44:21 +0100 Subject: Update copyright years. --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') 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 +Copyright: © 2015-2020 Guilhem Moulin License: GPL-3+ License: GPL-3+ -- cgit v1.2.3 From 1c488abae8259741db2d10659cd3d6f607425216 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:44:35 +0100 Subject: d/.gitattributes: New file to merge d/changelog with dpkg-mergechangelogs(1). --- debian/.gitattributes | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 debian/.gitattributes (limited to 'debian') diff --git a/debian/.gitattributes b/debian/.gitattributes new file mode 100644 index 0000000..592f8c4 --- /dev/null +++ b/debian/.gitattributes @@ -0,0 +1 @@ +/changelog merge=dpkg-mergechangelogs diff --git a/debian/changelog b/debian/changelog index c333a18..023857f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ interimap (0.5.5-1) UNRELEASED; urgency=medium 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 Sat, 26 Dec 2020 23:33:39 +0100 -- cgit v1.2.3 From 0f74cf84ddfbd289f2972afec80a612285412741 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:46:06 +0100 Subject: Refresh patches. --- debian/gbp.conf | 3 +++ .../Mention-the-Debian-BTS-in-the-manpages.patch | 14 +++++++++----- debian/patches/Skip-randomized-tests.patch | 17 +++++++++-------- 3 files changed, 21 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf index 692618f..97c190b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,3 +4,6 @@ debian-branch = debian/latest upstream-tag = v%(version)s debian-tag = debian/%(version)s pristine-tar = False + +[pq] +patch-numbers = False 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 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 -Date: Wed Jan 29 13:49:10 2020 +0100 - -Avoid running randomized tests on the build daemons +From: Guilhem Moulin +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 -- cgit v1.2.3 From bb9937ff5606bf7696e5c98c7bc058404fac02e3 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:54:34 +0100 Subject: Run wrap-and-sort(1). --- debian/control | 4 +--- debian/interimap.docs | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 8cd77b1..2cad992 100644 --- a/debian/control +++ b/debian/control @@ -48,9 +48,7 @@ Description: Fast bidirectional synchronization for QRESYNC-capable IMAP servers Package: pullimap Architecture: all -Depends: libinterimap (= ${binary: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/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 -- cgit v1.2.3 From 3d818bf7e24f0757bcd13f30118d229e5a6b5448 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 26 Dec 2020 23:58:06 +0100 Subject: Prepare new release. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 023857f..48ad453 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -interimap (0.5.5-1) UNRELEASED; urgency=medium +interimap (0.5.5-1) unstable; urgency=medium * New upstream release. Highlights include: + The 'SSL_protocols' option is now deprecated, and replaced by the @@ -17,7 +17,7 @@ interimap (0.5.5-1) UNRELEASED; urgency=medium * d/.gitattributes: New file to merge d/changelog with dpkg-mergechangelogs(1). - -- Guilhem Moulin Sat, 26 Dec 2020 23:33:39 +0100 + -- Guilhem Moulin Sat, 26 Dec 2020 23:57:56 +0100 interimap (0.5.4-1) unstable; urgency=medium -- cgit v1.2.3