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 8b4cc72d4e64803a41d432541170b74d19f51eae (commit) via 9612bc11334234371c561ad3150ae3665675f1b5 (commit) from f6474f325c00f213c9f5ff7747fa52a641780ad9 (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 8b4cc72d4e64803a41d432541170b74d19f51eae Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 7 19:07:54 2024 +0000
core185: Ship squid
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9612bc11334234371c561ad3150ae3665675f1b5 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Mar 7 18:38:39 2024 +0100
squid: Update to 6.8
For details see: https://github.com/squid-cache/squid/commits/v6
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/{oldcore/100 => core/185}/filelists/squid | 0 config/rootfiles/core/185/update.sh | 5 ++++- lfs/squid | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/100 => core/185}/filelists/squid (100%)
Difference in files: diff --git a/config/rootfiles/core/185/filelists/squid b/config/rootfiles/core/185/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/185/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh index 0a3fae638..a24f61692 100644 --- a/config/rootfiles/core/185/update.sh +++ b/config/rootfiles/core/185/update.sh @@ -33,6 +33,7 @@ done
# Stop services /etc/init.d/ntp stop +/etc/init.d/squid stop
# Extract files extract_files @@ -87,7 +88,9 @@ telinit u /etc/init.d/suricata restart /etc/init.d/unbound restart /etc/init.d/ntp start - +if [ -f /var/ipfire/proxy/enable ]; then + /etc/init.d/squid start +f ## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections # Check if ovpnconfig exists and is not empty if [ -s /var/ipfire/ovpn/ovpnconfig ]; then diff --git a/lfs/squid b/lfs/squid index 3a2d1039c..882a8842e 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 6.7 +VER = 6.8
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f91b0f617b6b32138c33575d5daec0bc6dfcb0d356939b6c01e9d4c33b77886ffb55c38678f31aeed9bf4d5d5e488c751d41098b846a956383c8b6db8c851cab +$(DL_FILE)_BLAKE2 = 771de358d395a6b4bb5d94b02325755d1ba891c24f2cc1bdc80d91a73467a475c2cb7f0e1c24aed2f714c0de38858a24ac3864a5b772b6828beeb014da827d9d
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree