From patchwork Fri Apr 10 17:17:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2926 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48zPpF5SG6z3yC3 for ; Fri, 10 Apr 2020 17:17:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48zPpD0LH8z2nT; Fri, 10 Apr 2020 17:17:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48zPpC3Qnfz30FG; Fri, 10 Apr 2020 17:17:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48zPp66fG2z2xFf for ; Fri, 10 Apr 2020 17:17:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48zPp62bjqz1XQ for ; Fri, 10 Apr 2020 17:17:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=seGvfZanGV0PZAGcYQfV42qzqy63pi0/761bkmFVjAQ=; b=IH3Etv+agsZO8HxcMlKVYWhjhYOzb7YZK2XsGMHmODyhiNEzRskojK8hQXX+h4i164+eln CdYDuu1O0HArMyAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=seGvfZanGV0PZAGcYQfV42qzqy63pi0/761bkmFVjAQ=; b=tOwlTipTCsKpwibtDS1HJD6mL66uIIQM3AuBF4ikRrNf4RzX8wIKoiENywOS4VYYAzre7V i5BH7gqrNkN1d3+0M1WDk+dvmJ/UrdPu9uK//F6azJjuaPenebedfwWG7rQjNnjaEiv7YR lZrjd+k/PyfNgNWTQUNiyADjlfsHQ35mhEoy8bwG64CgItqmIUFGmDI7kKI3chZBtbKagD cxQOKCvDcqyAZ7NvQRKYgtPCwsSoKiXI1SbjtsNoBSb40gisHcgow46EIJTkSXuTmMH6bs wcYYtPY7AnOKgSZVeOyIZ0664tGIMHck8m9idMjUodFmfE5YgcGyUU9Z7JtMFA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 1/4] vnstat: Update to 2.6 Date: Fri, 10 Apr 2020 19:17:08 +0200 Message-Id: <20200410171711.3902-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: https://humdi[dot]net/vnstat/CHANGES Signed-off-by: Matthias Fischer --- config/rootfiles/common/vnstat | 13 +++++-------- lfs/vnstat | 5 ++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/common/vnstat b/config/rootfiles/common/vnstat index 42e00ed2a..963b64bf7 100644 --- a/config/rootfiles/common/vnstat +++ b/config/rootfiles/common/vnstat @@ -1,12 +1,9 @@ -#etc/cron.d -#etc/cron.d/vnstat etc/vnstat.conf usr/bin/vnstat usr/bin/vnstati -#usr/sbin/vnstatd -#usr/share/man/man5/vnstat.conf.5 -#usr/share/man/man1/vnstatd.1 -#usr/share/man/man1/vnstati.1 +usr/sbin/vnstatd #usr/share/man/man1/vnstat.1 -#var/lib/vnstat -var/log/vnstat +#usr/share/man/man1/vnstati.1 +#usr/share/man/man5/vnstat.conf.5 +#usr/share/man/man8/vnstatd.8 +#var/log/vnstat diff --git a/lfs/vnstat b/lfs/vnstat index 27189126b..904e5a256 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -24,7 +24,7 @@ include Config -VER = 1.18 +VER = 2.6 THISAPP = vnstat-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c9abaeb0ce758c16f6cdfa247bd8606c +$(DL_FILE)_MD5 = fe2928a81243cc8a532a357f97221736 install : $(TARGET) @@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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|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