From 0d53554807bb01bdda4d7c24c65c71cab0f18b74253eb46c84cc4b70b0373956 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Apr 2013 06:47:18 +0000 Subject: [PATCH 1/7] - update to 7.3.13 [beta] 2013-04-29: - update to 7.3.12 [devel] 2013-04-25: - update to 7.3.11 [devel] 2013-04-23 - Added new lmcry_gcry.so plugin providing support for log file encryption to the rsyslog-module-gtls package. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=139 --- rsyslog-7.2.7.tar.gz | 3 --- rsyslog-7.3.13.tar.gz | 3 +++ rsyslog.changes | 51 +++++++++++++++++++++++++++++++++++++++++++ rsyslog.spec | 4 +++- 4 files changed, 57 insertions(+), 4 deletions(-) delete mode 100644 rsyslog-7.2.7.tar.gz create mode 100644 rsyslog-7.3.13.tar.gz diff --git a/rsyslog-7.2.7.tar.gz b/rsyslog-7.2.7.tar.gz deleted file mode 100644 index 05562b2..0000000 --- a/rsyslog-7.2.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d -size 2761741 diff --git a/rsyslog-7.3.13.tar.gz b/rsyslog-7.3.13.tar.gz new file mode 100644 index 0000000..67811bf --- /dev/null +++ b/rsyslog-7.3.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b11f63626aa849141a39e9c94ebcc495e19ab03f283a16b348f2fb0ab77be387 +size 2898293 diff --git a/rsyslog.changes b/rsyslog.changes index ed335ee..2095681 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Tue Apr 30 06:27:14 UTC 2013 - mt@suse.de + +- update to 7.3.13 [beta] 2013-04-29: + - added omrabbitmq module (contributed, untested) + Note: this is unsupported and as such was moved immediately + into the beta version. + Thanks to Vaclav Tomec for providing this module. + - bugfix: build problem when –enable-encryption was not selected + Thanks to Michael Biebl for fixing this. + - doc bugfix: omfile parameter “VeryRobustZip” was documentas as + “VeryReliableZip” + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=437 + Thanks to Thomas Doll for reporting this. +- update to 7.3.12 [devel] 2013-04-25: + - added doc for omelasticsearch + Thanks to Radu Gheorghe for the doc contribution. + - omelasticsearch: _id field support for bulk operations + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=392 + Thanks to Jérôme Renard for the idea and patches. + - max number of templates for plugin use has been increased to five + - platform compatibility enhancement: solve compile issue with + libgcrypt do not use GCRY_CIPHER_MODE_AESWRAP where not available + fix compile on Solaris + Thanks to Martin Carpenter for the patch. + - bugfix: off-by-one error in handling local FQDN name (regression) + A remporary buffer was allocated one byte too small. Did only + affect startup, not actual operations. Came up during routine tests, + and can have no effect once the engine runs. Introduced in 7.3.11. + - bugfix: build problems on Solaris + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=436 + - bugfix: block size limit was not properly honored + - bugfix: potential segfault in guardtime signature provider + it could segfault if an error was reported by the GuardTime API, + because an invalid free could happen then +- update to 7.3.11 [devel] 2013-04-23 + - added support for encrypting log files (lmcry_gcry plugin) + - omhiredis: added support for redis pipeline support + Thanks to Brian Knox for the patch. + - bugfix: $PreserveFQDN is not properly working + Thanks to Louis Bouchard for the patch + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=426 + - bugfix: imuxsock aborted due to problem in ratelimiting code + Thanks to Tomas Heinrich for the patch. + - bugfix: imuxsock aborted under some conditions regression from + ratelimiting enhancements – this was a different one to the one + Tomas Heinrich patched. + - bugfix: timestamp problems in imkmsg +- Added new lmcry_gcry.so plugin providing support for log file + encryption to the rsyslog-module-gtls package. + ------------------------------------------------------------------- Fri Apr 19 21:53:30 UTC 2013 - andreas.stieger@gmx.de diff --git a/rsyslog.spec b/rsyslog.spec index 7f96422..1755fb0 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: 7.2.7 +Version: 7.3.13 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -518,6 +518,7 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the for mod in \ %if %{with gnutls} lmnsd_gtls.so \ + lmcry_gcry.so \ %endif %if %{with gssapi} omgssapi.so imgssapi.so lmgssutil.so \ @@ -857,6 +858,7 @@ fi %files module-gtls %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/lmnsd_gtls.so +%{rsyslog_module_dir_withdeps}/lmcry_gcry.so %endif %if %{with relp} From 625bc57f879388d9e671c5ac2dc2339466748c61063d2effce2ee1ee2ece841d Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Apr 2013 07:35:46 +0000 Subject: [PATCH 2/7] - Enabled systemd imjournal,omjournal modules. - Enabled mmanon, providing anonymization support - Enabled lmcry_gcry.so, providing log file encryption support and the rscryutil utility to manage the encrypted log files. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=140 --- rsyslog.changes | 8 +++++--- rsyslog.spec | 29 +++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index 2095681..13bb8a7 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Apr 30 06:27:14 UTC 2013 - mt@suse.de +Tue Apr 30 07:21:07 UTC 2013 - mt@suse.de - update to 7.3.13 [beta] 2013-04-29: - added omrabbitmq module (contributed, untested) @@ -46,8 +46,10 @@ Tue Apr 30 06:27:14 UTC 2013 - mt@suse.de ratelimiting enhancements – this was a different one to the one Tomas Heinrich patched. - bugfix: timestamp problems in imkmsg -- Added new lmcry_gcry.so plugin providing support for log file - encryption to the rsyslog-module-gtls package. +- Enabled systemd imjournal,omjournal modules. +- Enabled mmanon, providing anonymization support +- Enabled lmcry_gcry.so, providing log file encryption support + and the rscryutil utility to manage the encrypted log files. ------------------------------------------------------------------- Fri Apr 19 21:53:30 UTC 2013 - andreas.stieger@gmx.de diff --git a/rsyslog.spec b/rsyslog.spec index 1755fb0..6049aa2 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -32,8 +32,10 @@ Release: 0 %bcond_with dbi %endif %if 0%{?suse_version} >= 1230 +%bcond_without journal %bcond_with systemv %else +%bcond_with journal %bcond_without systemv %endif %bcond_without gssapi @@ -71,6 +73,9 @@ Requires(pre): syslog-service >= 2.0 %endif %{?systemd_requires} BuildRequires: pkgconfig(systemd) +%if %{with journal} +BuildRequires: pkgconfig(libsystemd-journal) +%endif %else Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog BuildRequires: klogd @@ -95,8 +100,8 @@ BuildRequires: czmq-devel >= 1.1.0 %if %{with gssapi} BuildRequires: krb5-devel %endif -%if %{with gnutls} BuildRequires: libgcrypt-devel +%if %{with gnutls} BuildRequires: libgnutls-devel %endif %if %{with dbi} @@ -426,6 +431,8 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. # --enable-rfc3195 \ # needs java # --enable-gui \ +# meeds libgt >= 0.3.1 +# --enable-guardtime \ %configure \ --with-moddirs=%{rsyslog_module_dir_withdeps} \ --enable-option-checking \ @@ -502,6 +509,13 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. --enable-imdiag \ --enable-diagtools \ %endif +%if %{with systemd} && %{with journal} + --enable-imjournal \ + --enable-omjournal \ +%endif + --enable-mmanon \ + --enable-libgcrypt \ + --enable-usertools \ --disable-static make %{?_smp_mflags:%{_smp_mflags}} V=1 @@ -518,8 +532,8 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the for mod in \ %if %{with gnutls} lmnsd_gtls.so \ - lmcry_gcry.so \ %endif + lmcry_gcry.so \ %if %{with gssapi} omgssapi.so imgssapi.so lmgssutil.so \ %endif @@ -755,6 +769,7 @@ fi %{rsyslog_module_dir_nodeps}/imklog.so %{rsyslog_module_dir_nodeps}/imkmsg.so %{rsyslog_module_dir_nodeps}/immark.so +%{rsyslog_module_dir_nodeps}/impstats.so %{rsyslog_module_dir_nodeps}/imtcp.so %{rsyslog_module_dir_nodeps}/imttcp.so %{rsyslog_module_dir_nodeps}/imudp.so @@ -768,6 +783,7 @@ fi %{rsyslog_module_dir_nodeps}/lmtcpclt.so %{rsyslog_module_dir_nodeps}/lmtcpsrv.so %{rsyslog_module_dir_nodeps}/lmzlibw.so +%{rsyslog_module_dir_nodeps}/mmanon.so %{rsyslog_module_dir_nodeps}/ommail.so %{rsyslog_module_dir_nodeps}/omprog.so %{rsyslog_module_dir_nodeps}/omruleset.so @@ -775,12 +791,18 @@ fi %{rsyslog_module_dir_nodeps}/omtesting.so %{rsyslog_module_dir_nodeps}/omuxsock.so %{rsyslog_module_dir_nodeps}/pmlastmsg.so -%{rsyslog_module_dir_nodeps}/impstats.so %{rsyslog_module_dir_nodeps}/pmaixforwardedfrom.so %{rsyslog_module_dir_nodeps}/pmcisconames.so %{rsyslog_module_dir_nodeps}/pmrfc3164sd.so %{rsyslog_module_dir_nodeps}/pmsnare.so +%if %{with systemd} && %{with journal} +%{rsyslog_module_dir_nodeps}/imjournal.so +%{rsyslog_module_dir_nodeps}/omjournal.so +%endif %dir %{rsyslog_module_dir_withdeps} +%{rsyslog_module_dir_withdeps}/lmcry_gcry.so +%{_bindir}/rscryutil +%{_mandir}/man1/rscryutil.1* %{_mandir}/man5/rsyslog.conf.5* %{_mandir}/man8/rsyslogd.8* %dir %{rsyslogdocdir} @@ -858,7 +880,6 @@ fi %files module-gtls %defattr(-,root,root) %{rsyslog_module_dir_withdeps}/lmnsd_gtls.so -%{rsyslog_module_dir_withdeps}/lmcry_gcry.so %endif %if %{with relp} From f9819e9875f18490407475cd6c5232f429fb2cc5c9501a44adf1b89c089d29b1 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Apr 2013 07:42:53 +0000 Subject: [PATCH 3/7] - Removed obsolete --enable-pthreads configure option. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=141 --- rsyslog.changes | 1 + rsyslog.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rsyslog.changes b/rsyslog.changes index 13bb8a7..0d2c99f 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -50,6 +50,7 @@ Tue Apr 30 07:21:07 UTC 2013 - mt@suse.de - Enabled mmanon, providing anonymization support - Enabled lmcry_gcry.so, providing log file encryption support and the rscryutil utility to manage the encrypted log files. +- Removed obsolete --enable-pthreads configure option. ------------------------------------------------------------------- Fri Apr 19 21:53:30 UTC 2013 - andreas.stieger@gmx.de diff --git a/rsyslog.spec b/rsyslog.spec index 6049aa2..d985754 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -437,7 +437,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. --with-moddirs=%{rsyslog_module_dir_withdeps} \ --enable-option-checking \ --enable-largefile \ - --enable-pthreads \ --enable-regexp \ --enable-zlib \ --enable-klog \ From 5e869d9e9989c9b26391726399d69a07a36fed3924d21eaeaaec16f21834bf52 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Apr 2013 07:55:48 +0000 Subject: [PATCH 4/7] Fixed to use systemd journal on > 12.3 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=142 --- rsyslog.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rsyslog.spec b/rsyslog.spec index d985754..d087b0f 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -32,12 +32,15 @@ Release: 0 %bcond_with dbi %endif %if 0%{?suse_version} >= 1230 -%bcond_without journal %bcond_with systemv %else -%bcond_with journal %bcond_without systemv %endif +%if 0%{?suse_version} > 1230 +%bcond_without journal +%else +%bcond_with journal +%endif %bcond_without gssapi %bcond_without gnutls %bcond_without mysql From a55f1750753c641c2fdb4e2f2cd2d0592b8c4c9a0dd4a451dc9b7f274bd30021 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Apr 2013 07:56:33 +0000 Subject: [PATCH 5/7] - Enabled systemd imjournal,omjournal modules on > 12.3. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=143 --- rsyslog.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index 0d2c99f..a629576 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Apr 30 07:21:07 UTC 2013 - mt@suse.de +Tue Apr 30 07:56:12 UTC 2013 - mt@suse.de - update to 7.3.13 [beta] 2013-04-29: - added omrabbitmq module (contributed, untested) @@ -46,7 +46,7 @@ Tue Apr 30 07:21:07 UTC 2013 - mt@suse.de ratelimiting enhancements – this was a different one to the one Tomas Heinrich patched. - bugfix: timestamp problems in imkmsg -- Enabled systemd imjournal,omjournal modules. +- Enabled systemd imjournal,omjournal modules on > 12.3. - Enabled mmanon, providing anonymization support - Enabled lmcry_gcry.so, providing log file encryption support and the rscryutil utility to manage the encrypted log files. From 28eb7eed6a6bc7cd2c0cfd0709f16332e6f0b08c653694f0330fc3dbb03f3c64 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Apr 2013 10:52:44 +0000 Subject: [PATCH 6/7] - Enabled log file signing module lmsig_gt using GuardTime as separate rsyslog-module-guardtime package. - Moved previously enabled log file encryption module lmcry_gcry and its utility into a separate rsyslog-module-gcrypt package. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=144 --- rsyslog.changes | 8 +++++ rsyslog.spec | 79 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 6 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index a629576..9a8e9a5 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 30 10:49:01 UTC 2013 - mt@suse.de + +- Enabled log file signing module lmsig_gt using GuardTime as + separate rsyslog-module-guardtime package. +- Moved previously enabled log file encryption module lmcry_gcry + and its utility into a separate rsyslog-module-gcrypt package. + ------------------------------------------------------------------- Tue Apr 30 07:56:12 UTC 2013 - mt@suse.de diff --git a/rsyslog.spec b/rsyslog.spec index d087b0f..567295f 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -43,6 +43,8 @@ Release: 0 %endif %bcond_without gssapi %bcond_without gnutls +%bcond_without gcrypt +%bcond_without guardtime %bcond_without mysql %bcond_without pgsql %bcond_without relp @@ -103,10 +105,15 @@ BuildRequires: czmq-devel >= 1.1.0 %if %{with gssapi} BuildRequires: krb5-devel %endif -BuildRequires: libgcrypt-devel %if %{with gnutls} BuildRequires: libgnutls-devel %endif +%if %{with gcrypt} +BuildRequires: libgcrypt-devel +%endif +%if %{with guardtime} +BuildRequires: libgt-devel +%endif %if %{with dbi} BuildRequires: libdbi-devel %endif @@ -294,6 +301,39 @@ This module provides the ability for TLS encrypted TCP logging (based on current syslog-transport-tls internet drafts). %endif +%if %{with gcrypt} + +%package module-gcrypt +Requires: %{name} = %{version} +Summary: Libgcrypt log file encryption support module for rsyslog +Group: System/Daemons + +%description module-gcrypt +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides log file encryption support using libgcrypt and +a rsgtutil utility to manage the files. +%endif + +%if %{with guardtime} + +%package module-guardtime +Requires: %{name} = %{version} +Summary: GuardTime log file signing support module for rsyslog +Group: System/Daemons + +%description module-guardtime +Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog +package. + +This module provides log file signing support using GuardTime Keyless +Signature Service and a rsgtutil utility to manage the files. + +The digital timestamping component of the service is officially certified +and Guardtime is accredited as a timestamp authority by the European Union. +%endif + %if %{with relp} %package module-relp @@ -434,8 +474,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. # --enable-rfc3195 \ # needs java # --enable-gui \ -# meeds libgt >= 0.3.1 -# --enable-guardtime \ %configure \ --with-moddirs=%{rsyslog_module_dir_withdeps} \ --enable-option-checking \ @@ -516,7 +554,14 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../.. --enable-omjournal \ %endif --enable-mmanon \ +%if %{with guardtime} + --enable-guardtime \ +%endif +%if %{with gcrypt} --enable-libgcrypt \ +%else + --disable-libgcrypt \ +%endif --enable-usertools \ --disable-static @@ -524,6 +569,8 @@ make %{?_smp_mflags:%{_smp_mflags}} V=1 %install make install DESTDIR="%{buildroot}" V=1 +# Hack for v7.3.13, remove when fixed upstream +install -m644 tools/rsgtutil.1 %{buildroot}%{_mandir}/man1/ # rm -f %{buildroot}%{rsyslog_module_dir_nodeps}/*.la # @@ -535,7 +582,12 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the %if %{with gnutls} lmnsd_gtls.so \ %endif +%if %{with gcrypt} lmcry_gcry.so \ +%endif +%if %{with guardtime} + lmsig_gt.so \ +%endif %if %{with gssapi} omgssapi.so imgssapi.so lmgssutil.so \ %endif @@ -802,9 +854,6 @@ fi %{rsyslog_module_dir_nodeps}/omjournal.so %endif %dir %{rsyslog_module_dir_withdeps} -%{rsyslog_module_dir_withdeps}/lmcry_gcry.so -%{_bindir}/rscryutil -%{_mandir}/man1/rscryutil.1* %{_mandir}/man5/rsyslog.conf.5* %{_mandir}/man8/rsyslogd.8* %dir %{rsyslogdocdir} @@ -944,4 +993,22 @@ fi %{rsyslog_module_dir_withdeps}/omzmq3.so %endif +%if %{with gcrypt} + +%files module-gcrypt +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/lmcry_gcry.so +%{_bindir}/rscryutil +%{_mandir}/man1/rscryutil.1* +%endif + +%if %{with guardtime} + +%files module-guardtime +%defattr(-,root,root) +%{rsyslog_module_dir_withdeps}/lmsig_gt.so +%{_bindir}/rsgtutil +%{_mandir}/man1/rsgtutil.1* +%endif + %changelog From 9c11d671eb637baf2f2d3e9729a86defdcf9c76aead63dfb6f1a786bca72e273 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 30 Apr 2013 14:01:45 +0000 Subject: [PATCH 7/7] - Adopted config file to stop instead of deprecated "~" action. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=145 --- rsyslog.changes | 5 +++++ rsyslog.conf.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index 9a8e9a5..3198237 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 30 13:59:30 UTC 2013 - mt@suse.de + +- Adopted config file to stop instead of deprecated "~" action. + ------------------------------------------------------------------- Tue Apr 30 10:49:01 UTC 2013 - mt@suse.de diff --git a/rsyslog.conf.in b/rsyslog.conf.in index 43ba4c1..5dddae8 100644 --- a/rsyslog.conf.in +++ b/rsyslog.conf.in @@ -93,7 +93,7 @@ then /dev/tty10 if ($syslogfacility-text == 'kern') and \ ($msg contains 'IN=' and $msg contains 'OUT=') \ then -/var/log/firewall -& ~ +& stop # @@ -107,7 +107,7 @@ then -/var/log/firewall if ($programname == 'acpid' or $syslogtag == '[acpid]:') and \ ($syslogseverity <= 5 /* notice */) \ then -/var/log/acpid -& ~ +& stop # @@ -116,7 +116,7 @@ then -/var/log/acpid if ($programname == 'NetworkManager') or \ ($programname startswith 'nm-') \ then -/var/log/NetworkManager -& ~ +& stop #