diff --git a/rsyslog.conf b/rsyslog.conf index f6d3f6a..6d45c53 100644 --- a/rsyslog.conf +++ b/rsyslog.conf @@ -12,7 +12,7 @@ global(workDirectory="/var/lib/rsyslog") #### MODULES #### # Use default timestamp format -module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat") +module(load="builtin:omfile") module(load="imuxsock" # provides support for local system logging (e.g. via logger command) SysSock.Use="off") # Turn off message reception via local log socket; diff --git a/rsyslog.spec b/rsyslog.spec index ba6eb36..9a5e92d 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -8,7 +8,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.2102.0 -Release: 4%{?dist} +Release: 5%{?dist} License: (GPLv3+ and ASL 2.0) URL: http://www.rsyslog.com/ Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz @@ -42,7 +42,9 @@ BuildRequires: python3-docutils # make sure systemd is in a version that isn't affected by rhbz#974132 BuildRequires: systemd-devel >= 204-8 BuildRequires: zlib-devel +BuildRequires: openssl-devel +Requires: openssl-libs Requires: logrotate >= 3.5.2 Requires: bash >= 2.0 %{?systemd_ordering} @@ -101,10 +103,16 @@ Requires: %name = %version-%release BuildRequires: librelp-devel >= 1.2.16 %package gnutls -Summary: TLS protocol support for rsyslog +Summary: TLS protocol support for rsyslog via GnuTLS library Requires: %name = %version-%release BuildRequires: gnutls-devel +%package openssl +Summary: TLS protocol support for rsyslog via OpenSSL library +Group: System Environment/Daemons +Requires: %name = %version-%release +BuildRequires: openssl-devel + %package snmp Summary: SNMP protocol support for rsyslog Requires: %name = %version-%release @@ -219,8 +227,15 @@ protocol. %description gnutls The rsyslog-gnutls package contains the rsyslog plugins that provide the -ability to receive syslog messages via upcoming syslog-transport-tls -IETF standard protocol. +ability to send and receive syslog messages via TCP or RELP using TLS +encryption via GnuTLS library. For details refer to rsyslog doc on imtcp +and omfwd modules. + +%description openssl +The rsyslog-openssl package contains the rsyslog plugins that provide the +ability to send and receive syslog messages via TCP or RELP using TLS +encryption via OpenSSL library. For details refer to rsyslog doc on imtcp +and omfwd modules. %description snmp The rsyslog-snmp package contains the rsyslog plugin that provides the @@ -333,6 +348,7 @@ autoreconf -if --enable-elasticsearch \ --enable-generate-man-pages \ --enable-gnutls \ + --enable-openssl \ --enable-gssapi-krb5 \ --enable-imfile \ --enable-imjournal \ @@ -515,6 +531,9 @@ done %files gnutls %{_libdir}/rsyslog/lmnsd_gtls.so +%files openssl +%{_libdir}/rsyslog/lmnsd_ossl.so + %files snmp %{_libdir}/rsyslog/omsnmp.so @@ -550,6 +569,11 @@ done %changelog +* Wed Aug 25 2021 Attila Lakatos - 8.2102.0-5 +- Enable openssl +- Do not set default template for omfile + resolves: rhbz#1985195 + * Tue Jul 27 2021 Pavel Raiskup - 8.2102.0-4 - reorder the rsyslog.conf to simplify the rsyslog.d configuration (#1985202)