svn commit: r430388 - head/sysutils/rsyslog8/files

[Matthew Seaman]

Author: matthew
Date: Mon Jan  2 18:05:05 2017
New Revision: 430388
URL: https://svnweb.freebsd.org/changeset/ports/430388

Log:
  Handle errno==5 (EIO) as the result of trying to write(2) to the console.
  
  Submittet upstream by Damien Fleurot:
  https://github.com/rsyslog/rsyslog/issues/1351
  
  PR:		211033
  Submitted by:	dam at my.gd
  Reported by:	xavi.garcia at gmail.com

Added:
  head/sysutils/rsyslog8/files/patch-runtime_stream.c   (contents, props changed)
Modified:
  head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
  head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
  head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c

Modified: head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c	Mon Jan  2 18:00:15 2017	(r430387)
+++ head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c	Mon Jan  2 18:05:05 2017	(r430388)
@@ -1,4 +1,4 @@
---- 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>

Modified: head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c	Mon Jan  2 18:00:15 2017	(r430387)
+++ head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c	Mon Jan  2 18:05:05 2017	(r430388)
@@ -1,4 +1,4 @@
---- 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>

Modified: head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
==============================================================================
--- head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c	Mon Jan  2 18:00:15 2017	(r430387)
+++ head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c	Mon Jan  2 18:05:05 2017	(r430388)
@@ -1,4 +1,4 @@
---- 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) {

Added: head/sysutils/rsyslog8/files/patch-runtime_stream.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/rsyslog8/files/patch-runtime_stream.c	Mon Jan  2 18:05:05 2017	(r430388)
@@ -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));