[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8a86d257cf9e4669786dbef26ecb5071cb7511fb

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8a86d257cf9e4669786dbef26ecb5071cb7511fb

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2863 bytes --]

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  8a86d257cf9e4669786dbef26ecb5071cb7511fb (commit)
       via  625104ec57dfe53f0973ccb98d0f9b4f37c385a3 (commit)
       via  405c7326d2b712d5b212ac4112959f1a109c720a (commit)
       via  4963d555f601367b5da92d3a6dcdfa750a915e0b (commit)
      from  90c1e763b6651adc17ba210611bfb323265b20ab (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 8a86d257cf9e4669786dbef26ecb5071cb7511fb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jun 5 20:43:58 2020 +0000

    squid-accounting: remove deps that are moved to core
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 625104ec57dfe53f0973ccb98d0f9b4f37c385a3
Merge: 90c1e763b 405c7326d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jun 4 15:16:39 2020 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/rootfiles/oldcore/145/update.sh | 5 ++++-
 lfs/squid-accounting                   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/oldcore/145/update.sh b/config/rootfiles/oldcore/145/update.sh
index 38653b730..4b59a03dc 100644
--- a/config/rootfiles/oldcore/145/update.sh
+++ b/config/rootfiles/oldcore/145/update.sh
@@ -78,7 +78,10 @@ for package in perl-DBI perl-DBD-SQLite; do
 done
 
 # Enable OpenVPN metrics collection
-grep -q "^client-connect" /var/ipfire/ovpn/server.conf || cat <<EOF >> /var/ipfire/ovpn/server.conf
+sed -E -i /var/ipfire/ovpn/server.conf \
+	-e "/^client-(dis)?connect/d"
+
+cat <<EOF >> /var/ipfire/ovpn/server.conf
 # Log clients connecting/disconnecting
 client-connect "/usr/sbin/openvpn-metrics client-connect"
 client-disconnect "/usr/sbin/openvpn-metrics client-disconnect"
diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index bc39142cf..77742554e 100644
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -15,9 +15,9 @@ THISAPP    = squid-accounting-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squid-accounting
-PAK_VER    = 12
+PAK_VER    = 13
 
-DEPS       = perl-DBI perl-DBD-SQLite perl-File-ReadBackwards
+DEPS       = perl-File-ReadBackwards
 
 ###############################################################################
 # Top-level Rules


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