From owner-svn-ports-all@freebsd.org Mon Jan 2 18:05:07 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C65CC9CBBE; Mon, 2 Jan 2017 18:05:07 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D22B1BD7; Mon, 2 Jan 2017 18:05:06 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v02I56bk019879; Mon, 2 Jan 2017 18:05:06 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v02I55AY019875; Mon, 2 Jan 2017 18:05:05 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201701021805.v02I55AY019875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Mon, 2 Jan 2017 18:05:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430388 - head/sysutils/rsyslog8/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2017 18:05:07 -0000 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@my.gd Reported by: xavi.garcia@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 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 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));