Accepting request 173999 from Base:System

- Adopted config file to stop instead of deprecated "~" action.
- 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.
- 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
- 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.
- Removed obsolete --enable-pthreads configure option.

OBS-URL: https://build.opensuse.org/request/show/173999
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=69

rsyslog-7.2.7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d
-size 2761741

rsyslog-7.3.13.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b11f63626aa849141a39e9c94ebcc495e19ab03f283a16b348f2fb0ab77be387
+size 2898293

rsyslog.changes

@@ -1,3 +1,70 @@
+-------------------------------------------------------------------
+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
+
+- 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
+
+- 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
+- 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.
+- Removed obsolete --enable-pthreads configure option.
+
 -------------------------------------------------------------------
 Fri Apr 19 21:53:30 UTC 2013 - andreas.stieger@gmx.de
 

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
 
 
 #

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
@@ -36,8 +36,15 @@ Release:        0
 %else
 %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  gcrypt
+%bcond_without  guardtime
 %bcond_without  mysql
 %bcond_without  pgsql
 %bcond_without  relp
@@ -71,6 +78,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
@@ -96,9 +106,14 @@ BuildRequires:  czmq-devel >= 1.1.0
 BuildRequires:  krb5-devel
 %endif
 %if %{with gnutls}
-BuildRequires:  libgcrypt-devel
 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
@@ -286,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
@@ -430,7 +478,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		\
@@ -502,12 +549,28 @@ 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		\
+%if %{with guardtime}
+	--enable-guardtime	\
+%endif
+%if %{with gcrypt}
+	--enable-libgcrypt	\
+%else
+	--disable-libgcrypt	\
+%endif
+	--enable-usertools	\
 	--disable-static
 
 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
 #
@@ -519,6 +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
@@ -754,6 +823,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
@@ -767,6 +837,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
@@ -774,11 +845,14 @@ 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}
 %{_mandir}/man5/rsyslog.conf.5*
 %{_mandir}/man8/rsyslogd.8*
@@ -919,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