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 e9358dcceedbaa43c3bffc0e396c326aba1fb491 (commit) via f10a246946c3fd24f3d75f3a90bb9c86fe598e74 (commit) from 0f14446a89c090cd985ee544b19fdfa0afe04dad (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 e9358dcceedbaa43c3bffc0e396c326aba1fb491 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 31 23:35:52 2015 +0100
core94: Ship updated squid
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f10a246946c3fd24f3d75f3a90bb9c86fe598e74 Author: matthias.fischer@ipfire.org matthias.fischer@ipfire.org Date: Sun Aug 30 10:13:24 2015 +0200
squid 3.4.14: Import latest patch from upstream
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: .../{oldcore/93 => core/94}/filelists/squid | 0 config/rootfiles/core/94/update.sh | 2 ++ lfs/squid | 1 + src/patches/squid-3.4-13228.patch | 35 ++++++++++++++++++++++ 4 files changed, 38 insertions(+) copy config/rootfiles/{oldcore/93 => core/94}/filelists/squid (100%) create mode 100644 src/patches/squid-3.4-13228.patch
Difference in files: diff --git a/config/rootfiles/core/94/filelists/squid b/config/rootfiles/core/94/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/94/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh index 5fb0936..6df0958 100644 --- a/config/rootfiles/core/94/update.sh +++ b/config/rootfiles/core/94/update.sh @@ -32,6 +32,7 @@ do done
# Stop services +/etc/init.d/squid stop /etc/init.d/sshd stop /etc/init.d/dnsmasq stop
@@ -69,6 +70,7 @@ fcrontab -z &>/dev/null # Start services /etc/init.d/dnsmasq start /etc/init.d/sshd start +/etc/init.d/squid start
# This update need a reboot... #touch /var/run/need_reboot diff --git a/lfs/squid b/lfs/squid index d8c8a05..834df9a 100644 --- a/lfs/squid +++ b/lfs/squid @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/squid \ diff --git a/src/patches/squid-3.4-13228.patch b/src/patches/squid-3.4-13228.patch new file mode 100644 index 0000000..7f7d16f --- /dev/null +++ b/src/patches/squid-3.4-13228.patch @@ -0,0 +1,35 @@ +------------------------------------------------------------ +revno: 13228 +revision-id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg +parent: squid3@treenet.co.nz-20150801072237-5tzh2dczozz1e8sq +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3696 +committer: Amos Jeffries squid3@treenet.co.nz +branch nick: 3.4 +timestamp: Fri 2015-08-28 06:23:34 -0700 +message: + Bug 3696: crash when client delay pools are activated +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# testament_sha1: d193928c4656282187f2a31bf66d43fd4c247177 +# timestamp: 2015-08-28 13:33:44 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# base_revision_id: squid3@treenet.co.nz-20150801072237-\ +# 5tzh2dczozz1e8sq +# +# Begin patch +=== modified file 'src/client_side.cc' +--- src/client_side.cc 2014-06-21 04:24:37 +0000 ++++ src/client_side.cc 2015-08-28 13:23:34 +0000 +@@ -3447,7 +3447,8 @@ + + /* pools require explicit 'allow' to assign a client into them */ + if (pools[pool].access) { +- ch.accessList = pools[pool].access; ++ cbdataReferenceDone(ch.accessList); ++ ch.accessList = cbdataReference(pools[pool].access); + allow_t answer = ch.fastCheck(); + if (answer == ACCESS_ALLOWED) { + +
hooks/post-receive -- IPFire 2.x development tree