From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 0e8f275e80d8ad517019f7c0f8349a5a16ea9f1b
Date: Mon, 24 Apr 2017 11:22:36 +0100
Message-ID: <20170424102236.7369C10853C3@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4087575873703962183=="
List-Id: <ipfire-scm.lists.ipfire.org>

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  0e8f275e80d8ad517019f7c0f8349a5a16ea9f1b (commit)
       via  d55d05b6cb6bb3ddb7fde20d975cf4f9546afedf (commit)
      from  1bea8be2ce2ce0c4ee2a07bcffb978f4ea07ab89 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0e8f275e80d8ad517019f7c0f8349a5a16ea9f1b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sat Apr 22 18:17:27 2017 +0200

    vnstat: Update to 1.17
   =20
    For details see:
    http://humdi.net/vnstat/CHANGES
   =20
    Please note - this commit is based on:
    http://git.ipfire.org/?p=3Dpeople/mfischer/ipfire-2.x.git;a=3Dcommit;h=3D=
f92c3ef6b97d4bd5e3db9c6c783ab0059016b211
   =20
    1.15 was running here since then, upgrading to 1.17 showed no problems so=
 far.
   =20
    Best,
    Matthias
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d55d05b6cb6bb3ddb7fde20d975cf4f9546afedf
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Tue Jul 12 12:56:42 2016 +0200

    vnstat: Update to 1.15
   =20
    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>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/vnstat | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/lfs/vnstat b/lfs/vnstat
index 1c1333b..376a1e9 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-2017  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.17
=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 8de1c7e40806509943804bb4b26f5409
=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)


hooks/post-receive
--
IPFire 2.x development tree

--===============4087575873703962183==--