mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
4cdc4e4059
For details see: https://humdi.net/vnstat/CHANGES "2.11 / 19-Aug-2023 - Fixed - Database queries worked only if SQLite double-quoted string (DQS) feature (https://www.sqlite.org/quirks.html#dblquote) was enabled - Disabling data resolutions in data retention configuration didn't result in possibly existing database entries getting removed from the database - Disabling data resolutions in data retention configuration didn't result in the data resolution getting disabled but instead storing data forever - "expr: syntax error" during configure in BSD (pull request by namtsui) - Image output summary would show only "no data available" text in case of zero total traffic even when the historical data of no traffic could have been shown instead - Image output "-o -" content could get corrupted due to info, warning and error messages also using stdout, configuration file warnings being the most likely source, now uses stderr in image output - Configuration validation was too heavily limiting and enforcing image output 5 minute graph related configuration options for combinations that would have resulted in usable images - New - Database cleanup has been changed to interpret data retention configuration as number of entries to be kept instead of calendar time, this restores the behaviour to similar as it was up to version 1.18, the difference is visible only on systems that aren't powered all the time - Database is vacuumed during daemon startup and reload, behaviour is configurable using VacuumOnStartup and VacuumOnHUPSignal configuration options - Add configuration option InterfaceOrder for controlling the interface order in outputs with multiple interfaces - Used data retention configuration is made visible during daemon startup and after configuration reloads - Daemon will no longer start if all data resolutions have been disabled in the configuration file - SQLite version is visible in --version outputs - Notes - "Not enough data available yet." message has been replaced with "No data. Timestamp of last update is same YYYY-MM-DD HH:MM:SS as of database creation." to better explain the reason why there's nothing to show, this message is expected to disappear within configured SaveInterval if the interface is active" Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
93 lines
3.6 KiB
Plaintext
93 lines
3.6 KiB
Plaintext
###############################################################################
|
|
# #
|
|
# IPFire.org - A linux based firewall #
|
|
# Copyright (C) 2007-2023 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 #
|
|
# the Free Software Foundation, either version 3 of the License, or #
|
|
# (at your option) any later version. #
|
|
# #
|
|
# This program is distributed in the hope that it will be useful, #
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
|
# GNU General Public License for more details. #
|
|
# #
|
|
# You should have received a copy of the GNU General Public License #
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
|
# #
|
|
###############################################################################
|
|
|
|
###############################################################################
|
|
# Definitions
|
|
###############################################################################
|
|
|
|
include Config
|
|
|
|
VER = 2.11
|
|
|
|
THISAPP = vnstat-$(VER)
|
|
DL_FILE = $(THISAPP).tar.gz
|
|
DL_FROM = $(URL_IPFIRE)
|
|
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
|
TARGET = $(DIR_INFO)/$(THISAPP)
|
|
|
|
###############################################################################
|
|
# Top-level Rules
|
|
###############################################################################
|
|
|
|
objects = $(DL_FILE)
|
|
|
|
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
|
|
|
$(DL_FILE)_BLAKE2 = 6eeed45d628641c9d88cf33ae1fc14871109b1e9fd0ac4a46fe8e2c194bb4600878b69408ed177bcde38ca859d0a3165d0095cab9b0bb6c036f7788fbfcb47e6
|
|
|
|
install : $(TARGET)
|
|
|
|
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
|
|
|
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
|
|
|
b2 : $(subst %,%_BLAKE2,$(objects))
|
|
|
|
dist:
|
|
@$(PAK)
|
|
|
|
###############################################################################
|
|
# Downloading, checking, b2sum
|
|
###############################################################################
|
|
|
|
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
|
@$(CHECK)
|
|
|
|
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
|
@$(LOAD)
|
|
|
|
$(subst %,%_BLAKE2,$(objects)) :
|
|
@$(B2SUM)
|
|
|
|
###############################################################################
|
|
# Installation Details
|
|
###############################################################################
|
|
|
|
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
|
@$(PREBUILD)
|
|
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
|
$(UPDATE_AUTOMAKE)
|
|
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|^;||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
|
|
|
|
mkdir -p /var/log/vnstat
|
|
|
|
@rm -rf $(DIR_APP)
|
|
@$(POSTBUILD)
|