diff --git a/.gitignore b/.gitignore index 428ac4e..d4964f6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,3 @@ vnstat-1.11.tar.gz /vnstat-2.7.tar.gz /vnstat-2.8.tar.gz /vnstat-2.9.tar.gz -/vnstat-2.10.tar.gz -/vnstat-2.13.tar.gz diff --git a/sources b/sources index 07bd2b4..22c94d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.13.tar.gz) = 9b5d7b5085ab2ae39fd6b0d59afe56eb927b6e4ca1ca30ee7710afe2a412c4a1a8d756e095e9c3c81d182e3d6bb2efcd9a2a266e0048cac249477a09c1368969 +SHA512 (vnstat-2.9.tar.gz) = 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176 diff --git a/vnstat.service.patch b/vnstat.service.patch index 257adaa..3752308 100644 --- a/vnstat.service.patch +++ b/vnstat.service.patch @@ -5,6 +5,6 @@ [Service] +User=vnstat - ExecStart=/usr/sbin/vnstatd --nodaemon + ExecStart=/usr/sbin/vnstatd -n ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/vnstat.spec b/vnstat.spec index e93645c..584398b 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,13 +1,13 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.13 -Release: 3%{?dist} +Version: 2.9 +Release: 2%{?dist} -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +License: GPLv2 URL: http://humdi.net/vnstat/ Source0: http://humdi.net/vnstat/vnstat-%{version}.tar.gz Patch0: vnstat.service.patch +Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -35,18 +35,13 @@ be outputted either to a file or to standard output. %prep %setup -q -%patch -P0 -p1 +%patch0 -p1 # disable maximum bandwidth setting and change pidfile location sed -i -e "s,/var/run/,/run/vnstat/,g; \ s,MaxBandwidth 100,MaxBandwidth 0,g;" \ cfg/vnstat.conf -# Create a sysusers.d config file -cat >vnstat.sysusers.conf < /dev/null || groupadd -r %{name} +getent passwd %{name} > /dev/null || useradd -r -g %{name} -M \ + -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "vnStat user" %{name} +exit 0 %post %systemd_post vnstat.service @@ -95,7 +93,6 @@ install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf %{_sbindir}/vnstatd %attr(-,vnstat,vnstat)%dir /run/%{name}/ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} -%{_sysusersdir}/vnstat.conf %files vnstati %license COPYING @@ -103,45 +100,6 @@ install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf %{_bindir}/vnstati %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 2.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 2.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Dec 10 2025 Adrian Reber - 2.13-1 -- Upgrade to 2.13 (#2232896) - -* Fri Jul 25 2025 Fedora Release Engineering - 2.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.10-8 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Sun Jan 19 2025 Fedora Release Engineering - 2.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 2.10-6 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 2.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 2.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Dec 09 2022 Adrian Reber - 2.10-1 -- Upgrade to 2.10 (#2137399) - -* Sat Jul 23 2022 Fedora Release Engineering - 2.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - * Wed May 18 2022 Adrian Reber - 2.9-2 - Upgrade to 2.9 (#2044224)