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 5A7EF7A1FE for ; Thu, 18 May 2017 13:27:46 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id F341C8580F; Thu, 18 May 2017 13:27:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 836E8857D7 for ; Thu, 18 May 2017 13:27:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 9WQiWPZI_6BP for ; Thu, 18 May 2017 13:27:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 78D2384D9E for ; Thu, 18 May 2017 13:27:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 703DEFBE4; Thu, 18 May 2017 13:27:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1495114064181160" MIME-Version: 1.0 Date: Thu, 18 May 2017 13:27:44 +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: <20170518132744.703DEFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1495114064181160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Thu May 18 13:27:44 UTC 2017 Modified Files: pkgsrc/sysutils/rsyslog: Makefile.common distinfo pkgsrc/sysutils/rsyslog-elasticsearch: Makefile pkgsrc/sysutils/rsyslog/patches: patch-configure patch-plugins_mmexternal_mmexternal.c patch-runtime_lookup.c Log Message: Update sysutils/rsyslog to 8.27.0 Version 8.27.0 [v8-stable] 2017-05-16 - imkafka: add module - imptcp enhancements: * optionally emit an error message if incoming messages are truncated * optionally emit connection tracking message (on connection create and close) * add "maxFrameSize" parameter to specify the maximum size permitted in octet-counted mode * add parameter "discardTruncatedMsg" to permit truncation of oversize messages * improve octect-counted mode detection: if the octet count is larger then the set frame size (or overly large in general), it is now assumed that octet-stuffing mode is used. This probably solves a number of issues seen in real deployments. - imtcp enhancements: * add parameter "discardTruncatedMsg" to permit truncation of oversize messages * add "maxFrameSize" parameter to specify the maximum size permitted in octet-counted mode - imfile bugfix: "file not found error" repeatedly being reported for configured non-existing file. - imfile: in inotify mode, add error message if configured file cannot be found - imfile: add parameter "fileNotFoundError" to optinally disable "file not found" error messages - core: replaced gethostbyname() with getaddrinfo() call - omkafka: add "origin" field to stats output - imuxsock: rate-limiting also uses process name both for the actual limit procesing as well as warning messages emitted - Added new module: KSI log signing ver. 1.2 (lmsig_ksi_ls12) - rsylsog base functionality now builds on osx (Mac) - build now works on solaris again - imfile: fix cross-platform build issue - bugfix core: segfault when no parser could parse message - bugfix core: rate-limit internal messages when going to external log system - bugfix core: when obtaining local hostname, a NULL pointer could be accessed. - bugfix core: on shutdown, stderr was written to, even if alrady closed - bugfix core: perform MainqObj destruction only when not NULL already - bugfix core: memory leak when internal messages not processed internally - bugfix imptcp: potential overflow in octet count computation when a very large octet count was specified, the counter could overflow To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/rsyslog/Makefile.common cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/rsyslog/distinfo cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/rsyslog-elasticsearch/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-configure cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/sysutils/rsyslog/patches/patch-runtime_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1495114064181160 Content-Disposition: inline Content-Length: 8311 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.27 pkgsrc/sysutils/rsyslog/Makefile.common:1.28 --- pkgsrc/sysutils/rsyslog/Makefile.common:1.27 Thu Apr 6 20:08:37 2017 +++ pkgsrc/sysutils/rsyslog/Makefile.common Thu May 18 13:27:44 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2017/04/06 20:08:37 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.28 2017/05/18 13:27:44 fhajny Exp $ # used by sysutils/rsyslog/Makefile # used by sysutils/rsyslog-dbi/Makefile # used by sysutils/rsyslog-elasticsearch/Makefile @@ -13,7 +13,7 @@ .include "../../mk/bsd.prefs.mk" -DISTNAME= rsyslog-8.26.0 +DISTNAME= rsyslog-8.27.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -51,4 +51,5 @@ BUILDLINK_DEPMETHOD.libuuid+= build .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/pyversion.mk" .include "../../sysutils/liblogging/buildlink3.mk" +BUILDLINK_API_DEPENDS.liblognorm+= libfastjson>=0.99.3 .include "../../textproc/libfastjson/buildlink3.mk" Index: pkgsrc/sysutils/rsyslog/distinfo diff -u pkgsrc/sysutils/rsyslog/distinfo:1.25 pkgsrc/sysutils/rsyslog/distinfo:1.26 --- pkgsrc/sysutils/rsyslog/distinfo:1.25 Thu Apr 6 20:08:37 2017 +++ pkgsrc/sysutils/rsyslog/distinfo Thu May 18 13:27:44 2017 @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.25 2017/04/06 20:08:37 fhajny Exp $ +$NetBSD: distinfo,v 1.26 2017/05/18 13:27:44 fhajny Exp $ -SHA1 (rsyslog-8.26.0.tar.gz) = 9c5e253fbf1c6992ac5d1eefe17587d4da2cdbfd -RMD160 (rsyslog-8.26.0.tar.gz) = 1a8dd7a430c005c3a2b9b09eb958d0714b9fe52f -SHA512 (rsyslog-8.26.0.tar.gz) = 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 -Size (rsyslog-8.26.0.tar.gz) = 2393148 bytes -SHA1 (patch-configure) = aaba67d65b249b6aebfe8c5b3a1c9cd07e06c794 +SHA1 (rsyslog-8.27.0.tar.gz) = cdc1aa0744098bf595056d20a2970b2af4dd432b +RMD160 (rsyslog-8.27.0.tar.gz) = 57737e20ff19af3c667e66564605cc89d152b3f3 +SHA512 (rsyslog-8.27.0.tar.gz) = dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 +Size (rsyslog-8.27.0.tar.gz) = 2435123 bytes +SHA1 (patch-configure) = df356c47b6c19c96b923978a5b194724fc0f10ba SHA1 (patch-grammar_lexer.l) = 6de5aac9253ebcfae124f8dc3c7178446248f2b4 SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433 SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be SHA1 (patch-plugins_impstats_impstats.c) = a4eb7b8b9870271204d856c3a9e05fd24cee702b SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da -SHA1 (patch-plugins_mmexternal_mmexternal.c) = 14546fb631822c697c8ef766450a24afaf4ebf7a -SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be +SHA1 (patch-plugins_mmexternal_mmexternal.c) = 498fc31e687e50e6aee821c64e029f9407e902ef +SHA1 (patch-runtime_lookup.c) = 2d824bfb00d93ba2abfb481445ed8b904ecbeae7 SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341 SHA1 (patch-tools_rsyslogd.c) = 0776a632143a2dbbb3bf00159e4e3376c55418ff Index: pkgsrc/sysutils/rsyslog-elasticsearch/Makefile diff -u pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.8 pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.9 --- pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.8 Sun Apr 30 01:22:01 2017 +++ pkgsrc/sysutils/rsyslog-elasticsearch/Makefile Thu May 18 13:27:44 2017 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2017/04/30 01:22:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2017/05/18 13:27:44 fhajny Exp $ # RSYSLOG_MOD= elasticsearch PKGNAME= ${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/} -PKGREVISION= 1 DEPENDS+= rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog Index: pkgsrc/sysutils/rsyslog/patches/patch-configure diff -u pkgsrc/sysutils/rsyslog/patches/patch-configure:1.1 pkgsrc/sysutils/rsyslog/patches/patch-configure:1.2 --- pkgsrc/sysutils/rsyslog/patches/patch-configure:1.1 Mon Dec 5 10:36:46 2016 +++ pkgsrc/sysutils/rsyslog/patches/patch-configure Thu May 18 13:27:44 2017 @@ -1,11 +1,29 @@ -$NetBSD: patch-configure,v 1.1 2016/12/05 10:36:46 fhajny Exp $ +$NetBSD: patch-configure,v 1.2 2017/05/18 13:27:44 fhajny Exp $ Portability. ---- configure.orig 2016-11-13 15:48:32.000000000 +0000 +--- configure.orig 2017-05-15 09:42:02.000000000 +0000 +++ configure -@@ -15255,7 +15255,7 @@ if test -d "$srcdir"/.git && ! test -f - in_git_src=yes +@@ -15337,7 +15337,7 @@ $as_echo "#define OS_AIX 1" >>confdefs.h + + ;; + esac +- if test x$os_type == xapple; then ++ if test x$os_type = xapple; then + OS_APPLE_TRUE= + OS_APPLE_FALSE='#' + else +@@ -15345,7 +15345,7 @@ else + OS_APPLE_FALSE= + fi + +- if test x$os_type == xlinux; then ++ if test x$os_type = xlinux; then + xOS_LINUX_TRUE= + xOS_LINUX_FALSE='#' + else +@@ -15353,7 +15353,7 @@ else + xOS_LINUX_FALSE= fi - if test x$os_type == xlinux; then Index: pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c diff -u pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c:1.5 pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c:1.6 --- pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c:1.5 Mon Feb 13 19:59:36 2017 +++ pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c Thu May 18 13:27:44 2017 @@ -1,14 +1,14 @@ -$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.5 2017/02/13 19:59:36 fhajny Exp $ +$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.6 2017/05/18 13:27:44 fhajny Exp $ Fix build on BSD. ---- plugins/mmexternal/mmexternal.c.orig 2017-01-10 09:00:04.000000000 +0000 +--- plugins/mmexternal/mmexternal.c.orig 2017-05-15 09:41:19.000000000 +0000 +++ plugins/mmexternal/mmexternal.c @@ -31,7 +31,7 @@ #include #include #include --#if defined(_AIX) || defined(__FreeBSD__) -+#if defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__) +-#if defined(_AIX) || defined(__FreeBSD__) || defined(__APPLE__) ++#if defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__) #include #else #include Index: pkgsrc/sysutils/rsyslog/patches/patch-runtime_lookup.c diff -u pkgsrc/sysutils/rsyslog/patches/patch-runtime_lookup.c:1.2 pkgsrc/sysutils/rsyslog/patches/patch-runtime_lookup.c:1.3 --- pkgsrc/sysutils/rsyslog/patches/patch-runtime_lookup.c:1.2 Fri Apr 22 16:52:14 2016 +++ pkgsrc/sysutils/rsyslog/patches/patch-runtime_lookup.c Thu May 18 13:27:44 2017 @@ -1,21 +1,22 @@ -$NetBSD: patch-runtime_lookup.c,v 1.2 2016/04/22 16:52:14 jperkin Exp $ +$NetBSD: patch-runtime_lookup.c,v 1.3 2017/05/18 13:27:44 fhajny Exp $ Handle Darwin's pthread_setname_np(). ---- runtime/lookup.c.orig 2016-03-07 06:47:55.000000000 +0000 +--- runtime/lookup.c.orig 2017-05-15 09:41:19.000000000 +0000 +++ runtime/lookup.c -@@ -926,8 +926,14 @@ lookupTableDefProcessCnf(struct cnfobj * +@@ -958,10 +958,12 @@ lookupTableDefProcessCnf(struct cnfobj * strcpy(reloader_thd_name, reloader_prefix); strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu->name); reloader_thd_name[thd_name_len - 1] = '\0'; -+#if defined(__NetBSD__) -+ pthread_setname_np(lu->reloader, "%s", reloader_thd_name); -+#elif defined(__APPLE__) -+ pthread_setname_np(reloader_thd_name); -+#else - pthread_setname_np(lu->reloader, reloader_thd_name); +- #ifndef __APPLE__ +- pthread_setname_np(lu->reloader, reloader_thd_name); ++ #if defined(__NetBSD__) ++ pthread_setname_np(lu->reloader, "%s", reloader_thd_name); ++ #elif defined(__APPLE__) ++ pthread_setname_np(reloader_thd_name); // must check + #else +- pthread_setname_np(reloader_thd_name); // must check ++ pthread_setname_np(lu->reloader, reloader_thd_name); + #endif #endif -+#endif CHKiRet(lookupReadFile(lu->self, lu->name, lu->filename)); - DBGPRINTF("lookup table '%s' loaded from file '%s'\n", lu->name, lu->filename); - --_----------=_1495114064181160--