From f1c7790d1859d94f7467e915983660862fff5d7e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 Dec 2021 13:19:42 -0500 Subject: [PATCH] import rsyslog-8.2102.0-10.el9 --- SPECS/rsyslog.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/SPECS/rsyslog.spec b/SPECS/rsyslog.spec index 624480f..bdd7654 100644 --- a/SPECS/rsyslog.spec +++ b/SPECS/rsyslog.spec @@ -5,7 +5,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 8.2102.0 -Release: 9%{?dist} +Release: 10%{?dist} License: (GPLv3+ and ASL 2.0) URL: http://www.rsyslog.com/ Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz @@ -44,13 +44,18 @@ BuildRequires: python3-docutils BuildRequires: systemd-devel >= 204-8 BuildRequires: zlib-devel -Requires: logrotate >= 3.5.2 +Recommends: %{name}-logrotate = %version-%release Requires: bash >= 2.0 %{?systemd_ordering} Provides: syslog Obsoletes: sysklogd < 1.5-11 +%package logrotate +Summary: Log rotation for rsyslog +Requires: %name = %version-%release +Requires: logrotate >= 3.5.2 + %package crypto Summary: Encryption support Requires: %name = %version-%release @@ -153,6 +158,9 @@ and can be used as a drop-in replacement. Rsyslog is simple to set up, with advanced features suitable for enterprise-class, encryption-protected syslog relay chains. +%description logrotate +This subpackage contains the default logrotate configuration for rsyslog. + %description crypto This package contains a module providing log file encryption and a command line tool to process encrypted logs. @@ -400,7 +408,6 @@ done %{_unitdir}/rsyslog.service %config(noreplace) %{_sysconfdir}/rsyslog.conf %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog -%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog # plugins %{_libdir}/rsyslog/fmhash.so %{_libdir}/rsyslog/fmhttp.so @@ -436,6 +443,9 @@ done %{_libdir}/rsyslog/pmlastmsg.so %{_libdir}/rsyslog/pmsnare.so +%files logrotate +%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog + %files crypto %{_bindir}/rscryutil %{_mandir}/man1/rscryutil.1.gz @@ -502,6 +512,10 @@ done %changelog +* Tue Oct 26 2021 Davide Cavalca - 8.2102.0-10 +- Split out logrotate config and dependency into a subpackage + resolves: rhbz#1992155 + * Fri Aug 27 2021 Attila Lakatos - 8.2102.0-9 - Add required flags for branch protection - Add missing tests folder