From 48d35e65472e29d808a4bf604b7f99270496b810 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 22 Feb 2021 17:54:33 +0100
Subject: Improve message for unknown untagged UIDNEXT response.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per RFC3501 §6.3.1 and §6.3.2 ‘UIDNEXT’ must be returned in an OK
untagged response.  See also Appendix B#34.

However §6.3.1 suggests that it's in fact optional: “If this is missing,
the client can not make any assumptions about the next unique identifier
value.”

A correction was proposed in Errata ID 3445 https://www.rfc-editor.org/errata/eid3445 ,
and rejected on the ground that clients SHOULD support the implement
default behavior for missing data.

We heavily rely on the ‘UIDNEXT’ presence and won't implement a
workaround for its absence; instead we panic() with a more informative
message.
---
 lib/Net/IMAP/InterIMAP.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index a171554..56164cf 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -1312,7 +1312,8 @@ sub pull_new_messages($$&@) {
         # 2^32-1: don't use '*' since the highest UID can be known already
         $range .= "$since:4294967295";
 
-        $UIDNEXT = $cache->{UIDNEXT} // $self->panic(); # sanity check
+        $UIDNEXT = $cache->{UIDNEXT} //
+            $self->panic("Unknown UIDNEXT value - non-compliant server?");
         $self->fetch($range, "($attrs)", sub($) {
             my $mail = shift;
             $UIDNEXT = $mail->{UID} + 1 if $UIDNEXT <= $mail->{UID};
-- 
cgit v1.2.3


From 556f02ce636e11e898ed5608b3b130ce4e7c6ba6 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 21 Feb 2022 13:05:44 +0100
Subject: Tests: TLS ciphers/protocols: Downgrade security level to 0.

This is required to test TLS version <1.2 on systems with higher
security levels, see SSL_CTX_set_security_level(3ssl).  Addapted from a
patch from <xnox> for Unbuntu.
---
 tests/tls-protocols/openssl.cnf | 2 +-
 tests/tls-protocols/remote.conf | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
 mode change 120000 => 100644 tests/tls-protocols/remote.conf

diff --git a/tests/tls-protocols/openssl.cnf b/tests/tls-protocols/openssl.cnf
index 980097d..3d9769d 100644
--- a/tests/tls-protocols/openssl.cnf
+++ b/tests/tls-protocols/openssl.cnf
@@ -11,4 +11,4 @@ system_default = system_default_sect
 
 [system_default_sect]
 MinProtocol = None
-CipherString = DEFAULT
+CipherString = DEFAULT@SECLEVEL=0
diff --git a/tests/tls-protocols/remote.conf b/tests/tls-protocols/remote.conf
deleted file mode 120000
index 6029749..0000000
--- a/tests/tls-protocols/remote.conf
+++ /dev/null
@@ -1 +0,0 @@
-../tls/remote.conf
\ No newline at end of file
diff --git a/tests/tls-protocols/remote.conf b/tests/tls-protocols/remote.conf
new file mode 100644
index 0000000..96b3713
--- /dev/null
+++ b/tests/tls-protocols/remote.conf
@@ -0,0 +1,4 @@
+!include conf.d/imapd.conf
+!include conf.d/ssl.conf
+ssl_min_protocol = TLSv1
+ssl_cipher_list = DEFAULT@SECLEVEL=0
-- 
cgit v1.2.3


From 6bfc13635af817bb16b4fe5ef5a42619573c51fc Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 21 Feb 2022 13:52:52 +0100
Subject: Tests: Dovecot: Bump min protocol level to TLSv1.2.

And use security level 2 for ssl_cipher_list.  As of dovecot 2.3.18
ssl_min_protocol defaults to TLSv1.2.
---
 tests/config/dovecot/ssl.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/config/dovecot/ssl.conf b/tests/config/dovecot/ssl.conf
index 3fd99d5..1f3a698 100644
--- a/tests/config/dovecot/ssl.conf
+++ b/tests/config/dovecot/ssl.conf
@@ -2,4 +2,5 @@ ssl = required
 ssl_cert = <dovecot.rsa.crt
 ssl_key = <dovecot.rsa.key
 ssl_dh = <dhparams.pem
-ssl_min_protocol = TLSv1
+ssl_min_protocol = TLSv1.2
+ssl_cipher_list = DEFAULT@SECLEVEL=2
-- 
cgit v1.2.3


From 6cf878f69e15c6414dda4fb1171db244953bf8a4 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 22 Feb 2022 23:21:58 +0100
Subject: Makefile: Honor srcdir=.

Cf. https://www.gnu.org/prep/standards/html_node/Directory-Variables.html .
---
 Makefile | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 9f4702d..0324d65 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
+srcdir ?= .
 DESTDIR ?= /usr/local
-BUILD_DOCDIR ?= ./doc
+BUILD_DOCDIR ?= $(srcdir)/doc
 CSS ?= /usr/share/javascript/bootstrap4/css/bootstrap.css
-HTML_TEMPLATE ?= ./doc/template.html
+HTML_TEMPLATE ?= $(srcdir)/doc/template.html
 
-HTML_FILES = $(addprefix $(BUILD_DOCDIR)/,$(patsubst ./doc/%.md,%.html,$(wildcard ./doc/*.md)))
-MANUAL_FILES = $(addprefix $(BUILD_DOCDIR)/,$(patsubst ./doc/%.md,%,$(wildcard ./doc/*.[1-9].md)))
+HTML_FILES = $(addprefix $(BUILD_DOCDIR)/,$(patsubst $(srcdir)/doc/%.md,%.html,$(wildcard $(srcdir)/doc/*.md)))
+MANUAL_FILES = $(addprefix $(BUILD_DOCDIR)/,$(patsubst $(srcdir)/doc/%.md,%,$(wildcard $(srcdir)/doc/*.[1-9].md)))
 
 all: manual
 
@@ -12,34 +13,34 @@ manual: $(MANUAL_FILES)
 html: $(HTML_FILES)
 
 # upper case the headers and remove the links
-$(MANUAL_FILES): $(BUILD_DOCDIR)/%: ./doc/%.md
-	pandoc -f markdown -t json -- "$<" | ./pandoc2man.jq | pandoc -s -f json -t man -o "$@"
+$(MANUAL_FILES): $(BUILD_DOCDIR)/%: $(srcdir)/doc/%.md
+	pandoc -f markdown -t json -- "$<" | $(srcdir)/pandoc2man.jq | pandoc -s -f json -t man -o "$@"
 
 test:
-	./tests/certs/generate
-	./tests/run-all
+	$(srcdir)/tests/certs/generate
+	$(srcdir)/tests/run-all
 
 release:
-	@if ! git diff HEAD --quiet -- ./Changelog ./interimap ./pullimap ./lib/Net/IMAP/InterIMAP.pm; then \
+	@if ! git -C $(srcdir) diff --quiet HEAD -- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm; then \
 		echo "Dirty state, refusing to release!" >&2; \
 		exit 1; \
 	fi
-	VERS=$$(dpkg-parsechangelog -l Changelog -SVersion 2>/dev/null) && \
-		if git rev-parse -q --verify "refs/tags/v$$VERS" >/dev/null; then echo "tag exists" 2>/dev/null; exit 1; fi && \
-		sed -ri "0,/^( -- .*)  .*/ s//\\1  $(shell date -R)/" ./Changelog && \
+	VERS=$$(dpkg-parsechangelog -l $(srcdir)/Changelog -SVersion 2>/dev/null) && \
+		if git -C $(srcdir) rev-parse -q --verify "refs/tags/v$$VERS" >/dev/null; then echo "tag exists" 2>/dev/null; exit 1; fi && \
+		sed -ri "0,/^( -- .*)  .*/ s//\\1  $(shell date -R)/" $(srcdir)/Changelog && \
 		sed -ri "0,/^(our\\s+\\\$$VERSION\\s*=\\s*)'[0-9.]+'\\s*;/ s//\\1'$$VERS';/" \
-			-- ./interimap ./pullimap && \
+			-- $(srcdir)/interimap $(srcdir)/pullimap && \
 		sed -ri "0,/^(package\\s+Net::IMAP::InterIMAP\\s+)v[0-9.]+\\s*;/ s//\\1v$$VERS;/" \
-			-- ./lib/Net/IMAP/InterIMAP.pm && \
+			-- $(srcdir)/lib/Net/IMAP/InterIMAP.pm && \
 		sed -ri "0,/^(use\\s+Net::IMAP::InterIMAP\\s+)[0-9.]+(\\s|\\$$)/ s//\\1$$VERS\\2/" \
-			-- ./interimap ./pullimap && \
-		git commit -m "Prepare new release v$$VERS." \
-			-- ./Changelog ./interimap ./pullimap ./lib/Net/IMAP/InterIMAP.pm && \
-		git tag -sm "Release version $$VERS" "v$$VERS"
+			-- $(srcdir)/interimap $(srcdir)/pullimap && \
+		git -C $(srcdir) commit -m "Prepare new release v$$VERS." \
+			-- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm && \
+		git -C $(srcdir) tag -sm "Release version $$VERS" "v$$VERS"
 
 ## make html CSS="https://guilhem.org/static/css/bootstrap.min.css" BUILD_DOCDIR="$XDG_RUNTIME_DIR/Downloads"
-$(HTML_FILES): $(BUILD_DOCDIR)/%.html: ./doc/%.md $(HTML_TEMPLATE)
-	mtime="$$(git --no-pager log -1 --pretty="format:%ct" -- "$<" 2>/dev/null)"; \
+$(HTML_FILES): $(BUILD_DOCDIR)/%.html: $(srcdir)/doc/%.md $(HTML_TEMPLATE)
+	mtime="$$(git -C $(srcdir) --no-pager log -1 --pretty="format:%ct" -- "$<" 2>/dev/null)"; \
 	[ -n "$$mtime" ] || mtime="$$(date +%s -r "$<")"; \
 	[ "$<" = "doc/index.md" ] && parent="" || parent="./index.html"; \
 	pandoc -sp -f markdown -t html+smart --css=$(CSS) --template=$(HTML_TEMPLATE) \
@@ -60,12 +61,12 @@ mandir ?= $(datarootdir)/man
 man1dir ?= $(mandir)/man1
 
 install: all
-	install -m0755 -vDt $(bindir) ./interimap ./pullimap
-	install -m0644 -vDT ./lib/Net/IMAP/InterIMAP.pm $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+	install -m0755 -vDt $(bindir) $(srcdir)/interimap $(srcdir)/pullimap
+	install -m0644 -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
 	install -m0644 -vDt $(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
-	install -m0644 -vDt $(datarootdir)/doc/pullimap ./pullimap.sample
-	install -m0644 -vDt $(datarootdir)/doc/interimap ./interimap.sample ./doc/getting-started.md ./doc/multi-account.md README
-	install -m0644 -vDt $(libdir)/systemd/user ./*.service
+	install -m0644 -vDt $(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
+	install -m0644 -vDt $(datarootdir)/doc/interimap $(srcdir)/interimap.sample $(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md README
+	install -m0644 -vDt $(libdir)/systemd/user $(srcdir)/*.service
 
 uninstall:
 	rm -vf -- $(bindir)/interimap $(man1dir)/interimap.1 $(libdir)/systemd/user/interimap*.service
-- 
cgit v1.2.3


From 7ee950907f27dcb50da1821d206aeffe3d25c5c1 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 22 Feb 2022 23:32:15 +0100
Subject: Makefile: Honor INSTALL_PROGRAM and INSTALL_DATA.

Cf. https://www.gnu.org/prep/standards/html_node/Command-Variables.html .
---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 0324d65..7db373d 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,10 @@ $(HTML_FILES): $(BUILD_DOCDIR)/%.html: $(srcdir)/doc/%.md $(HTML_TEMPLATE)
 
 doc: manual html
 
+INSTALL ?= install
+INSTALL_PROGRAM ?= $(INSTALL)
+INSTALL_DATA ?= $(INSTALL) -m0644
+
 prefix ?= $(DESTDIR)
 exec_prefix ?= $(prefix)
 bindir ?= $(exec_prefix)/bin
@@ -61,12 +65,12 @@ mandir ?= $(datarootdir)/man
 man1dir ?= $(mandir)/man1
 
 install: all
-	install -m0755 -vDt $(bindir) $(srcdir)/interimap $(srcdir)/pullimap
-	install -m0644 -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
-	install -m0644 -vDt $(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
-	install -m0644 -vDt $(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
-	install -m0644 -vDt $(datarootdir)/doc/interimap $(srcdir)/interimap.sample $(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md README
-	install -m0644 -vDt $(libdir)/systemd/user $(srcdir)/*.service
+	$(INSTALL_PROGRAM) -vDt $(bindir) $(srcdir)/interimap $(srcdir)/pullimap
+	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+	$(INSTALL_DATA) -vDt $(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
+	$(INSTALL_DATA) -vDt $(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
+	$(INSTALL_DATA) -vDt $(datarootdir)/doc/interimap $(srcdir)/interimap.sample $(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md README
+	$(INSTALL_DATA) -vDt $(libdir)/systemd/user $(srcdir)/*.service
 
 uninstall:
 	rm -vf -- $(bindir)/interimap $(man1dir)/interimap.1 $(libdir)/systemd/user/interimap*.service
-- 
cgit v1.2.3


From 6f6acf57255a7602235792c248d5d4926794395a Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 22 Feb 2022 23:41:19 +0100
Subject: Makefile: Improve DESTDIR= handling.

Per https://www.gnu.org/prep/standards/html_node/DESTDIR.html .
---
 Makefile | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 7db373d..2cff2e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 srcdir ?= .
-DESTDIR ?= /usr/local
 BUILD_DOCDIR ?= $(srcdir)/doc
 CSS ?= /usr/share/javascript/bootstrap4/css/bootstrap.css
 HTML_TEMPLATE ?= $(srcdir)/doc/template.html
@@ -56,7 +55,7 @@ INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
 INSTALL_DATA ?= $(INSTALL) -m0644
 
-prefix ?= $(DESTDIR)
+prefix ?= /usr/local
 exec_prefix ?= $(prefix)
 bindir ?= $(exec_prefix)/bin
 libdir ?= $(exec_prefix)/lib
@@ -65,19 +64,19 @@ mandir ?= $(datarootdir)/man
 man1dir ?= $(mandir)/man1
 
 install: all
-	$(INSTALL_PROGRAM) -vDt $(bindir) $(srcdir)/interimap $(srcdir)/pullimap
-	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
-	$(INSTALL_DATA) -vDt $(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
-	$(INSTALL_DATA) -vDt $(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
-	$(INSTALL_DATA) -vDt $(datarootdir)/doc/interimap $(srcdir)/interimap.sample $(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md README
-	$(INSTALL_DATA) -vDt $(libdir)/systemd/user $(srcdir)/*.service
+	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(srcdir)/interimap $(srcdir)/pullimap
+	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/interimap $(srcdir)/interimap.sample \
+		$(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md $(srcdir)/README
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(libdir)/systemd/user $(srcdir)/*.service
 
 uninstall:
-	rm -vf -- $(bindir)/interimap $(man1dir)/interimap.1 $(libdir)/systemd/user/interimap*.service
-	rm -vf -- $(bindir)/pullimap $(man1dir)/pullimap.1 $(libdir)/systemd/user/pullimap*.service
-	rm -vf -- $(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
-	rm -rvf -- $(datarootdir)/doc/interimap $(datarootdir)/doc/pullimap
-	rm -vf -- $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
+	rm -vf -- $(DESTDIR)$(bindir)/interimap $(DESTDIR)$(man1dir)/interimap.1 $(DESTDIR)$(libdir)/systemd/user/interimap*.service
+	rm -vf -- $(DESTDIR)$(bindir)/pullimap $(DESTDIR)$(man1dir)/pullimap.1 $(DESTDIR)$(libdir)/systemd/user/pullimap*.service
+	rm -vf -- $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+	rm -rvf -- $(DESTDIR)$(datarootdir)/doc/interimap $(DESTDIR)$(datarootdir)/doc/pullimap
 
 clean:
 	rm -vf -- $(MANUAL_FILES) $(HTML_FILES)
-- 
cgit v1.2.3


From 79ef41e0b7565c2fed691f1492a1f239dd82e7b6 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 22 Feb 2022 23:44:56 +0100
Subject: Makefile: Ignore errors when installing manual pages.

Per https://www.gnu.org/prep/standards/html_node/Standard-Targets.html#Standard-Targets .
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2cff2e4..3f0df98 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ man1dir ?= $(mandir)/man1
 install: all
 	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(srcdir)/interimap $(srcdir)/pullimap
 	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
-	$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
+	-$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/interimap $(srcdir)/interimap.sample \
 		$(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md $(srcdir)/README
-- 
cgit v1.2.3


From 733ed91162b02cd0fa5d7d1c443c780d3d4405e9 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 01:23:25 +0100
Subject: Makefile: Honor builddir=.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Defaulting to ‘build’.  Also, remove BUILD_DOCDIR= (replaced with
‘$(builddir)/doc’).
---
 .gitignore |  4 +---
 Makefile   | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2267ea4..e8f355e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 *~
 *.bak
-/doc/*.1
-/doc/*.html
-!/doc/template.html
+/build/
 /.pc/
diff --git a/Makefile b/Makefile
index 3f0df98..b91dce3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 srcdir ?= .
-BUILD_DOCDIR ?= $(srcdir)/doc
+builddir ?= build
 CSS ?= /usr/share/javascript/bootstrap4/css/bootstrap.css
 HTML_TEMPLATE ?= $(srcdir)/doc/template.html
 
-HTML_FILES = $(addprefix $(BUILD_DOCDIR)/,$(patsubst $(srcdir)/doc/%.md,%.html,$(wildcard $(srcdir)/doc/*.md)))
-MANUAL_FILES = $(addprefix $(BUILD_DOCDIR)/,$(patsubst $(srcdir)/doc/%.md,%,$(wildcard $(srcdir)/doc/*.[1-9].md)))
+HTML_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%.html,$(wildcard $(srcdir)/doc/*.md))
+MANUAL_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%,$(wildcard $(srcdir)/doc/*.[1-9].md))
 
 all: manual
 
@@ -12,7 +12,8 @@ manual: $(MANUAL_FILES)
 html: $(HTML_FILES)
 
 # upper case the headers and remove the links
-$(MANUAL_FILES): $(BUILD_DOCDIR)/%: $(srcdir)/doc/%.md
+$(MANUAL_FILES): $(builddir)/doc/%: $(srcdir)/doc/%.md
+	@mkdir -vp $(dir $@)
 	pandoc -f markdown -t json -- "$<" | $(srcdir)/pandoc2man.jq | pandoc -s -f json -t man -o "$@"
 
 test:
@@ -37,8 +38,9 @@ release:
 			-- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm && \
 		git -C $(srcdir) tag -sm "Release version $$VERS" "v$$VERS"
 
-## make html CSS="https://guilhem.org/static/css/bootstrap.min.css" BUILD_DOCDIR="$XDG_RUNTIME_DIR/Downloads"
-$(HTML_FILES): $(BUILD_DOCDIR)/%.html: $(srcdir)/doc/%.md $(HTML_TEMPLATE)
+## `make html CSS="https://guilhem.org/static/css/bootstrap.min.css" builddir="$XDG_RUNTIME_DIR/Downloads/interimap"`
+$(HTML_FILES): $(builddir)/doc/%.html: $(srcdir)/doc/%.md $(HTML_TEMPLATE)
+	@mkdir -vp $(dir $@)
 	mtime="$$(git -C $(srcdir) --no-pager log -1 --pretty="format:%ct" -- "$<" 2>/dev/null)"; \
 	[ -n "$$mtime" ] || mtime="$$(date +%s -r "$<")"; \
 	[ "$<" = "doc/index.md" ] && parent="" || parent="./index.html"; \
@@ -66,7 +68,7 @@ man1dir ?= $(mandir)/man1
 install: all
 	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(srcdir)/interimap $(srcdir)/pullimap
 	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
-	-$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(BUILD_DOCDIR)/interimap.1 $(BUILD_DOCDIR)/pullimap.1
+	-$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(builddir)/doc/interimap.1 $(builddir)/doc/pullimap.1
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/interimap $(srcdir)/interimap.sample \
 		$(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md $(srcdir)/README
@@ -80,5 +82,6 @@ uninstall:
 
 clean:
 	rm -vf -- $(MANUAL_FILES) $(HTML_FILES)
+	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
 .PHONY: all manual html doc test release install uninstall clean
-- 
cgit v1.2.3


From ddb3e1236db89416bc233b8b876500b51fe0adbb Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 00:12:39 +0100
Subject: Don't hardcode $(bindir) in .service files.

---
 Makefile           | 27 ++++++++++++++++-----------
 interimap.service  |  2 +-
 interimap@.service |  2 +-
 pullimap@.service  |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index b91dce3..e25546d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,21 @@
 srcdir ?= .
 builddir ?= build
+prefix ?= /usr/local
+exec_prefix ?= $(prefix)
+bindir ?= $(exec_prefix)/bin
+libdir ?= $(exec_prefix)/lib
+datarootdir ?= $(prefix)/share
+mandir ?= $(datarootdir)/man
+man1dir ?= $(mandir)/man1
+
 CSS ?= /usr/share/javascript/bootstrap4/css/bootstrap.css
 HTML_TEMPLATE ?= $(srcdir)/doc/template.html
 
 HTML_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%.html,$(wildcard $(srcdir)/doc/*.md))
 MANUAL_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%,$(wildcard $(srcdir)/doc/*.[1-9].md))
+SERVICE_FILES = $(patsubst $(srcdir)/%.service,$(builddir)/%.service,$(wildcard $(srcdir)/*.service))
 
-all: manual
+all: manual $(SERVICE_FILES)
 
 manual: $(MANUAL_FILES)
 html: $(HTML_FILES)
@@ -16,6 +25,10 @@ $(MANUAL_FILES): $(builddir)/doc/%: $(srcdir)/doc/%.md
 	@mkdir -vp $(dir $@)
 	pandoc -f markdown -t json -- "$<" | $(srcdir)/pandoc2man.jq | pandoc -s -f json -t man -o "$@"
 
+$(SERVICE_FILES): $(builddir)/%.service: $(srcdir)/%.service
+	@mkdir -vp $(dir $@)
+	sed "s|@bindir@|$(bindir)|" <"$<" >"$@"
+
 test:
 	$(srcdir)/tests/certs/generate
 	$(srcdir)/tests/run-all
@@ -57,14 +70,6 @@ INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
 INSTALL_DATA ?= $(INSTALL) -m0644
 
-prefix ?= /usr/local
-exec_prefix ?= $(prefix)
-bindir ?= $(exec_prefix)/bin
-libdir ?= $(exec_prefix)/lib
-datarootdir ?= $(prefix)/share
-mandir ?= $(datarootdir)/man
-man1dir ?= $(mandir)/man1
-
 install: all
 	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(srcdir)/interimap $(srcdir)/pullimap
 	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
@@ -72,7 +77,7 @@ install: all
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/interimap $(srcdir)/interimap.sample \
 		$(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md $(srcdir)/README
-	$(INSTALL_DATA) -vDt $(DESTDIR)$(libdir)/systemd/user $(srcdir)/*.service
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(libdir)/systemd/user $(SERVICE_FILES)
 
 uninstall:
 	rm -vf -- $(DESTDIR)$(bindir)/interimap $(DESTDIR)$(man1dir)/interimap.1 $(DESTDIR)$(libdir)/systemd/user/interimap*.service
@@ -81,7 +86,7 @@ uninstall:
 	rm -rvf -- $(DESTDIR)$(datarootdir)/doc/interimap $(DESTDIR)$(datarootdir)/doc/pullimap
 
 clean:
-	rm -vf -- $(MANUAL_FILES) $(HTML_FILES)
+	rm -vf -- $(MANUAL_FILES) $(HTML_FILES) $(SERVICE_FILES)
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
 .PHONY: all manual html doc test release install uninstall clean
diff --git a/interimap.service b/interimap.service
index 6d7fa45..eef7a1c 100644
--- a/interimap.service
+++ b/interimap.service
@@ -5,7 +5,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/interimap --watch=60
+ExecStart=@bindir@/interimap --watch=60
 RestartSec=10min
 Restart=on-failure
 
diff --git a/interimap@.service b/interimap@.service
index 6957b79..54791d8 100644
--- a/interimap@.service
+++ b/interimap@.service
@@ -6,7 +6,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/interimap --config=%i --watch=60
+ExecStart=@bindir@/interimap --config=%i --watch=60
 RestartSec=10min
 Restart=on-failure
 
diff --git a/pullimap@.service b/pullimap@.service
index a9ce09a..aefc4f6 100644
--- a/pullimap@.service
+++ b/pullimap@.service
@@ -5,7 +5,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
-ExecStart=/usr/bin/pullimap --idle %i
+ExecStart=@bindir@/pullimap --idle %i
 RestartSec=2min
 Restart=always
 
-- 
cgit v1.2.3


From a7bae9d4eb282fe805834b8f4185a019fc9bb246 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 19:39:12 +0100
Subject: Add https://guilhem.org/interimap/ documentation to .service files.

---
 interimap.service  | 1 +
 interimap@.service | 1 +
 pullimap@.service  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/interimap.service b/interimap.service
index eef7a1c..6abc874 100644
--- a/interimap.service
+++ b/interimap.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Fast bidirectional synchronization for QRESYNC-capable IMAP servers
 Documentation=man:interimap(1)
+Documentation=https://guilhem.org/interimap/interimap.1.html
 Wants=network-online.target
 After=network-online.target
 
diff --git a/interimap@.service b/interimap@.service
index 54791d8..f870065 100644
--- a/interimap@.service
+++ b/interimap@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Fast bidirectional synchronization for QRESYNC-capable IMAP servers (instance %i)
 Documentation=man:interimap(1)
+Documentation=https://guilhem.org/interimap/interimap.1.html
 PartOf=interimap.service
 Wants=network-online.target
 After=network-online.target
diff --git a/pullimap@.service b/pullimap@.service
index aefc4f6..4f9518b 100644
--- a/pullimap@.service
+++ b/pullimap@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Pull mails from an IMAP mailbox and deliver them to an SMTP session (instance %i)
 Documentation=man:pullimap(1)
+Documentation=https://guilhem.org/interimap/pullimap.1.html
 Wants=network-online.target
 After=network-online.target
 
-- 
cgit v1.2.3


From eeed44617b8b2bf4c941f6de334a9006804615fb Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 00:35:41 +0100
Subject: Don't assume Net::IMAP::InterIMAP is always in @INC.

And make the installation path configurable at `make` time.  Moreover,
adjust the 'test' target so the site directory and interimap/pullimap
path are configurable with INTERIMAP_I and INTERIMAP_PATH respectively.
That way one can run `tests/run foo` to check the source, `make test` to
check what's been built, and we also have the possibility to check the
installed program e.g. for autopkgtests.
---
 Makefile                    | 22 +++++++++++++++-------
 benchmark/run               |  5 +++--
 doc/development.md          |  8 ++++----
 interimap                   |  1 +
 pullimap                    |  1 +
 tests/db-exclusive-lock/t   |  4 ++--
 tests/db-no-create--watch/t |  2 +-
 tests/run                   | 15 ++++++++++++---
 8 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index e25546d..83281dd 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ prefix ?= /usr/local
 exec_prefix ?= $(prefix)
 bindir ?= $(exec_prefix)/bin
 libdir ?= $(exec_prefix)/lib
+sitelib ?= $(libdir)/site_perl
 datarootdir ?= $(prefix)/share
 mandir ?= $(datarootdir)/man
 man1dir ?= $(mandir)/man1
@@ -11,15 +12,22 @@ man1dir ?= $(mandir)/man1
 CSS ?= /usr/share/javascript/bootstrap4/css/bootstrap.css
 HTML_TEMPLATE ?= $(srcdir)/doc/template.html
 
+PROGRAMS = $(addprefix $(builddir)/,interimap pullimap)
 HTML_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%.html,$(wildcard $(srcdir)/doc/*.md))
 MANUAL_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%,$(wildcard $(srcdir)/doc/*.[1-9].md))
 SERVICE_FILES = $(patsubst $(srcdir)/%.service,$(builddir)/%.service,$(wildcard $(srcdir)/*.service))
 
-all: manual $(SERVICE_FILES)
+all: manual $(PROGRAMS) $(SERVICE_FILES)
 
 manual: $(MANUAL_FILES)
 html: $(HTML_FILES)
 
+$(PROGRAMS): $(builddir)/%: $(srcdir)/%
+	@mkdir -vp $(dir $@)
+	perl -Te "print \"\$$_\\0\" foreach @INC;" | grep -Fxzq -e "$(sitelib)" && prefix="#" || prefix=""; \
+	sed -r "0,/^(use\\s+\lib\\s+)([\"'])[^\"']*\\2\\s*;/ s||$$prefix\\1\"$(sitelib)\";|" <"$<" >"$@"
+	chmod --reference="$<" -- "$@"
+
 # upper case the headers and remove the links
 $(MANUAL_FILES): $(builddir)/doc/%: $(srcdir)/doc/%.md
 	@mkdir -vp $(dir $@)
@@ -31,7 +39,7 @@ $(SERVICE_FILES): $(builddir)/%.service: $(srcdir)/%.service
 
 test:
 	$(srcdir)/tests/certs/generate
-	$(srcdir)/tests/run-all
+	INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all
 
 release:
 	@if ! git -C $(srcdir) diff --quiet HEAD -- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm; then \
@@ -70,9 +78,9 @@ INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
 INSTALL_DATA ?= $(INSTALL) -m0644
 
-install: all
-	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(srcdir)/interimap $(srcdir)/pullimap
-	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+install: $(PROGRAMS) $(SERVICE_FILES)
+	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(builddir)/interimap $(builddir)/pullimap
+	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(sitelib)/Net/IMAP/InterIMAP.pm
 	-$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(builddir)/doc/interimap.1 $(builddir)/doc/pullimap.1
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/interimap $(srcdir)/interimap.sample \
@@ -82,11 +90,11 @@ install: all
 uninstall:
 	rm -vf -- $(DESTDIR)$(bindir)/interimap $(DESTDIR)$(man1dir)/interimap.1 $(DESTDIR)$(libdir)/systemd/user/interimap*.service
 	rm -vf -- $(DESTDIR)$(bindir)/pullimap $(DESTDIR)$(man1dir)/pullimap.1 $(DESTDIR)$(libdir)/systemd/user/pullimap*.service
-	rm -vf -- $(DESTDIR)$(datarootdir)/perl5/Net/IMAP/InterIMAP.pm
+	rm -vf -- $(DESTDIR)$(sitelib)/Net/IMAP/InterIMAP.pm
 	rm -rvf -- $(DESTDIR)$(datarootdir)/doc/interimap $(DESTDIR)$(datarootdir)/doc/pullimap
 
 clean:
-	rm -vf -- $(MANUAL_FILES) $(HTML_FILES) $(SERVICE_FILES)
+	rm -vf -- $(PROGRAMS) $(MANUAL_FILES) $(HTML_FILES) $(SERVICE_FILES)
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
 .PHONY: all manual html doc test release install uninstall clean
diff --git a/benchmark/run b/benchmark/run
index 4a83c68..650270a 100755
--- a/benchmark/run
+++ b/benchmark/run
@@ -198,9 +198,10 @@ cat >"$ROOTDIR/dev/shm/nobody/.offlineimaprc" <<-EOF
 EOF
 
 # install interimap's development version
-install -oroot -groot -m0755 -Dt "/$ROOTDIR/usr/bin" \
+install -oroot -groot -m0755 -Dt "$ROOTDIR/usr/bin" \
     ./interimap ./benchmark/random_maildir.pl
-install -oroot -groot -Dm0644 \
+sed -ri "0,/^(use\\s+\lib\\s+)([\"'])[^\"']*\\2\\s*;/ s||#&|" -- "$ROOTDIR/usr/bin/interimap"
+install -oroot -groot -m0644 -DT \
     ./lib/Net/IMAP/InterIMAP.pm "$ROOTDIR/usr/share/perl5/Net/IMAP/InterIMAP.pm"
 
 # create a random mail store at mdbox:~/mail.back
diff --git a/doc/development.md b/doc/development.md
index f4578b9..530c52b 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -136,7 +136,7 @@ and `remote` accounts.
 
 Run [`interimap`(1)] without `--watch` in order to create the database.
 
-    $ env -i PATH="$PATH" perl -I./lib -T ./interimap --config="$BASEDIR/interimap.conf"
+    $ env -i PATH="$PATH" perl -T ./interimap --config="$BASEDIR/interimap.conf"
     Creating new schema in database file …/interimap.db
     database: Created mailbox INBOX
     […]
@@ -144,7 +144,7 @@ Run [`interimap`(1)] without `--watch` in order to create the database.
 You can now run [`interimap`(1)] with `--watch` set, here to one second
 to observe synchronization steps early.
 
-    $ env -i PATH="$PATH" perl -I./lib -T ./interimap --config="$BASEDIR/interimap.conf" \
+    $ env -i PATH="$PATH" perl -T ./interimap --config="$BASEDIR/interimap.conf" \
 		--watch=1 --debug
 
 Use instructions from the [previous section][Mail storage access]
@@ -168,12 +168,12 @@ Create a [`pullimap`(1)] configuration file with as section `[foo]`.
 
 Run [`pullimap`(1)] without `--idle` in order to create the state file.
 
-    $ env -i PATH="$PATH" perl -I./lib -T ./pullimap --config="$BASEDIR/pullimap.conf" \
+    $ env -i PATH="$PATH" perl -T ./pullimap --config="$BASEDIR/pullimap.conf" \
 		--no-delivery foo
 
 You can now run [`pullimap`(1)] with `--idle` set.
 
-    $ env -i PATH="$PATH" perl -I./lib -T ./pullimap --config="$BASEDIR/pullimap.conf" \
+    $ env -i PATH="$PATH" perl -T ./pullimap --config="$BASEDIR/pullimap.conf" \
 		--no-delivery --idle --debug foo
 
 Use instructions from the [previous section][Mail storage access]
diff --git a/interimap b/interimap
index 7525f9f..9ba5d06 100755
--- a/interimap
+++ b/interimap
@@ -32,6 +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.5.6 qw/xdg_basedir read_config compact_set/;
 
 # Clean up PATH
diff --git a/pullimap b/pullimap
index 6abd787..c225a2b 100755
--- a/pullimap
+++ b/pullimap
@@ -31,6 +31,7 @@ use Getopt::Long qw/:config posix_default no_ignore_case gnu_getopt auto_version
 use List::Util 'first';
 use Socket qw/PF_INET PF_INET6 SOCK_STREAM IPPROTO_TCP/;
 
+use lib "./lib";
 use Net::IMAP::InterIMAP 0.5.6 qw/xdg_basedir read_config compact_set/;
 
 # Clean up PATH
diff --git a/tests/db-exclusive-lock/t b/tests/db-exclusive-lock/t
index c2df4b5..7cbe550 100644
--- a/tests/db-exclusive-lock/t
+++ b/tests/db-exclusive-lock/t
@@ -10,7 +10,7 @@ sleep .5
 # subsequent runs fail as we can't acquire the exclusive lock
 ! interimap || error
 
-grep -Fx "DBD::SQLite::db do failed: database is locked at ./interimap line 176." <"$STDERR" \
-    || error "Is \$DBH->do(\"PRAGMA locking_mode = EXCLUSIVE\"); at line 176?"
+grep -Ex "DBD::SQLite::db do failed: database is locked at (\S+/)?interimap line 177\." <"$STDERR" \
+    || error "Is \$DBH->do(\"PRAGMA locking_mode = EXCLUSIVE\"); at line 177?"
 
 # vim: set filetype=sh :
diff --git a/tests/db-no-create--watch/t b/tests/db-no-create--watch/t
index a8ea07e..7ac3d31 100644
--- a/tests/db-no-create--watch/t
+++ b/tests/db-no-create--watch/t
@@ -1,6 +1,6 @@
 ! interimap --watch=60 || error
 
-grep -Ex "DBI connect\(.*\) failed: unable to open database file at \./interimap line 172\." <"$STDERR" || error
+grep -Ex "DBI connect\(.*\) failed: unable to open database file at (\S+/)?interimap line 173\." <"$STDERR" || error
 test \! -e "$XDG_DATA_HOME/interimap/remote.db" || error
 
 # vim: set filetype=sh :
diff --git a/tests/run b/tests/run
index 1eaad54..230ca83 100755
--- a/tests/run
+++ b/tests/run
@@ -38,6 +38,12 @@ fi
 # cleanup environment
 unset OPENSSL_CONF SSL_CERT_FILE SSL_CERT_DIR
 
+if [ -z "${INTERIMAP_PATH+x}" ]; then
+    INTERIMAP_PATH="./"
+elif [ -n "$INTERIMAP_PATH" ]; then
+    INTERIMAP_PATH="${INTERIMAP_PATH%/}/"
+fi
+
 ROOTDIR="$(mktemp --tmpdir="${TMPDIR:-/dev/shm}" --directory "$1.XXXXXXXXXX")"
 declare -a DOVECOT_SERVER=()
 trap cleanup EXIT INT TERM
@@ -206,14 +212,17 @@ prepare
 interimap() { _interimap_cmd "interimap" "$@"; }
 pullimap()  { _interimap_cmd "pullimap"  "$@"; }
 _interimap_cmd() {
-    declare -a ENVIRON=()
+    declare -a ENVIRON=() args=()
     local script="$1" rv=0
     shift
     environ_set "local"
     [ -z "${OPENSSL_CONF+x}" ]  || ENVIRON+=( OPENSSL_CONF="$OPENSSL_CONF" )
     [ -z "${SSL_CERT_FILE+x}" ] || ENVIRON+=( SSL_CERT_FILE="$SSL_CERT_FILE" )
     [ -z "${SSL_CERT_DIR+x}" ]  || ENVIRON+=( SSL_CERT_DIR="$SSL_CERT_DIR" )
-    env -i "${ENVIRON[@]}" perl -I./lib -T "./$script" "$@" 2>"$STDERR" || rv=$?
+    [ -z "${INTERIMAP_I:+x}" ] || args+=( perl -I"$INTERIMAP_I" -T )
+    args+=( "$INTERIMAP_PATH$script" "$@" )
+    #printf "I: Running \`%s\`\\n" "${args[*]}" >&3
+    env -i "${ENVIRON[@]}" "${args[@]}" 2>"$STDERR" || rv=$?
     cat <"$STDERR" >&2
     return $rv
 }
@@ -449,7 +458,7 @@ passed() {
 # Run test in a sub-shell
 declare -a ENVIRON=()
 environ_set "local"
-export TMPDIR TESTDIR STDERR "${ENVIRON[@]}"
+export TMPDIR TESTDIR INTERIMAP_PATH INTERIMAP_I STDERR "${ENVIRON[@]}"
 export -f environ_set doveadm interimap interimap_init pullimap _interimap_cmd
 export -f sqlite3 sample_message deliver ptree_abort step_start step_done passed
 export -f check_mailbox_status check_mailbox_status_values check_mailbox_status2
-- 
cgit v1.2.3


From b5f3eeaf83d68c64ee508624afa5b76c14907e15 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 02:37:43 +0100
Subject: Makefile: Add target 'all-nodoc'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is useful for Debian packages built under ‘nodoc’ profile.
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 83281dd..d7486eb 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,10 @@ HTML_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%.html,$(wildcard $(s
 MANUAL_FILES = $(patsubst $(srcdir)/doc/%.md,$(builddir)/doc/%,$(wildcard $(srcdir)/doc/*.[1-9].md))
 SERVICE_FILES = $(patsubst $(srcdir)/%.service,$(builddir)/%.service,$(wildcard $(srcdir)/*.service))
 
-all: manual $(PROGRAMS) $(SERVICE_FILES)
+all: all-nodoc manual
+all-nodoc: $(PROGRAMS) $(SERVICE_FILES)
 
+doc: manual html
 manual: $(MANUAL_FILES)
 html: $(HTML_FILES)
 
@@ -72,13 +74,11 @@ $(HTML_FILES): $(builddir)/doc/%.html: $(srcdir)/doc/%.md $(HTML_TEMPLATE)
 		--variable=parent:"$$parent" \
 		--output="$@" -- "$<"
 
-doc: manual html
-
 INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
 INSTALL_DATA ?= $(INSTALL) -m0644
 
-install: $(PROGRAMS) $(SERVICE_FILES)
+install: all-nodoc
 	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(builddir)/interimap $(builddir)/pullimap
 	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(sitelib)/Net/IMAP/InterIMAP.pm
 	-$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(builddir)/doc/interimap.1 $(builddir)/doc/pullimap.1
@@ -97,4 +97,4 @@ clean:
 	rm -vf -- $(PROGRAMS) $(MANUAL_FILES) $(HTML_FILES) $(SERVICE_FILES)
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
-.PHONY: all manual html doc test release install uninstall clean
+.PHONY: all all-nodoc manual html doc test release install uninstall clean
-- 
cgit v1.2.3


From 448760457c85b80eef23b7c1ede8c735e4491b98 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 02:38:25 +0100
Subject: Makefile: Rename 'test' target to 'check'.

Per convention, cf. https://www.gnu.org/prep/standards/html_node/Standard-Targets.html .
---
 Makefile     | 4 ++--
 doc/build.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d7486eb..cee54eb 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ $(SERVICE_FILES): $(builddir)/%.service: $(srcdir)/%.service
 	@mkdir -vp $(dir $@)
 	sed "s|@bindir@|$(bindir)|" <"$<" >"$@"
 
-test:
+check: $(PROGRAMS)
 	$(srcdir)/tests/certs/generate
 	INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all
 
@@ -97,4 +97,4 @@ clean:
 	rm -vf -- $(PROGRAMS) $(MANUAL_FILES) $(HTML_FILES) $(SERVICE_FILES)
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
-.PHONY: all all-nodoc manual html doc test release install uninstall clean
+.PHONY: all all-nodoc manual html doc check release install uninstall clean
diff --git a/doc/build.md b/doc/build.md
index 2e4e511..142097e 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -38,7 +38,7 @@ Additional packages are required in order to run the test suite:
 
     $ sudo apt install dovecot-imapd dovecot-lmtpd openssl procps sqlite3 xxd
 <!-- -->
-    $ make test
+    $ make check
 
 (The test suite also needs to bind to TCP ports 10024, 10143 and 10993
 on the loopback interface.)
-- 
cgit v1.2.3


From 50243cd7747575e2a035bc6b31c5efb86cb73eee Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 19:41:49 +0100
Subject: Makefile: Add target 'installcheck' for post-install tests.

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cee54eb..3d41f8a 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,10 @@ check: $(PROGRAMS)
 	$(srcdir)/tests/certs/generate
 	INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all
 
+installcheck:
+	$(srcdir)/tests/certs/generate
+	INTERIMAP_I="" INTERIMAP_PATH=$(bindir) $(srcdir)/tests/run-all
+
 release:
 	@if ! git -C $(srcdir) diff --quiet HEAD -- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm; then \
 		echo "Dirty state, refusing to release!" >&2; \
@@ -97,4 +101,4 @@ clean:
 	rm -vf -- $(PROGRAMS) $(MANUAL_FILES) $(HTML_FILES) $(SERVICE_FILES)
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
-.PHONY: all all-nodoc manual html doc check release install uninstall clean
+.PHONY: all all-nodoc manual html doc check release install installcheck uninstall clean
-- 
cgit v1.2.3


From a06ceca1c7c05175ca2361fc2da50ba36a51fc49 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 20:02:32 +0100
Subject: `make clean`: Also remove test keys and certificates.

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 3d41f8a..0f1d7ea 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,7 @@ uninstall:
 
 clean:
 	rm -vf -- $(PROGRAMS) $(MANUAL_FILES) $(HTML_FILES) $(SERVICE_FILES)
+	rm -vf -- $(srcdir)/tests/certs/*.key $(srcdir)/tests/certs/*.crt $(srcdir)/tests/certs/*.pem
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
 .PHONY: all all-nodoc manual html doc check release install installcheck uninstall clean
-- 
cgit v1.2.3


From 28b2728a3232741ab3e4ccc8ced585d75fffddb1 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 19:54:31 +0100
Subject: Fix/improve doc/build.md.

Update instructions/documentation obsolete since
a1c089b997ebf705a9023b4f0f97327e5bd2814e and
733ed91162b02cd0fa5d7d1c443c780d3d4405e9.
---
 Makefile     |  1 -
 doc/build.md | 36 +++++++++++++++---------------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 0f1d7ea..0c01999 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,6 @@ release:
 			-- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm && \
 		git -C $(srcdir) tag -sm "Release version $$VERS" "v$$VERS"
 
-## `make html CSS="https://guilhem.org/static/css/bootstrap.min.css" builddir="$XDG_RUNTIME_DIR/Downloads/interimap"`
 $(HTML_FILES): $(builddir)/doc/%.html: $(srcdir)/doc/%.md $(HTML_TEMPLATE)
 	@mkdir -vp $(dir $@)
 	mtime="$$(git -C $(srcdir) --no-pager log -1 --pretty="format:%ct" -- "$<" 2>/dev/null)"; \
diff --git a/doc/build.md b/doc/build.md
index 142097e..6c812dc 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -40,8 +40,8 @@ Additional packages are required in order to run the test suite:
 <!-- -->
     $ make check
 
-(The test suite also needs to bind to TCP ports 10024, 10143 and 10993
-on the loopback interface.)
+(Note also that the test suite needs to bind to TCP ports 10024, 10143
+and 10993 on the loopback interface.)
 
 Generate documentation
 ======================
@@ -51,29 +51,23 @@ Yet another set of packages is needed to generate the documentation:
     $ sudo apt install jq pandoc
 
 Run `` `make manual` `` (or just `` `make` ``) in order to generate the
-manpages.  You'll find them at `doc/*.[1-9]`.  Use for instance `` `man
--l doc/interimap.1` `` in order to read your copy of the [`interimap`(1)]
-manpage.
+manuals.  You'll find them at `build/doc/*.[1-9]`.  Then use for
+instance `` `man -l build/doc/interimap.1` `` to read your local copy of
+the [`interimap`(1)] manual.
 
-The HTML documentation can be built with `` `make html` ``.  HTML files
-are generated alongside their Markdown source by default, but you can
-choose another target directory using the `HTML_ROOTDIR` environment
-variable (the value of which defaults to `./doc`).  Moreover the
-[`libjs-bootstrap`](https://tracker.debian.org/libjs-bootstrap) is
-needed by default for the local CSS file; this can be controlled with
-the `CSS` environment variable (the value of which defaults to
-`/usr/share/javascript/bootstrap/css/bootstrap.min.css`).
+The HTML documentation can be built with `` `make html` ``.  By default
+HTML files are generated at `build/doc/*.html`, and a local CSS file is
+used — namely `/usr/share/javascript/bootstrap4/css/bootstrap.css`,
+shipped the by [`libjs-bootstrap`](https://tracker.debian.org/libjs-bootstrap)
+package.  But this is configurable: use for instance
 
-For instance, use
+    $ make html builddir="$XDG_RUNTIME_DIR/interimap" \
+		CSS="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css"
 
-    $ env CSS="https://guilhem.org/static/css/bootstrap.min.css" \
-		HTML_ROOTDIR="$XDG_RUNTIME_DIR/interimap" \
-		make html
+to generate the HTML documentation under `$XDG_RUNTIME_DIR/interimap/doc`
+using a remote CSS file.
 
-to generate the HTML documentation under directory `$XDG_RUNTIME_DIR/interimap`
-(which needs to exist) using a remote CSS file.
-
-The `doc` target generates all documentation, manpages as well as HTML
+The `doc` target generates all documentation, manuals as well as HTML
 pages.
 
 
-- 
cgit v1.2.3


From 9f73064e09cc22326c876c2e493b9994b027db27 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 19:55:05 +0100
Subject: Makefile: Replace shell test with $(if ,,).

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0c01999..6d5fd4f 100644
--- a/Makefile
+++ b/Makefile
@@ -69,12 +69,11 @@ $(HTML_FILES): $(builddir)/doc/%.html: $(srcdir)/doc/%.md $(HTML_TEMPLATE)
 	@mkdir -vp $(dir $@)
 	mtime="$$(git -C $(srcdir) --no-pager log -1 --pretty="format:%ct" -- "$<" 2>/dev/null)"; \
 	[ -n "$$mtime" ] || mtime="$$(date +%s -r "$<")"; \
-	[ "$<" = "doc/index.md" ] && parent="" || parent="./index.html"; \
 	pandoc -sp -f markdown -t html+smart --css=$(CSS) --template=$(HTML_TEMPLATE) \
 		--variable=date:"$$(LC_TIME=C date +"Last modified on %a, %d %b %Y at %T %z" -d @"$$mtime")" \
 		--variable=keywords:"interimap" \
 		--variable=lang:"en" \
-		--variable=parent:"$$parent" \
+		--variable=parent:"$(if $(filter $@,$(builddir)/doc/index.html),,./index.html)" \
 		--output="$@" -- "$<"
 
 INSTALL ?= install
-- 
cgit v1.2.3


From 96d5e83a705c463c62f3032bdf41949630878963 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 19:58:03 +0100
Subject: Makefile: Add target 'install-nodoc'.

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6d5fd4f..14656c4 100644
--- a/Makefile
+++ b/Makefile
@@ -80,13 +80,15 @@ INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
 INSTALL_DATA ?= $(INSTALL) -m0644
 
-install: all-nodoc
-	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(builddir)/interimap $(builddir)/pullimap
-	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(sitelib)/Net/IMAP/InterIMAP.pm
+install: install-nodoc
 	-$(INSTALL_DATA) -vDt $(DESTDIR)$(man1dir) $(builddir)/doc/interimap.1 $(builddir)/doc/pullimap.1
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/pullimap $(srcdir)/pullimap.sample
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(datarootdir)/doc/interimap $(srcdir)/interimap.sample \
 		$(srcdir)/doc/getting-started.md $(srcdir)/doc/multi-account.md $(srcdir)/README
+
+install-nodoc: all-nodoc
+	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(builddir)/interimap $(builddir)/pullimap
+	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(sitelib)/Net/IMAP/InterIMAP.pm
 	$(INSTALL_DATA) -vDt $(DESTDIR)$(libdir)/systemd/user $(SERVICE_FILES)
 
 uninstall:
@@ -100,4 +102,4 @@ clean:
 	rm -vf -- $(srcdir)/tests/certs/*.key $(srcdir)/tests/certs/*.crt $(srcdir)/tests/certs/*.pem
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
-.PHONY: all all-nodoc manual html doc check release install installcheck uninstall clean
+.PHONY: all all-nodoc manual html doc check release install install-nodoc installcheck uninstall clean
-- 
cgit v1.2.3


From 09d85b13359aabb377aeea489cd1f9c9bd1b1d63 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 21:42:46 +0100
Subject: Fix minor space damage.

---
 tests/tls-rsa+ecdsa/t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tls-rsa+ecdsa/t b/tests/tls-rsa+ecdsa/t
index c9f5b96..fd2b1be 100644
--- a/tests/tls-rsa+ecdsa/t
+++ b/tests/tls-rsa+ecdsa/t
@@ -28,7 +28,7 @@ interimap_init
 check_mailbox_status "INBOX"
 
 interimap --debug || error
-# which peer certificate is used is up to libssl 
+# which peer certificate is used is up to libssl
 grep -Fx -e "remote: Peer certificate fingerprint: sha256\$$X509_SHA256" \
          -e "remote: Peer certificate fingerprint: sha256\$$X509_ALT_SHA256" \
          <"$STDERR" || error
-- 
cgit v1.2.3


From 4d36557a007f06196affe14afd1a2bd2a4945c44 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 20:00:28 +0100
Subject: Document how to install without root privileges.

And make location for systemd user unit files configurable with
systemd_userunitdir=.
---
 Makefile     |  7 ++++---
 doc/build.md | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 14656c4..7bcda70 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ sitelib ?= $(libdir)/site_perl
 datarootdir ?= $(prefix)/share
 mandir ?= $(datarootdir)/man
 man1dir ?= $(mandir)/man1
+systemd_userunitdir ?= $(libdir)/systemd/user
 
 CSS ?= /usr/share/javascript/bootstrap4/css/bootstrap.css
 HTML_TEMPLATE ?= $(srcdir)/doc/template.html
@@ -89,11 +90,11 @@ install: install-nodoc
 install-nodoc: all-nodoc
 	$(INSTALL_PROGRAM) -vDt $(DESTDIR)$(bindir) $(builddir)/interimap $(builddir)/pullimap
 	$(INSTALL_DATA) -vDT $(srcdir)/lib/Net/IMAP/InterIMAP.pm $(DESTDIR)$(sitelib)/Net/IMAP/InterIMAP.pm
-	$(INSTALL_DATA) -vDt $(DESTDIR)$(libdir)/systemd/user $(SERVICE_FILES)
+	$(INSTALL_DATA) -vDt $(DESTDIR)$(systemd_userunitdir) $(SERVICE_FILES)
 
 uninstall:
-	rm -vf -- $(DESTDIR)$(bindir)/interimap $(DESTDIR)$(man1dir)/interimap.1 $(DESTDIR)$(libdir)/systemd/user/interimap*.service
-	rm -vf -- $(DESTDIR)$(bindir)/pullimap $(DESTDIR)$(man1dir)/pullimap.1 $(DESTDIR)$(libdir)/systemd/user/pullimap*.service
+	rm -vf -- $(DESTDIR)$(bindir)/interimap $(DESTDIR)$(man1dir)/interimap.1 $(DESTDIR)$(systemd_userunitdir)/interimap*.service
+	rm -vf -- $(DESTDIR)$(bindir)/pullimap $(DESTDIR)$(man1dir)/pullimap.1 $(DESTDIR)$(systemd_userunitdir)/pullimap*.service
 	rm -vf -- $(DESTDIR)$(sitelib)/Net/IMAP/InterIMAP.pm
 	rm -rvf -- $(DESTDIR)$(datarootdir)/doc/interimap $(DESTDIR)$(datarootdir)/doc/pullimap
 
diff --git a/doc/build.md b/doc/build.md
index 6c812dc..1936c13 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -71,6 +71,33 @@ The `doc` target generates all documentation, manuals as well as HTML
 pages.
 
 
+Installation without root privileges
+====================================
+
+By default `` `make install` `` installs [`interimap`(1)] under
+`/usr/local`, hence requires root privileges.  However another prefix
+can be used in order to perform the (un)installation as an unprivileged
+user.  For instance
+
+    $ install -m0700 -vd "${XDG_DATA_HOME:-~/.local/share}/interimap"
+    $ make install-nodoc \
+		prefix=~/.local \
+		sitelib="${XDG_DATA_HOME:-~/.local/share}/interimap/lib" \
+		systemd_userunitdir="${XDG_DATA_HOME:-~/.local/share}/systemd/user"
+
+skips documentation and installs
+
+  * executables into `~/.local/bin` (instead of `/usr/local/bin`);
+  * libraries into `$XDG_DATA_HOME/interimap/lib` or `~/.local/share/interimap/lib`
+    (instead of `/usr/local/lib/site_perl`); and
+  * [systemd user unit files][`systemd.unit`(5)] into `$XDG_DATA_HOME/systemd/user`
+    or `~/.local/share/systemd/user` (instead of `/usr/local/lib/systemd/user`).
+
+Note that for uninstallation one must call `` `make uninstall prefix=…` ``
+with the very same assignment(s) used for installation.
+
+[`systemd.unit`(5)]: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
+
 Build custom Debian packages
 ============================
 
-- 
cgit v1.2.3


From 2447861913835637bbf49d96728ce9ac6ab0ae22 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 23 Feb 2022 22:30:45 +0100
Subject: interimap, pullimap: Ensure DB and statefiles are created with mode
 0600.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It wasn't the case for interimap(1), see https://bugs.debian.org/608604 …
Fortunately we create $XDG_DATA_HOME/interimap with a secure mode, but
there is no reason to have the DB world-readable.  Since we can't rely
on SQLITE_OPEN_CREATE for secure mode we use sysopen(,,O_CREAT,0600).
---
 interimap                   | 10 +++++++---
 tests/db-exclusive-lock/t   |  4 ++--
 tests/db-no-create--watch/t |  2 +-
 tests/pullimap/t            |  7 +++++++
 tests/run                   |  5 ++++-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/interimap b/interimap
index 9ba5d06..d4ff3fc 100755
--- a/interimap
+++ b/interimap
@@ -29,7 +29,7 @@ use Getopt::Long qw/:config posix_default no_ignore_case gnu_compat
                             bundling auto_version/;
 use DBI ':sql_types';
 use DBD::SQLite::Constants ':file_open';
-use Fcntl qw/F_GETFD F_SETFD FD_CLOEXEC/;
+use Fcntl qw/O_WRONLY O_CREAT O_EXCL F_GETFD F_SETFD FD_CLOEXEC/;
 use List::Util 'first';
 
 use lib "./lib";
@@ -160,6 +160,12 @@ $SIG{TERM} = sub { cleanup(); exit 0; };
 # Open (and maybe create) the database
 
 {
+    # don't auto-create in long-lived mode
+    unless ($CONFIG{watch} or -e $DBFILE) {
+        sysopen(my $fh, $DBFILE, O_WRONLY | O_CREAT | O_EXCL, 0600) or die "Can't create $DBFILE: $!";
+        close $fh or warn "close: $!";
+    }
+
     my $dbi_data_source = "dbi:SQLite:dbname=".$DBFILE;
     my %dbi_attrs = (
         AutoCommit => 0,
@@ -167,8 +173,6 @@ $SIG{TERM} = sub { cleanup(); exit 0; };
         sqlite_use_immediate_transaction => 1,
         sqlite_open_flags => SQLITE_OPEN_READWRITE
     );
-    # don't auto-create in long-lived mode
-    $dbi_attrs{sqlite_open_flags} |= SQLITE_OPEN_CREATE unless defined $CONFIG{watch};
 
     $DBH = DBI::->connect($dbi_data_source, undef, undef, \%dbi_attrs);
     $DBH->sqlite_busy_timeout(250);
diff --git a/tests/db-exclusive-lock/t b/tests/db-exclusive-lock/t
index 7cbe550..837d21b 100644
--- a/tests/db-exclusive-lock/t
+++ b/tests/db-exclusive-lock/t
@@ -10,7 +10,7 @@ sleep .5
 # subsequent runs fail as we can't acquire the exclusive lock
 ! interimap || error
 
-grep -Ex "DBD::SQLite::db do failed: database is locked at (\S+/)?interimap line 177\." <"$STDERR" \
-    || error "Is \$DBH->do(\"PRAGMA locking_mode = EXCLUSIVE\"); at line 177?"
+grep -Ex "DBD::SQLite::db do failed: database is locked at (\S+/)?interimap line 181\." <"$STDERR" \
+    || error "Is \$DBH->do(\"PRAGMA locking_mode = EXCLUSIVE\"); at line 181?"
 
 # vim: set filetype=sh :
diff --git a/tests/db-no-create--watch/t b/tests/db-no-create--watch/t
index 7ac3d31..37fc6cb 100644
--- a/tests/db-no-create--watch/t
+++ b/tests/db-no-create--watch/t
@@ -1,6 +1,6 @@
 ! interimap --watch=60 || error
 
-grep -Ex "DBI connect\(.*\) failed: unable to open database file at (\S+/)?interimap line 173\." <"$STDERR" || error
+grep -Ex "DBI connect\(.*\) failed: unable to open database file at (\S+/)?interimap line 177\." <"$STDERR" || error
 test \! -e "$XDG_DATA_HOME/interimap/remote.db" || error
 
 # vim: set filetype=sh :
diff --git a/tests/pullimap/t b/tests/pullimap/t
index 0dfe634..7998cdc 100644
--- a/tests/pullimap/t
+++ b/tests/pullimap/t
@@ -6,6 +6,13 @@ step_start "\`pullimap --idle\` refuses to create the state file"
 ! pullimap --idle "remote" || error
 step_done
 
+step_start "\`pullimap\` creates statefile with mode 0600"
+pullimap "remote" || error
+if ! st="$(stat -c"%#a" -- "$XDG_DATA_HOME/pullimap/remote")" || [ "$st" != "0600" ]; then
+    error "$XDG_DATA_HOME/pullimap/remote has mode $st != 0600"
+fi
+step_done
+
 # compare mailboxes (can't compare the RFC 3501 TEXT as the LMTPd inconditionally
 # adds a Return-Path: header -- and also Delivered-To: and Received: to by default)
 list_mails_sha256() {
diff --git a/tests/run b/tests/run
index 230ca83..eed77df 100755
--- a/tests/run
+++ b/tests/run
@@ -228,13 +228,16 @@ _interimap_cmd() {
 }
 interimap_init() {
     local u="${1-remote}"
-    local db="$XDG_DATA_HOME/interimap/$u.db"
+    local db="$XDG_DATA_HOME/interimap/$u.db" st
     local cfg="config${u#remote}"
 
     test \! -e "$db"          || error "Database already exists" 1
     interimap --config "$cfg" || error "Couldn't initialize interimap" 1
     test -f "$db"             || error "Database is still missing" 1
     grep -Fx "Creating new schema in database file $db" <"$STDERR" || error "DB wasn't created" 1
+    if ! st="$(stat -c"%#a" -- "$db")" || [ "$st" != "0600" ]; then
+        error "$db has mode $st != 0600" 1
+    fi
 }
 doveadm() {
     if [ $# -le 2 ] || [ "$1" != "-u" ]; then
-- 
cgit v1.2.3


From ef431a25a61a764379f035d18a04fe13b8949fca Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 24 Feb 2022 01:33:18 +0100
Subject: Update Changelog for v0.5.7.

---
 Changelog | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/Changelog b/Changelog
index f82f68b..9549892 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,42 @@
+interimap (0.5.7) upstream;
+
+ * interimap: create database with mode 0600 (but don't change mode of
+   existing databases).  The file was previously created with mode 0644,
+   but its directory had restricted mode 0700.  pullimap, on the other
+   hand, already created state files with mode 0600.
+ * Major Makefile refactoring: improve DESTDIR= handling, add new
+   targets 'all-nodoc', 'install-nodoc', and 'installcheck'.  Also,
+   rename 'test' target to 'check'.
+ * `make install` now installs Net/IMAP/InterIMAP.pm to
+   /usr/local/lib/site_perl by default rather than /usr/local/share/perl5
+   (which is not in @INC as of perl 5.34.0-3 from Debian sid).  The
+   installation directory is configurable with sitelib=.
+ * Refactor test harness so one can check the source with `tests/run
+   foo`; what's been built with `INTERIMAP_I=./lib INTERIMAP_PATH=./build
+   ./tests/run foo`, and what's installed with `INTERIMAP_I=""
+   INTERIMAP_PATH=/usr/bin tests/run foo`.
+ + Improve message for missing untagged UIDNEXT responses, which we
+   require but are omitted from some servers.
+ + tests/tls-protocols: downgrade OpenSSL security level to 0, which is
+   required to test TLS version <1.2 on systems with higher security
+   levels, see SSL_CTX_set_security_level(3ssl).  Adapted from a patch
+   from <xnox> for Unbuntu.
+ + tests/tls-*: bump Dovecot's ssl_min_protocol to TLSv1.2, which is the
+   default as of dovecot 1:2.3.18+dfsg1-1 from Debian sid.
+ + `make clean` now cleans test certificates and key material.
+ + Add 'use lib "./lib";' to interimap and pullimap, so the programs can
+   be run directly from the source directory.  The directory is
+   substituted with $(sitelib) at compile time (and the line is commented
+   out if $(sitelib) is found in @INC).
+ + doc/build.md: update documentation, and add a new section for how to
+   install without root privileges.
+ + Add Documentation=https://guilhem.org/interimap/... URIs to .service
+   files.
+ - Don't hardcode path to interimap/pullimap in .service files, and
+   instead use $(bindir) (expanded at compile time).
+
+ -- Guilhem Moulin <guilhem@fripost.org>  Thu, 24 Feb 2022 01:28:25 +0100
+
 interimap (0.5.6) upstream;
 
  - Bump required Net::SSLeay version to 1.86_06 as it's when get_version()
-- 
cgit v1.2.3


From 404505bdf9a152ed9e0911027500b58d2c7ce72c Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 24 Feb 2022 20:15:58 +0100
Subject: Documentation: Update URL targets from https://wiki.dovecot.org to
 https://doc.dovecot.org .

---
 doc/benchmark.md       | 4 ++--
 doc/development.md     | 4 ++--
 doc/getting-started.md | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/benchmark.md b/doc/benchmark.md
index 72f51a4..f2f6cda 100644
--- a/doc/benchmark.md
+++ b/doc/benchmark.md
@@ -48,8 +48,8 @@ by placing packet counters on the interface.
 [OfflineIMAP]: https://www.offlineimap.org/
 [benchmark-script]: https://git.guilhem.org/interimap/plain/benchmark/run
 [Dovecot]: https://dovecot.org
-[dbox]: https://wiki.dovecot.org/MailboxFormat/dbox
-[maildir]: https://wiki.dovecot.org/MailboxFormat/Maildir
+[dbox]: https://doc.dovecot.org/admin_manual/mailbox_formats/dbox/
+[maildir]: https://doc.dovecot.org/admin_manual/mailbox_formats/maildir/
 
 -----------------------------------------------------------------------
 
diff --git a/doc/development.md b/doc/development.md
index 530c52b..0fe54f4 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -194,10 +194,10 @@ recursively remove the directory `$BASEDIR`.
 [IMAP4rev1]: https://tools.ietf.org/html/rfc3501
 [Dovecot]: https://dovecot.org
 [Dovecot Logging]: https://doc.dovecot.org/admin_manual/logging/
-[Dovecot LDA]: https://wiki.dovecot.org/LDA
+[Dovecot LDA]: https://doc.dovecot.org/configuration_manual/protocols/lda/
 [`getlogin`(3)]: https://pubs.opengroup.org/onlinepubs/9699919799/functions/getlogin.html
 [User Databases]: https://doc.dovecot.org/configuration_manual/authentication/user_databases_userdb/
-[Maildir]: https://wiki.dovecot.org/MailLocation/Maildir
+[Maildir]: https://doc.dovecot.org/configuration_manual/mail_location/Maildir/
 [RFC 2342]: https://tools.ietf.org/html/rfc2342
 [Dovecot Namespaces]: https://doc.dovecot.org/configuration_manual/namespace/
 [`interimap`(1)]: interimap.1.html
diff --git a/doc/getting-started.md b/doc/getting-started.md
index 74fc8da..7a77a6b 100644
--- a/doc/getting-started.md
+++ b/doc/getting-started.md
@@ -84,7 +84,7 @@ mailbox delivery) then don't disable them, and modify Dovecot's system
 wide configuration instead.  Same thing if your mail client isn't able
 to spawn a command for IMAP communication, and instead insists on
 connecting to a network socket (in that case you'll even need to
-configure [user authentication](https://wiki.dovecot.org/Authentication)
+configure [user authentication](https://doc.dovecot.org/configuration_manual/authentication/)
 for the IMAP service, which is out of scope for the present document).
 
 Run the following command to terminate and disable the system-wide
@@ -113,7 +113,8 @@ Some remarks on the above:
     running `` `doveconf -nc ${XDG_CONFIG_HOME:-~/.config}/dovecot/dovecot.conf` ``.
   * Messages will be stored in Maildir format under `~/Mail`.  Ensure
     the directory is either *empty* or *doesn't exist* before
-    continuing!  You may want to choose a different [format](https://wiki.dovecot.org/MailboxFormat)
+    continuing!  You may want to choose a different
+    [format](https://doc.dovecot.org/admin_manual/mailbox_formats/)
     here, or simply append `:LAYOUT=fs` to the `mail_location` value in
     order to use a nicer (File System like) Maildir layout.
   * The `separator` setting defines the IMAP hierarchy delimiter.  This
-- 
cgit v1.2.3


From 76a005507f284e874eb5a3e4e315bb324fb2a095 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 24 Feb 2022 23:09:14 +0100
Subject: Split interimap and pullimap test suites.

---
 Changelog            |  1 +
 Makefile             | 23 +++++++++++++-----
 tests/interimap.list | 63 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/list           | 66 ----------------------------------------------------
 tests/pullimap.list  |  2 ++
 tests/run-all        |  3 ++-
 6 files changed, 85 insertions(+), 73 deletions(-)
 create mode 100644 tests/interimap.list
 delete mode 100644 tests/list
 create mode 100644 tests/pullimap.list

diff --git a/Changelog b/Changelog
index 9549892..cad321b 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,7 @@ interimap (0.5.7) upstream;
    foo`; what's been built with `INTERIMAP_I=./lib INTERIMAP_PATH=./build
    ./tests/run foo`, and what's installed with `INTERIMAP_I=""
    INTERIMAP_PATH=/usr/bin tests/run foo`.
+ * Split interimap and pullimap test suites.
  + Improve message for missing untagged UIDNEXT responses, which we
    require but are omitted from some servers.
  + tests/tls-protocols: downgrade OpenSSL security level to 0, which is
diff --git a/Makefile b/Makefile
index 7bcda70..1d09ff2 100644
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,20 @@ $(SERVICE_FILES): $(builddir)/%.service: $(srcdir)/%.service
 	@mkdir -vp $(dir $@)
 	sed "s|@bindir@|$(bindir)|" <"$<" >"$@"
 
-check: $(PROGRAMS)
+testcerts:
 	$(srcdir)/tests/certs/generate
-	INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all
 
-installcheck:
-	$(srcdir)/tests/certs/generate
-	INTERIMAP_I="" INTERIMAP_PATH=$(bindir) $(srcdir)/tests/run-all
+check: check-interimap check-pullimap
+check-interimap: $(builddir)/interimap testcerts
+	INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all interimap.list
+check-pullimap: $(builddir)/pullimap testcerts
+	INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all pullimap.list
+
+installcheck: installcheck-interimap installcheck-pullimap
+installcheck-interimap: testcerts
+	INTERIMAP_I="" INTERIMAP_PATH=$(bindir) $(srcdir)/tests/run-all interimap.list
+installcheck-pullimap: testcerts
+	INTERIMAP_I="" INTERIMAP_PATH=$(bindir) $(srcdir)/tests/run-all pullimap.list
 
 release:
 	@if ! git -C $(srcdir) diff --quiet HEAD -- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm; then \
@@ -103,4 +110,8 @@ clean:
 	rm -vf -- $(srcdir)/tests/certs/*.key $(srcdir)/tests/certs/*.crt $(srcdir)/tests/certs/*.pem
 	-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
 
-.PHONY: all all-nodoc manual html doc check release install install-nodoc installcheck uninstall clean
+.PHONY: all all-nodoc manual html doc release testcerts \
+	check check-interimap check-pullimap \
+	install install-nodoc \
+	installcheck installcheck-interimap installcheck-pullimap \
+	uninstall clean
diff --git a/tests/interimap.list b/tests/interimap.list
new file mode 100644
index 0000000..559daed
--- /dev/null
+++ b/tests/interimap.list
@@ -0,0 +1,63 @@
+db-no-create--watch     `interimap --watch` refuses to create the database
+db-exclusive-lock       mutually exclusive DB access
+
+. DB schema upgrade (v0 -> v1)
+    db-upgrade-0-1                              migrate
+    # may happen if the server(s) software or its configuration changed
+    db-upgrade-0-1-delim-mismatch               abort on hierarchy delimiter mismatch
+    # foreign key checking was broken until v0.5
+    db-migration-0-1-foreign-key-violation      abort on foreign key contraint violation
+
+. Mailbox deletion
+    ... delete
+
+. Mailbox renaming
+    rename-exists-db        abort if target exists in the DB
+    rename-exists-local     abort if target exists locally
+    rename-exists-remote    abort if target exists remotely
+    ... rename-simple
+    ... rename-inferiors
+
+# try values beyond the signed integer limit
+largeint  Large UIDVALIDITY/UIDNEXT/HIGHESTMODSEQ values
+
+. Mailbox synchronization
+    ... sync-mailbox-list
+    list-reference      list-reference
+    list-mailbox        list-mailbox = foo "foo bar" "f\\\"o\x21o.*" "f\0o\0o"
+    list-select-opts    list-select-opts = SUBSCRIBED
+    ignore-mailbox      ignore-mailbox = ^virtual(?:\x00|$)
+    delimiter-change    doesn't choke on delimiter change
+
+resume  Resume when aborted
+repair  --repair
+
+. Authentication
+    auth-sasl-plain         AUTHENTICATE (SASL PLAIN)
+    auth-sasl-plain-no-ir   AUTHENTICATE (SASL PLAIN, no SASL-IR)
+    auth-login              LOGIN
+    auth-logindisabled      LOGINDISABLED
+    auth-noplaintext        abort when STARTTLS is not offered
+    preauth-plaintext       abort on MiTM via PREAUTH greeting
+
+compress    COMPRESS=DEFLATE
+condstore   CONDSTORE
+split-set   Split large sets to avoid extra-long command lines
+
+. SSL/TLS
+    starttls-logindisabled  LOGINDISABLED STARTTLS
+    starttls                STARTTLS
+    starttls-injection      STARTTLS response injection
+    tls                     SSL/TLS handshake
+    ... tls-verify-peer
+    tls-pin-fingerprint     pubkey fingerprint pinning
+    tls-rsa+ecdsa           pubkey fingerprint pinning for dual-cert RSA+ECDSA
+    tls-sni                 TLS servername extension (SNI)
+    tls-protocols           force TLS protocol versions
+    tls-ciphers             force TLS cipher list/suites
+
+. 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)
diff --git a/tests/list b/tests/list
deleted file mode 100644
index d1058ba..0000000
--- a/tests/list
+++ /dev/null
@@ -1,66 +0,0 @@
-db-no-create--watch     `interimap --watch` refuses to create the database
-db-exclusive-lock       mutually exclusive DB access
-
-. DB schema upgrade (v0 -> v1)
-    db-upgrade-0-1                              migrate
-    # may happen if the server(s) software or its configuration changed
-    db-upgrade-0-1-delim-mismatch               abort on hierarchy delimiter mismatch
-    # foreign key checking was broken until v0.5
-    db-migration-0-1-foreign-key-violation      abort on foreign key contraint violation
-
-. Mailbox deletion
-    ... delete
-
-. Mailbox renaming
-    rename-exists-db        abort if target exists in the DB
-    rename-exists-local     abort if target exists locally
-    rename-exists-remote    abort if target exists remotely
-    ... rename-simple
-    ... rename-inferiors
-
-# try values beyond the signed integer limit
-largeint  Large UIDVALIDITY/UIDNEXT/HIGHESTMODSEQ values
-
-. Mailbox synchronization
-    ... sync-mailbox-list
-    list-reference      list-reference
-    list-mailbox        list-mailbox = foo "foo bar" "f\\\"o\x21o.*" "f\0o\0o"
-    list-select-opts    list-select-opts = SUBSCRIBED
-    ignore-mailbox      ignore-mailbox = ^virtual(?:\x00|$)
-    delimiter-change    doesn't choke on delimiter change
-
-resume  Resume when aborted
-repair  --repair
-
-. Authentication
-    auth-sasl-plain         AUTHENTICATE (SASL PLAIN)
-    auth-sasl-plain-no-ir   AUTHENTICATE (SASL PLAIN, no SASL-IR)
-    auth-login              LOGIN
-    auth-logindisabled      LOGINDISABLED
-    auth-noplaintext        abort when STARTTLS is not offered
-    preauth-plaintext       abort on MiTM via PREAUTH greeting
-
-compress    COMPRESS=DEFLATE
-condstore   CONDSTORE
-split-set   Split large sets to avoid extra-long command lines
-
-. SSL/TLS
-    starttls-logindisabled  LOGINDISABLED STARTTLS
-    starttls                STARTTLS
-    starttls-injection      STARTTLS response injection
-    tls                     SSL/TLS handshake
-    ... tls-verify-peer
-    tls-pin-fingerprint     pubkey fingerprint pinning
-    tls-rsa+ecdsa           pubkey fingerprint pinning for dual-cert RSA+ECDSA
-    tls-sni                 TLS servername extension (SNI)
-    tls-protocols           force TLS protocol versions
-    tls-ciphers             force TLS cipher list/suites
-
-. 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/tests/pullimap.list b/tests/pullimap.list
new file mode 100644
index 0000000..f4304b9
--- /dev/null
+++ b/tests/pullimap.list
@@ -0,0 +1,2 @@
+. pullimap
+    ... pullimap
diff --git a/tests/run-all b/tests/run-all
index d13f689..79e62d1 100755
--- a/tests/run-all
+++ b/tests/run-all
@@ -24,6 +24,7 @@ export PATH
 
 BASEDIR="$(dirname -- "$0")"
 RUN="$BASEDIR/run"
+list="$1"
 
 failed=0
 
@@ -54,7 +55,7 @@ while IFS="" read -r x; do
     fi
 
     INDENT="$indent" "$RUN" "$t" ${desc+"$desc"} || failed=$(( failed+1 ))
-done <"$BASEDIR/list"
+done <"$BASEDIR/$list"
 
 if [ $failed -eq 0 ]; then
     printf "All tests passed.\\n"
-- 
cgit v1.2.3


From 90d0b00313686a8e6a05e807c24d5c460718ba41 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 24 Feb 2022 23:44:46 +0100
Subject: tests/certs/generate: Redirect known error output to the standard
 output.

That way we can avoid using autopkgtest's 'allow-stderr' restriction.
---
 Changelog            |  2 ++
 tests/certs/generate | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index cad321b..72f7331 100644
--- a/Changelog
+++ b/Changelog
@@ -35,6 +35,8 @@ interimap (0.5.7) upstream;
    files.
  - Don't hardcode path to interimap/pullimap in .service files, and
    instead use $(bindir) (expanded at compile time).
+ - tests/certs/generate: redirect known error output to the standard
+   output.
 
  -- Guilhem Moulin <guilhem@fripost.org>  Thu, 24 Feb 2022 01:28:25 +0100
 
diff --git a/tests/certs/generate b/tests/certs/generate
index de379a0..36fce8b 100755
--- a/tests/certs/generate
+++ b/tests/certs/generate
@@ -10,10 +10,15 @@ cd "$BASEDIR"
 
 cadir="$(mktemp --tmpdir --directory)"
 trap 'rm -rf -- "$cadir"' EXIT INT TERM
+genpkey() {
+    local key="$1"
+    shift
+    openssl genpkey -out "$key" "$@" 2>&1
+}
 
 # generate CA (we intentionally throw away the private key and serial
 # file to avoid reuse)
-openssl genpkey -algorithm RSA -out "$cadir/ca.key"
+genpkey "$cadir/ca.key" -algorithm RSA
 openssl req -new -x509 -rand /dev/urandom -subj "/OU=$OU/CN=Fake Root CA" -key "$cadir/ca.key" -out ./ca.crt
 
 SERIAL=1
@@ -31,14 +36,14 @@ new() {
         printf "subjectAltName = %s\\n" "$3" >>"$cadir/new-ext.cnf"
     fi
     openssl x509 -req -in "$cadir/new.csr" -CA ./ca.crt -CAkey "$cadir/ca.key" \
-        -CAserial "$cadir/ca.srl" -CAcreateserial -extfile "$cadir/new-ext.cnf"
+        -CAserial "$cadir/ca.srl" -CAcreateserial -extfile "$cadir/new-ext.cnf" 2>&1
 }
 
-openssl genpkey -algorithm RSA -out ./dovecot.rsa.key
+genpkey ./dovecot.rsa.key -algorithm RSA
 new ./dovecot.rsa.key "localhost" "DNS:localhost,DNS:ip6-localhost,IP:127.0.0.1,IP:::1" >./dovecot.rsa.crt
 
-openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:P-256 -pkeyopt ec_param_enc:named_curve -out ./dovecot.ecdsa.key
+genpkey ./dovecot.ecdsa.key -algorithm EC -pkeyopt ec_paramgen_curve:P-256 -pkeyopt ec_param_enc:named_curve
 new ./dovecot.ecdsa.key "localhost" >./dovecot.ecdsa.crt
 
-openssl genpkey -algorithm RSA -out ./dovecot.rsa2.key
+genpkey ./dovecot.rsa2.key -algorithm RSA
 new ./dovecot.rsa2.key "imap.example.net" "DNS:imap.example.net,DNS:localhost" >./dovecot.rsa2.crt
-- 
cgit v1.2.3


From 58c2c80b585fe51dea56ca13776b51f44ad68463 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 24 Feb 2022 23:59:37 +0100
Subject: tests/certs/generate: Use custom openssl.cnf.

To avoid depending on the system default.
---
 Changelog               | 2 ++
 tests/certs/generate    | 3 +++
 tests/certs/openssl.cnf | 4 ++++
 3 files changed, 9 insertions(+)
 create mode 100644 tests/certs/openssl.cnf

diff --git a/Changelog b/Changelog
index 72f7331..1365749 100644
--- a/Changelog
+++ b/Changelog
@@ -37,6 +37,8 @@ interimap (0.5.7) upstream;
    instead use $(bindir) (expanded at compile time).
  - tests/certs/generate: redirect known error output to the standard
    output.
+ - tests/certs/generate: use custom openssl.cnf to avoid depending on
+   the system default.
 
  -- Guilhem Moulin <guilhem@fripost.org>  Thu, 24 Feb 2022 01:28:25 +0100
 
diff --git a/tests/certs/generate b/tests/certs/generate
index 36fce8b..8e9c451 100755
--- a/tests/certs/generate
+++ b/tests/certs/generate
@@ -8,6 +8,9 @@ BASEDIR="$(dirname -- "$0")"
 OU="InterIMAP test suite"
 cd "$BASEDIR"
 
+OPENSSL_CONF="./openssl.cnf"
+export OPENSSL_CONF
+
 cadir="$(mktemp --tmpdir --directory)"
 trap 'rm -rf -- "$cadir"' EXIT INT TERM
 genpkey() {
diff --git a/tests/certs/openssl.cnf b/tests/certs/openssl.cnf
new file mode 100644
index 0000000..b1af7b8
--- /dev/null
+++ b/tests/certs/openssl.cnf
@@ -0,0 +1,4 @@
+[ req ]
+distinguished_name = req_distinguished_name
+
+[ req_distinguished_name ]
-- 
cgit v1.2.3


From 0ed97cf6a2d7783b59ea9855a99e6a95816961ae Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 25 Feb 2022 00:23:32 +0100
Subject: tests/pullimap: Allow easy exclusion of --idle'ing tests.

---
 Changelog        |  1 +
 tests/pullimap/t | 42 ++++++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Changelog b/Changelog
index 1365749..10db1a0 100644
--- a/Changelog
+++ b/Changelog
@@ -39,6 +39,7 @@ interimap (0.5.7) upstream;
    output.
  - tests/certs/generate: use custom openssl.cnf to avoid depending on
    the system default.
+ - tests/pullimap: allow easy exclusion of --idle'ing tests.
 
  -- Guilhem Moulin <guilhem@fripost.org>  Thu, 24 Feb 2022 01:28:25 +0100
 
diff --git a/tests/pullimap/t b/tests/pullimap/t
index 7998cdc..58a19ca 100644
--- a/tests/pullimap/t
+++ b/tests/pullimap/t
@@ -111,29 +111,31 @@ doveadm -u "remote" search mailbox "$MAILBOX" unseen >"$TMPDIR/unseen"
 step_done
 
 
-step_start "--idle (${TIMEOUT}s)"
-
-pullimap --idle "remote" & PID=$!
-trap "ptree_abort $PID" EXIT INT TERM
-
-timer=$(( $(date +%s) + TIMEOUT ))
-while [ $(date +%s) -le $timer ]; do
-    n="$(shuf -n1 -i1-5)"
-    for (( i=0; i < n; i++)); do
-        sample_message | deliver -u "remote"  -- -m "$MAILBOX"
+if [ $TIMEOUT -gt 0 ]; then
+    step_start "--idle (${TIMEOUT}s)"
+
+    pullimap --idle "remote" & PID=$!
+    trap "ptree_abort $PID" EXIT INT TERM
+
+    timer=$(( $(date +%s) + TIMEOUT ))
+    while [ $(date +%s) -le $timer ]; do
+        n="$(shuf -n1 -i1-5)"
+        for (( i=0; i < n; i++)); do
+            sample_message | deliver -u "remote"  -- -m "$MAILBOX"
+        done
+
+        s=$(shuf -n1 -i1-1500)
+        [ $s -ge 1000 ] && s="$(printf "1.%03d" $((s-1000)))" || s="$(printf "0.%03d" $s)"
+        sleep "$s"
     done
 
-    s=$(shuf -n1 -i1-1500)
-    [ $s -ge 1000 ] && s="$(printf "1.%03d" $((s-1000)))" || s="$(printf "0.%03d" $s)"
-    sleep "$s"
-done
-
-sleep 5
-ptree_abort $PID
-trap - EXIT INT TERM
+    sleep 5
+    ptree_abort $PID
+    trap - EXIT INT TERM
 
-check
-step_done
+    check
+    step_done
+fi
 
 
 step_start "Purging"
-- 
cgit v1.2.3


From 6b0010d82fe47b5f1f27084732431fb5b4ca0697 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 25 Feb 2022 01:04:32 +0100
Subject: Update copyright years.

---
 README                    | 2 +-
 interimap                 | 2 +-
 lib/Net/IMAP/InterIMAP.pm | 2 +-
 pullimap                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index c241486..e2687c4 100644
--- a/README
+++ b/README
@@ -77,6 +77,6 @@ sockets (type=imaps or type=imap).
 
 ______________________________________________________________________________
 
-InterIMAP is Copyright© 2015-2020 Guilhem Moulin ⟨guilhem@fripost.org⟩, and
+InterIMAP is Copyright© 2015-2022 Guilhem Moulin ⟨guilhem@fripost.org⟩, and
 licensed for use under the GNU General Public License version 3 or later.  See
 ‘COPYING’ for specific terms and distribution information.
diff --git a/interimap b/interimap
index d4ff3fc..8b54013 100755
--- a/interimap
+++ b/interimap
@@ -2,7 +2,7 @@
 
 #----------------------------------------------------------------------
 # Fast bidirectional synchronization for QRESYNC-capable IMAP servers
-# Copyright © 2015-2020 Guilhem Moulin <guilhem@fripost.org>
+# Copyright © 2015-2022 Guilhem Moulin <guilhem@fripost.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index 56164cf..5d1748b 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------
 # A minimal IMAP4 client for QRESYNC-capable servers
-# Copyright © 2015-2020 Guilhem Moulin <guilhem@fripost.org>
+# Copyright © 2015-2022 Guilhem Moulin <guilhem@fripost.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/pullimap b/pullimap
index c225a2b..f00cee8 100755
--- a/pullimap
+++ b/pullimap
@@ -2,7 +2,7 @@
 
 #----------------------------------------------------------------------
 # Pull mails from an IMAP mailbox and deliver them to an SMTP session
-# Copyright © 2016-2020 Guilhem Moulin <guilhem@fripost.org>
+# Copyright © 2016-2022 Guilhem Moulin <guilhem@fripost.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-- 
cgit v1.2.3


From 2682356846666608c67709ae1e5f4d49c283d280 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 25 Feb 2022 23:01:25 +0100
Subject: wibble

---
 README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index e2687c4..85562d4 100644
--- a/README
+++ b/README
@@ -77,6 +77,6 @@ sockets (type=imaps or type=imap).
 
 ______________________________________________________________________________
 
-InterIMAP is Copyright© 2015-2022 Guilhem Moulin ⟨guilhem@fripost.org⟩, and
-licensed for use under the GNU General Public License version 3 or later.  See
-‘COPYING’ for specific terms and distribution information.
+InterIMAP is Copyright © 2015-2022 Guilhem Moulin ⟨guilhem@fripost.org⟩, and
+is licensed for use under the GNU General Public License version 3 or later.
+See ‘COPYING’ for specific terms and distribution information.
-- 
cgit v1.2.3


From 3ae6de89c5fc18b5b133f91ef0955c8eec8546f4 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sat, 26 Feb 2022 16:38:08 +0100
Subject: =?UTF-8?q?Mention=20that=20interimap=20=E2=89=A40.5.6=20did=20hon?=
 =?UTF-8?q?or=20umask=20for=20DB=20creation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The commit message for 2447861913835637bbf49d96728ce9ac6ab0ae22 was
misleading.  DB creation does obey umask settings as of perl 5.34.0-3,
libdbi-perl 1.643-3+b2, libdbd-sqlite3-perl 1.70-3+b1 and libsqlite3-0
3.37.2-2 from Debian Sid.  Prefixing `make installcheck-interimap` with
`umask 0077` makes the test suite pass for interimap 0.5.6-1.
---
 Changelog | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 10db1a0..97283a5 100644
--- a/Changelog
+++ b/Changelog
@@ -1,9 +1,11 @@
 interimap (0.5.7) upstream;
 
  * interimap: create database with mode 0600 (but don't change mode of
-   existing databases).  The file was previously created with mode 0644,
-   but its directory had restricted mode 0700.  pullimap, on the other
-   hand, already created state files with mode 0600.
+   existing databases).  The file was previously created with mode 0644
+   minus umask restrictions, which for permissive umask(2)s is too open.
+   That being said its parent directory is created with restricted mode
+   0700 so the impact is limited.  pullimap, on the other hand, already
+   used mode 0600 for state file creation.
  * Major Makefile refactoring: improve DESTDIR= handling, add new
    targets 'all-nodoc', 'install-nodoc', and 'installcheck'.  Also,
    rename 'test' target to 'check'.
-- 
cgit v1.2.3


From 0df603bfca85e859bdf21ffe1b32ce897caf8b7d Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 27 Feb 2022 16:20:43 +0100
Subject: Documentation: Replace `foo=~/bar` with `foo=$HOME/bar`.

POSIX doesn't mandate expansion of the former.
---
 doc/build.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/build.md b/doc/build.md
index 1936c13..b40760e 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -79,11 +79,11 @@ By default `` `make install` `` installs [`interimap`(1)] under
 can be used in order to perform the (un)installation as an unprivileged
 user.  For instance
 
-    $ install -m0700 -vd "${XDG_DATA_HOME:-~/.local/share}/interimap"
+    $ install -m0700 -vd ${XDG_DATA_HOME:-~/.local/share}/interimap
     $ make install-nodoc \
-		prefix=~/.local \
-		sitelib="${XDG_DATA_HOME:-~/.local/share}/interimap/lib" \
-		systemd_userunitdir="${XDG_DATA_HOME:-~/.local/share}/systemd/user"
+		prefix=$HOME/.local \
+		sitelib=${XDG_DATA_HOME:-~/.local/share}/interimap/lib \
+		systemd_userunitdir=${XDG_DATA_HOME:-~/.local/share}/systemd/user
 
 skips documentation and installs
 
-- 
cgit v1.2.3


From 8ad5e5a218253a76eabf36bfd83f9e1a2a708377 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 27 Feb 2022 16:24:31 +0100
Subject: Prepare new release v0.5.7.

---
 Changelog                 | 2 +-
 interimap                 | 4 ++--
 lib/Net/IMAP/InterIMAP.pm | 2 +-
 pullimap                  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index 97283a5..e7b9520 100644
--- a/Changelog
+++ b/Changelog
@@ -43,7 +43,7 @@ interimap (0.5.7) upstream;
    the system default.
  - tests/pullimap: allow easy exclusion of --idle'ing tests.
 
- -- Guilhem Moulin <guilhem@fripost.org>  Thu, 24 Feb 2022 01:28:25 +0100
+ -- Guilhem Moulin <guilhem@fripost.org>  Sun, 27 Feb 2022 16:24:31 +0100
 
 interimap (0.5.6) upstream;
 
diff --git a/interimap b/interimap
index 8b54013..ac9550f 100755
--- a/interimap
+++ b/interimap
@@ -22,7 +22,7 @@ use v5.14.2;
 use strict;
 use warnings;
 
-our $VERSION = '0.5.6';
+our $VERSION = '0.5.7';
 my $NAME = 'interimap';
 my $DATABASE_VERSION = 1;
 use Getopt::Long qw/:config posix_default no_ignore_case gnu_compat
@@ -33,7 +33,7 @@ use Fcntl qw/O_WRONLY O_CREAT O_EXCL F_GETFD F_SETFD FD_CLOEXEC/;
 use List::Util 'first';
 
 use lib "./lib";
-use Net::IMAP::InterIMAP 0.5.6 qw/xdg_basedir read_config compact_set/;
+use Net::IMAP::InterIMAP 0.5.7 qw/xdg_basedir read_config compact_set/;
 
 # Clean up PATH
 $ENV{PATH} = join ':', qw{/usr/bin /bin};
diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index 5d1748b..55a18a0 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #----------------------------------------------------------------------
 
-package Net::IMAP::InterIMAP v0.5.6;
+package Net::IMAP::InterIMAP v0.5.7;
 use v5.20.0;
 use warnings;
 use strict;
diff --git a/pullimap b/pullimap
index f00cee8..8be78da 100755
--- a/pullimap
+++ b/pullimap
@@ -22,7 +22,7 @@ use v5.20.2;
 use strict;
 use warnings;
 
-our $VERSION = '0.5.6';
+our $VERSION = '0.5.7';
 my $NAME = 'pullimap';
 
 use Errno 'EINTR';
@@ -32,7 +32,7 @@ use List::Util 'first';
 use Socket qw/PF_INET PF_INET6 SOCK_STREAM IPPROTO_TCP/;
 
 use lib "./lib";
-use Net::IMAP::InterIMAP 0.5.6 qw/xdg_basedir read_config compact_set/;
+use Net::IMAP::InterIMAP 0.5.7 qw/xdg_basedir read_config compact_set/;
 
 # Clean up PATH
 $ENV{PATH} = join ':', qw{/usr/bin /bin};
-- 
cgit v1.2.3