X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fvnstat;h=a61bc5ed2b0efee8e89f538337c19b144016822f;hb=d53537ced9f0c52dbd8446e5e582275ba0053847;hp=2e7b46c65f310b87ec31b12cb514ef6604042b87;hpb=d34d9f3b16ae5e36b94e23de80a4664d13723662;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/vnstat b/lfs/vnstat
index 2e7b46c65f..a61bc5ed2b 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-2018  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.6
+VER        = 1.18
 
 THISAPP    = vnstat-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ccaffe8e70d47e0cf2f25e52daa25712
+$(DL_FILE)_MD5 = c9abaeb0ce758c16f6cdfa247bd8606c
 
 install : $(TARGET)
 
@@ -73,9 +73,17 @@ $(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 $(MAKETUNING)										LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
+
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc
+
+	cd $(DIR_APP) && make all $(MAKETUNING)		LOCAL_CONFIGURE_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/rrd/vnstat|g' /etc/vnstat.conf
+	sed -i 's|SaveInterval 5|SaveInterval 1|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)