diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/Ignore-custom-lib-PATH.patch | 31 | ||||
| -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 | 3 |
4 files changed, 137 insertions, 0 deletions
diff --git a/debian/patches/Ignore-custom-lib-PATH.patch b/debian/patches/Ignore-custom-lib-PATH.patch new file mode 100644 index 0000000..d621767 --- /dev/null +++ b/debian/patches/Ignore-custom-lib-PATH.patch @@ -0,0 +1,31 @@ +From: Guilhem Moulin <guilhem@debian.org> +Date: Sun, 12 Jun 2016 22:42:16 +0200 +Subject: Ignore custom lib PATH. + +--- + interimap | 2 +- + pullimap | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/interimap ++++ b/interimap +@@ -32,7 +32,7 @@ use DBD::SQLite::Constants ':file_open'; + use Fcntl qw/F_GETFD F_SETFD FD_CLOEXEC/; + use List::Util 'first'; + +-use lib 'lib'; ++ + use Net::IMAP::InterIMAP 0.0.5 qw/xdg_basedir read_config compact_set/; + + # Clean up PATH +--- a/pullimap ++++ b/pullimap +@@ -31,7 +31,7 @@ use Getopt::Long qw/:config posix_defaul + use List::Util 'first'; + use Socket qw/PF_INET PF_INET6 SOCK_STREAM IPPROTO_TCP/; + +-use lib 'lib'; ++ + use Net::IMAP::InterIMAP 0.0.5 qw/xdg_basedir read_config compact_set/; + + # Clean up PATH 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..991f992 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +Ignore-custom-lib-PATH.patch +Mention-the-Debian-BTS-in-the-manpages.patch +Skip-randomized-tests.patch |