From mboxrd@z Thu Jan  1 00:00:00 1970
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>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4711671499945496568=="
List-Id: <development.lists.ipfire.org>

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

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(a)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(a)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 @@
=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)										LOCAL_CONFIGURE_OPTIONS=3D=
"--enable-readline=3Dyes"
+
+	cd $(DIR_APP) && ./configure \
+		--prefix=3D/usr \
+		--sysconfdir=3D/etc
+
+	cd $(DIR_APP) && make all $(MAKETUNING)		LOCAL_CONFIGURE_OPTIONS=3D"--enabl=
e-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
2.9.1


--===============4711671499945496568==--