Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id CA45C7A279 for ; Thu, 20 Oct 2016 10:05:13 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 4530B85E59; Thu, 20 Oct 2016 10:05:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C914A85E25 for ; Thu, 20 Oct 2016 10:05:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id y8Jhu4AiLwzX for ; Thu, 20 Oct 2016 10:05:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0179284CFD for ; Thu, 20 Oct 2016 10:05:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id ED464FBD2; Thu, 20 Oct 2016 10:05:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147695791166120" MIME-Version: 1.0 Date: Thu, 20 Oct 2016 10:05:11 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20161020100511.ED464FBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_147695791166120 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Thu Oct 20 10:05:11 UTC 2016 Modified Files: pkgsrc/sysutils/rsyslog: Makefile.common distinfo pkgsrc/sysutils/rsyslog-elasticsearch: Makefile pkgsrc/sysutils/rsyslog-gnutls: Makefile pkgsrc/sysutils/rsyslog-pgsql: Makefile pkgsrc/sysutils/rsyslog/patches: patch-tools_rsyslogd.c Log Message: Update sysutils/rsyslog to 8.22.0. Version 8.22.0 [v8-stable] 2016-10-04 - ompgsql: add template support Thanks to Radu Gheorghe for implementing this. - generate somewhat better error message on config file syntax error a common case (object at invalid location) has received it's own error message; for the rest we still rely on the generic flex/bison handler - bugfix:omhiredis reconnects after failure previously it could loose messages under such conditions. Thanks to Bob Gregory for the patch. - general cleanup and code improvement mostly guided by compiler warnings induced by newer opensuse builbot environment ------------------------------------------------------------------------------ Version 8.21.0 [v8-stable] 2016-08-23 - CHANGE OF BEHAVIOUR: by default, internal messages are no longer logged via the internal bridge to rsyslog but via the syslog() API call [either directly or via liblogging). For the typical single-rsyslogd-instance installation this is mostly unnoticable (except for some additional latency). If multiple instances are run, only the "main" (the one processing system log messages) will see all messages. To return to the old behaviour, do either of those two: 1) add in rsyslog.conf: global(processInternalMessages="on") 2) export the environment variable RSYSLOG_DFLT_LOG_INTERNAL=1 This will set a new default - the value can still be overwritten via rsyslog.conf (method 1). Note that the environment variable must be set in your **startup script**. For more information, please visit http://www.rsyslog.com/rsyslog-error-reporting-improved/ - slightly improved TLS syslog error messages - queue subsystem: improved robustness The .qi file is now persisted whenever an existing queue file is fully written and a new file is begun. This helps with rsyslog aborts, including the common case where the OS issues kill -9 because of insufficiently configured termination timout (this is an OS config error, but a frequent one). Also, a situation where an orphaned empty file could be left in the queue work directory has been fixed. We expect that this change causes fewer permanent queue failures. - bugfix: build failed on some platforms due to missing include files To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/rsyslog/Makefile.common cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/rsyslog/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/rsyslog-elasticsearch/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/rsyslog-gnutls/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/rsyslog-pgsql/Makefile cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_147695791166120 Content-Disposition: inline Content-Length: 5784 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/rsyslog/Makefile.common diff -u pkgsrc/sysutils/rsyslog/Makefile.common:1.22 pkgsrc/sysutils/rsyslog/Makefile.common:1.23 --- pkgsrc/sysutils/rsyslog/Makefile.common:1.22 Tue Aug 9 11:55:41 2016 +++ pkgsrc/sysutils/rsyslog/Makefile.common Thu Oct 20 10:05:11 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2016/08/09 11:55:41 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.23 2016/10/20 10:05:11 fhajny Exp $ # used by sysutils/rsyslog/Makefile # used by sysutils/rsyslog-dbi/Makefile # used by sysutils/rsyslog-elasticsearch/Makefile @@ -12,7 +12,7 @@ .include "../../mk/bsd.prefs.mk" -DISTNAME= rsyslog-8.20.0 +DISTNAME= rsyslog-8.22.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ Index: pkgsrc/sysutils/rsyslog/distinfo diff -u pkgsrc/sysutils/rsyslog/distinfo:1.19 pkgsrc/sysutils/rsyslog/distinfo:1.20 --- pkgsrc/sysutils/rsyslog/distinfo:1.19 Tue Aug 9 11:55:41 2016 +++ pkgsrc/sysutils/rsyslog/distinfo Thu Oct 20 10:05:11 2016 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2016/08/09 11:55:41 fhajny Exp $ +$NetBSD: distinfo,v 1.20 2016/10/20 10:05:11 fhajny Exp $ -SHA1 (rsyslog-8.20.0.tar.gz) = 1863ce688d2e5cc134677f4f98c63b756dc908d7 -RMD160 (rsyslog-8.20.0.tar.gz) = e5ad874894e132648f6fbf1c2d8c56ec7e6748da -SHA512 (rsyslog-8.20.0.tar.gz) = 179b61e4d5393633909bf718cf9b187d34161e9e4395fa2577cfc4f2c35a50e3f9128de376b1a0bb9dc3dd112857d377e553f10e5332719df35e98f9cd631e2b -Size (rsyslog-8.20.0.tar.gz) = 2287709 bytes +SHA1 (rsyslog-8.22.0.tar.gz) = 4805628cfed4c6fa6941e7b988886ecd3d911966 +RMD160 (rsyslog-8.22.0.tar.gz) = 44c28fdaecade5a6f5b893657f9f6aa4b3726e2c +SHA512 (rsyslog-8.22.0.tar.gz) = 105c7a81bd96c6b68b9e9f4d1ae06e63bf531afe4dfd91efb73b2a96e8264270579ccacc6a1bf77ad284913fb7f4bac55f83c5b38f7fa7675f6c4a6fa9b2f3ca +Size (rsyslog-8.22.0.tar.gz) = 2259652 bytes SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433 SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be @@ -13,5 +13,5 @@ SHA1 (patch-plugins_mmexternal_mmexterna SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341 -SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f +SHA1 (patch-tools_rsyslogd.c) = 116f75e4e3edf32f339a2e66591b8a3d681d804f SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00 Index: pkgsrc/sysutils/rsyslog-elasticsearch/Makefile diff -u pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.4 pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.5 --- pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.4 Fri Oct 7 18:26:11 2016 +++ pkgsrc/sysutils/rsyslog-elasticsearch/Makefile Thu Oct 20 10:05:11 2016 @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.4 2016/10/07 18:26:11 adam Exp $ +# $NetBSD: Makefile,v 1.5 2016/10/20 10:05:11 fhajny Exp $ # RSYSLOG_MOD= elasticsearch PKGNAME= ${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/} -PKGREVISION= 1 DEPENDS+= rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog .include "../../sysutils/rsyslog/Makefile.common" CONFIGURE_ARGS+= --enable-elasticsearch -BUILD_DIRS= plugins/omelasticsearch + +BUILD_DIRS= plugins/omelasticsearch .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/rsyslog-gnutls/Makefile diff -u pkgsrc/sysutils/rsyslog-gnutls/Makefile:1.4 pkgsrc/sysutils/rsyslog-gnutls/Makefile:1.5 --- pkgsrc/sysutils/rsyslog-gnutls/Makefile:1.4 Mon Sep 19 13:04:28 2016 +++ pkgsrc/sysutils/rsyslog-gnutls/Makefile Thu Oct 20 10:05:11 2016 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2016/09/19 13:04:28 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2016/10/20 10:05:11 fhajny Exp $ # RSYSLOG_MOD= gnutls PKGNAME= ${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/} -PKGREVISION= 1 DEPENDS+= rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog Index: pkgsrc/sysutils/rsyslog-pgsql/Makefile diff -u pkgsrc/sysutils/rsyslog-pgsql/Makefile:1.2 pkgsrc/sysutils/rsyslog-pgsql/Makefile:1.3 --- pkgsrc/sysutils/rsyslog-pgsql/Makefile:1.2 Sun Oct 9 21:42:03 2016 +++ pkgsrc/sysutils/rsyslog-pgsql/Makefile Thu Oct 20 10:05:11 2016 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2016/10/09 21:42:03 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2016/10/20 10:05:11 fhajny Exp $ # RSYSLOG_MOD= pgsql PKGNAME= ${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/} -PKGREVISION= 1 DEPENDS+= rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog Index: pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c diff -u pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.3 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.4 --- pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.3 Fri Jan 16 16:58:28 2015 +++ pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c Thu Oct 20 10:05:11 2016 @@ -1,18 +1,18 @@ -$NetBSD: patch-tools_rsyslogd.c,v 1.3 2015/01/16 16:58:28 fhajny Exp $ +$NetBSD: patch-tools_rsyslogd.c,v 1.4 2016/10/20 10:05:11 fhajny Exp $ Need errno.h on NetBSD. Default PID file path. ---- tools/rsyslogd.c.orig 2015-01-12 08:49:44.000000000 +0000 +--- tools/rsyslogd.c.orig 2016-08-23 12:15:33.000000000 +0000 +++ tools/rsyslogd.c -@@ -29,7 +29,7 @@ - #ifdef HAVE_LIBLOGGING_STDLOG - # include +@@ -32,7 +32,7 @@ + #else + # include #endif -#ifdef OS_SOLARIS +#if defined(OS_SOLARIS) || defined(OS_BSD) # include #else # include -@@ -87,7 +87,7 @@ void rsyslogdDoDie(int sig); +@@ -89,7 +89,7 @@ void rsyslogdDoDie(int sig); #ifndef PATH_PIDFILE --_----------=_147695791166120--