Attachment #161830 for bug #203131

Lines 1-7 Link Here

(-)Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= rsyslog	3	PORTNAME= rsyslog
4	PORTVERSION= 8.11.0	4	PORTVERSION= 8.13.0
5	CATEGORIES= sysutils	5	CATEGORIES= sysutils
6	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/	6	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
7		7
Lines 104-110 Link Here
104	USE_RC_SUBR= ${PORTNAME}d	104	USE_RC_SUBR= ${PORTNAME}d
105	SUB_FILES= pkg-message	105	SUB_FILES= pkg-message
106		106
107	CONFIGURE_ARGS+= --enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench	107	CONFIGURE_ARGS+= --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench
108		108
109	post-patch:	109	post-patch:
110	@${REINPLACE_CMD} -e 's\|/lib/rsyslog/\|${PREFIX}/lib/rsyslog/\|'\	110	@${REINPLACE_CMD} -e 's\|/lib/rsyslog/\|${PREFIX}/lib/rsyslog/\|'\

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (rsyslog-8.11.0.tar.gz) = bc64d8ba1e3fb8cfe21eadd5fb0938381bb37ed72cef9d6f14d376d2bac9bf78	1	SHA256 (rsyslog-8.13.0.tar.gz) = b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33
2	SIZE (rsyslog-8.11.0.tar.gz) = 2060890	2	SIZE (rsyslog-8.13.0.tar.gz) = 2077267




--- configure.ac.orig	2015-08-10 10:25:41 UTC
+++ configure.ac
@@ -303,6 +303,14 @@ AC_CHECK_FUNCS(
       rsyslog_have_pthread_setschedparam=no
     ]
 )
