From fed6fcdcc0a2576634e31a1dc29311093807f686b6251deda2e2dd480a7e71fe Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 21 Aug 2014 17:01:57 +0000 Subject: [PATCH] Accepting request 245645 from home:darix:branches:Base:System - reenable gssapi module - rsyslog 8.4.0 [v8-stable] - added documentation tarball and also install the html documentation new subpackage rsyslog-doc - drop rsyslog-pid-file.patch: patch is included in update - added rsyslog-8.4.0_implicit_declaration.patch: include sys/time.h for gettimeofday OBS-URL: https://build.opensuse.org/request/show/245645 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=196 --- rsyslog-8.2.2.tar.gz | 3 - rsyslog-8.4.0.tar.gz | 3 + rsyslog-8.4.0_implicit_declaration.patch | 12 ++ rsyslog-doc-8.4.0.tar.gz | 3 + rsyslog-pid-file.patch | 27 ---- rsyslog.changes | 164 +++++++++++++++++++++++ rsyslog.spec | 35 +++-- 7 files changed, 208 insertions(+), 39 deletions(-) delete mode 100644 rsyslog-8.2.2.tar.gz create mode 100644 rsyslog-8.4.0.tar.gz create mode 100644 rsyslog-8.4.0_implicit_declaration.patch create mode 100644 rsyslog-doc-8.4.0.tar.gz delete mode 100644 rsyslog-pid-file.patch diff --git a/rsyslog-8.2.2.tar.gz b/rsyslog-8.2.2.tar.gz deleted file mode 100644 index 3e7f206..0000000 --- a/rsyslog-8.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3be91450b456a41f8baf01e8080023dbb5155debb9785ac22cae28ca94fa2a2d -size 1943594 diff --git a/rsyslog-8.4.0.tar.gz b/rsyslog-8.4.0.tar.gz new file mode 100644 index 0000000..4548773 --- /dev/null +++ b/rsyslog-8.4.0.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..a0f92b7 --- /dev/null +++ b/rsyslog-8.4.0_implicit_declaration.patch @@ -0,0 +1,12 @@ +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-doc-8.4.0.tar.gz b/rsyslog-doc-8.4.0.tar.gz new file mode 100644 index 0000000..6d64600 --- /dev/null +++ b/rsyslog-doc-8.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd7ae1271b09028816cd47eb6126ce52650a7d43896d243afaa920a70d349d9c +size 4047126 diff --git a/rsyslog-pid-file.patch b/rsyslog-pid-file.patch deleted file mode 100644 index f7a55aa..0000000 --- a/rsyslog-pid-file.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: rsyslog-8.2.2/tools/syslogd.c -=================================================================== ---- rsyslog-8.2.2.orig/tools/syslogd.c -+++ rsyslog-8.2.2/tools/syslogd.c -@@ -133,19 +133,14 @@ rsRetVal rsyslogdInit(void); - void rsyslogdDebugSwitch(); - void rsyslogdDoDie(int sig); - -- --#if defined(SYSLOGD_PIDNAME) --# undef _PATH_LOGPID --# define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME --#else --# ifndef _PATH_LOGPID --# define _PATH_LOGPID "/etc/rsyslogd.pid" --# endif -+#ifndef _PATH_LOGPID -+# define _PATH_LOGPID "/var/run/rsyslogd.pid" - #endif - - #ifndef _PATH_TTY - # define _PATH_TTY "/dev/tty" - #endif -+ - char *PidFile = _PATH_LOGPID; /* read-only after startup */ - - int bHadHUP = 0; /* did we have a HUP? */ diff --git a/rsyslog.changes b/rsyslog.changes index 68f6bc2..6eb61f4 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,167 @@ +------------------------------------------------------------------- +Thu Aug 21 15:20:20 UTC 2014 - mrueckert@suse.de + +- reenable gssapi module + +------------------------------------------------------------------- +Thu Aug 21 14:47:32 UTC 2014 - mrueckert@suse.de + +- rsyslog 8.4.0 [v8-stable] + - this is the new stable branch, which incorporates all + enhancements of rsyslog 8.3. +- rsyslog 8.3.5 [v8-devel] 2014-08-05 + - mmjsonparse: support selectable cookie and target containers + This permits to put different meanings into a json formatted + syslog message, e.g. the "traditional" cee or cim data. + - bugfix: mmjsonparse did not build with json-c < 0.10 This was a + regression introduced some time in the past in order to support + API changes in json-c. Now we check for the - rsyslog and use + proper code. + - omprog: emit error message via syslog() if loading binary fails + This happens after forking, so omprog has no longer access to + rsyslog's regular error reporting functions. Previously, this + meant any error message was lost. Now it is emitted via regular + syslog (which may end up in a different instance, if multiple + instances run...) + - couple of patches imported from v7-stable (7.6.4) +- rsyslog 8.3.4 [v8-devel] 2014-07-11 + - new pmciscoios parser supporting various Cisco IOS formats + - RFC3164 timestamp parser now accepts timezones and subsecond + resolution ... at least for some common formats and where we + could do so without running risk of breaking proper formats (or + introducing regressions) + - new parser config object -- permits to define custom parser + definitions + - new tzinfo config object -- permits to define time zone offsets + This is a utility object that currently is being used by some + parsers. + - bugfix: mishandling of input modules not supporting new input + instances If they did not support this, accidently the output + module part of the module union was written, leading to + unpredictable results. Note: all core modules do support this + interface, but some contributed or very old ones do not. + - bugfix: double-free when ruleset() parser parameters were used + While unlikely, this could cause stability issues even after + the config phase. +- rsyslog 8.3.3 [v8-devel] 2014-06-26 + - unify input object naming imudp now supports "name" paramter, + as other inputs do. "inputname" has been deprecated, but can + still be used. Same applies to "appendport" subparamter". + Thanks to "Nick Syslog" for the suggestion. + - made the missing (contributed) modules build under v8 [import + from 8.2.2] Modules: + * mmrfc5424addhmac omrabbitmq omgssapi omhdfs omzmq3 + - added a cleanup process (janitor); permits to close omfile + files after a timeout + - make omgssapi build under v8.3 [import vom v8.2] note that we + could do this to the stable, because there is NO regression + chance at all: only omgssapi was changed, and this module did + NOT work previously. + - removed obsolete --disable-fsstnd configure option Thanks to + Thomas D. for alerting us. Closes: + https://github.com/rsyslog/rsyslog/issues/72 +- rsyslog 8.3.2 [v8-devel] 2014-05-02 + - new template options for date extraction: + - year + - month + - day + - wday + - hour + - minute + - second + - tzoffshour + - tzoffsmin + - tzoffsdirection + - wdayname For string templates, these are property options and + they are prefixed with "date-" (e.g. "date-year", + "date-month", ...) see also: + https://github.com/rsyslog/rsyslog/issues/65 + - bugfix: mmexternal remove framing char before processing JSON + reply This did not have any real bad effects, but caused + unnecessary processing, as empty replies were not properly + detected. Otherwise, the bug was not noticible from the user's + PoV. + - bugfix: mmexternal segfault due to invalid free in non-json + input mode closes: https://github.com/rsyslog/rsyslog/issues/70 + - bugfix: mmexternal segfault when external plugin sent invalid + reply ... or no reply at all. This happened if the reply was + imporper JSON. Now, we emit an error message in those cases. + see also: https://github.com/rsyslog/rsyslog/issues/69 + - bugfix: mmexternal did potentially pass incomplete data to + restarted external plugin This could happen if EPIPE was + returned "too late", in which case the beginning of the data + could be lost. + - bugfix: mmexternal did not properly process messages over 4KiB + The data to be passed to the external plugin was truncated + after 4KiB. see: https://github.com/rsyslog/rsyslog/issues/64 + - imrelp: added support for per-listener ruleset and inputname + see: https://github.com/rsyslog/rsyslog/pull/63 Thanks to + bobthesecurityguy github user for the patch +- rsyslog 8.3.1 [v8-devel] 2014-04-24 + - external message modification interface now support modifying + message PRI + - "jsonmesg" property will include uuid only if one was + previously generated This is primarily a performance + optimization. Whenever the message uuid is gotten, it is + generated when not already present. As we used the regular + setter, this means that always the uuid was generated, which is + quite time-consuming. This has now been changed so that it only + is generated if it already exists. That also matches more + closly the semantics, as "jsonmesg" should not make + modifications to the message. Note that the same applies to + "fulljson" passing mode for external plugins. + - added plugin to rewrite message facility and/or severity Name: + fac-sever-rewrite.py + - permits to build against json-c 0.12 Unfortunately, json-c had + an ABI breakage, so this is necessary. Note that - rsyslogs + prior to 0.12 had security issues (CVE-2013-6370, + CVE-2013-6371) and so it is desirable to link against the new - + rsyslog. Thanks to Thomas D. for the patch. Note that at least + some distros have fixed the security issue in older - rsyslogs + of json-c, so this seems to apply mostly when building from + sources. + - bugfix: using UUID property could cause segfault + - bugfix/mmexternal: memory leak + - bugfix: memory leak when using "jsonmesg" property + - bugfix: mmutf8fix did not detect two invalid sequences Thanks + to Axel Rau for the patch. + - bugfix: build problems with lexer.l on some platforms For some + reason, the strdup() prototype and others are missing. I admit + that I don't know why, as this happens only in 8.3.0+ and there + is no indication of changes to the affected files. In any case, + we need to fix this, and the current solution works at least as + an interim one. +- rsyslog 8.3.0 [v8-devel] 2014-04-10 + - new plugin for anonymizing credit card numbers Thanks to Peter + Slavov for providing the code. + - external message modification modules are now supported They + are bound via the new native module "mmexternal". Also, a + sample skeleton for an external python message modification + module has been added. + - new $jsonmesg property with JSON representation of whole + message object closes: + https://github.com/rsyslog/rsyslog/issues/19 + - improved error message for invalid field extraction in string + template see also: + http://kb.monitorware.com/problem-with-field-based-extraction-t12299.html + - fix build problems on Solaris + - NOTE: a json-c API that we begun to use requires the compiler + to be in c99 mode. By default, we select it automatically. If + you modify this and use gcc, be sure to include "-std=c99" in + your compiler flags. This seems to be necessary only for older + - rsyslogs of gcc. +- rsyslog 8.2.3 [v8-stable] 2014-??-?? + - bugfix: ommysql: handle/mem leak upon termination of worker + thread This could become bad if the (instance) worker threads + are often started and terminated. But it takes quite a while to + show effect. +- added documentation tarball and also install the html + documentation + new subpackage rsyslog-doc +- drop rsyslog-pid-file.patch: patch is included in update +- added rsyslog-8.4.0_implicit_declaration.patch: + include sys/time.h for gettimeofday + ------------------------------------------------------------------- Wed Jul 16 15:17:34 UTC 2014 - jsegitz@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index e05e502..66fcece 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.2.2 +Version: 8.4.0 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -41,7 +41,7 @@ Release: 0 %else %bcond_with journal %endif -%bcond_with gssapi +%bcond_without gssapi %bcond_without gnutls %bcond_without gcrypt %bcond_without guardtime @@ -180,11 +180,11 @@ Source10: module-pgsql Source11: module-relp Source12: module-snmp Source13: module-udpspoof +Source14: http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-%{upstream_version}.tar.gz # PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs. Patch0: rsyslog-unit.patch -# PATCH-FIX-UPSTREAM rsyslog-pid-file.patch jsegitz@suse.com Fixes https://github.com/rsyslog/rsyslog/issues/86, can probably be removed after 8.2.2 -Patch1: rsyslog-pid-file.patch +Patch1: rsyslog-8.4.0_implicit_declaration.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 @@ -203,6 +203,17 @@ Its advanced features make it suitable for enterprise-class, encryption protected syslog relay chains while at the same time being very easy to setup for the novice user. +%package doc +Requires: %{name} = %{version} +Summary: Additional documentation for rsyslog +Group: System/Daemons + +%description doc +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This package provides additional documentation for rsyslog. + %if %{with diagtools} %package diag-tools @@ -467,7 +478,7 @@ This module provides support for ZeroMQ. %endif %prep -%setup -q -n %{name}-%{upstream_version} +%setup -q -n %{name}-%{upstream_version} -a 14 %patch0 -p1 %patch1 -p1 # @@ -680,10 +691,11 @@ install -m0600 %{_sourcedir}/rsyslog.sysconfig \ %{buildroot}/var/adm/fillup-templates/sysconfig.syslog-rsyslog # rm -f doc/Makefile* -install -d -m0755 %{buildroot}%{rsyslogdocdir}/ -find ChangeLog README AUTHORS COPYING COPYING.LESSER \ +install -d -m0755 %{buildroot}%{rsyslogdocdir}/html/ +find ChangeLog README AUTHORS COPYING* \ \( -type d -exec install -m755 -d %{buildroot}%{rsyslogdocdir}/\{\} \; \) \ -o \( -type f -exec install -m644 \{\} %{buildroot}%{rsyslogdocdir}/\{\} \; \) +cp -av build/* %{buildroot}%{rsyslogdocdir}/html/ # %if %{with mysql} install -m644 plugins/ommysql/createDB.sql \ @@ -885,6 +897,7 @@ fi %{rsyslog_module_dir_nodeps}/lmzlibw.so %{rsyslog_module_dir_nodeps}/mmanon.so %{rsyslog_module_dir_nodeps}/mmcount.so +%{rsyslog_module_dir_nodeps}/mmexternal.so %{rsyslog_module_dir_nodeps}/mmfields.so %{rsyslog_module_dir_nodeps}/mmpstrucdata.so %{rsyslog_module_dir_nodeps}/mmrfc5424addhmac.so @@ -915,8 +928,7 @@ fi %doc %{rsyslogdocdir}/ChangeLog %doc %{rsyslogdocdir}/README %doc %{rsyslogdocdir}/AUTHORS -%doc %{rsyslogdocdir}/COPYING -%doc %{rsyslogdocdir}/COPYING.LESSER +%doc %{rsyslogdocdir}/COPYING* %dir %{_localstatedir}/spool/rsyslog /var/adm/fillup-templates/sysconfig.syslog-rsyslog %attr(0755,root,root) %dir %ghost %{rsyslog_rundir} @@ -929,6 +941,11 @@ fi %{APPARMOR_PROFILE_PATH_DIR_COMMANDS} %config %{APPARMOR_PROFILE_PATH}/usr.sbin.rsyslogd +%files doc +%defattr(-,root,root) +%dir %{rsyslogdocdir}/ +%doc %{rsyslogdocdir}/html/ + %if %{with diagtools} %files diag-tools