Index: head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
===================================================================
--- head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c	(revision 430387)
+++ head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c	(revision 430388)
@@ -1,10 +1,10 @@
---- grammar/rainerscript.c.orig	2016-05-30 10:40:35 UTC
+--- grammar/rainerscript.c.orig	2016-11-13 15:46:26 UTC
 +++ grammar/rainerscript.c
 @@ -35,6 +35,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <libestr.h>
 +#include <unistd.h>
  #include "rsyslog.h"
  #include "rainerscript.h"
  #include "conf.h"
Index: head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
===================================================================
--- head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c	(revision 430387)
+++ head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c	(revision 430388)
@@ -1,10 +1,10 @@
---- plugins/impstats/impstats.c.orig	2016-05-30 10:40:35 UTC
+--- plugins/impstats/impstats.c.orig	2016-11-13 15:46:26 UTC
 +++ plugins/impstats/impstats.c
 @@ -36,6 +36,7 @@
  #include <errno.h>
  #include <sys/time.h>
  #include <sys/resource.h>
 +#include <unistd.h>
  
  #include "dirty.h"
  #include "cfsysline.h"
Index: head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
===================================================================
--- head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c	(revision 430387)
+++ head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c	(revision 430388)
@@ -1,38 +1,38 @@
---- runtime/nsd_ptcp.c.orig	2016-05-02 13:37:05 UTC
+--- runtime/nsd_ptcp.c.orig	2016-11-06 16:32:01 UTC
 +++ runtime/nsd_ptcp.c
 @@ -656,7 +656,11 @@ EnableKeepAlive(nsd_t *pNsd)
  	if(pThis->iKeepAliveProbes > 0) {
  		optval = pThis->iKeepAliveProbes;
  		optlen = sizeof(optval);
 +#if defined(SOL_TCP)
  		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
 +#else
 +		ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPCNT, &optval, optlen);
 +#endif
  	} else {
  		ret = 0;
  	}
 @@ -671,7 +675,11 @@ EnableKeepAlive(nsd_t *pNsd)
  	if(pThis->iKeepAliveTime > 0) {
  		optval = pThis->iKeepAliveTime;
  		optlen = sizeof(optval);
 +#if defined(SOL_TCP)
  		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
 +#else
 +		ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPIDLE, &optval, optlen);
 +#endif
  	} else {
  		ret = 0;
  	}
 @@ -686,7 +694,11 @@ EnableKeepAlive(nsd_t *pNsd)
  	if(pThis->iKeepAliveIntvl > 0) {
  		optval = pThis->iKeepAliveIntvl;
  		optlen = sizeof(optval);
 +#if defined(SOL_TCP)
  		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
 +#else
 +		ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPINTVL, &optval, optlen);
 +#endif
  	} else {
  		ret = 0;
  	}
Index: head/sysutils/rsyslog8/files/patch-runtime_stream.c
===================================================================
--- head/sysutils/rsyslog8/files/patch-runtime_stream.c	(nonexistent)
+++ head/sysutils/rsyslog8/files/patch-runtime_stream.c	(revision 430388)
@@ -0,0 +1,14 @@
+--- runtime/stream.c.orig	2016-11-13 15:46:26 UTC
++++ runtime/stream.c
+@@ -1153,7 +1153,10 @@ tryTTYRecover(strm_t *pThis, int err)
+ #ifndef __FreeBSD__
+ 	if(err == ERR_TTYHUP) {
+ #else
+-	if(err == ERR_TTYHUP || err == ENXIO) {
++	/* Try to reopen our file descriptor even on errno 6, FreeBSD bug 200429
++	 * Also try on errno 5, FreeBSD bug 211033
++	 */
++	if(err == ERR_TTYHUP || err == ENXIO || err == EIO) {
+ #endif /* __FreeBSD__ */
+ 		close(pThis->fd);
+ 		CHKiRet(doPhysOpen(pThis));

Property changes on: head/sysutils/rsyslog8/files/patch-runtime_stream.c
___________________________________________________________________
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