From 694afa6a3f370f78919ba78906a35e48fc196ef9 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Tue, 16 Sep 2014 21:55:27 +0000 Subject: [PATCH] rsyslog: update to 8.4.0 and remove -doc subpackage. The rsyslog-doc subpackage was removed since the html documentation is no longer part of the tarball but released separately. --- .../rsyslog/patches/json-tokener-fix.patch | 46 +++++++++++++++++++ .../patches/non-atomic-builtins-64-fix.patch | 23 ++++++++++ ...tsobj-fix-for-non-atomic-builtins-64.patch | 11 ----- srcpkgs/rsyslog/template | 18 ++------ 4 files changed, 72 insertions(+), 26 deletions(-) create mode 100644 srcpkgs/rsyslog/patches/json-tokener-fix.patch create mode 100644 srcpkgs/rsyslog/patches/non-atomic-builtins-64-fix.patch delete mode 100644 srcpkgs/rsyslog/patches/runtime-statsobj-fix-for-non-atomic-builtins-64.patch diff --git a/srcpkgs/rsyslog/patches/json-tokener-fix.patch b/srcpkgs/rsyslog/patches/json-tokener-fix.patch new file mode 100644 index 0000000000..0f5bffe16f --- /dev/null +++ b/srcpkgs/rsyslog/patches/json-tokener-fix.patch @@ -0,0 +1,46 @@ +From 6b47dd542d07ed557f02af9970d1004eb262e1c1 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +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)) diff --git a/srcpkgs/rsyslog/patches/non-atomic-builtins-64-fix.patch b/srcpkgs/rsyslog/patches/non-atomic-builtins-64-fix.patch new file mode 100644 index 0000000000..763811265e --- /dev/null +++ b/srcpkgs/rsyslog/patches/non-atomic-builtins-64-fix.patch @@ -0,0 +1,23 @@ +From a92972687652dc8b793ee5cb04ec676910aaa725 Mon Sep 17 00:00:00 2001 +From: Eivind Uggedal +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); \ diff --git a/srcpkgs/rsyslog/patches/runtime-statsobj-fix-for-non-atomic-builtins-64.patch b/srcpkgs/rsyslog/patches/runtime-statsobj-fix-for-non-atomic-builtins-64.patch deleted file mode 100644 index fe0a9ddf15..0000000000 --- a/srcpkgs/rsyslog/patches/runtime-statsobj-fix-for-non-atomic-builtins-64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/statsobj.h.orig -+++ 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); \ diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 0b2aae2c71..2e8c08d494 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,6 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=7.6.4 +version=8.4.0 revision=1 build_style=gnu-configure configure_args="--enable-gnutls --enable-mysql --enable-pgsql @@ -17,13 +17,13 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=72b595c9e06b58cd7e10f59e7385a25471136fca0a1257afe4eb8a38e10a3feb +checksum=bf0ab78c3739d49527c3734f3da7f48cb90e51f89d9741adced0cf234c7190c0 lib32disabled=yes hostmakedepends="pkg-config" makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel libmysqlclient-devel>=5.5.27 mit-krb5-devel libestr-devel>=0.1.9 - libee-devel>=0.4.1 liblogging-devel>=1.0.2" + libee-devel>=0.4.1 liblogging-devel>=1.0.3" conf_files="/etc/rsyslog.conf" systemd_services="rsyslog.service on" provides="syslog-daemon-0_1" @@ -53,18 +53,6 @@ post_configure() { post_install() { vinstall ${FILESDIR}/rsyslog.conf 644 etc - # Install HTML documentation. - install -d ${DESTDIR}/usr/share/doc/rsyslog/html - install -m644 ${wrksrc}/doc/*.{html,png} \ - ${DESTDIR}/usr/share/doc/rsyslog/html -} - -rsyslog-docs_package() { - short_desc+=" - HTML documentation" - noarch=yes - pkg_install() { - vmove usr/share/doc - } } rsyslog-gssapi_package() {