rsyslog: update to 8.4.1
This commit is contained in:
parent
5849f5653f
commit
1fd0ec2068
3 changed files with 2 additions and 71 deletions
|
@ -1,46 +0,0 @@
|
|||
From 6b47dd542d07ed557f02af9970d1004eb262e1c1 Mon Sep 17 00:00:00 2001
|
||||
From: Rainer Gerhards <rgerhards@adiscon.com>
|
||||
Date: Tue, 19 Aug 2014 11:33:41 +0200
|
||||
Subject: [PATCH] bugfix: build failure on systems which don't have
|
||||
json_tokener_errors
|
||||
|
||||
Older versions of json-c need to use a different API (which don't exists
|
||||
on newer versions, unfortunately...)
|
||||
Thanks to Thomas D. for reporting this problem.
|
||||
---
|
||||
ChangeLog | 6 ++++++
|
||||
runtime/msg.c | 6 +++++-
|
||||
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 177387d..cb09b6c 100644
|
||||
--- ChangeLog
|
||||
+++ ChangeLog
|
||||
@@ -1,4 +1,10 @@
|
||||
---------------------------------------------------------------------------
|
||||
+Version 8.4.1 [v8-stable] 2014-08-??
|
||||
+- bugfix: build failure on systems which don't have json_tokener_errors
|
||||
+ Older versions of json-c need to use a different API (which don't exists
|
||||
+ on newer versions, unfortunately...)
|
||||
+ Thanks to Thomas D. for reporting this problem.
|
||||
+---------------------------------------------------------------------------
|
||||
Version 8.4.0 [v8-stable] 2014-08-18
|
||||
- this is the new stable branch, which incorporates all enhancements of
|
||||
rsyslog 8.3.
|
||||
diff --git a/runtime/msg.c b/runtime/msg.c
|
||||
index 66c3b7b..81b13f9 100644
|
||||
--- runtime/msg.c
|
||||
+++ runtime/msg.c
|
||||
@@ -4074,7 +4074,11 @@ MsgSetPropsViaJSON(msg_t *__restrict__ const pMsg, const uchar *__restrict__ con
|
||||
|
||||
err = tokener->err;
|
||||
if(err != json_tokener_continue)
|
||||
- errMsg = json_tokener_errors[err];
|
||||
+# if HAVE_JSON_TOKENER_ERROR_DESC
|
||||
+ errMsg = json_tokener_error_desc(err);
|
||||
+# else
|
||||
+ errMsg = json_tokener_errors[err];
|
||||
+# endif
|
||||
else
|
||||
errMsg = "Unterminated input";
|
||||
} else if(!json_object_is_type(json, json_type_object))
|
|
@ -1,23 +0,0 @@
|
|||
From a92972687652dc8b793ee5cb04ec676910aaa725 Mon Sep 17 00:00:00 2001
|
||||
From: Eivind Uggedal <eivind@uggedal.com>
|
||||
Date: Tue, 16 Sep 2014 21:45:12 +0000
|
||||
Subject: [PATCH] build fix for systems without 64bit atomic builtins
|
||||
|
||||
Triggered for instance when cross compiling to armv6.
|
||||
---
|
||||
runtime/statsobj.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/runtime/statsobj.h b/runtime/statsobj.h
|
||||
index 347f639..d56485d 100644
|
||||
--- runtime/statsobj.h
|
||||
+++ runtime/statsobj.h
|
||||
@@ -139,7 +139,7 @@ PROTOTYPEObj(statsobj);
|
||||
*/
|
||||
#define STATSCOUNTER_DEF(ctr, mut) \
|
||||
intctr_t ctr; \
|
||||
- DEF_ATOMIC_HELPER_MUT64(mut)
|
||||
+ DEF_ATOMIC_HELPER_MUT64(mut);
|
||||
|
||||
#define STATSCOUNTER_INIT(ctr, mut) \
|
||||
INIT_ATOMIC_HELPER_MUT64(mut); \
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'rsyslog'
|
||||
pkgname=rsyslog
|
||||
version=8.4.0
|
||||
version=8.4.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-gnutls --enable-mysql --enable-pgsql
|
||||
|
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
license="GPL-3"
|
||||
homepage="http://www.rsyslog.com"
|
||||
distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz"
|
||||
checksum=bf0ab78c3739d49527c3734f3da7f48cb90e51f89d9741adced0cf234c7190c0
|
||||
checksum=1c7f3e8ebb7f9865dd4100c4982d50567dded2218177086d1e02d698e352d8ac
|
||||
|
||||
lib32disabled=yes
|
||||
hostmakedepends="pkg-config"
|
||||
|
|
Loading…
Reference in a new issue