From acdf5e87d35192ac34aba09606d9376e6a415b56 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 28 Jun 2011 11:51:31 +0200 Subject: [PATCH 01/81] do not run vnstatd as the root user but as the vnstat user (#711995) --- vnstat.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index a6636c1..8432357 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -38,6 +38,9 @@ touch -r cfg/vnstat.conf{,.new} touch -r examples/init.d/fedora/vnstat{,.new} %{__mv} -f examples/init.d/fedora/vnstat{.new,} +# do not run vnstatd as the root user but as the vnstat user (#711995) +sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat + # Use -p everywhere, -s nowhere %{__sed} -i -e "s,install \(-s \)\?,install -p ," Makefile @@ -129,6 +132,9 @@ fi %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Tue Jun 28 2011 Adrian Reber - 1.11-2 +- do not run vnstatd as the root user but as the vnstat user (#711995) + * Thu Jun 02 2011 Robert Scheck - 1.11-1 - Upgrade to 1.11 From 7353b53d130e8ad5c52d3917eeb4ebf980bad9b5 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 29 Nov 2011 11:07:20 +0100 Subject: [PATCH 02/81] create file in tmpfiles.d for pidfile (#750141) --- vnstat.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 8432357..916cf69 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -24,11 +24,10 @@ be used without root permissions. See the webpage for few 'screenshots'. %prep %setup -q -# disable maximum bandwidth setting -%{__sed} -e "s,MaxBandwidth 100,MaxBandwidth 0,g" \ - cfg/vnstat.conf > cfg/vnstat.conf.new -touch -r cfg/vnstat.conf{,.new} -%{__mv} -f cfg/vnstat.conf{.new,} +# 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 # no automatic runlevel %{__sed} -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \ @@ -52,6 +51,7 @@ sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d %{__make} install DESTDIR=$RPM_BUILD_ROOT %{__install} -p -m 755 examples/init.d/fedora/vnstat \ @@ -95,6 +95,10 @@ fi %{_bindir}/%{name} \$VNSTAT_OPTIONS END +%{__cat} >> $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/vnstat.conf << END +D /run/vnstat 0700 vnstat vnstat +END + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -124,6 +128,7 @@ fi %config(noreplace) %{_sysconfdir}/cron.d/%{name} %{_sysconfdir}/rc.d/init.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%{_sysconfdir}/tmpfiles.d/vnstat.conf %{_mandir}/man*/* %{_bindir}/vnstat %{_bindir}/vnstati @@ -132,6 +137,9 @@ fi %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Tue Nov 29 2011 Adrian Reber - 1.11-3 +- create file in tmpfiles.d for pidfile (#750141) + * Tue Jun 28 2011 Adrian Reber - 1.11-2 - do not run vnstatd as the root user but as the vnstat user (#711995) From 973b8d36bf45494141e124e0904a53d222402274 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 22 Dec 2011 22:42:55 +0100 Subject: [PATCH 03/81] added patch to check for pidfile in /run/vnstat --- vnstat-run-vnstat.diff | 25 +++++++++++++++++++++++++ vnstat.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 vnstat-run-vnstat.diff diff --git a/vnstat-run-vnstat.diff b/vnstat-run-vnstat.diff new file mode 100644 index 0000000..b3d464d --- /dev/null +++ b/vnstat-run-vnstat.diff @@ -0,0 +1,25 @@ +--- a/src/vnstatd.c 2011-06-01 00:29:51.000000000 +0200 ++++ b/src/vnstatd.c 2011-12-22 22:23:22.512967108 +0100 +@@ -482,10 +482,18 @@ + /* lock / pid file */ + pidfile = open(cfg.pidfile, O_RDWR|O_CREAT, 0644); + if (pidfile<0) { +- perror("pidfile"); +- snprintf(errorstring, 512, "pidfile failed, exiting."); +- printe(PT_Error); +- exit(EXIT_FAILURE); /* can't open */ ++ /* for Fedora's move to systemd and /run check ++ * for /run/vnstat/vnstat.pid, so that it needs no changes ++ * to the config file */ ++ pidfile = open("/run/vnstat/vnstat.pid", O_RDWR|O_CREAT, 0644); ++ if (pidfile<0) { ++ perror("pidfile"); ++ snprintf(errorstring, 512, "pidfile failed, exiting."); ++ printe(PT_Error); ++ exit(EXIT_FAILURE); /* can't open */ ++ } else { ++ strncpy(cfg.pidfile, "/run/vnstat/vnstat.pid", 512); ++ } + } + if (lockf(pidfile,F_TLOCK,0)<0) { + perror("pidfile lock"); diff --git a/vnstat.spec b/vnstat.spec index 916cf69..369fcb1 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -14,6 +14,7 @@ Requires(preun): initscripts Requires(postun): initscripts BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel +Patch0: vnstat-run-vnstat.diff %description vnStat is a console-based network traffic monitor that keeps a log of daily @@ -23,6 +24,7 @@ be used without root permissions. See the webpage for few 'screenshots'. %prep %setup -q +%patch0 -p1 # disable maximum bandwidth setting and change pidfile location sed -i -e "s,/var/run/,/run/vnstat/,g; \ @@ -137,6 +139,9 @@ fi %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Thu Dec 22 2011 Adrian Reber - 1.11-4 +- added patch to check for pidfile in /run/vnstat + * Tue Nov 29 2011 Adrian Reber - 1.11-3 - create file in tmpfiles.d for pidfile (#750141) From e11a4e46b152b8ada718df7e23c0f77dc51dee23 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 23 Dec 2011 11:27:22 +0100 Subject: [PATCH 04/81] added /run/%{name}/ directory to file list --- vnstat.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 369fcb1..eaa904d 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -55,6 +55,9 @@ sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d +%{__mkdir_p} %{buildroot}/run/ +%{__install} -d -m 0710 %{buildroot}/run/%{name}/ + %{__make} install DESTDIR=$RPM_BUILD_ROOT %{__install} -p -m 755 examples/init.d/fedora/vnstat \ $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d @@ -135,10 +138,14 @@ fi %{_bindir}/vnstat %{_bindir}/vnstati %{_sbindir}/vnstatd +%dir /run/%{name}/ %attr(755,root,root)%{_sbindir}/%{name}.cron %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Thu Dec 22 2011 Adrian Reber - 1.11-5 +- added /run/%%{name}/ directory to file list + * Thu Dec 22 2011 Adrian Reber - 1.11-4 - added patch to check for pidfile in /run/vnstat From 59b78276389eb638ee904d093b41eae09c727981 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 23 Dec 2011 12:20:11 +0100 Subject: [PATCH 05/81] fixed /run/%{name}/ permissions --- vnstat.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index eaa904d..450ada9 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -56,7 +56,7 @@ sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d %{__mkdir_p} %{buildroot}/run/ -%{__install} -d -m 0710 %{buildroot}/run/%{name}/ +%{__install} -d -m 0700 %{buildroot}/run/%{name}/ %{__make} install DESTDIR=$RPM_BUILD_ROOT %{__install} -p -m 755 examples/init.d/fedora/vnstat \ @@ -138,11 +138,14 @@ fi %{_bindir}/vnstat %{_bindir}/vnstati %{_sbindir}/vnstatd -%dir /run/%{name}/ +%attr(-,vnstat,vnstat)%dir /run/%{name}/ %attr(755,root,root)%{_sbindir}/%{name}.cron %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Thu Dec 22 2011 Adrian Reber - 1.11-6 +- fixed /run/%%{name}/ permissions + * Thu Dec 22 2011 Adrian Reber - 1.11-5 - added /run/%%{name}/ directory to file list From 62fe3037cab7213e230f4eab7924128a5d6c7287 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:02:13 -0600 Subject: [PATCH 06/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 450ada9..2ee3fca 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -143,6 +143,9 @@ fi %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Dec 22 2011 Adrian Reber - 1.11-6 - fixed /run/%%{name}/ permissions From 86ad690bba0c06f1651ca5536be4e4b2baa076fe Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 14 Feb 2012 07:54:03 -0600 Subject: [PATCH 07/81] Migrate to systemd, --- vnstat.service | 10 ++++++ vnstat.spec | 83 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 vnstat.service diff --git a/vnstat.service b/vnstat.service new file mode 100644 index 0000000..3efda38 --- /dev/null +++ b/vnstat.service @@ -0,0 +1,10 @@ +[Unit] +Description=VnStat - Lightweight Network Traffic Monitor +After=network.target + +[Service] +User=vnstat +ExecStart=/usr/sbin/vnstatd -d + +[Install] +WantedBy=multi-user.target diff --git a/vnstat.spec b/vnstat.spec index 2ee3fca..fff473e 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,17 +1,21 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://humdi.net/vnstat/ -Source: http://humdi.net/vnstat/vnstat-%{version}.tar.gz +Source0: http://humdi.net/vnstat/vnstat-%{version}.tar.gz +Source1: vnstat.service Requires(pre): shadow-utils -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +#Requires(post): chkconfig +#Requires(preun): chkconfig +#Requires(preun): initscripts +#Requires(postun): initscripts +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel Patch0: vnstat-run-vnstat.diff @@ -32,15 +36,15 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \ cfg/vnstat.conf # no automatic runlevel -%{__sed} -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \ - -e "s,Default-Start: 2 3 4 5,Default-Start:," \ - -e "s,Default-Stop: 0 1 6,Default-Stop:," \ - examples/init.d/fedora/vnstat > examples/init.d/fedora/vnstat.new -touch -r examples/init.d/fedora/vnstat{,.new} -%{__mv} -f examples/init.d/fedora/vnstat{.new,} +#%{__sed} -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \ +# -e "s,Default-Start: 2 3 4 5,Default-Start:," \ +# -e "s,Default-Stop: 0 1 6,Default-Stop:," \ +# examples/init.d/fedora/vnstat > examples/init.d/fedora/vnstat.new +#touch -r examples/init.d/fedora/vnstat{,.new} +#%{__mv} -f examples/init.d/fedora/vnstat{.new,} # do not run vnstatd as the root user but as the vnstat user (#711995) -sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat +#sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat # Use -p everywhere, -s nowhere %{__sed} -i -e "s,install \(-s \)\?,install -p ," Makefile @@ -51,7 +55,8 @@ sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat %install %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d +#%%{__mkdir_p} $RPM_BUILD_ROOT%%{_sysconfdir}/rc.d/init.d +%{__mkdir_p} $RPM_BUILD_ROOT%{_unitdir} %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d @@ -59,8 +64,9 @@ sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat %{__install} -d -m 0700 %{buildroot}/run/%{name}/ %{__make} install DESTDIR=$RPM_BUILD_ROOT -%{__install} -p -m 755 examples/init.d/fedora/vnstat \ - $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d +#%%{__install} -p -m 755 examples/init.d/fedora/vnstat \ +# $RPM_BUILD_ROOT%%{_sysconfdir}/rc.d/init.d +%{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/ %{__rm} -rf examples/init.d %{__chmod} 644 examples/vnstat.cgi %{__chmod} 644 examples/vnstat.cron @@ -113,25 +119,53 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "vnStat user" %{name} %post -/sbin/chkconfig --add vnstat || : +#/sbin/chkconfig --add vnstat || : +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + %preun -if [ "$1" = 0 ] ; then - /sbin/service vnstat stop > /dev/null 2>&1 - /sbin/chkconfig --del vnstat || : +#if [ "$1" = 0 ] ; then +# /sbin/service vnstat stop > /dev/null 2>&1 +# /sbin/chkconfig --del vnstat || : +#fi +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable vnstat.service > /dev/null 2>&1 || : + /bin/systemctl stop vnstat.service > /dev/null 2>&1 || : fi + %postun -if [ "$1" -ge 1 ]; then - /sbin/service vnstat try-restart >/dev/null 2>&1 || : +#if [ "$1" -ge 1 ]; then +# /sbin/service vnstat try-restart >/dev/null 2>&1 || : +#fi +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart vnstat.service >/dev/null 2>&1 || : fi +%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,-) %doc CHANGES COPYING FAQ README INSTALL examples %config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/cron.d/%{name} -%{_sysconfdir}/rc.d/init.d/%{name} +#%%{_sysconfdir}/rc.d/init.d/%%{name} +%{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_sysconfdir}/tmpfiles.d/vnstat.conf %{_mandir}/man*/* @@ -143,6 +177,9 @@ fi %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Tue Feb 14 2012 Jon Ciesla - 1.11-8 +- Update to systemd, BZ 661325. + * Sat Jan 14 2012 Fedora Release Engineering - 1.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 64a7e854830b62cdab490eb9c8e72b911b516ddd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:57:26 -0500 Subject: [PATCH 08/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index fff473e..10570bd 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -177,6 +177,9 @@ fi %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 14 2012 Jon Ciesla - 1.11-8 - Update to systemd, BZ 661325. From 0fe7cc1572eadc7b488ff85328691a6babff82a0 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 24 Aug 2012 11:57:51 +0200 Subject: [PATCH 09/81] fixed "Introduce new systemd-rpm macros in vnstat spec file" (#850361) --- vnstat.service | 1 + vnstat.spec | 32 +++++++------------------------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/vnstat.service b/vnstat.service index 3efda38..acfc785 100644 --- a/vnstat.service +++ b/vnstat.service @@ -3,6 +3,7 @@ Description=VnStat - Lightweight Network Traffic Monitor After=network.target [Service] +Type=forking User=vnstat ExecStart=/usr/sbin/vnstatd -d diff --git a/vnstat.spec b/vnstat.spec index 10570bd..e324c13 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -119,34 +119,13 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "vnStat user" %{name} %post -#/sbin/chkconfig --add vnstat || : -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - +%systemd_post vnstat.service %preun -#if [ "$1" = 0 ] ; then -# /sbin/service vnstat stop > /dev/null 2>&1 -# /sbin/chkconfig --del vnstat || : -#fi -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable vnstat.service > /dev/null 2>&1 || : - /bin/systemctl stop vnstat.service > /dev/null 2>&1 || : -fi - +%systemd_preun vnstat.service %postun -#if [ "$1" -ge 1 ]; then -# /sbin/service vnstat try-restart >/dev/null 2>&1 || : -#fi -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart vnstat.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart vnstat.service %triggerun -- vnstat < 1.11-8 # Save the current service runlevel info @@ -177,6 +156,9 @@ fi %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Fri Aug 24 2012 Adrian Reber - 1.11-10 +- fixed "Introduce new systemd-rpm macros in vnstat spec file" (#850361) + * Sun Jul 22 2012 Fedora Release Engineering - 1.11-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From fa49993914369d37c5081b9081afbf5956cbda34 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 24 Aug 2012 12:02:04 +0200 Subject: [PATCH 10/81] fixed "Introduce new systemd-rpm macros in vnstat spec file" (#850361) --- vnstat.service | 1 - vnstat.spec | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/vnstat.service b/vnstat.service index acfc785..3efda38 100644 --- a/vnstat.service +++ b/vnstat.service @@ -3,7 +3,6 @@ Description=VnStat - Lightweight Network Traffic Monitor After=network.target [Service] -Type=forking User=vnstat ExecStart=/usr/sbin/vnstatd -d diff --git a/vnstat.spec b/vnstat.spec index e324c13..f31d5a1 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -156,7 +156,7 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog -* Fri Aug 24 2012 Adrian Reber - 1.11-10 +* Fri Aug 24 2012 Adrian Reber - 1.11-11 - fixed "Introduce new systemd-rpm macros in vnstat spec file" (#850361) * Sun Jul 22 2012 Fedora Release Engineering - 1.11-9 From c7c72e464a00c7e7717234fa32f7e2a7ac3dbf1c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:52:46 -0600 Subject: [PATCH 11/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index f31d5a1..2143d8f 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -156,6 +156,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Aug 24 2012 Adrian Reber - 1.11-11 - fixed "Introduce new systemd-rpm macros in vnstat spec file" (#850361) From b8a9a29223892cfbfa9240288762f3f10942d578 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 7 Mar 2013 20:02:08 +0100 Subject: [PATCH 12/81] fixed "/usr/sbin/vnstat.cron is incorrect" (#919157) --- vnstat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 2143d8f..be1236a 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -97,7 +97,7 @@ END VNSTAT_CONF=%{_sysconfdir}/sysconfig/%{name} -if [ ! -f $VNSTAT_CONF ]; then +if [ ! -f \$VNSTAT_CONF ]; then exit 0 fi @@ -156,6 +156,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Thu Mar 07 2013 Adrian Reber - 1.11-13 +- fixed "/usr/sbin/vnstat.cron is incorrect" (#919157) + * Fri Feb 15 2013 Fedora Release Engineering - 1.11-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 1c96a62903badb2f32d9f675a4bee84fbadc0381 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 8 Mar 2013 12:16:48 +0100 Subject: [PATCH 13/81] spec cleanup --- vnstat.spec | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index be1236a..ae0686c 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -9,14 +9,9 @@ URL: http://humdi.net/vnstat/ Source0: http://humdi.net/vnstat/vnstat-%{version}.tar.gz Source1: vnstat.service Requires(pre): shadow-utils -#Requires(post): chkconfig -#Requires(preun): chkconfig -#Requires(preun): initscripts -#Requires(postun): initscripts Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gd-devel Patch0: vnstat-run-vnstat.diff @@ -35,17 +30,6 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \ s,MaxBandwidth 100,MaxBandwidth 0,g;" \ cfg/vnstat.conf -# no automatic runlevel -#%{__sed} -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \ -# -e "s,Default-Start: 2 3 4 5,Default-Start:," \ -# -e "s,Default-Stop: 0 1 6,Default-Stop:," \ -# examples/init.d/fedora/vnstat > examples/init.d/fedora/vnstat.new -#touch -r examples/init.d/fedora/vnstat{,.new} -#%{__mv} -f examples/init.d/fedora/vnstat{.new,} - -# do not run vnstatd as the root user but as the vnstat user (#711995) -#sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat - # Use -p everywhere, -s nowhere %{__sed} -i -e "s,install \(-s \)\?,install -p ," Makefile @@ -53,9 +37,7 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \ %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" all %install -%{__rm} -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d -#%%{__mkdir_p} $RPM_BUILD_ROOT%%{_sysconfdir}/rc.d/init.d %{__mkdir_p} $RPM_BUILD_ROOT%{_unitdir} %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d @@ -64,8 +46,6 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \ %{__install} -d -m 0700 %{buildroot}/run/%{name}/ %{__make} install DESTDIR=$RPM_BUILD_ROOT -#%%{__install} -p -m 755 examples/init.d/fedora/vnstat \ -# $RPM_BUILD_ROOT%%{_sysconfdir}/rc.d/init.d %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/ %{__rm} -rf examples/init.d %{__chmod} 644 examples/vnstat.cgi @@ -110,9 +90,6 @@ END D /run/vnstat 0700 vnstat vnstat END -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %pre getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name} getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ @@ -143,7 +120,6 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %doc CHANGES COPYING FAQ README INSTALL examples %config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/cron.d/%{name} -#%%{_sysconfdir}/rc.d/init.d/%%{name} %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_sysconfdir}/tmpfiles.d/vnstat.conf @@ -156,6 +132,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Fri Mar 08 2013 Adrian Reber - 1.11-14 +- spec cleanup + * Thu Mar 07 2013 Adrian Reber - 1.11-13 - fixed "/usr/sbin/vnstat.cron is incorrect" (#919157) From 8128332dabf06093d5acedcd2a0b156424718264 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Jun 2013 12:39:31 +0200 Subject: [PATCH 14/81] rebuild for new GD 2.1.0 --- vnstat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index ae0686c..bc253e4 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -131,7 +131,11 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %attr(755,root,root)%{_sbindir}/%{name}.cron %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} + %changelog +* Tue Jun 11 2013 Remi Collet - 1.11-15 +- rebuild for new GD 2.1.0 + * Fri Mar 08 2013 Adrian Reber - 1.11-14 - spec cleanup From 0de81c29c8fb4a47ea16f0d1fd293634330d6b6c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:23:41 -0500 Subject: [PATCH 15/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index bc253e4..3178ce4 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -133,6 +133,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.11-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jun 11 2013 Remi Collet - 1.11-15 - rebuild for new GD 2.1.0 From 4cda9c689f5819d441a19581cddb55eb465fd733 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Wed, 7 Aug 2013 12:05:23 +0800 Subject: [PATCH 16/81] Fix the build by adding the missing BR on systemd --- vnstat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 3178ce4..5a37a16 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -13,6 +13,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units BuildRequires: gd-devel +BuildRequires: systemd Patch0: vnstat-run-vnstat.diff %description @@ -133,6 +134,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Wed Aug 07 2013 Mathieu Bridon - 1.11-17 +- Fix the build by adding the missing BR on systemd. + * Sun Aug 04 2013 Fedora Release Engineering - 1.11-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 805be23608520d079536a757a90e95b88150a70a Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 7 Aug 2013 14:47:24 +0200 Subject: [PATCH 17/81] fix bogus dates - added patch for "vnstat.c:489:22: warning: iteration 12u invokes undefined behavior [-Waggressive-loop-optimizations]" --- vnstat-1.11-there-are-only-12-months.patch | 11 +++++++++++ vnstat.spec | 15 +++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 vnstat-1.11-there-are-only-12-months.patch diff --git a/vnstat-1.11-there-are-only-12-months.patch b/vnstat-1.11-there-are-only-12-months.patch new file mode 100644 index 0000000..41806c0 --- /dev/null +++ b/vnstat-1.11-there-are-only-12-months.patch @@ -0,0 +1,11 @@ +--- vnstat-1.11/src/vnstat.c.old 2011-06-01 00:29:51.000000000 +0200 ++++ vnstat-1.11/src/vnstat.c 2013-08-07 14:42:58.396231450 +0200 +@@ -485,7 +485,7 @@ + readdb(interface, dirname); + + data.totalrx=data.totaltx=data.totalrxk=data.totaltxk=0; +- for (i=0; i<=29; i++) { ++ for (i=0; i<=12; i++) { + if (data.month[i].used) { + addtraffic(&data.totalrx, &data.totalrxk, data.month[i].rx, data.month[i].rxk); + addtraffic(&data.totaltx, &data.totaltxk, data.month[i].tx, data.month[i].txk); diff --git a/vnstat.spec b/vnstat.spec index 5a37a16..bfd694b 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -15,6 +15,7 @@ Requires(postun): systemd-units BuildRequires: gd-devel BuildRequires: systemd Patch0: vnstat-run-vnstat.diff +Patch1: vnstat-1.11-there-are-only-12-months.patch %description vnStat is a console-based network traffic monitor that keeps a log of daily @@ -25,6 +26,7 @@ be used without root permissions. See the webpage for few 'screenshots'. %prep %setup -q %patch0 -p1 +%patch1 -p1 # disable maximum bandwidth setting and change pidfile location sed -i -e "s,/var/run/,/run/vnstat/,g; \ @@ -134,6 +136,11 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Wed Aug 07 2013 Adrian Reber - 1.11-18 +- fix bogus dates +- added patch for + "vnstat.c:489:22: warning: iteration 12u invokes undefined behavior [-Waggressive-loop-optimizations]" + * Wed Aug 07 2013 Mathieu Bridon - 1.11-17 - Fix the build by adding the missing BR on systemd. @@ -234,16 +241,16 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ * Fri Sep 15 2006 Adrian Reber - 1.4-8 - rebuilt -* Fri Mar 18 2006 Adrian Reber - 1.4-7 +* Fri Mar 17 2006 Adrian Reber - 1.4-7 - rebuilt; fixed dist tag -* Fri Mar 18 2006 Adrian Reber - 1.4-6 +* Fri Mar 17 2006 Adrian Reber - 1.4-6 - rebuilt * Sun May 22 2005 Jeremy Katz - 1.4-5 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 8 2005 Michael Schwendt - rebuilt * Mon Feb 28 2005 Adrian Reber 1.4-3 From 70ad62936e3f18d49b57bec60b0f0fc1baddb493 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:54:49 -0500 Subject: [PATCH 18/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index bfd694b..e95e355 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -136,6 +136,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.11-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Aug 07 2013 Adrian Reber - 1.11-18 - fix bogus dates - added patch for From 95bec3b335424c91f2540802d91e10e9abb762ae Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:03:13 +0000 Subject: [PATCH 19/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index e95e355..820058e 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -136,6 +136,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.11-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.11-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From b49bb43efd714221db5588c4cb5892ace39457b1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 Aug 2014 11:54:20 -0600 Subject: [PATCH 20/81] Rebuild for rpm bug 1131960 --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 820058e..715093d 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -136,6 +136,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Thu Aug 21 2014 Kevin Fenzi - 1.11-21 +- Rebuild for rpm bug 1131960 + * Mon Aug 18 2014 Fedora Release Engineering - 1.11-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 311e2c3ab7ebaa50400baa9dd1e5101893cf4f43 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 26 Oct 2014 09:32:45 +0100 Subject: [PATCH 21/81] install unit file as 644 and not 755 (fixes #1157199) --- vnstat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 715093d..dd499e9 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -49,7 +49,7 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \ %{__install} -d -m 0700 %{buildroot}/run/%{name}/ %{__make} install DESTDIR=$RPM_BUILD_ROOT -%{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/ +%{__install} -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/ %{__rm} -rf examples/init.d %{__chmod} 644 examples/vnstat.cgi %{__chmod} 644 examples/vnstat.cron @@ -136,6 +136,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Sun Oct 26 2014 Adrian Reber - 1.11-22 +- install unit file as 644 and not 755 (fixes #1157199) + * Thu Aug 21 2014 Kevin Fenzi - 1.11-21 - Rebuild for rpm bug 1131960 From a14ba40bd3cee259377e3f709e173235e63a7d8b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:06:35 +0000 Subject: [PATCH 22/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index dd499e9..c857ea9 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.11 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -136,6 +136,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.11-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Oct 26 2014 Adrian Reber - 1.11-22 - install unit file as 644 and not 755 (fixes #1157199) From 694e300fd7179cf456f022197edc89585842c0b4 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 11 Aug 2015 17:14:56 +0200 Subject: [PATCH 23/81] Upgrade to 1.14 - Remove cron based setup (removed functionality) - Remove systemd unit file (now included) - Remove unnecessary patches --- .gitignore | 1 + sources | 2 +- vnstat-1.11-there-are-only-12-months.patch | 11 --- vnstat-run-vnstat.diff | 25 ------- vnstat.service | 10 --- vnstat.spec | 86 +++++++--------------- 6 files changed, 27 insertions(+), 108 deletions(-) delete mode 100644 vnstat-1.11-there-are-only-12-months.patch delete mode 100644 vnstat-run-vnstat.diff delete mode 100644 vnstat.service diff --git a/.gitignore b/.gitignore index 8504eb2..ef31a55 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vnstat-1.11.tar.gz +/vnstat-1.14.tar.gz diff --git a/sources b/sources index f615528..2dfc971 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5a113f9176cd61fb954f2ba297f5fdb vnstat-1.11.tar.gz +1df5dccff4d84f2995f840db4cac2ed0 vnstat-1.14.tar.gz diff --git a/vnstat-1.11-there-are-only-12-months.patch b/vnstat-1.11-there-are-only-12-months.patch deleted file mode 100644 index 41806c0..0000000 --- a/vnstat-1.11-there-are-only-12-months.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vnstat-1.11/src/vnstat.c.old 2011-06-01 00:29:51.000000000 +0200 -+++ vnstat-1.11/src/vnstat.c 2013-08-07 14:42:58.396231450 +0200 -@@ -485,7 +485,7 @@ - readdb(interface, dirname); - - data.totalrx=data.totaltx=data.totalrxk=data.totaltxk=0; -- for (i=0; i<=29; i++) { -+ for (i=0; i<=12; i++) { - if (data.month[i].used) { - addtraffic(&data.totalrx, &data.totalrxk, data.month[i].rx, data.month[i].rxk); - addtraffic(&data.totaltx, &data.totaltxk, data.month[i].tx, data.month[i].txk); diff --git a/vnstat-run-vnstat.diff b/vnstat-run-vnstat.diff deleted file mode 100644 index b3d464d..0000000 --- a/vnstat-run-vnstat.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/vnstatd.c 2011-06-01 00:29:51.000000000 +0200 -+++ b/src/vnstatd.c 2011-12-22 22:23:22.512967108 +0100 -@@ -482,10 +482,18 @@ - /* lock / pid file */ - pidfile = open(cfg.pidfile, O_RDWR|O_CREAT, 0644); - if (pidfile<0) { -- perror("pidfile"); -- snprintf(errorstring, 512, "pidfile failed, exiting."); -- printe(PT_Error); -- exit(EXIT_FAILURE); /* can't open */ -+ /* for Fedora's move to systemd and /run check -+ * for /run/vnstat/vnstat.pid, so that it needs no changes -+ * to the config file */ -+ pidfile = open("/run/vnstat/vnstat.pid", O_RDWR|O_CREAT, 0644); -+ if (pidfile<0) { -+ perror("pidfile"); -+ snprintf(errorstring, 512, "pidfile failed, exiting."); -+ printe(PT_Error); -+ exit(EXIT_FAILURE); /* can't open */ -+ } else { -+ strncpy(cfg.pidfile, "/run/vnstat/vnstat.pid", 512); -+ } - } - if (lockf(pidfile,F_TLOCK,0)<0) { - perror("pidfile lock"); diff --git a/vnstat.service b/vnstat.service deleted file mode 100644 index 3efda38..0000000 --- a/vnstat.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=VnStat - Lightweight Network Traffic Monitor -After=network.target - -[Service] -User=vnstat -ExecStart=/usr/sbin/vnstatd -d - -[Install] -WantedBy=multi-user.target diff --git a/vnstat.spec b/vnstat.spec index c857ea9..3afb523 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,32 +1,27 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 1.11 -Release: 23%{?dist} +Version: 1.14 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://humdi.net/vnstat/ Source0: http://humdi.net/vnstat/vnstat-%{version}.tar.gz -Source1: vnstat.service Requires(pre): shadow-utils -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd BuildRequires: gd-devel BuildRequires: systemd -Patch0: vnstat-run-vnstat.diff -Patch1: vnstat-1.11-there-are-only-12-months.patch %description vnStat is a console-based network traffic monitor that keeps a log of daily network traffic for the selected interface(s). vnStat isn't a packet sniffer. -The traffic information is analyzed from the /proc-filesystem, so vnStat can -be used without root permissions. See the webpage for few 'screenshots'. +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'. %prep %setup -q -%patch0 -p1 -%patch1 -p1 # disable maximum bandwidth setting and change pidfile location sed -i -e "s,/var/run/,/run/vnstat/,g; \ @@ -40,63 +35,29 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \ %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" all %install -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d +%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} %{__mkdir_p} $RPM_BUILD_ROOT%{_unitdir} -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d +%{__mkdir_p} $RPM_BUILD_ROOT%{_tmpfilesdir} %{__mkdir_p} %{buildroot}/run/ %{__install} -d -m 0700 %{buildroot}/run/%{name}/ %{__make} install DESTDIR=$RPM_BUILD_ROOT -%{__install} -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/ +%{__install} -p -m 644 examples/systemd/vnstat.service $RPM_BUILD_ROOT%{_unitdir}/ %{__rm} -rf examples/init.d -%{__chmod} 644 examples/vnstat.cgi -%{__chmod} 644 examples/vnstat.cron +%{__rm} -rf examples/systemd +%{__rm} -rf examples/launchd +%{__rm} -rf examples/upstart -%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name} << END -MAILTO=root -# to enable interface monitoring via vnstat remove comment on next line -# */5 * * * * vnstat %{_sbindir}/%{name}.cron -END - -%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} << END -# see also: vnstat(1) -# -# starting with vnstat-1.6 vnstat can also be -# configured via %{_sysconfdir}/vnstat.conf -# -# the following sets vnstat up to monitor eth0 -VNSTAT_OPTIONS="-u -i eth0" -END - -%{__cat} >> $RPM_BUILD_ROOT%{_sbindir}/%{name}.cron << END -#!/bin/bash -# this script (%{_sbindir}/%{name}.cron) reads %{_sysconfdir}/sysconfig/%{name} -# to start %{_bindir}/%{name}. -# example for %{_sysconfdir}/sysconfig/%{name}: -# VNSTAT_OPTIONS="-u -i eth0" -# see also: vnstat(1) - -VNSTAT_CONF=%{_sysconfdir}/sysconfig/%{name} - -if [ ! -f \$VNSTAT_CONF ]; then - exit 0 -fi - -. \$VNSTAT_CONF - -%{_bindir}/%{name} \$VNSTAT_OPTIONS -END - -%{__cat} >> $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/vnstat.conf << END +%{__cat} >> $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf << END D /run/vnstat 0700 vnstat vnstat END %pre -getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name} -getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ +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 @@ -122,20 +83,23 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ %defattr(-,root,root,-) %doc CHANGES COPYING FAQ README INSTALL examples %config(noreplace) %{_sysconfdir}/%{name}.conf -%config(noreplace) %{_sysconfdir}/cron.d/%{name} %{_unitdir}/%{name}.service -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} -%{_sysconfdir}/tmpfiles.d/vnstat.conf +%{_tmpfilesdir}/%{name}.conf %{_mandir}/man*/* %{_bindir}/vnstat %{_bindir}/vnstati %{_sbindir}/vnstatd %attr(-,vnstat,vnstat)%dir /run/%{name}/ -%attr(755,root,root)%{_sbindir}/%{name}.cron %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Tue Aug 11 2015 Adrian Reber - 1.14-1 +- Upgrade to 1.14 +- Remove cron based setup (removed functionality) +- Remove systemd unit file (now included) +- Remove unnecessary patches + * Fri Jun 19 2015 Fedora Release Engineering - 1.11-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -271,7 +235,7 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \ * Mon Feb 28 2005 Adrian Reber 1.4-3 - removed occurences of VNSTAT_DISABLED in %%{_sysconfdir}/sysconfig/%%{name} and - %%{_sbindir}/%{name}.cron + %%{_sbindir}/%%{name}.cron * Thu Feb 24 2005 Adrian Reber 1.4-2 - removed "#--------------" From 4091f731a934e7af11242d130d903e55ce0e0087 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 11 Aug 2015 19:03:15 +0200 Subject: [PATCH 24/81] Use %license for COPYING --- vnstat.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 3afb523..3a6f10a 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -81,7 +81,8 @@ exit 0 %files %defattr(-,root,root,-) -%doc CHANGES COPYING FAQ README INSTALL examples +%license COPYING +%doc CHANGES FAQ README INSTALL examples %config(noreplace) %{_sysconfdir}/%{name}.conf %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf @@ -94,6 +95,9 @@ exit 0 %changelog +* Tue Aug 11 2015 Adrian Reber - 1.14-2 +- Use %%license for COPYING + * Tue Aug 11 2015 Adrian Reber - 1.14-1 - Upgrade to 1.14 - Remove cron based setup (removed functionality) From 8bcb8373039d16f2ae485ec1ae6d4c26efece322 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 1 Dec 2015 08:10:19 +0100 Subject: [PATCH 25/81] Fixed "Service fails to start because it's run as root" (#1278027) --- vnstat.service.patch | 10 ++++++++++ vnstat.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 vnstat.service.patch diff --git a/vnstat.service.patch b/vnstat.service.patch new file mode 100644 index 0000000..4033530 --- /dev/null +++ b/vnstat.service.patch @@ -0,0 +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 @@ + After=network.target + + [Service] ++User=vnstat + ExecStart=/usr/sbin/vnstatd -n + ExecReload=/bin/kill -HUP $MAINPID + diff --git a/vnstat.spec b/vnstat.spec index 3a6f10a..fba26f1 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,12 +1,13 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.14 -Release: 2%{?dist} +Release: 3%{?dist} 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 @@ -22,6 +23,7 @@ be used without root permissions. See the web-page for few 'screenshots'. %prep %setup -q +%patch0 -p1 # disable maximum bandwidth setting and change pidfile location sed -i -e "s,/var/run/,/run/vnstat/,g; \ @@ -95,6 +97,9 @@ exit 0 %changelog +* Tue Dec 01 2015 Adrian Reber - 1.14-3 +- Fixed "Service fails to start because it's run as root" (#1278027) + * Tue Aug 11 2015 Adrian Reber - 1.14-2 - Use %%license for COPYING From 0a566b0a4ebe179411b407d290720eea3bf82222 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 13 Jan 2016 08:53:33 +0100 Subject: [PATCH 26/81] Upgrade to 1.15 (#1296771) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ef31a55..f9922a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vnstat-1.11.tar.gz /vnstat-1.14.tar.gz +/vnstat-1.15.tar.gz diff --git a/sources b/sources index 2dfc971..778341b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1df5dccff4d84f2995f840db4cac2ed0 vnstat-1.14.tar.gz +351051ef3005e3ca99123eec07ac0a7d vnstat-1.15.tar.gz diff --git a/vnstat.spec b/vnstat.spec index fba26f1..0491a9a 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 1.14 -Release: 3%{?dist} +Version: 1.15 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -30,10 +30,8 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \ s,MaxBandwidth 100,MaxBandwidth 0,g;" \ cfg/vnstat.conf -# Use -p everywhere, -s nowhere -%{__sed} -i -e "s,install \(-s \)\?,install -p ," Makefile - %build +%{configure} %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" all %install @@ -97,6 +95,9 @@ exit 0 %changelog +* Wed Jan 13 2016 Adrian Reber - 1.15-1 +- Upgrade to 1.15 (#1296771) + * Tue Dec 01 2015 Adrian Reber - 1.14-3 - Fixed "Service fails to start because it's run as root" (#1278027) From dd7a35e2a7a735f366e9f62e7e0c814ec9fc2372 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:48:25 +0000 Subject: [PATCH 27/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 0491a9a..1bbd4f8 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jan 13 2016 Adrian Reber - 1.15-1 - Upgrade to 1.15 (#1296771) From 9d792861c79f5fa576512309d6e9ef2b1960fdfc Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 4 Jan 2017 10:23:34 +0100 Subject: [PATCH 28/81] Upgrade to 1.16 (#1408565) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9922a5..0b3d9c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vnstat-1.11.tar.gz /vnstat-1.14.tar.gz /vnstat-1.15.tar.gz +/vnstat-1.16.tar.gz diff --git a/sources b/sources index 778341b..ced7e5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -351051ef3005e3ca99123eec07ac0a7d vnstat-1.15.tar.gz +SHA512 (vnstat-1.16.tar.gz) = 8906acebead4aef7ec7e96c4f9f17a2b9483f69cf530eb21d2ddc60de71b7690453bf533acfac298cf7e5184c23c7e6a886a757fdbfac3006cc09653c9a2cf6b diff --git a/vnstat.spec b/vnstat.spec index 1bbd4f8..14ff056 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 1.15 -Release: 2%{?dist} +Version: 1.16 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Wed Jan 04 2017 Adrian Reber - 1.16-1 +- Upgrade to 1.16 (#1408565) + * Fri Feb 05 2016 Fedora Release Engineering - 1.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 30a20989993a53b3f6bf6465e3746658c5e17a55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:09:29 +0000 Subject: [PATCH 29/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 14ff056..4839abb 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Jan 04 2017 Adrian Reber - 1.16-1 - Upgrade to 1.16 (#1408565) From e6d831a4eddf27d275d2dc54f8830d6b48e720f1 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 17 Feb 2017 07:48:38 +0100 Subject: [PATCH 30/81] Upgrade to 1.17 (#1423060) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0b3d9c1..1801006 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ vnstat-1.11.tar.gz /vnstat-1.14.tar.gz /vnstat-1.15.tar.gz /vnstat-1.16.tar.gz +/vnstat-1.17.tar.gz diff --git a/sources b/sources index ced7e5f..c3b4077 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-1.16.tar.gz) = 8906acebead4aef7ec7e96c4f9f17a2b9483f69cf530eb21d2ddc60de71b7690453bf533acfac298cf7e5184c23c7e6a886a757fdbfac3006cc09653c9a2cf6b +SHA512 (vnstat-1.17.tar.gz) = c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 diff --git a/vnstat.spec b/vnstat.spec index 4839abb..da6cedb 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 1.16 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Fri Feb 17 2017 Adrian Reber - 1.17-1 +- Upgrade to 1.17 (#1423060) + * Sat Feb 11 2017 Fedora Release Engineering - 1.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9eed4b3be05acc40b2416020914809f25d62fbe9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:23:39 +0000 Subject: [PATCH 31/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index da6cedb..19d74a8 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 17 2017 Adrian Reber - 1.17-1 - Upgrade to 1.17 (#1423060) From 0249b0ed4fc018800467d49c7c4efec4b814978d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:06:46 +0000 Subject: [PATCH 32/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 19d74a8..0aebf0b 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.17 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 92d93a19611cc409e2f3413641acd305059053e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:37:44 +0000 Subject: [PATCH 33/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 0aebf0b..6d74390 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.17 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 4fadffcf3346438fd1be01a6bc63dd794e4ac8e0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 34/81] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- vnstat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vnstat.spec b/vnstat.spec index 6d74390..b7b7a4e 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -12,6 +12,7 @@ Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: gcc BuildRequires: gd-devel BuildRequires: systemd From 03071491c2cf5fed1993f586c540db650571765f Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:43:23 -0500 Subject: [PATCH 35/81] Remove needless use of %defattr --- vnstat.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index b7b7a4e..152a350 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -81,7 +81,6 @@ exit 0 %files -%defattr(-,root,root,-) %license COPYING %doc CHANGES FAQ README INSTALL examples %config(noreplace) %{_sysconfdir}/%{name}.conf From 75bf8a6d290809f9178aa9b4c9a65249398fb6d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:37:35 +0000 Subject: [PATCH 36/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 152a350..74c511f 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.17 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -95,6 +95,9 @@ exit 0 %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.17-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 7eb00f5c91b4e069551b5f28e52dd2302c2ce7d2 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 14 Jul 2018 17:04:41 +0200 Subject: [PATCH 37/81] Upgrade to 1.18 (#1551364) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- vnstat.service.patch | 2 +- vnstat.spec | 18 +++++------------- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 1801006..1273904 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 diff --git a/sources b/sources index c3b4077..362dc36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-1.17.tar.gz) = c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 +SHA512 (vnstat-1.18.tar.gz) = 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68 diff --git a/vnstat.service.patch b/vnstat.service.patch index 4033530..f79c784 100644 --- a/vnstat.service.patch +++ b/vnstat.service.patch @@ -7,4 +7,4 @@ +User=vnstat ExecStart=/usr/sbin/vnstatd -n ExecReload=/bin/kill -HUP $MAINPID - + Restart=on-failure diff --git a/vnstat.spec b/vnstat.spec index 74c511f..f91b31d 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 1.17 -Release: 5%{?dist} +Version: 1.18 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons @@ -69,17 +69,6 @@ exit 0 %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 %license COPYING %doc CHANGES FAQ README INSTALL examples @@ -95,6 +84,9 @@ exit 0 %changelog +* Sat Jul 14 2018 Adrian Reber - 1.18-1 +- Upgrade to 1.18 (#1551364) + * Sat Jul 14 2018 Fedora Release Engineering - 1.17-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0b2dcc059dfdcb7440f5bd6e12257ed56b0ef641 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 38/81] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- vnstat.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index f91b31d..a9001ad 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -4,7 +4,6 @@ Version: 1.18 Release: 1%{?dist} License: GPLv2 -Group: System Environment/Daemons URL: http://humdi.net/vnstat/ Source0: http://humdi.net/vnstat/vnstat-%{version}.tar.gz Patch0: vnstat.service.patch From e799a69d75586ce6ca2e61d0b72ee23fa9877051 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:24:31 +0000 Subject: [PATCH 39/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index a9001ad..9361f89 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -83,6 +83,9 @@ exit 0 %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Adrian Reber - 1.18-1 - Upgrade to 1.18 (#1551364) From f27f6b3af17a6320f3356f6a4492e6c0de63daf2 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 28 Apr 2019 18:42:27 +0200 Subject: [PATCH 40/81] Upgrade to 2.2 (#1703811) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1273904..9feedef 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ vnstat-1.11.tar.gz /vnstat-1.16.tar.gz /vnstat-1.17.tar.gz /vnstat-1.18.tar.gz +/vnstat-2.2.tar.gz diff --git a/sources b/sources index 362dc36..e8beea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-1.18.tar.gz) = 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68 +SHA512 (vnstat-2.2.tar.gz) = 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc diff --git a/vnstat.spec b/vnstat.spec index 9361f89..78ececf 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 1.18 -Release: 2%{?dist} +Version: 2.2 +Release: 1%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -11,9 +11,10 @@ Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: gcc +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 @@ -83,6 +84,9 @@ exit 0 %changelog +* Sun Apr 28 2019 Adrian Reber -2.2-1 +- Upgrade to 2.2 (#1703811) + * Sun Feb 03 2019 Fedora Release Engineering - 1.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2862d17167bfd9ba7277dff9b8ca639d8ac77bda Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 12 Jul 2019 07:56:17 +0200 Subject: [PATCH 41/81] Upgrade to 2.3 --- .gitignore | 1 + sources | 2 +- vnstat.service.patch | 2 +- vnstat.spec | 5 ++++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9feedef..f42b9b9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ vnstat-1.11.tar.gz /vnstat-1.17.tar.gz /vnstat-1.18.tar.gz /vnstat-2.2.tar.gz +/vnstat-2.3.tar.gz diff --git a/sources b/sources index e8beea3..d68919a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.2.tar.gz) = 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc +SHA512 (vnstat-2.3.tar.gz) = 244aae8a127fb93407918e90efefe09d901410abbfda715272f1d754692661f2036ea98cc7f75ebc53ec27249ba676f84463af24ed7e19a9a130d6ce29b32677 diff --git a/vnstat.service.patch b/vnstat.service.patch index f79c784..3752308 100644 --- a/vnstat.service.patch +++ b/vnstat.service.patch @@ -1,7 +1,7 @@ --- 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 @@ - After=network.target + StartLimitBurst=4 [Service] +User=vnstat diff --git a/vnstat.spec b/vnstat.spec index 78ececf..7c8e2fa 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,6 +1,6 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.2 +Version: 2.3 Release: 1%{?dist} License: GPLv2 @@ -84,6 +84,9 @@ exit 0 %changelog +* Fri Jun 12 2019 Adrian Reber -2.3-1 +- Upgrade to 2.3 + * Sun Apr 28 2019 Adrian Reber -2.2-1 - Upgrade to 2.2 (#1703811) From e839d91655647b6b1a006d8d6bf432fc246f7c32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:08:01 +0000 Subject: [PATCH 42/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 7c8e2fa..f331802 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -84,6 +84,9 @@ exit 0 %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 12 2019 Adrian Reber -2.3-1 - Upgrade to 2.3 From 0b2deff108c4598baf9d6c7bdca9d199708c7559 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 6 Nov 2019 08:27:48 +0100 Subject: [PATCH 43/81] Upgrade to 2.4 --- .gitignore | 1 + sources | 2 +- vnstat.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f42b9b9..b608d5e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ vnstat-1.11.tar.gz /vnstat-1.18.tar.gz /vnstat-2.2.tar.gz /vnstat-2.3.tar.gz +/vnstat-2.4.tar.gz diff --git a/sources b/sources index d68919a..64ad05b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.3.tar.gz) = 244aae8a127fb93407918e90efefe09d901410abbfda715272f1d754692661f2036ea98cc7f75ebc53ec27249ba676f84463af24ed7e19a9a130d6ce29b32677 +SHA512 (vnstat-2.4.tar.gz) = e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6 diff --git a/vnstat.spec b/vnstat.spec index f331802..1198394 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.3 -Release: 2%{?dist} +Version: 2.4 +Release: 1%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -84,6 +84,9 @@ exit 0 %changelog +* Wed Nov 06 2019 Adrian Reber - 2.4-1 +- Upgrade to 2.4 + * Sat Jul 27 2019 Fedora Release Engineering - 2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1b10cde8e6feca77533f72f88e0946bc567b8921 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 15 Jan 2020 09:06:39 +0100 Subject: [PATCH 44/81] Upgrade to 2.5 (#1791158) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b608d5e..81a9ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ vnstat-1.11.tar.gz /vnstat-2.2.tar.gz /vnstat-2.3.tar.gz /vnstat-2.4.tar.gz +/vnstat-2.5.tar.gz diff --git a/sources b/sources index 64ad05b..175cd8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.4.tar.gz) = e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6 +SHA512 (vnstat-2.5.tar.gz) = 5f44f2ee7fa4bdaf0cfd48b35927ec590f5344cc497b5e02a999ece40e53812a7bf725cf1ddaf08c7316bf83ed567f370a72f00b279553cb1d06dfec26c3c1c8 diff --git a/vnstat.spec b/vnstat.spec index 1198394..7fd9a0c 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,6 +1,6 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.4 +Version: 2.5 Release: 1%{?dist} License: GPLv2 @@ -84,6 +84,9 @@ exit 0 %changelog +* Wed Jan 15 2020 Adrian Reber - 2.5-1 +- Upgrade to 2.5 (#1791158) + * Wed Nov 06 2019 Adrian Reber - 2.4-1 - Upgrade to 2.4 From a41cf70e5803f67daed34a37c3ec33f1894f5f7f Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 21 Jan 2020 08:29:00 +0100 Subject: [PATCH 45/81] Upgrade to 2.6 (#1791158) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 81a9ee8..a5beacf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ vnstat-1.11.tar.gz /vnstat-2.3.tar.gz /vnstat-2.4.tar.gz /vnstat-2.5.tar.gz +/vnstat-2.6.tar.gz diff --git a/sources b/sources index 175cd8e..bf9681e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.5.tar.gz) = 5f44f2ee7fa4bdaf0cfd48b35927ec590f5344cc497b5e02a999ece40e53812a7bf725cf1ddaf08c7316bf83ed567f370a72f00b279553cb1d06dfec26c3c1c8 +SHA512 (vnstat-2.6.tar.gz) = 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea diff --git a/vnstat.spec b/vnstat.spec index 7fd9a0c..beec68c 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,6 +1,6 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.5 +Version: 2.6 Release: 1%{?dist} License: GPLv2 @@ -84,6 +84,9 @@ exit 0 %changelog +* Tue Jan 21 2020 Adrian Reber - 2.6-1 +- Upgrade to 2.6 (#1791158) + * Wed Jan 15 2020 Adrian Reber - 2.5-1 - Upgrade to 2.5 (#1791158) From a441cde3c8e4f6cc5a1b117f3e67ddd8655fc7fe Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 Jan 2020 10:46:01 -0600 Subject: [PATCH 46/81] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 01bf67275c63dfd22c63940d50214aeba627d000 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:19:59 +0000 Subject: [PATCH 47/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index beec68c..d0be524 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -84,6 +84,9 @@ exit 0 %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 21 2020 Adrian Reber - 2.6-1 - Upgrade to 2.6 (#1791158) From 68aa3f747607945da9efd073eede6f76cacefd90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:50:56 +0000 Subject: [PATCH 48/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index d0be524..6bfe5b0 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -84,6 +84,9 @@ exit 0 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f1a460650974e001b6737ebc7991fe6f2870fcb5 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:46:01 +0000 Subject: [PATCH 49/81] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 61b77dbda21ebd809fdd4e03db5b4a6f78aa6778 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:45:54 +0000 Subject: [PATCH 50/81] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vnstat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vnstat.spec b/vnstat.spec index 6bfe5b0..4faa0c9 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -11,6 +11,7 @@ Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: make BuildRequires: gcc BuildRequires: gd-devel BuildRequires: systemd From 445a252effc17fe474bbba5117b179741498f272 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:12:31 +0000 Subject: [PATCH 51/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 4faa0c9..97a5390 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,9 @@ exit 0 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0c71ea1fb26fd416f6857ff6d0517d1f28e997c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:03 +0100 Subject: [PATCH 52/81] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- vnstat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 97a5390..45760f7 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,10 @@ exit 0 %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6-5 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 42701ebf25a2f0338bca6dac97b45ed71d687a81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:37:36 +0000 Subject: [PATCH 53/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 45760f7..a56cbe7 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,9 @@ exit 0 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6-5 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From daaef06384e583b5262e47afd31e8b1ec3c17bd1 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 30 Aug 2021 23:54:45 +0200 Subject: [PATCH 54/81] Upgrade to 2.7 (#1961015) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5beacf..7a59670 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ vnstat-1.11.tar.gz /vnstat-2.4.tar.gz /vnstat-2.5.tar.gz /vnstat-2.6.tar.gz +/vnstat-2.7.tar.gz diff --git a/sources b/sources index bf9681e..6073c0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.6.tar.gz) = 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea +SHA512 (vnstat-2.7.tar.gz) = 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4 diff --git a/vnstat.spec b/vnstat.spec index a56cbe7..c5af47d 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.6 -Release: 6%{?dist} +Version: 2.7 +Release: 1%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,9 @@ exit 0 %changelog +* Mon Aug 30 2021 Adrian Reber - 2.7-1 +- Upgrade to 2.7 (#1961015) + * Fri Jul 23 2021 Fedora Release Engineering - 2.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2e1a348b1623010ee6e513bcd2aa1df3ad12c79e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 14 Dec 2021 17:54:32 +0100 Subject: [PATCH 55/81] Upgrade to 2.8 (#1961015) Create sub-package for vnstati and its libgd dependency (#1993650) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 25 ++++++++++++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7a59670..702712b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ vnstat-1.11.tar.gz /vnstat-2.5.tar.gz /vnstat-2.6.tar.gz /vnstat-2.7.tar.gz +/vnstat-2.8.tar.gz diff --git a/sources b/sources index 6073c0e..59552eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.7.tar.gz) = 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4 +SHA512 (vnstat-2.8.tar.gz) = 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd diff --git a/vnstat.spec b/vnstat.spec index c5af47d..2a07ef2 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,6 +1,6 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.7 +Version: 2.8 Release: 1%{?dist} License: GPLv2 @@ -23,6 +23,16 @@ 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 %patch0 -p1 @@ -76,15 +86,24 @@ exit 0 %config(noreplace) %{_sysconfdir}/%{name}.conf %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf -%{_mandir}/man*/* +%{_mandir}/man1/vnstat.1* +%{_mandir}/man5/vnstat.conf.5* +%{_mandir}/man8/vnstatd.8* %{_bindir}/vnstat -%{_bindir}/vnstati %{_sbindir}/vnstatd %attr(-,vnstat,vnstat)%dir /run/%{name}/ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} +%files vnstati +%license COPYING +%{_mandir}/man1/vnstati.1* +%{_bindir}/vnstati %changelog +* Tue Dec 14 2021 Adrian Reber - 2.8-1 +- Upgrade to 2.8 (#1961015) +- Create sub-package for vnstati and its libgd dependency (#1993650) + * Mon Aug 30 2021 Adrian Reber - 2.7-1 - Upgrade to 2.7 (#1961015) From ad37bf12d096d58c4c7b1f6fda7a27ea2225d2b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:08:21 +0000 Subject: [PATCH 56/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 2a07ef2..4cf158a 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Adrian Reber - 2.8-1 - Upgrade to 2.8 (#1961015) - Create sub-package for vnstati and its libgd dependency (#1993650) From b041f35c4a3672c023c709f700a1ef66c47caf1c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 18 May 2022 09:49:10 +0200 Subject: [PATCH 57/81] Upgrade to 2.9 (#2044224) Signed-off-by: Adrian Reber --- vnstat.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 4cf158a..2028dbf 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.8 -Release: 2%{?dist} +Version: 2.9 +Release: 1%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* Wed May 18 2022 Adrian Reber - 2.9-1 +- Upgrade to 2.9 (#2044224) + * Sat Jan 22 2022 Fedora Release Engineering - 2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 96369f9d7ac039e97155134081d254eb44f3cca3 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 18 May 2022 09:57:11 +0200 Subject: [PATCH 58/81] Uploaded 2.9 tarball to cache Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 702712b..d4964f6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ vnstat-1.11.tar.gz /vnstat-2.6.tar.gz /vnstat-2.7.tar.gz /vnstat-2.8.tar.gz +/vnstat-2.9.tar.gz diff --git a/sources b/sources index 59552eb..22c94d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.8.tar.gz) = 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd +SHA512 (vnstat-2.9.tar.gz) = 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176 From ccfb3a415eee72831cfeeb2760bba455255c5f02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:50:56 +0000 Subject: [PATCH 59/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index d0be524..6bfe5b0 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -84,6 +84,9 @@ exit 0 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 65fa23f4e41791c86370daf23aee954f83056cc2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:45:54 +0000 Subject: [PATCH 60/81] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vnstat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vnstat.spec b/vnstat.spec index 6bfe5b0..4faa0c9 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -11,6 +11,7 @@ Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: make BuildRequires: gcc BuildRequires: gd-devel BuildRequires: systemd From ac2a8c4155960a360741c3ecb375e76c5c45a5ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:12:31 +0000 Subject: [PATCH 61/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 4faa0c9..97a5390 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,9 @@ exit 0 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4bb546482f242f36a80e0ee43532224536e9abe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:03 +0100 Subject: [PATCH 62/81] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- vnstat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 97a5390..45760f7 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,10 @@ exit 0 %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6-5 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 31902d394483a9c12049e7a68353faf1f6d0c0e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:37:36 +0000 Subject: [PATCH 63/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 45760f7..a56cbe7 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,9 @@ exit 0 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6-5 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From e81fa6a670fc2d2cb5e9711aa31754bf2c39d53d Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 30 Aug 2021 23:54:45 +0200 Subject: [PATCH 64/81] Upgrade to 2.7 (#1961015) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5beacf..7a59670 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ vnstat-1.11.tar.gz /vnstat-2.4.tar.gz /vnstat-2.5.tar.gz /vnstat-2.6.tar.gz +/vnstat-2.7.tar.gz diff --git a/sources b/sources index bf9681e..6073c0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.6.tar.gz) = 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea +SHA512 (vnstat-2.7.tar.gz) = 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4 diff --git a/vnstat.spec b/vnstat.spec index a56cbe7..c5af47d 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.6 -Release: 6%{?dist} +Version: 2.7 +Release: 1%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -85,6 +85,9 @@ exit 0 %changelog +* Mon Aug 30 2021 Adrian Reber - 2.7-1 +- Upgrade to 2.7 (#1961015) + * Fri Jul 23 2021 Fedora Release Engineering - 2.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2fa617808cecb92b9444718704ea2cf540623fa1 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 14 Dec 2021 17:54:32 +0100 Subject: [PATCH 65/81] Upgrade to 2.8 (#1961015) Create sub-package for vnstati and its libgd dependency (#1993650) --- .gitignore | 1 + sources | 2 +- vnstat.spec | 25 ++++++++++++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7a59670..702712b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ vnstat-1.11.tar.gz /vnstat-2.5.tar.gz /vnstat-2.6.tar.gz /vnstat-2.7.tar.gz +/vnstat-2.8.tar.gz diff --git a/sources b/sources index 6073c0e..59552eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.7.tar.gz) = 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4 +SHA512 (vnstat-2.8.tar.gz) = 207aa1699df298ce3008153701782634a96a239599d17a5b2f1fbb298a9cf8edb35298e2de1f4f93415ddf34e0bdb831f95984b47fdd7f89ecc6aeb4821a0afd diff --git a/vnstat.spec b/vnstat.spec index c5af47d..2a07ef2 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,6 +1,6 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.7 +Version: 2.8 Release: 1%{?dist} License: GPLv2 @@ -23,6 +23,16 @@ 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 %patch0 -p1 @@ -76,15 +86,24 @@ exit 0 %config(noreplace) %{_sysconfdir}/%{name}.conf %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf -%{_mandir}/man*/* +%{_mandir}/man1/vnstat.1* +%{_mandir}/man5/vnstat.conf.5* +%{_mandir}/man8/vnstatd.8* %{_bindir}/vnstat -%{_bindir}/vnstati %{_sbindir}/vnstatd %attr(-,vnstat,vnstat)%dir /run/%{name}/ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} +%files vnstati +%license COPYING +%{_mandir}/man1/vnstati.1* +%{_bindir}/vnstati %changelog +* Tue Dec 14 2021 Adrian Reber - 2.8-1 +- Upgrade to 2.8 (#1961015) +- Create sub-package for vnstati and its libgd dependency (#1993650) + * Mon Aug 30 2021 Adrian Reber - 2.7-1 - Upgrade to 2.7 (#1961015) From f8d4126c7addca5fa23e2ca59f3c483e79f0940d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:08:21 +0000 Subject: [PATCH 66/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 2a07ef2..4cf158a 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Adrian Reber - 2.8-1 - Upgrade to 2.8 (#1961015) - Create sub-package for vnstati and its libgd dependency (#1993650) From cfe060eb6241e0a857cb9ee90ae8764fdd0a838c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 18 May 2022 11:01:19 +0200 Subject: [PATCH 67/81] Bump release Signed-off-by: Adrian Reber --- vnstat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 2028dbf..584398b 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,7 +100,7 @@ exit 0 %{_bindir}/vnstati %changelog -* Wed May 18 2022 Adrian Reber - 2.9-1 +* Wed May 18 2022 Adrian Reber - 2.9-2 - Upgrade to 2.9 (#2044224) * Sat Jan 22 2022 Fedora Release Engineering - 2.8-2 From 274b4fd5faf918feced776cedc8f738044b31e78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:04:10 +0000 Subject: [PATCH 68/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 584398b..8a44bd4 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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) From eb7d0b38969928080246fc9ee181be6207abb9a0 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 9 Dec 2022 13:07:55 +0100 Subject: [PATCH 69/81] Upgrade to 2.10 (#2137399) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- vnstat.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d4964f6..3a988f5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ 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 diff --git a/sources b/sources index 22c94d3..a8223ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vnstat-2.9.tar.gz) = 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176 +SHA512 (vnstat-2.10.tar.gz) = 86c761290ec059a3252049b4f2a0a2aecdd7f8c159ee3db904339b1a9b14157a2125b919dd52754a29320ccdb41c89739bca78548b5a44b158b493f48be24a78 diff --git a/vnstat.spec b/vnstat.spec index 8a44bd4..a96432b 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.9 -Release: 3%{?dist} +Version: 2.10 +Release: 1%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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 From 1e785a11858b3cf6da4adc71e2e7c77cd8d96809 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:27:46 +0000 Subject: [PATCH 70/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index a96432b..84732c9 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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) From a904a80639d49ab3cfa08b4ca40a4bf638961209 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:49:26 +0000 Subject: [PATCH 71/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 84732c9..018852e 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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 From d7ad7adebc9bf2af1ddc3183f5105f30db7c21bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:08:02 +0000 Subject: [PATCH 72/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 018852e..187b3dd 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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 From 0cad8487c3d8b394bec98c5e7f9a6f75b2880697 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 73/81] Eliminate use of obsolete %patchN syntax (#2283636) --- vnstat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 187b3dd..acc0d3b 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -35,7 +35,7 @@ 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; \ From ea9094eb801ebb3a5453b9fa22003eacdfd6ef74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:58:02 +0000 Subject: [PATCH 74/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index acc0d3b..242101d 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://humdi.net/vnstat/ @@ -100,6 +100,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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 From e083fd578b9f3f471ff3633deba766a1aa82afde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:28:58 +0200 Subject: [PATCH 75/81] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vnstat.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 242101d..d0900c6 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,9 +1,10 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 5%{?dist} +Release: 6%{?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 @@ -100,6 +101,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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 From 9cee2d8948e2801062e2f83c51b32b1de646f3b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:34:09 +0000 Subject: [PATCH 76/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index d0900c6..69022fc 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 6%{?dist} +Release: 7%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -101,6 +101,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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 From 6497c0328cda0a6336f88e8162bf4c3e6dc45ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:12 +0100 Subject: [PATCH 77/81] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- vnstat.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/vnstat.spec b/vnstat.spec index 69022fc..86ed4c2 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,14 +1,13 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 7%{?dist} +Release: 8%{?dist} # 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 @@ -43,6 +42,11 @@ 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 @@ -94,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 @@ -101,6 +103,9 @@ exit 0 %{_bindir}/vnstati %changelog +* 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 From 09ec2a0aef2b562455265378c0cba8cc1805922a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:12:02 +0000 Subject: [PATCH 78/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 86ed4c2..b87da32 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.10 -Release: 8%{?dist} +Release: 9%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -103,6 +103,9 @@ install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf %{_bindir}/vnstati %changelog +* 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 From 9e02490cdd14bd56b350ae0d471909d06e01891d Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 10 Dec 2025 08:19:43 +0100 Subject: [PATCH 79/81] Upgrade to 2.13 (#2232896) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- vnstat.service.patch | 2 +- vnstat.spec | 7 +++++-- 4 files changed, 8 insertions(+), 4 deletions(-) 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 b87da32..9a90926 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat -Version: 2.10 -Release: 9%{?dist} +Version: 2.13 +Release: 1%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -103,6 +103,9 @@ install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf %{_bindir}/vnstati %changelog +* 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 From 69669454589c66fa5963058c111fc311ccbb6f37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:01:44 +0000 Subject: [PATCH 80/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 9a90926..598e298 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.13 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -103,6 +103,9 @@ install -m0644 -D vnstat.sysusers.conf %{buildroot}%{_sysusersdir}/vnstat.conf %{_bindir}/vnstati %changelog +* 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) From f5762f5bccfa9ceec9dc1ecb48673a9cbde91fc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:35:53 +0000 Subject: [PATCH 81/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vnstat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vnstat.spec b/vnstat.spec index 598e298..e93645c 100644 --- a/vnstat.spec +++ b/vnstat.spec @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 2.13 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -103,6 +103,9 @@ 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