Rebase to 8.30.0
- added patch that resolves imgssapi compilation errors
This commit is contained in:
Radovan Sroka
parent
3a42386188
commit
2df2107a5d
2
.gitignore
vendored
2
.gitignore
vendored
@ -43,3 +43,5 @@ rsyslog-4.6.3.tar.gz
|
||||
/rsyslog-8.27.0.tar.gz
|
||||
/rsyslog-8.29.0.tar.gz
|
||||
/rsyslog-doc-8.29.0.tar.gz
|
||||
/rsyslog-8.30.0.tar.gz
|
||||
/rsyslog-doc-8.30.0.tar.gz
|
||||
|
||||
128
rsyslog-8.30.0-imgssapi-compile-error.patch
Normal file
128
rsyslog-8.30.0-imgssapi-compile-error.patch
Normal 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.13.6
|
||||
|
||||
10
rsyslog.spec
10
rsyslog.spec
@ -15,8 +15,8 @@
|
||||
|
||||
Summary: Enhanced system logging and kernel message trapping daemon
|
||||
Name: rsyslog
|
||||
Version: 8.29.0
|
||||
Release: 4%{?dist}
|
||||
Version: 8.30.0
|
||||
Release: 1%{?dist}
|
||||
License: (GPLv3+ and ASL 2.0)
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.rsyslog.com/
|
||||
@ -56,6 +56,7 @@ Obsoletes: sysklogd < 1.5-11
|
||||
# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
|
||||
Patch0: rsyslog-8.8.0-sd-service.patch
|
||||
Patch1: rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
|
||||
Patch2: rsyslog-8.30.0-imgssapi-compile-error.patch
|
||||
|
||||
%package crypto
|
||||
Summary: Encryption support
|
||||
@ -276,6 +277,7 @@ mv build doc
|
||||
%setup -q -D
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
autoreconf -iv
|
||||
|
||||
@ -533,6 +535,10 @@ done
|
||||
%{_libdir}/rsyslog/omkafka.so
|
||||
|
||||
%changelog
|
||||
* Mon Oct 23 2017 Radovan Sroka <rsroka@redhat.com> - 8.30.0-1
|
||||
- rebase to 8.30.0
|
||||
- added patch that resolves imgssapi compilation errors
|
||||
|
||||
* Tue Oct 9 2017 Marek Tamaskovic <mtamasko@redhat.com> - 8.29.0-4
|
||||
- mysql-devel changed for mariadb-connector-c-devel
|
||||
resolves: rhbz#1493695
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (rsyslog-8.29.0.tar.gz) = 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952
|
||||
SHA512 (rsyslog-doc-8.29.0.tar.gz) = 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc
|
||||
SHA512 (rsyslog-8.30.0.tar.gz) = 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
|
||||
SHA512 (rsyslog-doc-8.30.0.tar.gz) = 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user