From 80bf8d5932f2ce96f2150bdec7fc0e50cc3d31aa3550c8f76ef1c45ced362668 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Sep 2014 11:14:20 +0000 Subject: [PATCH] - update to rsyslog 8.4.1 [v8-stable] 2014-09-30 (bnc#897262) - imudp: add for bracketing mode, which makes parsing stats easier - permit at-sign in variable names closes: https://github.com/rsyslog/rsyslog/issues/110 - bugfix: fix syntax error in anon_cc_numbers.py script Thanks to github user anthcourtney for the patch. closes: https://github.com/rsyslog/rsyslog/issues/109 - bugfix: ompgsql: don't loose uncomitted data on retry Thanks to Jared Johnson and Axel Rau for the patch. - bugfix: imfile: if a state file for a different file name was set, that different file (name) was monitored instead of the configured one. Now, the state file is deleted and the correct file monitored. closes: https://github.com/rsyslog/rsyslog/issues/103 - bugfix: omudpspoof: source port was invalid Thanks to Pavel Levshin for the 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. - bugfix: omelasticsearch does not work with broken/changed ES 1.0+ API closes: https://github.com/rsyslog/rsyslog/issues/104 - bugfix: mmanon did not properly anonymize IP addresses starting with '9' Thanks to defa-at-so36.net for reporting this problem. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=529 - bugfix: build problems on SuSe Linux Thanks Andreas Stieger for the patch - bugfix: omelasticsearch error file did not work correctly on ES 1.0+ due to a breaking change in the ElasticSearch API. see also: https://github.com/rsyslog/rsyslog/issues/104 - bugfix: potential abort when a message with PRI > 191 was processed OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=204 --- rsyslog-8.4.0-json-c-0.12-configure.patch | 38 -------------------- rsyslog-8.4.0-json-c-0.12.patch | 34 ------------------ rsyslog-8.4.0.tar.gz | 3 -- rsyslog-8.4.0_implicit_declaration.patch | 12 ------- rsyslog-8.4.1.tar.gz | 3 ++ rsyslog-doc-8.4.0.tar.gz | 3 -- rsyslog-doc-8.4.1.tar.gz | 3 ++ rsyslog-unit.patch | 15 ++++---- rsyslog.changes | 43 +++++++++++++++++++++++ rsyslog.spec | 11 +----- 10 files changed, 59 insertions(+), 106 deletions(-) delete mode 100644 rsyslog-8.4.0-json-c-0.12-configure.patch delete mode 100644 rsyslog-8.4.0-json-c-0.12.patch delete mode 100644 rsyslog-8.4.0.tar.gz delete mode 100644 rsyslog-8.4.0_implicit_declaration.patch create mode 100644 rsyslog-8.4.1.tar.gz delete mode 100644 rsyslog-doc-8.4.0.tar.gz create mode 100644 rsyslog-doc-8.4.1.tar.gz diff --git a/rsyslog-8.4.0-json-c-0.12-configure.patch b/rsyslog-8.4.0-json-c-0.12-configure.patch deleted file mode 100644 index bc00746..0000000 --- a/rsyslog-8.4.0-json-c-0.12-configure.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Andreas Stieger -Subject: [PATCH] fix build with json-c 0.12 if it provides a compatibility json.pc -Date: Mon, 22 Sep 2014 20:40:53 +0100 -Upstream: submitting -References: - -json-c on openSUSE provides a compatibility pkg-config for "json". -The autoconf check find it first, assuming it does not provide -the function json_tokener_error_desc. Check for availability of -function using AC_CHECK_FUNCS instead. - ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -Index: rsyslog-8.4.0/configure.ac -=================================================================== ---- rsyslog-8.4.0.orig/configure.ac 2014-08-18 10:41:34.000000000 +0100 -+++ rsyslog-8.4.0/configure.ac 2014-09-22 20:34:18.000000000 +0100 -@@ -32,14 +32,16 @@ PKG_PROG_PKG_CONFIG - PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9) - PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3) - PKG_CHECK_MODULES([JSON_C], [json],, [ -- PKG_CHECK_MODULES([JSON_C], [json-c], -- [AC_DEFINE([HAVE_JSON_TOKENER_ERROR_DESC], [1], [we have the newer JSON-C API])]) -+ PKG_CHECK_MODULES([JSON_C], [json-c],,) - ]) - - # if int64 is supported, use it - AC_CHECK_LIB(json-c, json_object_new_object,,) - AC_CHECK_FUNCS(json_object_new_int64,,) - -+# look for newer API -+AC_CHECK_FUNCS(json_tokener_error_desc,,) -+ - case "${host}" in - *-*-linux*) - AC_DEFINE([OS_LINUX], [1], [Indicator for a Linux OS]) diff --git a/rsyslog-8.4.0-json-c-0.12.patch b/rsyslog-8.4.0-json-c-0.12.patch deleted file mode 100644 index 46f8692..0000000 --- a/rsyslog-8.4.0-json-c-0.12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Rainer Gerhards -Date: Tue Aug 19 11:33:41 2014 +0200 -Subject: build failure on systems which don't have json_tokener_errors -Upstream: Committed -References: https://github.com/rsyslog/rsyslog/commit/6b47dd542d07ed557f02af9970d1004eb262e1c1 - - 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. - -Build error: -[ 77s] msg.c: In function 'MsgSetPropsViaJSON': -[ 77s] msg.c:4077:14: error: 'json_tokener_errors' undeclared (first use in this function) -[ 77s] errMsg = json_tokener_errors[err]; - -diff --git a/runtime/msg.c b/runtime/msg.c -index 66c3b7b..81b13f9 100644 ---- a/runtime/msg.c -+++ b/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/rsyslog-8.4.0.tar.gz b/rsyslog-8.4.0.tar.gz deleted file mode 100644 index 4548773..0000000 --- a/rsyslog-8.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf0ab78c3739d49527c3734f3da7f48cb90e51f89d9741adced0cf234c7190c0 -size 1955549 diff --git a/rsyslog-8.4.0_implicit_declaration.patch b/rsyslog-8.4.0_implicit_declaration.patch deleted file mode 100644 index a0f92b7..0000000 --- a/rsyslog-8.4.0_implicit_declaration.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: rsyslog-8.4.0/plugins/imkmsg/kmsg.c -=================================================================== ---- rsyslog-8.4.0.orig/plugins/imkmsg/kmsg.c -+++ rsyslog-8.4.0/plugins/imkmsg/kmsg.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - - #include "rsyslog.h" diff --git a/rsyslog-8.4.1.tar.gz b/rsyslog-8.4.1.tar.gz new file mode 100644 index 0000000..c604977 --- /dev/null +++ b/rsyslog-8.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c7f3e8ebb7f9865dd4100c4982d50567dded2218177086d1e02d698e352d8ac +size 1938151 diff --git a/rsyslog-doc-8.4.0.tar.gz b/rsyslog-doc-8.4.0.tar.gz deleted file mode 100644 index 6d64600..0000000 --- a/rsyslog-doc-8.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd7ae1271b09028816cd47eb6126ce52650a7d43896d243afaa920a70d349d9c -size 4047126 diff --git a/rsyslog-doc-8.4.1.tar.gz b/rsyslog-doc-8.4.1.tar.gz new file mode 100644 index 0000000..d3dc185 --- /dev/null +++ b/rsyslog-doc-8.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48 +size 4066598 diff --git a/rsyslog-unit.patch b/rsyslog-unit.patch index e347a01..af8aec0 100644 --- a/rsyslog-unit.patch +++ b/rsyslog-unit.patch @@ -1,22 +1,25 @@ ---- rsyslog-7.4.8/rsyslog.service.in -+++ rsyslog-7.4.8/rsyslog.service.in 2014/01/24 14:23:45 -@@ -1,11 +1,19 @@ +--- rsyslog-8.4.1/rsyslog.service.in ++++ rsyslog-8.4.1/rsyslog.service.in 2014/09/30 11:04:56 +@@ -1,14 +1,21 @@ [Unit] Description=System Logging Service Requires=syslog.socket +Requires=var-run.mount +After=var-run.mount +Conflicts=syslog-ng.service syslogd.service + Documentation=man:rsyslogd(8) + Documentation=http://www.rsyslog.com/doc/ [Service] Type=notify -ExecStart=@sbindir@/rsyslogd -n -+ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS - StandardOutput=null +Environment=RSYSLOGD_PARAMS= -+ExecStartPre=@sbindir@/rsyslog-service-prepare +EnvironmentFile=-/etc/sysconfig/syslog ++ExecStartPre=@sbindir@/rsyslog-service-prepare ++ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS +ExecReload=/bin/kill -HUP $MAINPID + StandardOutput=null +-Restart=on-failure +Restart=on-abort [Install] diff --git a/rsyslog.changes b/rsyslog.changes index b906a16..24df632 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Tue Sep 30 11:07:08 UTC 2014 - mt@suse.de + +- update to rsyslog 8.4.1 [v8-stable] 2014-09-30 (bnc#897262) + - imudp: add for bracketing mode, which makes parsing stats easier + - permit at-sign in variable names + closes: https://github.com/rsyslog/rsyslog/issues/110 + - bugfix: fix syntax error in anon_cc_numbers.py script + Thanks to github user anthcourtney for the patch. + closes: https://github.com/rsyslog/rsyslog/issues/109 + - bugfix: ompgsql: don't loose uncomitted data on retry + Thanks to Jared Johnson and Axel Rau for the patch. + - bugfix: imfile: if a state file for a different file name was set, + that different file (name) was monitored instead of the configured + one. Now, the state file is deleted and the correct file monitored. + closes: https://github.com/rsyslog/rsyslog/issues/103 + - bugfix: omudpspoof: source port was invalid + Thanks to Pavel Levshin for the 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. + - bugfix: omelasticsearch does not work with broken/changed ES 1.0+ API + closes: https://github.com/rsyslog/rsyslog/issues/104 + - bugfix: mmanon did not properly anonymize IP addresses starting with '9' + Thanks to defa-at-so36.net for reporting this problem. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=529 + - bugfix: build problems on SuSe Linux + Thanks Andreas Stieger for the patch + - bugfix: omelasticsearch error file did not work correctly on ES 1.0+ + due to a breaking change in the ElasticSearch API. + see also: https://github.com/rsyslog/rsyslog/issues/104 + - bugfix: potential abort when a message with PRI > 191 was processed + if the "pri-text" property was used in active templates, this could + be abused to a remote denial of service from permitted senders + see also: CVE-2014-3634 +- removed patches obsoleted by this version: + [- rsyslog-8.4.0_implicit_declaration.patch, + - rsyslog-8.4.0-json-c-0.12-configure.patch, + - rsyslog-8.4.0-json-c-0.12.patch] +- adopted patch for modified rsyslog.service: + [* rsyslog-unit.patch] + ------------------------------------------------------------------- Mon Sep 22 19:50:42 UTC 2014 - andreas.stieger@gmx.de diff --git a/rsyslog.spec b/rsyslog.spec index 95fd597..1a89446 100644 --- a/rsyslog.spec +++ b/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: 8.4.0 +Version: 8.4.1 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -90,7 +90,6 @@ BuildRequires: pkgconfig(libsystemd-journal) >= 197 Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog BuildRequires: klogd %endif -# for Patch3 rsyslog-8.4.0-json-c-0.12-configure.patch BuildRequires: autoconf >= 2.61 BuildRequires: automake BuildRequires: libtool @@ -190,9 +189,6 @@ Source15: rsyslog.firewall # PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs. Patch0: rsyslog-unit.patch -Patch1: rsyslog-8.4.0_implicit_declaration.patch -Patch2: rsyslog-8.4.0-json-c-0.12.patch -Patch3: rsyslog-8.4.0-json-c-0.12-configure.patch # this is a dirty hack since % dir does only work for the specified directory and nothing above # but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing @@ -488,9 +484,6 @@ This module provides support for ZeroMQ. %prep %setup -q -n %{name}-%{upstream_version} -a 14 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 # %if %{with systemd} for file in rsyslog-service-prepare; do @@ -502,8 +495,6 @@ done %endif %build -# for Patch3 rsyslog-8.4.0-json-c-0.12-configure.patch -autoreconf -fiv export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar" # needs java # --enable-gui \