From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 25 Jun 2018 00:34:52 +0200
Subject: dovecot-trees: Fix build with dovecot 2.3.

The following patch was taken verbatim from the upstream repository[0]
and will be included in the next release.

[0]: https://0xacab.org/riseuplabs/trees/commit/e136c32a044701d68b0235b8405357c5fca62a11
---
From e136c32a044701d68b0235b8405357c5fca62a11 Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@ev0ke.net>
Date: Tue, 10 Apr 2018 13:48:01 -0400
Subject: [PATCH] Support dovecot 2.3

Untested but it builds now properly. Thanks to "smorks" for the report!

Fixes #16

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
---
 src/trees-istream.c | 4 ++++
 src/trees-ostream.c | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/src/trees-istream.c b/src/trees-istream.c
index b08ff16..e94be7d 100644
--- a/src/trees-istream.c
+++ b/src/trees-istream.c
@@ -431,5 +431,9 @@ trees_istream_create(struct istream *input,
   sstream->out_byte_count = 0;
 #endif
 
+#if DOVECOT_PREREQ(2, 3)
+	return i_stream_create(&sstream->istream, input, i_stream_get_fd(input), 0);
+#else
   return i_stream_create(&sstream->istream, input, i_stream_get_fd(input));
+#endif /* DOVECOT_PREREQ */
 }
diff --git a/src/trees-ostream.c b/src/trees-ostream.c
index 1b25a91..0cb7867 100644
--- a/src/trees-ostream.c
+++ b/src/trees-ostream.c
@@ -174,7 +174,14 @@ trees_ostream_sendv(struct ostream_private *stream,
 static int
 trees_ostream_flush(struct ostream_private *stream)
 {
+  /* This is pretty ugly but unfortunately between 2.2 and 2.3, Dovecot changed
+   * the expected value to be non zero in 2.3+ . */
+#if DOVECOT_PREREQ(2, 3)
+  ssize_t result = 1;
+#else
   ssize_t result = 0;
+#endif /* DOVECOT_PREREQ */
+
   struct trees_ostream *sstream = (struct trees_ostream *) stream;
 
   if (sstream->flushed) {
-- 
2.17.1


</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d9bb9f539093938c8b0ac9c204db990d5179e1d2'>root</a>/<a href='/guix/log/tests?id=d9bb9f539093938c8b0ac9c204db990d5179e1d2'>tests</a>/<a href='/guix/log/tests/import-github.scm?id=d9bb9f539093938c8b0ac9c204db990d5179e1d2'>import-github.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/import-github.scm?id=d9bb9f539093938c8b0ac9c204db990d5179e1d2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-26 17:15:06 +0100'>2022-12-26</span></td><td><a href='/guix/commit/tests/import-github.scm?id=a274a6a1acb99738f02de7b226e6a0d3883ec353'>upstream-updater: Rename record field.</a><span class='msg-avail'>...<span class='msg-tooltip'>The next commits will make the functions, which are currently importing the
latest version of a package, change into importing the latest or a given
version of the package (for those updaters supporting specifying a version).
Thus the name ‘latest‘ is no longer appropriate.

* guix/upstream.scm (upstream-updater) Rename field [latest] to
  [import]. (lookup-updater, package-latest-release) Adjust fieldname
  accordingly.
* guix/gnu-maintenance.scm (%gnu-updater, %gnu-ftp-updater,
  %savannah-updater, %sourceforge-updater, %xorg-updater,
  %kernel.org-updater, %generic-html-updater),
  guix/import/cpan.scm (%cpan-updater),
  guix/import/cran.scm (%cran-updater, %bioconductor-updater),
  guix/import/crate.scm (%crate-updater),
  guix/import/egg.scm (%egg-updater),
  guix/import/elpa.scm (%elpa-updater),
  guix/import/gem.scm (%gem-updater),
  guix/import/git.scm (%generic-git-updater),
  guix/import/github.scm (%github-updater),
  guix/import/gnome.scm (%gnome-updater),
  guix/import/hackage.scm (%hackage-updater),
  guix/import/hexpm.scm (%hexpm-updater),
  guix/import/kde.scm (%kde-updater),
  guix/import/launchpad.scm (%launchpad-updater),
  guix/import/minetest.scm (%minetest-updater),
  guix/import/opam.scm (%opam-updater),
  guix/import/pypi.scm (%pypi-updater),
  guix/import/stackage.scm (%stackage-updater),
  tests/import-github.scm (found-sexp)
  tests/transformations.scm ("options-&gt;transformation, with-latest"):
  Adjust fieldname accordingly.
</span></span></td><td>Hartmut Goebel</td></tr>
<tr><td><span title='2022-03-07 22:49:27 +0100'>2022-03-07</span></td><td><a href='/guix/commit/tests/import-github.scm?id=667f21aea000b988f2587f9039be25e61a2cbb08'>tests: Adjust to (guix import github) changes.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to a8d3033da61958c53c44dd5db90672bfc4533ef9.

* tests/import-github.scm (call-with-releases): Mock
'open-connection-for-uri'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-16 23:56:56 +0100'>2022-01-16</span></td><td><a href='/guix/commit/tests/import-github.scm?id=81f036bfd23fb6e0f381ced2de27762fa9d1bb65'>import/github: Test it.</a><span class='msg-avail'>...<span class='msg-tooltip'>* Makefile.am (SCM_TESTS): Register new tests.
* guix/import/github.scm
  (%github-api): New variable.
  (fetch-releases-or-tags): Use the new variable.
* tests/import-github.scm: New file with tests.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxime Devos</td></tr>