summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2019-07-19 15:13:30 +0000
committerhauke <hauke@pkgsrc.org>2019-07-19 15:13:30 +0000
commitffbda535d2a6dd425a9ce92b06685608828fccba (patch)
tree6c96da67270ed5491c5c38c4f45e9e432483b3b9 /mail
parentdd8e5310daac7c0d922febb0f0e8cc3543c05b43 (diff)
downloadpkgsrc-ffbda535d2a6dd425a9ce92b06685608828fccba.tar.gz
Silence Error: file_ostream.net_set_tcp_nodelay(, TRUE) failed
Patch from upstream -head via FreeBSD <https://svnweb.freebsd.org/ports/head/mail/dovecot/files/patch-src_lib_ostream-file.c?view=markup&pathrev=506487> <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239172>
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot2/Makefile4
-rw-r--r--mail/dovecot2/distinfo3
-rw-r--r--mail/dovecot2/patches/patch-src_lib_ostream-file.c18
3 files changed, 23 insertions, 2 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 0e6129faf30..0155a73858e 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.98 2019/07/03 06:09:22 triaxx Exp $
+# $NetBSD: Makefile,v 1.99 2019/07/19 15:13:30 hauke Exp $
.include "../../mail/dovecot2/Makefile.common"
+PKGREVISION= 1
+
RCD_SCRIPTS= dovecot
SMF_NAME= dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 8b2deee6a2c..09d168313d4 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2019/07/18 13:38:18 taca Exp $
+$NetBSD: distinfo,v 1.95 2019/07/19 15:13:30 hauke Exp $
SHA1 (dovecot-2.3.7.tar.gz) = d45241cc649e30053720626cc422a6212a6d02d4
RMD160 (dovecot-2.3.7.tar.gz) = d7774bf57fa57fc10d662a2e04be4ee432bf822f
@@ -11,4 +11,5 @@ SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
SHA1 (patch-src_imap_imap-client.h) = 1a2bf95ab6af57d88862a1512624bf263f4c2ce7
SHA1 (patch-src_lib-ldap_ldap-private.h) = 2d5ce32330ad4164cc75f8d209ba499d37ed01fc
SHA1 (patch-src_lib_connection.h) = c147511f4ff50e4b5a048c3a363f0af90ee4c6ad
+SHA1 (patch-src_lib_ostream-file.c) = 7c444f9be16b6f7f6588d1c3d2024b45c1e697d4
SHA1 (patch-src_old-stats_mail-stats.h) = 0d40c618445c089af2646a6864c3e909812282af
diff --git a/mail/dovecot2/patches/patch-src_lib_ostream-file.c b/mail/dovecot2/patches/patch-src_lib_ostream-file.c
new file mode 100644
index 00000000000..05d9b032b16
--- /dev/null
+++ b/mail/dovecot2/patches/patch-src_lib_ostream-file.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_ostream-file.c,v 1.1 2019/07/19 15:13:30 hauke Exp $
+
+Silence Error: file_ostream.net_set_tcp_nodelay(, TRUE) failed
+
+Patch from upstream -head via FreeBSD
+<https://svnweb.freebsd.org/ports/head/mail/dovecot/files/patch-src_lib_ostream-file.c?view=markup&pathrev=506487>
+
+--- src/lib/ostream-file.c.orig 2019-07-12 10:46:25.000000000 +0000
++++ src/lib/ostream-file.c
+@@ -334,7 +334,7 @@ static void o_stream_tcp_flush_via_nodel
+ {
+ if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) {
+ if (errno != ENOTSUP && errno != ENOTSOCK &&
+- errno != ENOPROTOOPT) {
++ errno != ENOPROTOOPT && errno != EINVAL) {
+ i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m",
+ o_stream_get_name(&fstream->ostream.ostream));
+ }