Attachment 161830 Details for Bug 203131 – Update sysutils/rsyslog8 to 8.13.0

[patch] Update sysutils/rsyslog8 to 8.13.0

rsyslog8.diff (text/plain), 6.48 KB, created by Matthew Seaman on 2015-10-08 15:25:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2015-10-08 15:25:07 UTC

Size: 6.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 398820)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	rsyslog
>-PORTVERSION=	8.11.0
>+PORTVERSION=	8.13.0
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
> 
>@@ -104,7 +104,7 @@
> USE_RC_SUBR=	${PORTNAME}d
> SUB_FILES=	pkg-message
> 
>-CONFIGURE_ARGS+=	--enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench
>+CONFIGURE_ARGS+=	--enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
>Index: distinfo
>===================================================================
>--- distinfo	(revision 398820)
>+++ 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.13.0.tar.gz) = b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33
>+SIZE (rsyslog-8.13.0.tar.gz) = 2077267
>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: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 398820)
>+++ 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 398820)
>+++ 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 398820)
>+++ 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 398820)
>+++ 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 398820)
>+++ 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 398820)
>+++ 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 398820)
>+++ 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;

Flags:

matthew: maintainer-approval?

Actions: View | Diff

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