pool/rsyslog
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 541859 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/541859
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=130
This commit is contained in:
Dominique Leuenberger 2017-11-16 12:59:14 +00:00 committed by Git OBS Bridge
commit 240137fbe1
7 changed files with 184 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
0001-imgssapi-fix-compiler-warnings.patch Normal file
View File

@ -0,0 +1,128 @@
From 8d793eafdde0b74d0b4424f0d194b5dc6801a5d1 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 17 Oct 2017 17:34:49 +0200
Subject: [PATCH] imgssapi: fix compiler warnings
---
plugins/imgssapi/imgssapi.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c
index aafce7d2..836931c7 100644
--- a/plugins/imgssapi/imgssapi.c
+++ b/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, size_t lenBuf, ssize_t *piLenRcvd)
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_sess_t *pSess)
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_sess_t *pSess)
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, void *buf, size_t buf_len, ssize_t *piLen
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;
}
--
2.15.0

3
rsyslog-8.29.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738
size 2447907

3
rsyslog-8.30.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfb9c3efe52ad03ad9f4479699139fb447177049553b6993315f53b668a2251f
size 2468224

3
rsyslog-doc-8.29.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca3f6a11a165221b4e5e189d9b86ea146245d7ad892758ef9c543db73a914663
size 4473644

3
rsyslog-doc-8.30.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59c702e587e8f4566104b3266909deedba3c189849bed6965bbc56a1fbc08ca8
size 4487378

44
rsyslog.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Tue Nov 14 15:33:34 UTC 2017 - astieger@suse.com
- rsyslog 8.30.0
* changed 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
* 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
- build requirements:
* libfastjson 0.99.7 is now mandatory
* libsystemd-journal >= 234 is now recommended
- packaging:
* add upstream build fix 0001-imgssapi-fix-compiler-warnings.patch
-------------------------------------------------------------------
Tue Aug 8 20:39:00 UTC 2017 - astieger@suse.com

10
rsyslog.spec
View File

@ -20,7 +20,7 @@ Name: rsyslog
Summary: The enhanced syslogd for Linux and Unix
License: (GPL-3.0+ and Apache-2.0)
Group: System/Daemons
Version: 8.29.0
Version: 8.30.0
Release: 0
%if 0%{?suse_version} >= 1210
%bcond_without systemd
@ -95,7 +95,7 @@ Requires(pre): syslog-service >= 2.0
%{?systemd_requires}
BuildRequires: pkgconfig(systemd) >= 209
%if %{with journal}
BuildRequires: pkgconfig(libsystemd) >= 209
BuildRequires: pkgconfig(libsystemd) >= 234
%endif
%else
Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog
@ -198,12 +198,12 @@ BuildRequires: pkgconfig(libmaxminddb)
%if %{with pkgconfig}
BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(libestr) >= 0.1.9
BuildRequires: pkgconfig(libfastjson) >= 0.99.3
BuildRequires: pkgconfig(libfastjson) >= 0.99.7
BuildRequires: pkgconfig(uuid) >= 2.21.0
%else
BuildRequires: libee-devel >= 0.4.0
BuildRequires: libestr-devel
BuildRequires: libfastjson-devel >= 0.99.3
BuildRequires: libfastjson-devel >= 0.99.7
BuildRequires: libuuid-devel
%endif
%if %{with tcl}
@ -232,6 +232,7 @@ Source15: rsyslog.firewall
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
Patch0: rsyslog-unit.patch
Patch1: 0001-imgssapi-fix-compiler-warnings.patch
# this is a dirty hack since % dir does only work for the specified directory and nothing above
# but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing
@ -548,6 +549,7 @@ This module provides an output module for TCL.
%prep
%setup -q -a 14
%patch0 -p1
%patch1 -p1
#
%if %{with systemd}
for file in rsyslog-service-prepare; do