From owner-svn-ports-head@FreeBSD.ORG Thu May 28 15:44:04 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 17411726; Thu, 28 May 2015 15:44:04 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 04C99A47; Thu, 28 May 2015 15:44:04 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4SFi3oG094435; Thu, 28 May 2015 15:44:03 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4SFi29I094431; Thu, 28 May 2015 15:44:02 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201505281544.t4SFi29I094431@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Thu, 28 May 2015 15:44:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387739 - in 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2015 15:44:04 -0000 Author: brd Date: Thu May 28 15:44:02 2015 New Revision: 387739 URL: https://svnweb.freebsd.org/changeset/ports/387739 Log: Update sysutils/rsyslog8 to 8.10.0 Include a few bug fixes: 1) Endless loop at boot time 2) Console output starting on the previous line PR: 200429 [1] PR: 200270 [2] Submitted by: Alexandre Fenyo [1 and 2] Approved by: bdrewery (mentor) Added: head/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c (contents, props changed) head/sysutils/rsyslog8/files/patch-runtime_stream.c (contents, props changed) Modified: head/sysutils/rsyslog8/Makefile head/sysutils/rsyslog8/distinfo Modified: head/sysutils/rsyslog8/Makefile ============================================================================== --- head/sysutils/rsyslog8/Makefile Thu May 28 15:17:11 2015 (r387738) +++ head/sysutils/rsyslog8/Makefile Thu May 28 15:44:02 2015 (r387739) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.9.0 +PORTVERSION= 8.10.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ Modified: head/sysutils/rsyslog8/distinfo ============================================================================== --- head/sysutils/rsyslog8/distinfo Thu May 28 15:17:11 2015 (r387738) +++ head/sysutils/rsyslog8/distinfo Thu May 28 15:44:02 2015 (r387739) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.9.0.tar.gz) = eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc -SIZE (rsyslog-8.9.0.tar.gz) = 2022294 +SHA256 (rsyslog-8.10.0.tar.gz) = b92df3f367108219e2fffccd463bf49d75cb8ab3ceaa52e9789f85eace066912 +SIZE (rsyslog-8.10.0.tar.gz) = 2013205 Added: head/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c Thu May 28 15:44:02 2015 (r387739) @@ -0,0 +1,17 @@ +--- plugins/imfile/imfile.c.orig 2015-05-19 08:53:40 UTC ++++ plugins/imfile/imfile.c +@@ -1869,12 +1869,14 @@ CODESTARTmodExit + objRelease(errmsg, CORE_COMPONENT); + objRelease(prop, CORE_COMPONENT); + objRelease(ruleset, CORE_COMPONENT); ++#ifdef HAVE_SYS_INOTIFY_H + if(dirs != NULL) { + free(dirs->active.listeners); + free(dirs->configured.listeners); + free(dirs); + } + free(wdmap); ++#endif + ENDmodExit + + 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 Thu May 28 15:44:02 2015 (r387739) @@ -0,0 +1,42 @@ +--- runtime/stream.c.orig 2015-05-19 08:53:40 UTC ++++ runtime/stream.c +@@ -1063,7 +1063,7 @@ tryTTYRecover(strm_t *pThis, int err) + { + DEFiRet; + ISOBJ_TYPE_assert(pThis, strm); +- if(err == ERR_TTYHUP) { ++ if(err == ERR_TTYHUP || err == ENXIO) { + close(pThis->fd); + CHKiRet(doPhysOpen(pThis)); + } +@@ -1089,12 +1089,30 @@ doWriteCall(strm_t *pThis, uchar *pBuf, + char *pWriteBuf; + DEFiRet; + ISOBJ_TYPE_assert(pThis, strm); ++#ifdef __FreeBSD__ ++ sbool crnlNow = 0; ++#endif /* __FreeBSD__ */ + + lenBuf = *pLenBuf; + pWriteBuf = (char*) pBuf; + iTotalWritten = 0; + do { ++#ifdef __FreeBSD__ ++ if (pThis->bIsTTY && !pThis->iZipLevel && !pThis->cryprov) { ++ char *pNl = NULL; ++ if (crnlNow == 0) pNl = strchr(pWriteBuf, '\n'); ++ else crnlNow = 0; ++ if (pNl == pWriteBuf) { ++ iWritten = write(pThis->fd, "\r", 1); ++ if (iWritten > 0) { ++ crnlNow = 1; ++ iWritten = 0; ++ } ++ } else iWritten = write(pThis->fd, pWriteBuf, pNl ? pNl - pWriteBuf : lenBuf); ++ } else ++#endif /* __FreeBSD__ */ + iWritten = write(pThis->fd, pWriteBuf, lenBuf); ++ + if(iWritten < 0) { + char errStr[1024]; + int err = errno;