From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] vnstat: Update to 1.15 Date: Tue, 12 Jul 2016 12:07:28 +0100 Message-ID: <1468321648.2710.90.camel@ipfire.org> In-Reply-To: <20160712105642.5235-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8190561747339161561==" List-Id: --===============8190561747339161561== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 >=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 > --- > =C2=A0lfs/vnstat | 15 +++++++++++---- > =C2=A01 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 @@ > =C2=A0#####################################################################= ######## > ## > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# IPFire.org - A linux based > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > -# Copyright (C) 2007=C2=A0=C2=A0Michael Tremer & Christian > Schmidt=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# Copyright (C) 2007-2016=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# This program is free software: you can redistribute it and/or > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0# it under the terms of the GNU General Public License as published > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > @@ -24,7 +24,7 @@ > =C2=A0 > =C2=A0include Config > =C2=A0 > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.11 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.15 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D vnstat-$(VER) > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) > =C2=A0 > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0 > -$(DL_FILE)_MD5 =3D a5a113f9176cd61fb954f2ba297f5fdb > +$(DL_FILE)_MD5 =3D 351051ef3005e3ca99123eec07ac0a7d > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 > @@ -73,9 +73,16 @@ $(subst %,%_MD5,$(objects)) : > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 @$(PREBUILD) > =C2=A0 @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" > =C2=A0 cd $(DIR_APP) && make install > =C2=A0 sed -i 's|eth0|green0|g' /etc/vnstat.conf > =C2=A0 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 > =C2=A0 @rm -rf $(DIR_APP) > =C2=A0 @$(POSTBUILD) --===============8190561747339161561== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlhoTTl3QUFvSkVJQjU4UDl2a0FrSGswZ1AvMkRMdU0zUXVWNGIvZDJpU09zRkN1ajgK YklUb21sWEU4YmMwaGZaS09XanFMdkZYSTY5OHNQcDRxRXZBMGxUazAxMlZaa3ZqQ2hPUG8yODl1 VUVwLzdyUgowN3c3Vzd5YUpyZjZuS3ltMDlBSTduMGhKblRGYUdQN2NTdFR5S21MNTUyWHlwQmE1 Y0MydkhxelpGck9XdVpZCnNWUVNRdmlBNUs0YXZkU0lOWW0vL1hPb1BRTFl4QXFuS3lvRlMxU3dX YlVVZmFIcTE5TGRCR0pmeGhyM0h1MFkKdXlFYUZYb0ZqY250eHFiQVljZHpBZklPQzNjTnV6cUNG SXFOK3hHVnEvSE5pV0Y1N3VmVjd0NjhiUlFvd1I2egptQWlybTUvRzZwcTZmd1dqa2RrUkxTbk1Q U3pNK0FuQkNHTHJLUEVqV2dNWmszZDNyTXI0ZzAzWU1BUElkcGdDClNDblRxa0U3Vk5ZSkQvSmJm bFlEWVh6OVZJZHAyYUI3TWx1dVh6Vld5TFdtM2cwTXc0SmtnZWdDSnFkYSsyN3IKOWlVM3gzV0dn VEorTEhYRGV0N3VIOUtZcEpCMStiS1VrUVVWVm50ZjkxeExhVkVBSUdDdlNibWpwMGN5MDJnTwpz VXJmM3dMemgvZVU4ZCtTQlNNK0FSMHVxUlRwRTZJL2VFSEg2bVU2YUw2NGt0bVZmNHBqemVXRUFT ZEh2cGVnCitQM3pCR1hwZmk1LzVsSkpFajRUVi8rdGc0elJxaytCMnRUd1AvZVEweEhkOG1kaW9x UWxOd21BOGxkREJVR2EKUFEvSEYwb0JzYmczZnEzeTZMY3doaS81K3JGaWZENHFCMVFSb0ROOGZM RGc3WGJGT0Voa2JtL1M1UFZNSWpRdApod2Z0SVJJZHRqeXpDOGM5Q21SYwo9bEcxVwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============8190561747339161561==--