Attachment 161071 Details for Bug 203131 – update to sysutils/rsyslog8 port

[patch] update to sysutils/rsyslog8 port

rsyslog8.diff (text/plain), 8.56 KB, created by Matthew Seaman on 2015-09-15 16:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2015-09-15 16:19:15 UTC

Size: 8.56 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396954)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	rsyslog
>-PORTVERSION=	8.11.0
>+PORTVERSION=	8.12.0
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
> 
>@@ -22,8 +22,10 @@
> PORTSCOUT=	limit:^8\.
> PKGNAMESUFFIX=	8
> 
>+MAKE_JOBS_UNSAFE=	yes
>+
> OPTIONS_DEFINE=	DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP \
>-		NORMALIZE
>+		NORMALIZE INOTIFY
> 
> DBI_DESC=	LibDBI output module for rsyslog
> GNUTLS_DESC=	GNUTLS module for rsyslog
>@@ -33,6 +35,7 @@
> RELP_DESC=	RELP input/output module for rsyslog
> SNMP_DESC=	SNMP trap sender for rsyslog
> NORMALIZE_DESC=	Message normalization module for rsyslog
>+INOTIFY_DESC=	iNotify support in imfile module
> 
> USES=		libtool pkgconfig autoreconf
> 
>@@ -71,6 +74,14 @@
> NORMALIZE_CONFIGURE_ENABLE=	mmnormalize
> NORMALIZE_PLIST_FILES=	lib/rsyslog/mmnormalize.so
> 
>+# iNotify support in the imfile module via devel/libinotify seems to
>+# work only with the '-n' "don't auto-background" flag to rsyslogd,
>+# which is not particularly useful.
>+INOTIFY_BROKEN=		Compiles and runs with libinotify but notify functionality fails to work 
>+INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
>+INOTIFY_CONFIGURE_ENABLE=	inotify
>+INOTIFY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-inotify	
>+
> .include <bsd.port.options.mk>
> 
> .ifdef WITH_MYSQL_MICROSECONDS
>Index: distinfo
>===================================================================
>--- distinfo	(revision 396954)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (rsyslog-8.11.0.tar.gz) = bc64d8ba1e3fb8cfe21eadd5fb0938381bb37ed72cef9d6f14d376d2bac9bf78
>-SIZE (rsyslog-8.11.0.tar.gz) = 2060890
>+SHA256 (rsyslog-8.12.0.tar.gz) = 466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20
>+SIZE (rsyslog-8.12.0.tar.gz) = 2091620
>Index: files/extra-patch-inotify
>===================================================================
>--- files/extra-patch-inotify	(revision 0)
>+++ files/extra-patch-inotify	(working copy)
>@@ -0,0 +1,12 @@
>+--- configure.ac.orig	2015-09-15 16:17:37.915948039 +0100
>++++ configure.ac	2015-09-15 16:14:01.435963544 +0100
>+@@ -141,6 +141,9 @@ AC_FUNC_VPRINTF
>+ AC_CHECK_FUNCS([flock inotify_init recvmmsg basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setsid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync syscall lseek64])
>+ AC_CHECK_TYPES([off64_t])
>+ 
>++# inotify_init is provided by libinotify rather than libc on *BSD
>++AC_SEARCH_LIBS([inotify_init], [inotify], [AC_DEFINE(HAVE_INOTIFY_INIT, [1], [set define])])
>++
>+ # getifaddrs is in libc (mostly) or in libsocket (eg Solaris 11) or not defined (eg Solaris 10)
>+ AC_SEARCH_LIBS([getifaddrs], [socket], [AC_DEFINE(HAVE_GETIFADDRS, [1], [set define])])
>+ 
>
>Property changes on: files/extra-patch-inotify
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(revision 0)
>+++ files/patch-configure.ac	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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],
>+     [
>
>Property changes on: files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+Author Date Id Rev URL
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-grammar_rainerscript.c
>===================================================================
>--- files/patch-grammar_rainerscript.c	(revision 396954)
>+++ files/patch-grammar_rainerscript.c	(working copy)
>@@ -1,10 +0,0 @@
>---- grammar/rainerscript.c.orig	2015-06-30 12:26:24 UTC
>-+++ grammar/rainerscript.c
>-@@ -35,6 +35,7 @@
>- #include <sys/stat.h>
>- #include <sys/types.h>
>- #include <libestr.h>
>-+#include <unistd.h>
>- #include "rsyslog.h"
>- #include "rainerscript.h"
>- #include "conf.h"
>Index: files/patch-plugins__mmexternal__mmexternal.c
>===================================================================
>--- files/patch-plugins__mmexternal__mmexternal.c	(revision 396954)
>+++ files/patch-plugins__mmexternal__mmexternal.c	(working copy)
>@@ -1,11 +0,0 @@
>---- plugins/mmexternal/mmexternal.c.orig	2015-04-30 08:50:16 UTC
>-+++ plugins/mmexternal/mmexternal.c
>-@@ -31,7 +31,7 @@
>- #include <errno.h>
>- #include <unistd.h>
>- #include <fcntl.h>
>--#include <wait.h>
>-+#include <sys/wait.h>
>- #include <sys/uio.h>
>- #include "conf.h"
>- #include "syslogd-types.h"
>Index: files/patch-plugins__omprog__omprog.c
>===================================================================
>--- files/patch-plugins__omprog__omprog.c	(revision 396954)
>+++ files/patch-plugins__omprog__omprog.c	(working copy)
>@@ -1,11 +0,0 @@
>---- plugins/omprog/omprog.c.orig	2015-04-30 08:50:16 UTC
>-+++ plugins/omprog/omprog.c
>-@@ -36,7 +36,7 @@
>- #include <errno.h>
>- #include <unistd.h>
>- #include <fcntl.h>
>--#include <wait.h>
>-+#include <sys/wait.h>
>- #include <pthread.h>
>- #include "conf.h"
>- #include "syslogd-types.h"
>Index: files/patch-plugins_imfile_imfile.c
>===================================================================
>--- files/patch-plugins_imfile_imfile.c	(revision 396954)
>+++ files/patch-plugins_imfile_imfile.c	(working copy)
>@@ -1,17 +0,0 @@
>---- 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
>- 
>- 
>Index: files/patch-plugins_impstats_impstats.c
>===================================================================
>--- files/patch-plugins_impstats_impstats.c	(revision 396954)
>+++ files/patch-plugins_impstats_impstats.c	(working copy)
>@@ -1,10 +0,0 @@
>---- plugins/impstats/impstats.c.orig	2015-04-30 08:50:15 UTC
>-+++ plugins/impstats/impstats.c
>-@@ -36,6 +36,7 @@
>- #include <errno.h>
>- #include <sys/time.h>
>- #include <sys/resource.h>
>-+#include <unistd.h>
>- 
>- #include "dirty.h"
>- #include "cfsysline.h"
>Index: files/patch-runtime_nsd__ptcp.c
>===================================================================
>--- files/patch-runtime_nsd__ptcp.c	(revision 396954)
>+++ files/patch-runtime_nsd__ptcp.c	(working copy)
>@@ -1,4 +1,4 @@
>---- runtime/nsd_ptcp.c.orig	2015-04-30 08:50:16 UTC
>+--- runtime/nsd_ptcp.c.orig	2015-07-08 14:31:07 UTC
> +++ runtime/nsd_ptcp.c
> @@ -656,7 +656,11 @@ EnableKeepAlive(nsd_t *pNsd)
>  	if(pThis->iKeepAliveProbes > 0) {
>Index: files/patch-runtime_stream.c
>===================================================================
>--- files/patch-runtime_stream.c	(revision 396954)
>+++ files/patch-runtime_stream.c	(working copy)
>@@ -1,33 +0,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;

Actions: View | Diff

Attachments on bug 203131: 161071 | 161072 | 161830 | 161831