From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid: Update to 3.5.28 Date: Tue, 17 Jul 2018 20:50:41 +0200 Message-ID: <20180717185041.12572-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0119108220817900597==" List-Id: --===============0119108220817900597== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable For details see: http://www.squid-cache.org/Versions/v3/3.5/changesets/ Best, Matthias Signed-off-by: Matthias Fischer --- lfs/squid | 8 ++---- src/patches/squid/SQUID-2018_1.patch | 28 ------------------- src/patches/squid/SQUID-2018_2.patch | 23 --------------- ...uid-3.5.28-fix-max-file-descriptors.patch} | 0 4 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 src/patches/squid/SQUID-2018_1.patch delete mode 100644 src/patches/squid/SQUID-2018_2.patch rename src/patches/squid/{squid-3.5.27-fix-max-file-descriptors.patch =3D> s= quid-3.5.28-fix-max-file-descriptors.patch} (100%) diff --git a/lfs/squid b/lfs/squid index f93097019..cae56407c 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 3.5.27 +VER =3D 3.5.28 =20 THISAPP =3D squid-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 39ef8199675d48a314b540f92c00c545 +$(DL_FILE)_MD5 =3D 9367e0375ea53ba0e99f77054d4402c5 =20 install : $(TARGET) =20 @@ -72,9 +72,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 -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.pa= tch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_2.pa= tch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-fi= x-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.28-fi= x-max-file-descriptors.patch =20 cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid/SQUID-2018_1.patch b/src/patches/squid/SQUID-2= 018_1.patch deleted file mode 100644 index 9392219a9..000000000 --- a/src/patches/squid/SQUID-2018_1.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5) -Author: Amos Jeffries -Date: 2018-01-19 13:54:14 +1300 - - ESI: make sure endofName never exceeds tagEnd (#130) - -diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc -index d86d2d3..db634d9 100644 ---- a/src/esi/CustomParser.cc -+++ b/src/esi/CustomParser.cc -@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t c= onst lengthOfData, bool -=20 - char * endofName =3D strpbrk(const_cast(tag), w_space); -=20 -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName =3D const_cast(tagEnd); -=20 - *endofName =3D '\0'; -@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t c= onst lengthOfData, bool -=20 - char * endofName =3D strpbrk(const_cast(tag), w_space); -=20 -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName =3D const_cast(tagEnd); -=20 - *endofName =3D '\0'; diff --git a/src/patches/squid/SQUID-2018_2.patch b/src/patches/squid/SQUID-2= 018_2.patch deleted file mode 100644 index 9ecd8a5b7..000000000 --- a/src/patches/squid/SQUID-2018_2.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5) -Author: squidadm -Date: 2018-01-21 08:07:08 +1300 - - Fix indirect IP logging for transactions without a client connection (#1= 29) (#136) - -diff --git a/src/client_side_request.cc b/src/client_side_request.cc -index be124f3..203f89d 100644 ---- a/src/client_side_request.cc -+++ b/src/client_side_request.cc -@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *dat= a) - * Ensure that the access log shows the indirect client - * instead of the direct client. - */ -- ConnStateData *conn =3D http->getConn(); -- conn->log_addr =3D request->indirect_client_addr; -- http->al->cache.caddr =3D conn->log_addr; -+ http->al->cache.caddr =3D request->indirect_client_addr; -+ if (ConnStateData *conn =3D http->getConn()) -+ conn->log_addr =3D request->indirect_client_addr; - } - request->x_forwarded_for_iterator.clean(); - request->flags.done_follow_x_forwarded_for =3D true; diff --git a/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch b/= src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch similarity index 100% rename from src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch rename to src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch --=20 2.18.0 --===============0119108220817900597==--