From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] vnstat: Update to 1.15
Date: Tue, 12 Jul 2016 12:07:28 +0100 [thread overview]
Message-ID: <1468321648.2710.90.camel@ipfire.org> (raw)
In-Reply-To: <20160712105642.5235-1-matthias.fischer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2970 bytes --]
Hi,
why do we have to move the PID and log files?
-Michael
On Tue, 2016-07-12 at 12:56 +0200, Matthias Fischer wrote:
> Changelog:
> http://humdi.net/vnstat/CHANGES
>
> I had to add some 'configure'-lines to build this - nevertheless: its
> working. ;-)
>
> 'vnstat.conf' needed some additional 'sed'-lines, too.
>
> Please review, test and confirm.
>
> Best,
> Matthias
>
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> lfs/vnstat | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/lfs/vnstat b/lfs/vnstat
> index 1c1333b..07cca69 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-2016 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 @@
>
> include Config
>
> -VER = 1.11
> +VER = 1.15
>
> THISAPP = vnstat-$(VER)
> DL_FILE = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = a5a113f9176cd61fb954f2ba297f5fdb
> +$(DL_FILE)_MD5 = 351051ef3005e3ca99123eec07ac0a7d
>
> install : $(TARGET)
>
> @@ -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="
> --enable-readline=yes"
> +
> + cd $(DIR_APP) && ./configure \
> + --prefix=/usr \
> + --sysconfdir=/etc
> +
> + cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGUR
> E_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/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)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-07-12 11:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 10:56 Matthias Fischer
2016-07-12 11:07 ` Michael Tremer [this message]
2016-07-12 16:23 ` Matthias Fischer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468321648.2710.90.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox