From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid 3.5.22: latest patches (14100-14102) Date: Fri, 28 Oct 2016 09:49:32 +0200 Message-ID: <20161028074932.1509-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4883828573246286675==" List-Id: --===============4883828573246286675== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Matthias Fischer --- lfs/squid | 3 ++ src/patches/squid/squid-3.5-14100.patch | 39 ++++++++++++++++++++++ src/patches/squid/squid-3.5-14101.patch | 59 +++++++++++++++++++++++++++++++= ++ src/patches/squid/squid-3.5-14102.patch | 38 +++++++++++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 src/patches/squid/squid-3.5-14100.patch create mode 100644 src/patches/squid/squid-3.5-14101.patch create mode 100644 src/patches/squid/squid-3.5-14102.patch diff --git a/lfs/squid b/lfs/squid index f6015af..338dcc9 100644 --- a/lfs/squid +++ b/lfs/squid @@ -71,6 +71,9 @@ $(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/squid-3.5-14099= .patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14100= .patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14101= .patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14102= .patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.22-fix-max-= file-descriptors.patch =20 cd $(DIR_APP) && autoreconf -vfi diff --git a/src/patches/squid/squid-3.5-14100.patch b/src/patches/squid/squi= d-3.5-14100.patch new file mode 100644 index 0000000..7e5335a --- /dev/null +++ b/src/patches/squid/squid-3.5-14100.patch @@ -0,0 +1,39 @@ +------------------------------------------------------------ +revno: 14100 +revision-id: squid3(a)treenet.co.nz-20161025081949-3sxzd0n4snmadlke +parent: squid3(a)treenet.co.nz-20161015042024-jagzafukd2t6gcr0 +author: Christos Tsantilas +committer: Amos Jeffries +branch nick: 3.5 +timestamp: Tue 2016-10-25 21:19:49 +1300 +message: + Fix regression bug introduced by r14089. + =20 + Squid crashed because HttpMsg::body_pipe was used without check that it + was initialized. The message lacks body pipe when it has no body or + empty body. +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20161025081949-3sxzd0n4snmadlke +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 50468130801fc3ebf75129c103bcfe4be9b6d4b7 +# timestamp: 2016-10-25 08:28:30 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20161015042024-\ +# jagzafukd2t6gcr0 +#=20 +# Begin patch +=3D=3D=3D modified file 'src/adaptation/icap/ModXact.cc' +--- src/adaptation/icap/ModXact.cc 2016-09-16 18:50:04 +0000 ++++ src/adaptation/icap/ModXact.cc 2016-10-25 08:19:49 +0000 +@@ -1303,7 +1303,8 @@ + virgin_msg =3D virgin_request_; + assert(virgin_msg !=3D virgin.cause); + al.http.clientRequestSz.header =3D virgin_msg->hdr_sz; +- al.http.clientRequestSz.payloadData =3D virgin_msg->body_pipe->produced= Size(); ++ if (virgin_msg->body_pipe !=3D NULL) ++ al.http.clientRequestSz.payloadData =3D virgin_msg->body_pipe->prod= ucedSize(); +=20 + // leave al.icap.bodyBytesRead negative if no body + if (replyHttpHeaderSize >=3D 0 || replyHttpBodySize >=3D 0) { + diff --git a/src/patches/squid/squid-3.5-14101.patch b/src/patches/squid/squi= d-3.5-14101.patch new file mode 100644 index 0000000..92ff4d4 --- /dev/null +++ b/src/patches/squid/squid-3.5-14101.patch @@ -0,0 +1,59 @@ +------------------------------------------------------------ +revno: 14101 +revision-id: squid3(a)treenet.co.nz-20161025082349-4gds2nic8qcahkem +parent: squid3(a)treenet.co.nz-20161025081949-3sxzd0n4snmadlke +committer: Amos Jeffries +branch nick: 3.5 +timestamp: Tue 2016-10-25 21:23:49 +1300 +message: + Fix external_acl_type default children documentations + =20 + The max children has always been 5, not 20. + =20 + Also, make mgr:config report dumper actually hide only the real default + values. (sync with helper/ChildConfig.cc defaults) +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20161025082349-4gds2nic8qcahkem +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 02234eff0589032ea31d911c20f792617eeb18a9 +# timestamp: 2016-10-25 08:28:32 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20161025081949-\ +# 3sxzd0n4snmadlke +#=20 +# Begin patch +=3D=3D=3D modified file 'src/cf.data.pre' +--- src/cf.data.pre 2016-09-23 15:28:42 +0000 ++++ src/cf.data.pre 2016-10-25 08:23:49 +0000 +@@ -678,7 +678,7 @@ +=20 + children-max=3Dn + Maximum number of acl helper processes spawned to service +- external acl lookups of this type. (default 20) ++ external acl lookups of this type. (default 5) +=20 + children-startup=3Dn + Minimum number of acl helper processes to spawn during + +=3D=3D=3D modified file 'src/external_acl.cc' +--- src/external_acl.cc 2016-05-17 18:14:16 +0000 ++++ src/external_acl.cc 2016-10-25 08:23:49 +0000 +@@ -474,13 +474,13 @@ + if (node->children.n_max !=3D DEFAULT_EXTERNAL_ACL_CHILDREN) + storeAppendPrintf(sentry, " children-max=3D%d", node->children.= n_max); +=20 +- if (node->children.n_startup !=3D 1) ++ if (node->children.n_startup !=3D 0) // sync with helper/ChildConfi= g.cc default + storeAppendPrintf(sentry, " children-startup=3D%d", node->child= ren.n_startup); +=20 +- if (node->children.n_idle !=3D (node->children.n_max + node->childr= en.n_startup) ) ++ if (node->children.n_idle !=3D 1) // sync with helper/ChildConfig.c= c default + storeAppendPrintf(sentry, " children-idle=3D%d", node->children= .n_idle); +=20 +- if (node->children.concurrency) ++ if (node->children.concurrency !=3D 0) + storeAppendPrintf(sentry, " concurrency=3D%d", node->children.c= oncurrency); +=20 + if (node->cache) + diff --git a/src/patches/squid/squid-3.5-14102.patch b/src/patches/squid/squi= d-3.5-14102.patch new file mode 100644 index 0000000..f592531 --- /dev/null +++ b/src/patches/squid/squid-3.5-14102.patch @@ -0,0 +1,38 @@ +------------------------------------------------------------ +revno: 14102 +revision-id: squid3(a)treenet.co.nz-20161025082530-do632qnr9bwyk5et +parent: squid3(a)treenet.co.nz-20161025082349-4gds2nic8qcahkem +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3D4620 +author: Takahiro Kambe +committer: Amos Jeffries +branch nick: 3.5 +timestamp: Tue 2016-10-25 21:25:30 +1300 +message: + Bug 4620: NetBSD build error with --enable-ipf-transparent + =20 + On NetBSD sys/param.h must be included before netinet/ip_compat.h +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20161025082530-do632qnr9bwyk5et +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: eedfc8764a631aa008fd4aba589ca08ee161c3a5 +# timestamp: 2016-10-25 08:28:35 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20161025082349-\ +# 4gds2nic8qcahkem +#=20 +# Begin patch +=3D=3D=3D modified file 'src/ip/Intercept.cc' +--- src/ip/Intercept.cc 2016-10-09 00:14:14 +0000 ++++ src/ip/Intercept.cc 2016-10-25 08:25:30 +0000 +@@ -25,6 +25,9 @@ + #define IPFILTER_VERSION 5000004 + #endif +=20 ++#if HAVE_SYS_PARAM_H ++#include ++#endif + #if HAVE_SYS_IOCCOM_H + #include + #endif + --=20 2.10.1 --===============4883828573246286675==--