- 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
This commit is contained in:
Marius Tomaschewski 2013-04-30 07:35:46 +00:00 committed by Git OBS Bridge
parent 0d53554807
commit 625bc57f87
2 changed files with 30 additions and 7 deletions

View File

@ -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

View File

@ -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}