diff --git a/.gitignore b/.gitignore index 3a988f5..428ac4e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ vnstat-1.11.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 a8223ba..07bd2b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.10.tar.gz) = 86c761290ec059a3252049b4f2a0a2aecdd7f8c159ee3db904339b1a9b14157a2125b919dd52754a29320ccdb41c89739bca78548b5a44b158b493f48be24a78 +SHA512 (vnstat-2.13.tar.gz) = 9b5d7b5085ab2ae39fd6b0d59afe56eb927b6e4ca1ca30ee7710afe2a412c4a1a8d756e095e9c3c81d182e3d6bb2efcd9a2a266e0048cac249477a09c1368969 diff --git a/vnstat.service.patch b/vnstat.service.patch index 3752308..257adaa 100644 --- a/vnstat.service.patch +++ b/vnstat.service.patch @@ -5,6 +5,6 @@ [Service] +User=vnstat - ExecStart=/usr/sbin/vnstatd -n + ExecStart=/usr/sbin/vnstatd --nodaemon ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure diff --git a/vnstat.spec b/vnstat.spec index 84732c9..e93645c 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,13 +1,13 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.10 -Release: 2%{?dist} +Version: 2.13 +Release: 3%{?dist} -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only 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,13 +35,18 @@ be outputted either to a file or to standard output. %prep %setup -q -%patch0 -p1 +%patch -P0 -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 +install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf + %post %systemd_post vnstat.service @@ -93,6 +95,7 @@ exit 0 %{_sbindir}/vnstatd %attr(-,vnstat,vnstat)%dir /run/%{name}/ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} +%{_sysusersdir}/vnstat.conf %files vnstati %license COPYING @@ -100,6 +103,36 @@ exit 0 %{_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