Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 May 2019 01:47:53 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503026 - in head/mail/nullmailer: . files
Message-ID:  <201905300147.x4U1lrdm097652@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Thu May 30 01:47:53 2019
New Revision: 503026
URL: https://svnweb.freebsd.org/changeset/ports/503026

Log:
  mail/nullmailer: Fix send fail on GnuTLS
  
  PR:		237613
  Submitted by:	David Hauweele <david@hauweele.net>

Added:
  head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc   (contents, props changed)
  head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc   (contents, props changed)
Modified:
  head/mail/nullmailer/Makefile   (contents, props changed)

Modified: head/mail/nullmailer/Makefile
==============================================================================
--- head/mail/nullmailer/Makefile	Thu May 30 01:40:57 2019	(r503025)
+++ head/mail/nullmailer/Makefile	Thu May 30 01:47:53 2019	(r503026)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nullmailer
 PORTVERSION=	1.13
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/nullmailer/ \

Added: head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc	Thu May 30 01:47:53 2019	(r503026)
@@ -0,0 +1,14 @@
+--- lib/fdbuf/tlsibuf.cc.orig
++++ lib/fdbuf/tlsibuf.cc
+@@ -27,5 +27,10 @@
+ 
+ ssize_t tlsibuf::_read(char* buf, ssize_t len)
+ {
+-  return gnutls_record_recv(session, buf, len);
++  ssize_t rc;
++  do
++  {
++    rc = gnutls_record_recv(session, buf, len);
++  } while (rc == GNUTLS_E_AGAIN || rc == GNUTLS_E_INTERRUPTED);
++  return rc;
+ }

Added: head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc	Thu May 30 01:47:53 2019	(r503026)
@@ -0,0 +1,14 @@
+--- lib/fdbuf/tlsobuf.cc.orig
++++ lib/fdbuf/tlsobuf.cc
+@@ -27,5 +27,10 @@
+ 
+ ssize_t tlsobuf::_write(const char* buf, ssize_t len)
+ {
+-  return gnutls_record_send(session, buf, len);
++  ssize_t rc;
++  do
++  {
++    rc = gnutls_record_send(session, buf, len);
++  } while(rc == GNUTLS_E_AGAIN || rc == GNUTLS_E_INTERRUPTED);
++  return rc;
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905300147.x4U1lrdm097652>