kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update sysutils/rsyslog8 to 8.10.0

Browse source 
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)
This commit is contained in:
Brad Davis 2015-05-28 15:44:02 +00:00
parent 5464ce7e9a
commit 21b8eb2fb0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=387739
4 changed files with 62 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/rsyslog8/Makefile
View file

@ -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/

4
sysutils/rsyslog8/distinfo
View file

@ -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

17
sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c Normal file
View file

@ -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

42
sysutils/rsyslog8/files/patch-runtime_stream.c Normal file
View file

@ -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;