Index: head/mail/nullmailer/Makefile =================================================================== --- head/mail/nullmailer/Makefile (revision 503025) +++ head/mail/nullmailer/Makefile (revision 503026) @@ -1,58 +1,58 @@ # Created by: clive # $FreeBSD$ PORTNAME= nullmailer PORTVERSION= 1.13 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ http://untroubled.org/nullmailer/archive/ MAINTAINER= ports@FreeBSD.org COMMENT= MTA for hosts which relay to a fixed set of smart relays LICENSE= GPLv2 LOCALSTATEDIR= /var/spool .if defined(MAINTAINER_MODE) UID_FILES+= ../../UIDs GID_FILES+= ../../GIDs .endif USERS= nullmail GROUPS= nullmail NULLMAIL_UID= 522 NULLMAIL_GID= 522 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--localstatedir=${LOCALSTATEDIR} USE_CXXSTD= gnu++98 USE_SUBMAKE= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES+= pkg-install pkg-deinstall pkg-message PLIST_SUB+= LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS} SUB_LIST+= LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS} OPTIONS_DEFINE= GNUTLS .include .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:security/gnutls CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lgnutls CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--enable-tls .else CONFIGURE_ARGS+=--disable-tls .endif post-install: ${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${STAGEDIR}${ETCDIR} ${ECHO} 'hostname' > ${STAGEDIR}${ETCDIR}/me.sample .include Index: head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc =================================================================== --- head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc (nonexistent) +++ head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc (revision 503026) @@ -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; + } Property changes on: head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc =================================================================== --- head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc (nonexistent) +++ head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc (revision 503026) @@ -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; + } Property changes on: head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property