Attachment 951975 Details for Bug 1157995 – Update to 1.12 - finito

[patch] Update to 1.12 - finito

Update-to-1.12.patch (text/plain), 6.26 KB, created by poma on 2014-10-30 07:23:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-10-30 07:23:47 UTC

Size: 6.26 KB

patch

obsolete

>
>Subject: [PATCH] Update to 1.12
>
>---
> sources                                    |  2 +-
> vnstat-1.11-there-are-only-12-months.patch | 11 --------
> vnstat-run-vnstat.diff                     | 25 ------------------
> vnstat.service                             |  6 +++--
> vnstat.spec                                | 41 +++++-------------------------
> 5 files changed, 11 insertions(+), 74 deletions(-)
> delete mode 100644 vnstat-1.11-there-are-only-12-months.patch
> delete mode 100644 vnstat-run-vnstat.diff
>
>diff --git a/sources b/sources
>index f615528..5d04602 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-a5a113f9176cd61fb954f2ba297f5fdb  vnstat-1.11.tar.gz
>+a154b2196771e06a8accd1c24374009c  vnstat-1.12.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
>index 3efda38..77554f0 100644
>--- a/vnstat.service
>+++ b/vnstat.service
>@@ -1,10 +1,12 @@
> [Unit]
>-Description=VnStat - Lightweight Network Traffic Monitor
>+Description=vnStat network traffic monitor
>+Documentation=man:vnstatd(1) man:vnstat(1) man:vnstat.conf(5)
> After=network.target
> 
> [Service]
> User=vnstat
>-ExecStart=/usr/sbin/vnstatd -d
>+ExecStart=/usr/sbin/vnstatd -n
>+ExecReload=/bin/kill -HUP $MAINPID
> 
> [Install]
> WantedBy=multi-user.target
>diff --git a/vnstat.spec b/vnstat.spec
>index dd499e9..f2f222a 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}
>+Version: 1.12
>+Release: 1%{?dist}
> 
> License: GPLv2
> Group: System Environment/Daemons
>@@ -14,8 +14,6 @@ Requires(preun): systemd-units
> 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,8 +23,6 @@ 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; \
>@@ -40,10 +36,10 @@ 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%{_unitdir}
> %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
> %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
>+%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/vnstat
> 
> %{__mkdir_p} %{buildroot}/run/
> %{__install} -d -m 0700 %{buildroot}/run/%{name}/
>@@ -52,13 +48,6 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \
> %{__install} -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/
> %{__rm} -rf examples/init.d
> %{__chmod} 644 examples/vnstat.cgi
>-%{__chmod} 644 examples/vnstat.cron
>-
>-%{__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)
>@@ -70,25 +59,6 @@ END
> 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
> D /run/vnstat 0700 vnstat vnstat
> END
>@@ -122,7 +92,6 @@ 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
>@@ -131,11 +100,13 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \
> %{_bindir}/vnstati
> %{_sbindir}/vnstatd
> %attr(-,vnstat,vnstat)%dir /run/%{name}/
>-%attr(755,root,root)%{_sbindir}/%{name}.cron
> %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
> 
> 
> %changelog
>+* Thu Oct 30 2014 poma <poma@gmail.com> - 1.12-1
>+- Update to 1.12
>+
> * Sun Oct 26 2014 Adrian Reber <adrian@lisas.de> - 1.11-22
> - install unit file as 644 and not 755 (fixes #1157199)
> 
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1157995: 951760 | 951915 | 951975