Accepting request 569987 from home:AndreasStieger:branches:Base:System
rsyslog 8.32.0 OBS-URL: https://build.opensuse.org/request/show/569987 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=284
This commit is contained in:
Git OBS Bridge
@@ -1,128 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dfb9c3efe52ad03ad9f4479699139fb447177049553b6993315f53b668a2251f
|
||||
size 2468224
|
||||
3
rsyslog-8.32.0.tar.gz
Normal file
3
rsyslog-8.32.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9646fdc33a6314464cba68323716010a8a55c3deb523cd798ba8b41a0efa40b8
|
||||
size 2478990
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:59c702e587e8f4566104b3266909deedba3c189849bed6965bbc56a1fbc08ca8
|
||||
size 4487378
|
||||
3
rsyslog-doc-8.32.0.tar.gz
Normal file
3
rsyslog-doc-8.32.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d38bcb3a06da917b15d0f6afac0645655dcc3475284a3839100de215d87b1436
|
||||
size 5368254
|
||||
@@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 26 14:47:16 UTC 2018 - astieger@suse.com
|
||||
|
||||
- rsyslog 8.32.0
|
||||
* libfastjson 0.99.8 required
|
||||
* libczmq >= 3.0.2 is now required for omczmq
|
||||
* libcurl is now needed for rsyslog core
|
||||
* rsyslogd: add capability to specify that no pid file shall be written
|
||||
* core improvements and bug fixes
|
||||
* RainerScript improvements and bug fixes
|
||||
* build fixes, including gcc7 fixes
|
||||
drop 0001-imgssapi-fix-compiler-warnings.patch
|
||||
* various bug fixes in multiple modules
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 19 08:48:59 UTC 2018 - rgerhards@adiscon.com
|
||||
|
||||
|
||||
12
rsyslog.spec
12
rsyslog.spec
@@ -25,7 +25,7 @@ Name: rsyslog
|
||||
Summary: The enhanced syslogd for Linux and Unix
|
||||
License: (GPL-3.0+ and Apache-2.0)
|
||||
Group: System/Daemons
|
||||
Version: 8.30.0
|
||||
Version: 8.32.0
|
||||
Release: 0
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%bcond_without systemd
|
||||
@@ -112,6 +112,7 @@ BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
#
|
||||
BuildRequires: bison
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: openssl-devel >= 0.9.7
|
||||
BuildRequires: pcre-devel
|
||||
@@ -129,9 +130,6 @@ BuildRequires: pkgconfig(liblogging-stdlog) >= 1.0.1
|
||||
%else
|
||||
BuildRequires: liblogging-devel
|
||||
%endif
|
||||
%if %{with elasticsearch}
|
||||
BuildRequires: curl-devel
|
||||
%endif
|
||||
%if %{with omhttpfs}
|
||||
BuildRequires: curl-devel >= 7.0.0
|
||||
%endif
|
||||
@@ -149,7 +147,7 @@ BuildRequires: hiredis-devel >= 0.10.1
|
||||
# TODO: PKG_CHECK_MODULES(LIBMONGO_CLIENT, libmongo-client >= 0.1.4)
|
||||
%endif
|
||||
%if %{with zeromq}
|
||||
BuildRequires: czmq-devel >= 1.1.0
|
||||
BuildRequires: czmq-devel >= 3.0.2
|
||||
%endif
|
||||
%if %{with gssapi}
|
||||
BuildRequires: krb5-devel
|
||||
@@ -200,7 +198,7 @@ BuildRequires: pkgconfig(libmaxminddb)
|
||||
# but json check is unconditional
|
||||
%if %{with pkgconfig}
|
||||
BuildRequires: pkgconfig(libestr) >= 0.1.9
|
||||
BuildRequires: pkgconfig(libfastjson) >= 0.99.7
|
||||
BuildRequires: pkgconfig(libfastjson) >= 0.99.8
|
||||
BuildRequires: pkgconfig(uuid) >= 2.21.0
|
||||
%else
|
||||
BuildRequires: libestr-devel
|
||||
@@ -233,7 +231,6 @@ 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
|
||||
@@ -550,7 +547,6 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user