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.
 dfdfafc7af57b5088279680098408df823516703
Date: Tue, 20 Mar 2018 20:37:08 +0000
Message-ID: <20180320203708.B4EA71081DF2@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3774460233581138522=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3774460233581138522==
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  dfdfafc7af57b5088279680098408df823516703 (commit)
       via  a05af852c5f2266151479c9424a9b36243fb1c79 (commit)
      from  e7ea357cecf5e069dd4fb4e5cd6099d8e5b7d9a4 (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 dfdfafc7af57b5088279680098408df823516703
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Mar 20 20:36:15 2018 +0000

    core120: Ship updated vnstat
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a05af852c5f2266151479c9424a9b36243fb1c79
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Tue Mar 20 20:46:52 2018 +0100

    vnstat: Update to 1.18
   =20
    For details see: https://humdi.net/vnstat/CHANGES
   =20
    Changed "SaveInterval 5" to "SaveInterval 1" in '/etc/vnstat.conf', trigg=
ered by
    https://forum.ipfire.org/viewtopic.php?f=3D22&t=3D20448 to avoid data los=
s with 1Gbit
    connections and high traffic.
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/{oldcore/111 =3D> core/120}/filelists/vnstat | 0
 lfs/vnstat                                                  | 7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 copy config/rootfiles/{oldcore/111 =3D> core/120}/filelists/vnstat (100%)

Difference in files:
diff --git a/config/rootfiles/core/120/filelists/vnstat b/config/rootfiles/co=
re/120/filelists/vnstat
new file mode 120000
index 000000000..2e2e6100b
--- /dev/null
+++ b/config/rootfiles/core/120/filelists/vnstat
@@ -0,0 +1 @@
+../../../common/vnstat
\ No newline at end of file
diff --git a/lfs/vnstat b/lfs/vnstat
index 376a1e999..a61bc5ed2 100644
--- a/lfs/vnstat
+++ b/lfs/vnstat
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2017  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2018  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.17
+VER        =3D 1.18
=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 8de1c7e40806509943804bb4b26f5409
+$(DL_FILE)_MD5 =3D c9abaeb0ce758c16f6cdfa247bd8606c
=20
 install : $(TARGET)
=20
@@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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|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


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

--===============3774460233581138522==--