.gitignore

@@ -3,14 +3,3 @@ vnstat-1.11.tar.gz
 /vnstat-1.15.tar.gz
 /vnstat-1.16.tar.gz
 /vnstat-1.17.tar.gz
-/vnstat-1.18.tar.gz
-/vnstat-2.2.tar.gz
-/vnstat-2.3.tar.gz
-/vnstat-2.4.tar.gz
-/vnstat-2.5.tar.gz
-/vnstat-2.6.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

sources

@@ -1 +1 @@
-SHA512 (vnstat-2.13.tar.gz) = 9b5d7b5085ab2ae39fd6b0d59afe56eb927b6e4ca1ca30ee7710afe2a412c4a1a8d756e095e9c3c81d182e3d6bb2efcd9a2a266e0048cac249477a09c1368969
+SHA512 (vnstat-1.17.tar.gz) = c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3

vnstat.service.patch

@@ -1,10 +1,10 @@
 --- a/examples/systemd/vnstat.service	2015-12-01 08:05:12.053856367 +0100
 +++ b/examples/systemd/vnstat.service	2015-12-01 08:05:07.967936194 +0100
 @@ -4,6 +4,7 @@
- StartLimitBurst=4
+ After=network.target
  
  [Service]
 +User=vnstat
- ExecStart=/usr/sbin/vnstatd --nodaemon
+ ExecStart=/usr/sbin/vnstatd -n
  ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
+ 

vnstat.spec

@@ -1,21 +1,19 @@
 Summary: Console-based network traffic monitor
 Name: vnstat
-Version: 2.13
-Release: 3%{?dist}
+Version: 1.17
+Release: 1%{?dist}
 
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License: GPL-2.0-only
+License: GPLv2
+Group: System Environment/Daemons
 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
-BuildRequires: make
-BuildRequires: gcc
 BuildRequires: gd-devel
 BuildRequires: systemd
-BuildRequires: sqlite-devel
 
 %description
 vnStat is a console-based network traffic monitor that keeps a log of daily
@@ -23,30 +21,15 @@ network traffic for the selected interface(s). vnStat isn't a packet sniffer.
 The traffic information is analyzed from the /proc file-system, so vnStat can
 be used without root permissions. See the web-page for few 'screenshots'.
 
-%package vnstati
-Summary: Image output support for vnstat
-Recommends: %{name} = %{version}-%{release}
-
-%description vnstati
-The purpose of vnstati is to provide image output support for statistics
-collected using vnstat. The image file format is limited to png. All basic
-outputs of vnStat are supported excluding live traffic features. The image can
-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 <<EOF
-u vnstat - 'vnStat user' %{_localstatedir}/lib/%{name} -
-EOF
-
 %build
 %{configure}
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" all
@@ -70,8 +53,11 @@ EOF
 D /run/vnstat 0700 vnstat vnstat
 END
 
-install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf
-
+%pre
+getent group %{name} > /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
@@ -82,131 +68,33 @@ install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf
 %postun
 %systemd_postun_with_restart vnstat.service
 
+%triggerun -- vnstat < 1.11-8
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply httpd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save vnstat >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del vnstat >/dev/null 2>&1 || :
+/bin/systemctl try-restart vnstat.service >/dev/null 2>&1 || :
+
+
 %files
+%defattr(-,root,root,-)
 %license COPYING
 %doc CHANGES FAQ README INSTALL examples
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_unitdir}/%{name}.service
 %{_tmpfilesdir}/%{name}.conf
-%{_mandir}/man1/vnstat.1*
-%{_mandir}/man5/vnstat.conf.5*
-%{_mandir}/man8/vnstatd.8*
+%{_mandir}/man*/*
 %{_bindir}/vnstat
+%{_bindir}/vnstati
 %{_sbindir}/vnstatd
 %attr(-,vnstat,vnstat)%dir /run/%{name}/
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
-%{_sysusersdir}/vnstat.conf
 
-%files vnstati
-%license COPYING
-%{_mandir}/man1/vnstati.1*
-%{_bindir}/vnstati
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Dec 10 2025 Adrian Reber <adrian@lisas.de> - 2.13-1
-- Upgrade to 2.13 (#2232896)
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.10-8
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 2.10-6
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Dec 09 2022 Adrian Reber <adrian@lisas.de> - 2.10-1
-- Upgrade to 2.10 (#2137399)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed May 18 2022 Adrian Reber <adrian@lisas.de> - 2.9-2
-- Upgrade to 2.9 (#2044224)
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Dec 14 2021 Adrian Reber <adrian@lisas.de> - 2.8-1
-- Upgrade to 2.8 (#1961015)
-- Create sub-package for vnstati and its libgd dependency (#1993650)
-
-* Mon Aug 30 2021 Adrian Reber <adrian@lisas.de> - 2.7-1
-- Upgrade to 2.7 (#1961015)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6-5
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 21 2020 Adrian Reber <adrian@lisas.de> - 2.6-1
-- Upgrade to 2.6 (#1791158)
-
-* Wed Jan 15 2020 Adrian Reber <adrian@lisas.de> - 2.5-1
-- Upgrade to 2.5 (#1791158)
-
-* Wed Nov 06 2019 Adrian Reber <adrian@lisas.de> - 2.4-1
-- Upgrade to 2.4
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 12 2019 Adrian Reber <adrian@lisas.de> -2.3-1
-- Upgrade to 2.3
-
-* Sun Apr 28 2019 Adrian Reber <adrian@lisas.de> -2.2-1
-- Upgrade to 2.2 (#1703811)
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Adrian Reber <adrian@lisas.de> - 1.18-1
-- Upgrade to 1.18 (#1551364)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Fri Feb 17 2017 Adrian Reber <adrian@lisas.de> - 1.17-1
 - Upgrade to 1.17 (#1423060)