From f1be1cc02c5536b674a86a2fa3cef1c2bf8c59ef Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 9 Feb 2014 23:29:23 +0100 Subject: [PATCH] Fixed 32-bit PowerPC build --- rsyslog-7.4.7-atomicops.patch | 53 +++++++++++++++++++++++++++++++++++ rsyslog.spec | 7 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 rsyslog-7.4.7-atomicops.patch diff --git a/rsyslog-7.4.7-atomicops.patch b/rsyslog-7.4.7-atomicops.patch new file mode 100644 index 0000000..4a9c7f7 --- /dev/null +++ b/rsyslog-7.4.7-atomicops.patch @@ -0,0 +1,53 @@ +From 612f881d541aaf3a8725276d41ff4ed3948e2d01 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Fri, 18 Oct 2013 07:11:44 +0200 +Subject: [PATCH] bugfix: omelasticsearch did not compile on platforms without + atomic instructions + +--- + plugins/omelasticsearch/omelasticsearch.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c +index b82968d..8f51e1a 100644 +--- a/plugins/omelasticsearch/omelasticsearch.c ++++ b/plugins/omelasticsearch/omelasticsearch.c +@@ -608,7 +608,7 @@ curlPost(instanceData *pData, uchar *message, int msglen, uchar **tpls, int nmsg + 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,18 +1001,18 @@ 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); ++ ctrType_Int, &indexSubmit)); ++ STATSCOUNTER_INIT(indexHTTPFail, mutIndexHTTPFail); + CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.http", +- ctrType_IntCtr, &indexHTTPFail)); +- STATSCOUNTER_INIT(indexHTTPReqFail, mutCtrIndexHTTPReqFail); ++ ctrType_Int, &indexHTTPFail)); ++ STATSCOUNTER_INIT(indexHTTPReqFail, mutIndexHTTPReqFail); + CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.httprequests", +- ctrType_IntCtr, &indexHTTPReqFail)); +- STATSCOUNTER_INIT(indexESFail, mutCtrIndexESFail); ++ ctrType_Int, &indexHTTPReqFail)); ++ STATSCOUNTER_INIT(indexESFail, mutIndexESFail); + CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.es", +- ctrType_IntCtr, &indexESFail)); ++ ctrType_Int, &indexESFail)); + CHKiRet(statsobj.ConstructFinalize(indexStats)); + ENDmodInit + +-- +1.8.5.3 + diff --git a/rsyslog.spec b/rsyslog.spec index 7ef043d..df79bcc 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -11,7 +11,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 7.4.7 -Release: 2%{?dist} +Release: 3%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -28,6 +28,7 @@ Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch Patch3: rsyslog-7.3.15-imuxsock-warning.patch Patch4: rsyslog-7.4.7-bz1030044-remove-ads.patch Patch5: rsyslog-7.4.7-numeric-uid.patch +Patch6: rsyslog-7.4.7-atomicops.patch BuildRequires: bison BuildRequires: flex @@ -248,6 +249,7 @@ of source ports. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %ifarch sparc64 @@ -475,6 +477,9 @@ done %{_libdir}/rsyslog/omudpspoof.so %changelog +* Sun Feb 09 2014 Lubomir Rintel 7.4.7-3 +- Fixed 32-bit PowerPC build + * Mon Jan 27 2014 Tomas Heinrich 7.4.7-2 - rebuild for libdbi-0.9.0-1