rpms/rsyslog
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix build against latest json-c

Browse Source
This commit is contained in:
Tom Callaway 2014-08-04 01:27:22 -04:00
parent 26caabbdc7
commit 901dc04a21
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rsyslog-7.4.10-json-c-fix.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up rsyslog-7.4.10/plugins/mmjsonparse/mmjsonparse.c.jsonfix rsyslog-7.4.10/plugins/mmjsonparse/mmjsonparse.c
--- rsyslog-7.4.10/plugins/mmjsonparse/mmjsonparse.c.jsonfix 2014-08-04 01:23:23.434286740 -0400
+++ rsyslog-7.4.10/plugins/mmjsonparse/mmjsonparse.c 2014-08-04 01:24:07.617956596 -0400
@@ -146,7 +146,7 @@ processJSON(instanceData *pData, msg_t *
err = pData->tokener->err;
if(err != json_tokener_continue)
- errMsg = json_tokener_errors[err];
+ errMsg = json_tokener_get_err(err);
else
errMsg = "Unterminated input";
} else if((size_t)pData->tokener->char_offset < lenBuf)

4
rsyslog.spec
View File

@ -31,6 +31,8 @@ Patch5: rsyslog-7.4.7-numeric-uid.patch
Patch6: rsyslog-7.4.7-atomicops.patch Patch6: rsyslog-7.4.7-atomicops.patch
# merged upstream # merged upstream
Patch8: rsyslog-7.4.8-bz1026804-imjournal-message-loss.patch Patch8: rsyslog-7.4.8-bz1026804-imjournal-message-loss.patch
# json_tokener_errors is gone in current json-c
Patch9: rsyslog-7.4.10-json-c-fix.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
@ -254,6 +256,7 @@ of source ports.
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 -b .jsonfix
%build %build
%ifarch sparc64 %ifarch sparc64
@ -487,6 +490,7 @@ done
%changelog %changelog
* Mon Aug 04 2014 Tom Callaway <spot@fedoraproject.org> - 7.4.10-3 * Mon Aug 04 2014 Tom Callaway <spot@fedoraproject.org> - 7.4.10-3
- fix license handling - fix license handling
- fix build against latest json-c
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4.10-2 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild