diff --git a/mrtg.fc b/mrtg.fc index b235a1b..340735d 100644 --- a/mrtg.fc +++ b/mrtg.fc @@ -7,10 +7,10 @@ /var/lib/mrtg(/.*)? gen_context(system_u:object_r:mrtg_var_lib_t,s0) -/run/lock/mrtg(/.*)? gen_context(system_u:object_r:mrtg_lock_t,s0) -/run/lock/mrtg-rrd(/.*)? gen_context(system_u:object_r:mrtg_lock_t,s0) -/run/lock/subsys/mrtg -- gen_context(system_u:object_r:mrtg_lock_t,s0) +/var/lock/mrtg(/.*)? gen_context(system_u:object_r:mrtg_lock_t,s0) +/var/lock/mrtg-rrd(/.*)? gen_context(system_u:object_r:mrtg_lock_t,s0) +/var/lock/subsys/mrtg -- gen_context(system_u:object_r:mrtg_lock_t,s0) /var/log/mrtg.* gen_context(system_u:object_r:mrtg_log_t,s0) -/run/mrtg\.pid -- gen_context(system_u:object_r:mrtg_var_run_t,s0) +/var/run/mrtg\.pid -- gen_context(system_u:object_r:mrtg_var_run_t,s0) diff --git a/mrtg.spec b/mrtg.spec index 1f24bd2..fbf0663 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 12%{?dist} +Release: 4%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 @@ -39,7 +39,7 @@ Patch1: mrtg-2.17.2-socket6-fix.patch # Patch2: some devices return 2**32-2 on ifSpeed (e. g. IBM FibreChannel switches) Patch2: mrtg-2.17.4-cfgmaker-ifhighspeed.patch Patch3: mrtg-configure-c99.patch -License: GPL-2.0-or-later +License: GPLv2+ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -80,10 +80,10 @@ Custom SELinux policy module %prep %setup -q -%patch -P0 -p1 -b .lib64 -%patch -P1 -p1 -b .socket6 -%patch -P2 -p1 -b .ifhighspeed -%patch -P3 -p1 -b .c99 +%patch0 -p1 -b .lib64 +%patch1 -p1 -b .socket6 +%patch2 -p1 -b .ifhighspeed +%patch3 -p1 -b .c99 for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -151,6 +151,7 @@ install -D -p -m 0644 selinux/%{modulename}.if %{buildroot}%{_datadir}/selinux/d %post install -d -m 0755 -o root -g root /var/lock/mrtg +restorecon /var/lock/mrtg %systemd_post mrtg.service %preun @@ -175,7 +176,7 @@ fi if [ "$1" -le "1" ]; then # First install # the service needs to be restarted for the custom label to be applied - %systemd_postun_with_restart mrtg.service &> /dev/null || : + %systemd_postun_with_restart mrtg.service fi %postun selinux @@ -208,35 +209,10 @@ fi %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.* %{_datadir}/selinux/devel/include/distributed/%{modulename}.if -%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} +%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %endif %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 2.17.10-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 04 2025 Vitezslav Crhonek - 2.17.10-11 -- Remove redundand restorecon call, redirect safe to ignore output - to /dev/null, mark module directory to avoid rpm verification - -* Fri Jan 17 2025 Fedora Release Engineering - 2.17.10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 2.17.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 2.17.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.17.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 2.17.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 25 2023 Vitezslav Crhonek - 2.17.10-5 -- SPDX migration - * Thu Jan 19 2023 Fedora Release Engineering - 2.17.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild