diff options
author | fhajny <fhajny@pkgsrc.org> | 2017-10-18 11:01:05 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2017-10-18 11:01:05 +0000 |
commit | b074ac46c48b73717c74595e71da0f1687d96cf5 (patch) | |
tree | 200a770c1f5e6712f78fce58daf205ab7b7123d1 /sysutils/rsyslog | |
parent | bf5ce036707ee9b87a6da6341d5a242af7e4d9d3 (diff) | |
download | pkgsrc-b074ac46c48b73717c74595e71da0f1687d96cf5.tar.gz |
Update sysutils/rsyslog* to 8.30.0.
- CHANGE OF BEHAVIOUR: all variables are now case-insensitive by
default
- core: handle (JSON) variables in case-insensitive way
- imjournal: made switching to persistent journal in runtime possible
- mmanon: complete refactor and enhancements
- add pseudonymization mode
- add address randomization mode
- add support for IPv6 (this also supports various replacement
modes)
- in IPv4 address recognition
- in IPv4 simple mode to-be-anonymized bits can get wrong
- imfile: add "fileoffset" metadata
- RainerScript: add ltrim and rtrim functions
- core: report module name when suspending action
- core: add ability to limit number of error messages going to stderr
- tcpsrv subsystem: improvate clarity of some error messages
- imptcp: include module name in error msg
- imtcp: include module name in error msg
- tls improvement: better error message if certificate file cannot be
read
- omfwd: slightly improved error messages during config parsing
- ommysql improvements
- ommysql bugfix: do not duplicate entries on failed transaction
- imtcp bugfix: parameter priorityString was ignored
- template/bugfix: invalid template option conflict detection
- core/actions: fix handling of data-induced errors
- core/action bugfix: no "action suspended" message during retry
processing
- core/ratelimit bugfix: race can lead to segfault
- core bugfix: rsyslog aborts if errmsg is generated in early startup
- core bugfix: informational messages was logged with error severity
- core bugfix: --enable-debugless build was broken
- queue bugfix: file write error message was incorrect
- omrelp bugfix: segfault when rebindinterval parameter is used
- omkafka bugfix: invalid load of failedmsg file on startup if
disabled
- kafka bugfix: problem on invalid kafka configuration values
- imudp bugfix: UDP oversize message not properly handled
- core bugfix: memory corruption during configuration parsing
- core bugfix: race on worker thread termination during shutdown
- omelasticsearch: avoid ES5 warnings while sending json in bulkmode
- omelasticsearch bugfix: incompatibility with newer ElasticSearch
version
- imptcp bugfix: invalid mutex addressing on some platforms
- imptcp bugfix: do not accept missing port in legacy listener
definition
Diffstat (limited to 'sysutils/rsyslog')
-rw-r--r-- | sysutils/rsyslog/Makefile.common | 6 | ||||
-rw-r--r-- | sysutils/rsyslog/distinfo | 11 | ||||
-rw-r--r-- | sysutils/rsyslog/patches/patch-plugins_imgssapi_imgssapi.c | 119 |
3 files changed, 128 insertions, 8 deletions
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common index 67be332e868..c2bb5edb407 100644 --- a/sysutils/rsyslog/Makefile.common +++ b/sysutils/rsyslog/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2017/08/16 16:29:52 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.32 2017/10/18 11:01:05 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.29.0 +DISTNAME= rsyslog-8.30.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -51,5 +51,5 @@ BUILDLINK_DEPMETHOD.libuuid+= build .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/pyversion.mk" .include "../../sysutils/liblogging/buildlink3.mk" -BUILDLINK_API_DEPENDS.libfastjson+= libfastjson>=0.99.3 +BUILDLINK_API_DEPENDS.libfastjson+= libfastjson>=0.99.7 .include "../../textproc/libfastjson/buildlink3.mk" diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo index 8a39042de3a..b7738da0c84 100644 --- a/sysutils/rsyslog/distinfo +++ b/sysutils/rsyslog/distinfo @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.29 2017/08/16 16:29:52 fhajny Exp $ +$NetBSD: distinfo,v 1.30 2017/10/18 11:01:05 fhajny Exp $ -SHA1 (rsyslog-8.29.0.tar.gz) = 39253a402b14fda0044fc25d15b694c46edee142 -RMD160 (rsyslog-8.29.0.tar.gz) = 2fe39fa05306a37ac49f789a63eeaebd013464cb -SHA512 (rsyslog-8.29.0.tar.gz) = 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 -Size (rsyslog-8.29.0.tar.gz) = 2447907 bytes +SHA1 (rsyslog-8.30.0.tar.gz) = 59248ac00f5dd27a32bcb979cfa2bc6970f3e8aa +RMD160 (rsyslog-8.30.0.tar.gz) = 5c394a8d5bfbb7d56287c57c0a51bff9972b0b0d +SHA512 (rsyslog-8.30.0.tar.gz) = 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 +Size (rsyslog-8.30.0.tar.gz) = 2468224 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_imgssapi_imgssapi.c) = 24128b085f3eaab99d92e679c3e58d3918f94a91 SHA1 (patch-plugins_impstats_impstats.c) = a4eb7b8b9870271204d856c3a9e05fd24cee702b SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da diff --git a/sysutils/rsyslog/patches/patch-plugins_imgssapi_imgssapi.c b/sysutils/rsyslog/patches/patch-plugins_imgssapi_imgssapi.c new file mode 100644 index 00000000000..03e6b821a61 --- /dev/null +++ b/sysutils/rsyslog/patches/patch-plugins_imgssapi_imgssapi.c @@ -0,0 +1,119 @@ +$NetBSD: patch-plugins_imgssapi_imgssapi.c,v 1.1 2017/10/18 11:01:05 fhajny Exp $ + +Backport imgssapi fixes from upstream. +https://github.com/rsyslog/rsyslog/pull/1855 + +--- plugins/imgssapi/imgssapi.c.orig 2017-07-02 11:02:11.000000000 +0000 ++++ plugins/imgssapi/imgssapi.c +@@ -9,7 +9,7 @@ + * NOTE: read comments in module-template.h to understand how this file + * works! + * +- * Copyright 2007, 2014 Rainer Gerhards and Adiscon GmbH. ++ * Copyright 2007, 2017 Rainer Gerhards and Adiscon GmbH. + * + * This file is part of rsyslog. + * +@@ -63,7 +63,6 @@ + + MODULE_TYPE_INPUT + MODULE_TYPE_NOKEEP +-MODULE_CNFNAME("imgssapi") + + /* defines */ + #define ALLOWEDMETHOD_GSS 2 +@@ -162,7 +161,7 @@ OnSessDestruct(void *ppUsr) + OM_uint32 maj_stat, min_stat; + maj_stat = gss_delete_sec_context(&min_stat, &(*ppGSess)->gss_context, GSS_C_NO_BUFFER); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("deleting context", maj_stat, min_stat); ++ gssutil.display_status((char*)"deleting context", maj_stat, min_stat); + } + + free(*ppGSess); +@@ -291,7 +290,7 @@ finalize_it: + + + static rsRetVal +-doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) ++doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr) + { + DEFiRet; + int allowedMethods; +@@ -307,7 +306,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, + CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd)); + } else { + *piLenRcvd = lenBuf; +- CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK); ++ CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr)); + } + + finalize_it: +@@ -380,11 +379,11 @@ static int TCPSessGSSInit(void) + if (gss_server_creds != GSS_C_NO_CREDENTIAL) + return 0; + +- name_buf.value = (gss_listen_service_name == NULL) ? "host" : gss_listen_service_name; ++ name_buf.value = (gss_listen_service_name == NULL) ? (char*)"host" : gss_listen_service_name; + name_buf.length = strlen(name_buf.value) + 1; + maj_stat = gss_import_name(&min_stat, &name_buf, GSS_C_NT_HOSTBASED_SERVICE, &server_name); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("importing name", maj_stat, min_stat); ++ gssutil.display_status((char*)"importing name", maj_stat, min_stat); + return -1; + } + +@@ -392,7 +391,7 @@ static int TCPSessGSSInit(void) + GSS_C_NULL_OID_SET, GSS_C_ACCEPT, + &gss_server_creds, NULL, NULL); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("acquiring credentials", maj_stat, min_stat); ++ gssutil.display_status((char*)"acquiring credentials", maj_stat, min_stat); + return -1; + } + +@@ -549,7 +548,7 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_se + pGSess->allowedMethods = ALLOWEDMETHOD_TCP; + ABORT_FINALIZE(RS_RET_OK); // TODO: define good error codes + } +- gssutil.display_status("accepting context", maj_stat, acc_sec_min_stat); ++ gssutil.display_status((char*)"accepting context", maj_stat, acc_sec_min_stat); + ABORT_FINALIZE(RS_RET_ERR); // TODO: define good error codes + } + if (send_tok.length != 0) { +@@ -566,7 +565,7 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_se + + maj_stat = gss_display_name(&min_stat, client, &recv_tok, NULL); + if (maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("displaying name", maj_stat, min_stat); ++ gssutil.display_status((char*)"displaying name", maj_stat, min_stat); + } else { + dbgprintf("GSS-API Accepted connection from peer %s: %s\n", (char *)pszPeer, (char*) recv_tok.value); + } +@@ -608,7 +607,7 @@ int TCPSessGSSRecv(tcps_sess_t *pSess, v + maj_stat = gss_unwrap(&min_stat, *context, &xmit_buf, &msg_buf, + &conf_state, (gss_qop_t *) NULL); + if(maj_stat != GSS_S_COMPLETE) { +- gssutil.display_status("unsealing message", maj_stat, min_stat); ++ gssutil.display_status((char*)"unsealing message", maj_stat, min_stat); + if(xmit_buf.value) { + free(xmit_buf.value); + xmit_buf.value = 0; +@@ -644,7 +643,7 @@ void TCPSessGSSClose(tcps_sess_t* pSess) + context = &pGSess->gss_context; + maj_stat = gss_delete_sec_context(&min_stat, context, GSS_C_NO_BUFFER); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("deleting context", maj_stat, min_stat); ++ gssutil.display_status((char*)"deleting context", maj_stat, min_stat); + *context = GSS_C_NO_CONTEXT; + pGSess->gss_flags = 0; + pGSess->allowedMethods = 0; +@@ -665,7 +664,7 @@ TCPSessGSSDeinit(void) + if (gss_server_creds != GSS_C_NO_CREDENTIAL) { + maj_stat = gss_release_cred(&min_stat, &gss_server_creds); + if (maj_stat != GSS_S_COMPLETE) +- gssutil.display_status("releasing credentials", maj_stat, min_stat); ++ gssutil.display_status((char*)"releasing credentials", maj_stat, min_stat); + } + RETiRet; + } |