From: Tobias Geerinckx-Rice 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 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 --- 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 value='range'>range
path: root/gnu/services/networking.scm
AgeCommit message (Expand)Author
2018-03-05services: Add openntpd service....* gnu/packages/ntp.scm (openntpd)[arguments]: Add 'configure-flags to set openntpd daemon's user and localstatedir. Add a custom phase to not try to create said directory at install time. * gnu/services/networking.scm (<openntpd-configuration>): New record type. (openntpd-shepherd-service, openntpd-service-activation): New procedures. (openntpd-service-type): New variable. * doc/guix.texi (Networking Services): Add openntpd documentation. Efraim Flashner
2018-01-15services: bitlbee: Move to (gnu services messaging)....* gnu/services/networking.scm (<bitlbee-configuration>) (bitlbee-shepherd-service, %bitlbee-accounts, %bitlbee-activation) (bitlbee-service-type, bitlbee-service): Move to... * gnu/services/messaging.scm: ... here. * doc/guix.texi (Networking Services): Move 'bitlbee-service' doc to... (Messaging Services): ... here. Ludovic Courtès
2017-12-29services: networking: Add a dependency override mechanism to <static-networki......* gnu/services/networking.scm (<static-networking>)[requirement]: New field. (static-networking-shepherd-service): Don't override requirement for loopback. (static-networking-service): Expose 'requirement' parameter. Default to UDEV. * gnu/services/base.scm (%base-services): Add (requirement '()) for loopback service. * doc/guix.texi (Networking Services): Document it. Marius Bakke
2017-10-08services: Remove unneeded imported....This caused a circular dependency. Reported by Oleg Pykhalov <go.wigust@gmail.com> at <https://lists.gnu.org/archive/html/help-guix/2017-10/msg00021.html>. * gnu/services/networking.scm: Remove unneeded import of (gnu system base). Ludovic Courtès
2017-09-22services: network-manager: Add support for VPN plug-ins....* gnu/services.scm (directory-union): Export. * gnu/services/networking.scm (<network-manager-configuration>)[vpn-plugins]: New field. (vpn-plugin-directory, network-manager-environment): New procedure. (network-manager-shepherd-service): Pass #:environment-variables to 'make-forkexec-constructor'. (network-manager-service-type): Add SESSION-ENVIRONMENT-SERVICE-TYPE extension. * doc/guix.texi (Networking Services): Document it. Ludovic Courtès
2017-09-16services: networking: Add descriptions....* gnu/services/networking.scm (static-networking-service-type) (ntp-service-type, inetd-service-type, tor-service-type) (tor-hidden-service-type, bitlbee-service-type) (wicd-service-type, network-manager-service-type) (connman-service-type, openvswitch-service-type): Add 'description' field. * po/packages/POTFILES.in: Add gnu/services/networking.scm. Ludovic Courtès
2017-07-30services: ntp: Use the NTP pool via the 'guix' zone....* gnu/services/networking.scm (%ntp-servers): Use *.guix.pool.ntp.org. Leo Famulari
2017-06-21services: network-manager: Specify a default value....* gnu/services/networking.scm (network-manager-service-type)[default-value]: New field. Ludovic Courtès