vnstat: Update to 1.15
Message ID | 20160712105642.5235-1-matthias.fischer@ipfire.org |
---|---|
State | Accepted |
Commit | d55d05b6cb6bb3ddb7fde20d975cf4f9546afedf |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 4452D61AE3 for <patchwork@ipfire.org>; Tue, 12 Jul 2016 12:56:59 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id AEEFF969; Tue, 12 Jul 2016 12:56:48 +0200 (CEST) Received: from Devel.localdomain (p57905B87.dip0.t-ipconnect.de [87.144.91.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id AF298963 for <development@lists.ipfire.org>; Tue, 12 Jul 2016 12:56:46 +0200 (CEST) From: Matthias Fischer <matthias.fischer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] vnstat: Update to 1.15 Date: Tue, 12 Jul 2016 12:56:42 +0200 Message-Id: <20160712105642.5235-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.9.1 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Matthias Fischer
July 12, 2016, 8:56 p.m. UTC
Changelog:
http://humdi.net/vnstat/CHANGES
I had to add some 'configure'-lines to build this - nevertheless: its
working. ;-)
'vnstat.conf' needed some additional 'sed'-lines, too.
Please review, test and confirm.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
lfs/vnstat | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
Comments
Hi, why do we have to move the PID and log files? -Michael On Tue, 2016-07-12 at 12:56 +0200, Matthias Fischer wrote: > Changelog: > http://humdi.net/vnstat/CHANGES > > I had to add some 'configure'-lines to build this - nevertheless: its > working. ;-) > > 'vnstat.conf' needed some additional 'sed'-lines, too. > > Please review, test and confirm. > > Best, > Matthias > > Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> > --- > lfs/vnstat | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/lfs/vnstat b/lfs/vnstat > index 1c1333b..07cca69 100644 > --- a/lfs/vnstat > +++ b/lfs/vnstat > @@ -1,7 +1,7 @@ > ############################################################################# > ## > # > # > # IPFire.org - A linux based > firewall # > -# Copyright (C) 2007 Michael Tremer & Christian > Schmidt # > +# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> > # > # > # > # This program is free software: you can redistribute it and/or > modify # > # it under the terms of the GNU General Public License as published > by # > @@ -24,7 +24,7 @@ > > include Config > > -VER = 1.11 > +VER = 1.15 > > THISAPP = vnstat-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -40,7 +40,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = a5a113f9176cd61fb954f2ba297f5fdb > +$(DL_FILE)_MD5 = 351051ef3005e3ca99123eec07ac0a7d > > install : $(TARGET) > > @@ -73,9 +73,16 @@ $(subst %,%_MD5,$(objects)) : > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > - cd $(DIR_APP) && make all $(MAKETUNING) > LOCAL_CONFIGURE_OPTIONS=" > --enable-readline=yes" > + > + cd $(DIR_APP) && ./configure \ > + --prefix=/usr \ > + --sysconfdir=/etc > + > + cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGUR > E_OPTIONS="--enable-readline=yes" > cd $(DIR_APP) && make install > sed -i 's|eth0|green0|g' /etc/vnstat.conf > sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf > + sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' > /etc/vnstat.conf > + sed -i 's|/var/run/vnstat/vnstat.pid|/var/run/vnstat.pid|g' > /etc/vnstat.conf > @rm -rf $(DIR_APP) > @$(POSTBUILD)
Hi, I thought we might keep the LOG and PID-settings from 1.11: After building there were differences - I didn't find how to change these with appropriate 'configure'-options, so I used 'sed' instead: 1.11: LogFile "/var/log/vnstat.log" PidFile "/var/run/vnstat.pid" 1.15: LogFile "/var/log/vnstat/vnstat.log" PidFile "/var/run/vnstat/vnstat.pid" Best, Matthias On 12.07.2016 13:07, Michael Tremer wrote: > Hi, > > why do we have to move the PID and log files? > > -Michael > > On Tue, 2016-07-12 at 12:56 +0200, Matthias Fischer wrote: >> Changelog: >> http://humdi.net/vnstat/CHANGES >> >> I had to add some 'configure'-lines to build this - nevertheless: its >> working. ;-) >> >> 'vnstat.conf' needed some additional 'sed'-lines, too. >> >> Please review, test and confirm. >> >> Best, >> Matthias >> >> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> >> --- >> lfs/vnstat | 15 +++++++++++---- >> 1 file changed, 11 insertions(+), 4 deletions(-) >> >> diff --git a/lfs/vnstat b/lfs/vnstat >> index 1c1333b..07cca69 100644 >> --- a/lfs/vnstat >> +++ b/lfs/vnstat >> @@ -1,7 +1,7 @@ >> ############################################################################# >> ## >> # >> # >> # IPFire.org - A linux based >> firewall # >> -# Copyright (C) 2007 Michael Tremer & Christian >> Schmidt # >> +# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> >> # >> # >> # >> # This program is free software: you can redistribute it and/or >> modify # >> # it under the terms of the GNU General Public License as published >> by # >> @@ -24,7 +24,7 @@ >> >> include Config >> >> -VER = 1.11 >> +VER = 1.15 >> >> THISAPP = vnstat-$(VER) >> DL_FILE = $(THISAPP).tar.gz >> @@ -40,7 +40,7 @@ objects = $(DL_FILE) >> >> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_MD5 = a5a113f9176cd61fb954f2ba297f5fdb >> +$(DL_FILE)_MD5 = 351051ef3005e3ca99123eec07ac0a7d >> >> install : $(TARGET) >> >> @@ -73,9 +73,16 @@ $(subst %,%_MD5,$(objects)) : >> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> @$(PREBUILD) >> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >> - cd $(DIR_APP) && make all $(MAKETUNING) >> LOCAL_CONFIGURE_OPTIONS=" >> --enable-readline=yes" >> + >> + cd $(DIR_APP) && ./configure \ >> + --prefix=/usr \ >> + --sysconfdir=/etc >> + >> + cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGUR >> E_OPTIONS="--enable-readline=yes" >> cd $(DIR_APP) && make install >> sed -i 's|eth0|green0|g' /etc/vnstat.conf >> sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf >> + sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' >> /etc/vnstat.conf >> + sed -i 's|/var/run/vnstat/vnstat.pid|/var/run/vnstat.pid|g' >> /etc/vnstat.conf >> @rm -rf $(DIR_APP) >> @$(POSTBUILD) >