[rpms/inn] epel10: use a config drop-in instead of modifying rsyslog.conf in a trigger scriptlet

[rpms/inn] epel10: use a config drop-in instead of modifying rsyslog.conf in a trigger scriptlet

[Dominik 'Rathann' Mierzejewski]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10
Commit : 8e62e1ed42fb60cc68e59d491d1e6c8269ed2ec3
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date   : 2021-02-18T12:59:55+01:00
Stats  : +14/-26 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/8e62e1ed42fb60cc68e59d491d1e6c8269ed2ec3?branch=epel10

Log:
use a config drop-in instead of modifying rsyslog.conf in a trigger scriptlet

---
diff --git a/inn.rsyslog b/inn.rsyslog
new file mode 100644
index 0000000..43d2597
--- /dev/null
+++ b/inn.rsyslog
@@ -0,0 +1,4 @@
+news.=crit                                        /var/log/news/news.crit
+news.=err                                         /var/log/news/news.err
+news.notice                                       /var/log/news/news.notice
+news.=debug                                       /var/log/news/news.debug

diff --git a/inn.spec b/inn.spec
index ce56f8b..e36b826 100644
--- a/inn.spec
+++ b/inn.spec
@@ -3,7 +3,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 URL: https://www.eyrie.org/~eagle/software/inn/
@@ -21,6 +21,7 @@ Source23: innd-nntpsend.service
 Source24: innd-nntpsend.timer
 Source25: innd-rnews.service
 Source26: innd-rnews.timer
+Source30: inn.rsyslog
 Patch1: inn-2.6.4-rh.patch
 Patch2: https://inn.eyrie.org/trac/changeset/10541?format=diff&new=10541#/inn-2.6.4-changeset-10541.patch
 BuildRequires: autoconf
@@ -256,6 +257,9 @@ enable innd-nntpsend.timer
 enable innd-rnews.timer
 EOF
 
+install -dm755 %{buildroot}%{_sysconfdir}/rsyslog.d
+install -pm644 %{S:30} %{buildroot}%{_sysconfdir}/rsyslog.d/inn.conf
+
 %check
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C tests test
 
@@ -298,31 +302,6 @@ chown -R news:news /var/log/news*
 
 %ldconfig_scriptlets libs
 
-%triggerin -- rsyslog
-if [ -f /etc/rsyslog.conf ]; then
-  if ! grep -q INN /etc/rsyslog.conf; then
-    sed 's/mail.none;/mail.none;news.none;/' < /etc/rsyslog.conf > /etc/rsyslog.conf.inn
-    mv /etc/rsyslog.conf.inn /etc/rsyslog.conf
-
-    echo '' \
-       >> /etc/rsyslog.conf
-    echo '#' \
-       >> /etc/rsyslog.conf
-    echo '# INN' \
-       >> /etc/rsyslog.conf
-    echo '#' \
-       >> /etc/rsyslog.conf
-    echo 'news.=crit                                        /var/log/news/news.crit'   >> /etc/rsyslog.conf
-    echo 'news.=err                                         /var/log/news/news.err'    >> /etc/rsyslog.conf
-    echo 'news.notice                                       /var/log/news/news.notice' >> /etc/rsyslog.conf
-    echo 'news.=debug                                       /var/log/news/news.debug' >> /etc/rsyslog.conf
-
-    fi
-  if [ -f /var/run/rsyslogd.pid ]; then
-    kill -HUP `cat /var/run/rsyslogd.pid` 2> /dev/null ||:
-  fi
-fi
-
 %preun
 %systemd_preun innd.service
 
@@ -357,6 +336,8 @@ fi
 %{_unitdir}/innd-rnews.service
 %{_unitdir}/innd-rnews.timer
 %{_presetdir}/80-inn.preset
+%dir %{_sysconfdir}/rsyslog.d
+%{_sysconfdir}/rsyslog.d/inn.conf
 %defattr(-,news,news,-)
 # tmpfile.d files
 %{_tmpfilesdir}/inn.conf
@@ -595,6 +576,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Thu Feb 18 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-3
+- use a config drop-in instead of modifying rsyslog.conf in a trigger scriptlet
+
 * Tue Feb 16 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-2
 - backport upstream patch to fix util/inndf test on ppc64le
 - drop obsolete patch (-pie is used for all programs by default now)