Accepting request 226910 from Base:System
Rsyslog 7.6.2 [v7.6-stable] OBS-URL: https://build.opensuse.org/request/show/226910 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=85
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
24e20b8fda
@ -1,57 +0,0 @@
|
||||
From: Rainer Gerhards <rgerhards@adiscon.com>
|
||||
Date: Fri, 18 Oct 2013 05:11:44 +0000 (+0200)
|
||||
Subject: bugfix: omelasticsearch did not compile on platforms without atomic instructions
|
||||
X-Git-Url: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=16207e3d55ac6bb15af6d50791d2c7462816de57
|
||||
References: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=16207e3d55ac6bb15af6d50791d2c7462816de57#patch2
|
||||
|
||||
Fixes build on ppc.
|
||||
|
||||
[ 249s] In file included from ../../runtime/prop.h:25:0,
|
||||
[ 249s] from ../../runtime/glbl.h:35,
|
||||
[ 249s] from ../../runtime/stream.h:70,
|
||||
[ 249s] from ../../runtime/obj.h:48,
|
||||
[ 249s] from ../../runtime/rsyslog.h:525,
|
||||
[ 249s] from omelasticsearch.c:26:
|
||||
[ 249s] omelasticsearch.c: In function 'curlPost':
|
||||
[ 249s] omelasticsearch.c:611:39: error: 'mutHTTPReqFail' undeclared (first use in this function)
|
||||
[ 249s] STATSCOUNTER_INC(indexHTTPReqFail, mutHTTPReqFail);
|
||||
and similar
|
||||
|
||||
---
|
||||
plugins/omelasticsearch/omelasticsearch.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: rsyslog-7.4.6/plugins/omelasticsearch/omelasticsearch.c
|
||||
===================================================================
|
||||
--- rsyslog-7.4.6.orig/plugins/omelasticsearch/omelasticsearch.c 2013-10-29 15:08:48.000000000 +0000
|
||||
+++ rsyslog-7.4.6/plugins/omelasticsearch/omelasticsearch.c 2013-11-04 20:00:38.000000000 +0000
|
||||
@@ -608,7 +608,7 @@ curlPost(instanceData *pData, uchar *mes
|
||||
case CURLE_COULDNT_RESOLVE_PROXY:
|
||||
case CURLE_COULDNT_CONNECT:
|
||||
case CURLE_WRITE_ERROR:
|
||||
- STATSCOUNTER_INC(indexHTTPReqFail, mutHTTPReqFail);
|
||||
+ STATSCOUNTER_INC(indexHTTPReqFail, mutIndexHTTPReqFail);
|
||||
indexHTTPFail += nmsgs;
|
||||
DBGPRINTF("omelasticsearch: we are suspending ourselfs due "
|
||||
"to failure %lld of curl_easy_perform()\n",
|
||||
@@ -1001,16 +1001,16 @@ CODEmodInit_QueryRegCFSLineHdlr
|
||||
/* support statistics gathering */
|
||||
CHKiRet(statsobj.Construct(&indexStats));
|
||||
CHKiRet(statsobj.SetName(indexStats, (uchar *)"omelasticsearch"));
|
||||
- STATSCOUNTER_INIT(indexSubmit, mutCtrIndexSubmit);
|
||||
+ STATSCOUNTER_INIT(indexSubmit, mutIndexSubmit);
|
||||
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"submitted",
|
||||
ctrType_IntCtr, &indexSubmit));
|
||||
- STATSCOUNTER_INIT(indexHTTPFail, mutCtrIndexHTTPFail);
|
||||
+ STATSCOUNTER_INIT(indexHTTPFail, mutIndexHTTPFail);
|
||||
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.http",
|
||||
ctrType_IntCtr, &indexHTTPFail));
|
||||
- STATSCOUNTER_INIT(indexHTTPReqFail, mutCtrIndexHTTPReqFail);
|
||||
+ STATSCOUNTER_INIT(indexHTTPReqFail, mutIndexHTTPReqFail);
|
||||
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.httprequests",
|
||||
ctrType_IntCtr, &indexHTTPReqFail));
|
||||
- STATSCOUNTER_INIT(indexESFail, mutCtrIndexESFail);
|
||||
+ STATSCOUNTER_INIT(indexESFail, mutIndexESFail);
|
||||
CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.es",
|
||||
ctrType_IntCtr, &indexESFail));
|
||||
CHKiRet(statsobj.ConstructFinalize(indexStats));
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0d140baad95fa5e4e7d76a9e955751ab24ecd73a257b64958c5c32a52d38eb2d
|
||||
size 2918403
|
||||
3
rsyslog-7.6.2.tar.gz
Normal file
3
rsyslog-7.6.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d252f50daa2c1c3e6fca4bd4f27c40aabc8dccadf2e15f351862e5458fbc1c20
|
||||
size 3057495
|
||||
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 20 21:18:07 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- rsyslog 7.6.2 [v7.6-stable]
|
||||
major updates of the 7.6 series:
|
||||
* imrelp/omrelp now support TLS & (zip) compression
|
||||
* impstats is now emitting resource usage counters, can directly
|
||||
emit delta values and can now be bound to a ruleset
|
||||
* mmpstrucdata is a new module to parse RFC5424 structured data
|
||||
into JSON message properties
|
||||
* mmutf8fix is a new module to fix invalid UTF-8 sequences
|
||||
* mmsequence is a new module that helps with action load balancing
|
||||
* new defaults for main/ruleset queues to be more enterprise-like
|
||||
- For specific version changelogs, see
|
||||
* http://www.rsyslog.com/changelog-for-7-6-0-v7-stable/
|
||||
* http://www.rsyslog.com/changelog-for-7-6-1-v7-stable/
|
||||
* http://www.rsyslog.com/changelog-for-7-6-2-v7-stable/
|
||||
- packaging changes:
|
||||
* drop rsyslog-7.4.6-omelasticsearch-atomic-instructions-ppc.patch
|
||||
committed upstream
|
||||
* build with rfc3195 support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 20 19:47:26 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- rsyslog 7.4.10:
|
||||
- bugfix: json templates are improperly created
|
||||
- ompgsql bugfix: improper handling of auto-backgrounding mode
|
||||
- contains changes from 7.4.9:
|
||||
- added ProcessInternalMessages global system parameter
|
||||
- bugfix: imuxsock input parameters were not accepted
|
||||
- bugfix: potential double-free in RainerScript equal comparison
|
||||
- bugfix: some RainerScript Json(Variable)/string comparisons were wrong
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 11 12:33:10 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
|
||||
47
rsyslog.spec
47
rsyslog.spec
@ -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: 7.4.8
|
||||
Version: 7.6.2
|
||||
Release: 0
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%bcond_without systemd
|
||||
@ -48,6 +48,7 @@ Release: 0
|
||||
%bcond_without mysql
|
||||
%bcond_without pgsql
|
||||
%bcond_without relp
|
||||
%bcond_without rfc3195
|
||||
%bcond_without snmp
|
||||
%bcond_without diagtools
|
||||
%bcond_without mmnormalize
|
||||
@ -86,10 +87,14 @@ Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog
|
||||
BuildRequires: klogd
|
||||
%endif
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: openssl-devel >= 0.9.7
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: zlib-devel
|
||||
%if %{with rfc3195}
|
||||
BuildRequires: pkgconfig(liblogging-rfc3195) >= 1.0.1
|
||||
%endif
|
||||
BuildRequires: pkgconfig(liblogging-stdlog) >= 1.0.1
|
||||
%if %{with elasticsearch}
|
||||
BuildRequires: curl-devel
|
||||
%endif
|
||||
@ -129,9 +134,9 @@ BuildRequires: postgresql-devel
|
||||
%if %{with relp}
|
||||
# RELP support
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: pkgconfig(relp) >= 1.0.3
|
||||
BuildRequires: pkgconfig(relp) >= 1.2.4
|
||||
%else
|
||||
BuildRequires: librelp-devel
|
||||
BuildRequires: librelp-devel >= 1.2.4
|
||||
%endif
|
||||
%endif
|
||||
%if %{with udpspoof}
|
||||
@ -141,16 +146,16 @@ BuildRequires: libnet-devel
|
||||
%if %{with mmnormalize}
|
||||
# mmnormalize support
|
||||
BuildRequires: pkgconfig(lognorm) >= 0.3.1
|
||||
# no support for 1.0.0 as per configure
|
||||
BuildRequires: pkgconfig(lognorm) < 1.0.0
|
||||
# no support for 1.0.0 in v7.6-stable as per configure
|
||||
BuildConflicts: pkgconfig(lognorm) >= 1.0.0
|
||||
# pull in 0.3.x in Factory
|
||||
%if 0%{?suse_version} > 1310
|
||||
BuildRequires: liblognorm0-devel
|
||||
BuildRequires: liblognorm0-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: pkgconfig(libee) >= 0.4.0
|
||||
%else
|
||||
BuildRequires: libee-devel
|
||||
BuildRequires: libee-devel >= 0.4.0
|
||||
%endif # >= 1210
|
||||
%endif # with mmnormalize
|
||||
#
|
||||
@ -187,7 +192,6 @@ Source4: rsyslog.d.remote.conf.in
|
||||
Source5: rsyslog-service-prepare.in
|
||||
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
|
||||
Patch0: rsyslog-unit.patch
|
||||
Patch1: rsyslog-7.4.6-omelasticsearch-atomic-instructions-ppc.patch
|
||||
|
||||
%description
|
||||
Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
|
||||
@ -475,7 +479,6 @@ This module provides support for ZeroMQ.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{upstream_version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
#
|
||||
%if %{with systemd}
|
||||
for file in rsyslog-service-prepare; do
|
||||
@ -489,8 +492,6 @@ dos2unix doc/*.html
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar"
|
||||
# needs liblogging
|
||||
# --enable-rfc3195 \
|
||||
# needs java
|
||||
# --enable-gui \
|
||||
%configure \
|
||||
@ -528,6 +529,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
|
||||
%if %{with relp}
|
||||
--enable-relp \
|
||||
%endif
|
||||
%if %{with rfc3195}
|
||||
--enable-rfc3195 \
|
||||
%endif
|
||||
%if %{with snmp}
|
||||
--enable-snmp \
|
||||
--enable-mmsnmptrapd \
|
||||
@ -576,6 +580,14 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
|
||||
--enable-omjournal \
|
||||
%endif
|
||||
--enable-mmanon \
|
||||
--enable-mmaudit \
|
||||
--enable-mmjsonparse \
|
||||
--enable-mmutf8fix \
|
||||
--enable-mmcount \
|
||||
--enable-mmsequence \
|
||||
--enable-mmfields \
|
||||
--enable-mmpstrucdata \
|
||||
--enable-mmrfc5424addhmac \
|
||||
%if %{with guardtime}
|
||||
--enable-guardtime \
|
||||
%endif
|
||||
@ -862,6 +874,12 @@ fi
|
||||
%{rsyslog_module_dir_nodeps}/lmtcpsrv.so
|
||||
%{rsyslog_module_dir_nodeps}/lmzlibw.so
|
||||
%{rsyslog_module_dir_nodeps}/mmanon.so
|
||||
%{rsyslog_module_dir_nodeps}/mmcount.so
|
||||
%{rsyslog_module_dir_nodeps}/mmfields.so
|
||||
%{rsyslog_module_dir_nodeps}/mmpstrucdata.so
|
||||
%{rsyslog_module_dir_nodeps}/mmrfc5424addhmac.so
|
||||
%{rsyslog_module_dir_nodeps}/mmsequence.so
|
||||
%{rsyslog_module_dir_nodeps}/mmutf8fix.so
|
||||
%{rsyslog_module_dir_nodeps}/ommail.so
|
||||
%{rsyslog_module_dir_nodeps}/omprog.so
|
||||
%{rsyslog_module_dir_nodeps}/omruleset.so
|
||||
@ -873,6 +891,9 @@ fi
|
||||
%{rsyslog_module_dir_nodeps}/pmcisconames.so
|
||||
%{rsyslog_module_dir_nodeps}/pmrfc3164sd.so
|
||||
%{rsyslog_module_dir_nodeps}/pmsnare.so
|
||||
%if %{with rfc3195}
|
||||
%{rsyslog_module_dir_nodeps}/im3195.so
|
||||
%endif
|
||||
%if %{with systemd} && %{with journal}
|
||||
%{rsyslog_module_dir_nodeps}/imjournal.so
|
||||
%{rsyslog_module_dir_nodeps}/omjournal.so
|
||||
|
||||
Loading…
Reference in New Issue
Block a user