+AC_SEARCH_LIBS([pthread_setschedparam],
+	[pthread],
+	[
+		rsyslog_have_pthread_setschedparam=yes
+		AC_DEFINE(HAVE_PTHREAD_SETSCHEDPARAM, [1], [set define])
+	]
+	)
+
 AC_CHECK_HEADERS(
     [sched.h],
     [

Lines 1-10 Link Here

(-)files/patch-grammar_rainerscript.c (-10 lines)
1	--- grammar/rainerscript.c.orig 2015-06-30 12:26:24 UTC
2	+++ grammar/rainerscript.c
3	@@ -35,6 +35,7 @@
4	#include <sys/stat.h>
5	#include <sys/types.h>
6	#include <libestr.h>
7	+#include <unistd.h>
8	#include "rsyslog.h"
9	#include "rainerscript.h"
10	#include "conf.h"

Lines 1-11 Link Here

(-)files/patch-plugins__mmexternal__mmexternal.c (-11 lines)
1	--- plugins/mmexternal/mmexternal.c.orig 2015-04-30 08:50:16 UTC
2	+++ plugins/mmexternal/mmexternal.c
3	@@ -31,7 +31,7 @@
4	#include <errno.h>
5	#include <unistd.h>
6	#include <fcntl.h>
7	-#include <wait.h>
8	+#include <sys/wait.h>
9	#include <sys/uio.h>
10	#include "conf.h"
11	#include "syslogd-types.h"

Lines 1-11 Link Here

(-)files/patch-plugins__omprog__omprog.c (-11 lines)
1	--- plugins/omprog/omprog.c.orig 2015-04-30 08:50:16 UTC
2	+++ plugins/omprog/omprog.c
3	@@ -36,7 +36,7 @@
4	#include <errno.h>
5	#include <unistd.h>
6	#include <fcntl.h>
7	-#include <wait.h>
8	+#include <sys/wait.h>
9	#include <pthread.h>
10	#include "conf.h"
11	#include "syslogd-types.h"




--- plugins/imfile/imfile.c.orig	2015-06-30 12:26:24 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
 
 

Lines 1-10 Link Here

(-)files/patch-plugins_impstats_impstats.c (-10 lines)
1	--- plugins/impstats/impstats.c.orig 2015-04-30 08:50:15 UTC
2	+++ plugins/impstats/impstats.c
3	@@ -36,6 +36,7 @@
4	#include <errno.h>
5	#include <sys/time.h>
6	#include <sys/resource.h>
7	+#include <unistd.h>
8
9	#include "dirty.h"
10	#include "cfsysline.h"

Lines 1-4 Link Here

(-)files/patch-runtime_nsd__ptcp.c (-1 / +1 lines)
1	--- runtime/nsd_ptcp.c.orig 2015-04-30 08:50:16 UTC	1	--- runtime/nsd_ptcp.c.orig 2015-07-08 14:31:07 UTC
2	+++ runtime/nsd_ptcp.c	2	+++ runtime/nsd_ptcp.c
3	@@ -656,7 +656,11 @@ EnableKeepAlive(nsd_t *pNsd)	3	@@ -656,7 +656,11 @@ EnableKeepAlive(nsd_t *pNsd)
4	if(pThis->iKeepAliveProbes > 0) {	4	if(pThis->iKeepAliveProbes > 0) {




--- runtime/stream.c.orig	2015-06-30 12:26:24 UTC
+++ runtime/stream.c
@@ -1097,12 +1097,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;

Return to bug 203131

Line 0 Link Here

(-)files/patch-configure.ac (+17 lines)
	1	--- configure.ac.orig 2015-08-10 10:25:41 UTC
	2	+++ configure.ac
	3	@@ -303,6 +303,14 @@ AC_CHECK_FUNCS(
	4	rsyslog_have_pthread_setschedparam=no
	5	]
	6	)
	7	+AC_SEARCH_LIBS([pthread_setschedparam],
	8	+ [pthread],
	9	+ [
	10	+ rsyslog_have_pthread_setschedparam=yes
	11	+ AC_DEFINE(HAVE_PTHREAD_SETSCHEDPARAM, [1], [set define])
	12	+ ]
	13	+ )
	14	+
	15	AC_CHECK_HEADERS(
	16	[sched.h],
	17	[

Lines 1-17 Link Here

(-)files/patch-plugins_imfile_imfile.c (-17 lines)
1	--- plugins/imfile/imfile.c.orig 2015-06-30 12:26:24 UTC
2	+++ plugins/imfile/imfile.c
3	@@ -1869,12 +1869,14 @@ CODESTARTmodExit
4	objRelease(errmsg, CORE_COMPONENT);
5	objRelease(prop, CORE_COMPONENT);
6	objRelease(ruleset, CORE_COMPONENT);
7	+#ifdef HAVE_SYS_INOTIFY_H
8	if(dirs != NULL) {
9	free(dirs->active.listeners);
10	free(dirs->configured.listeners);
11	free(dirs);
12	}
13	free(wdmap);
14	+#endif
15	ENDmodExit
16
17

Lines 1-33 Link Here

(-)files/patch-runtime_stream.c (-33 lines)
1	--- runtime/stream.c.orig 2015-06-30 12:26:24 UTC
2	+++ runtime/stream.c
3	@@ -1097,12 +1097,30 @@ doWriteCall(strm_t pThis, uchar pBuf,
4	char *pWriteBuf;
5	DEFiRet;
6	ISOBJ_TYPE_assert(pThis, strm);
7	+#ifdef __FreeBSD__
8	+ sbool crnlNow = 0;
9	+#endif /* __FreeBSD__ */
10
11	lenBuf = *pLenBuf;
12	pWriteBuf = (char*) pBuf;
13	iTotalWritten = 0;
14	do {
15	+#ifdef __FreeBSD__
16	+ if (pThis->bIsTTY && !pThis->iZipLevel && !pThis->cryprov) {
17	+ char *pNl = NULL;
18	+ if (crnlNow == 0) pNl = strchr(pWriteBuf, '\n');
19	+ else crnlNow = 0;
20	+ if (pNl == pWriteBuf) {
21	+ iWritten = write(pThis->fd, "\r", 1);
22	+ if (iWritten > 0) {
23	+ crnlNow = 1;
24	+ iWritten = 0;
25	+ }
26	+ } else iWritten = write(pThis->fd, pWriteBuf, pNl ? pNl - pWriteBuf : lenBuf);
27	+ } else
28	+#endif /* __FreeBSD__ */
29	iWritten = write(pThis->fd, pWriteBuf, lenBuf);
30	+
31	if(iWritten < 0) {
32	char errStr[1024];
33	int err = errno;