diff options
| author | brd <brd@FreeBSD.org> | 2015-05-28 23:44:02 +0800 |
|---|---|---|
| committer | brd <brd@FreeBSD.org> | 2015-05-28 23:44:02 +0800 |
| commit | 76e39a8a7f21d526ac3c4f2c2fa874c8c4eec85e (patch) | |
| tree | 09e3b4043c61283f678f2924f2998a8351a1e00a | |
| parent | c1b2cd1b09e0b5024af4fcead832aabeac43c4fc (diff) | |
| download | freebsd-ports-gnome-76e39a8a7f21d526ac3c4f2c2fa874c8c4eec85e.tar.gz freebsd-ports-gnome-76e39a8a7f21d526ac3c4f2c2fa874c8c4eec85e.tar.zst freebsd-ports-gnome-76e39a8a7f21d526ac3c4f2c2fa874c8c4eec85e.zip | |
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 <fbsd.bugzilla@fenyo.net> [1 and 2]
Approved by: bdrewery (mentor)
| -rw-r--r-- | sysutils/rsyslog8/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/rsyslog8/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c | 17 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_stream.c | 42 |
4 files changed, 62 insertions, 3 deletions
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 621964384a40..f1af349fd7ab 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -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/ diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo index 883b0223a75f..2d21ce5d7b8c 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -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 diff --git a/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c b/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c new file mode 100644 index 000000000000..00291058acbd --- /dev/null +++ b/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c @@ -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 + + diff --git a/sysutils/rsyslog8/files/patch-runtime_stream.c b/sysutils/rsyslog8/files/patch-runtime_stream.c new file mode 100644 index 000000000000..852f0adcface --- /dev/null +++ b/sysutils/rsyslog8/files/patch-runtime_stream.c @@ -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; |