From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] vnstat: Update to 1.15
Date: Tue, 12 Jul 2016 18:23:50 +0200
Message-ID: <e29e3213-2ea5-e0a2-cc7a-fc18d1a120cb@ipfire.org>
In-Reply-To: <1468321648.2710.90.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1540773732597887751=="
List-Id: <development.lists.ipfire.org>

--===============1540773732597887751==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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,
>=20
> why do we have to move the PID and log files?
>=20
> -Michael
>=20
> On Tue, 2016-07-12 at 12:56 +0200, Matthias Fischer wrote:
>> Changelog:
>> http://humdi.net/vnstat/CHANGES
>>=20
>> I had to add some 'configure'-lines to build this - nevertheless: its
>> working. ;-)
>>=20
>> 'vnstat.conf' needed some additional 'sed'-lines, too.
>>=20
>> Please review, test and confirm.
>>=20
>> Best,
>> Matthias
>>=20
>> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
>> ---
>>  lfs/vnstat | 15 +++++++++++----
>>  1 file changed, 11 insertions(+), 4 deletions(-)
>>=20
>> diff --git a/lfs/vnstat b/lfs/vnstat
>> index 1c1333b..07cca69 100644
>> --- a/lfs/vnstat
>> +++ b/lfs/vnstat
>> @@ -1,7 +1,7 @@
>>  #########################################################################=
####
>> ##
>>  #                                                                        =
   =20
>>  #
>>  # IPFire.org - A linux based
>> firewall                                         #
>> -# Copyright (C) 2007  Michael Tremer & Christian
>> Schmidt                      #
>> +# Copyright (C) 2007-2016  IPFire Team  <info(a)ipfire.org>              =
     =20
>>  #
>>  #                                                                        =
   =20
>>  #
>>  # 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 @@
>> =20
>>  include Config
>> =20
>> -VER        =3D 1.11
>> +VER        =3D 1.15
>> =20
>>  THISAPP    =3D vnstat-$(VER)
>>  DL_FILE    =3D $(THISAPP).tar.gz
>> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
>> =20
>>  $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>> =20
>> -$(DL_FILE)_MD5 =3D a5a113f9176cd61fb954f2ba297f5fdb
>> +$(DL_FILE)_MD5 =3D 351051ef3005e3ca99123eec07ac0a7d
>> =20
>>  install : $(TARGET)
>> =20
>> @@ -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)			=09
>> 						LOCAL_CONFIGURE_OPTIONS=3D"
>> --enable-readline=3Dyes"
>> +
>> +	cd $(DIR_APP) && ./configure \
>> +		--prefix=3D/usr \
>> +		--sysconfdir=3D/etc
>> +
>> +	cd $(DIR_APP) && make all $(MAKETUNING)		LOCAL_CONFIGUR
>> E_OPTIONS=3D"--enable-readline=3Dyes"
>>  	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)
>=20


--===============1540773732597887751==--