From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] squid 3.5.27: latest patch from upstream (2018_1))
Date: Sun, 21 Jan 2018 19:06:45 +0000
Message-ID: <1516561605.2373.4.camel@ipfire.org>
In-Reply-To: <20180120175051.14815-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8183230028756227072=="
List-Id: <development.lists.ipfire.org>

--===============8183230028756227072==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Do we even use ESI?

On Sat, 2018-01-20 at 18:50 +0100, Matthias Fischer wrote:
> First patch after a long time, for details see:
> http://www.squid-cache.org/Versions/v3/3.5/changesets/
>=20
> Best,
> Matthias
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  lfs/squid                                          |  5 ++--
>  src/patches/squid/SQUID-2018_1.patch               | 28 ++++++++++++++++++=
++++
>  .../squid-3.5.27-fix-max-file-descriptors.patch    |  0
>  3 files changed, 31 insertions(+), 2 deletions(-)
>  create mode 100644 src/patches/squid/SQUID-2018_1.patch
>  rename src/patches/{ =3D> squid}/squid-3.5.27-fix-max-file-descriptors.pat=
ch (100%)
>=20
> diff --git a/lfs/squid b/lfs/squid
> index 08583d0b9..ae4d7ea44 100644
> --- a/lfs/squid
> +++ b/lfs/squid
> @@ -1,7 +1,7 @@
>  ##########################################################################=
#####
>  #                                                                         =
    #
>  # IPFire.org - A linux based firewall                                     =
    #
> -# Copyright (C) 2007-2017  IPFire Team  <info(a)ipfire.org>               =
      #
> +# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>               =
      #
>  #                                                                         =
    #
>  # This program is free software: you can redistribute it and/or modify    =
    #
>  # it under the terms of the GNU General Public License as published by    =
    #
> @@ -70,7 +70,8 @@ $(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.5.27-fix-ma=
x-file-descriptors.patch
> +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.=
patch
> +	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-=
fix-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=
-2018_1.patch
> new file mode 100644
> index 000000000..9392219a9
> --- /dev/null
> +++ b/src/patches/squid/SQUID-2018_1.patch
> @@ -0,0 +1,28 @@
> +commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5)
> +Author: Amos Jeffries <yadij(a)users.noreply.github.com>
> +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=
 const lengthOfData, bool
> +=20
> +             char * endofName =3D strpbrk(const_cast<char *>(tag), w_space=
);
> +=20
> +-            if (endofName > tagEnd)
> ++            if (!endofName || endofName > tagEnd)
> +                 endofName =3D const_cast<char *>(tagEnd);
> +=20
> +             *endofName =3D '\0';
> +@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t=
 const lengthOfData, bool
> +=20
> +             char * endofName =3D strpbrk(const_cast<char *>(tag), w_space=
);
> +=20
> +-            if (endofName > tagEnd)
> ++            if (!endofName || endofName > tagEnd)
> +                 endofName =3D const_cast<char *>(tagEnd);
> +=20
> +             *endofName =3D '\0';
> diff --git a/src/patches/squid-3.5.27-fix-max-file-descriptors.patch b/src/=
patches/squid/squid-3.5.27-fix-max-file-descriptors.patch
> similarity index 100%
> rename from src/patches/squid-3.5.27-fix-max-file-descriptors.patch
> rename to src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch

--===============8183230028756227072==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxwazVNVUFDZ2tRZ0hudy8yK1EKQ1FjNXRRLytOdzJVTDVsZGs5
SnlHWnl6Y2NGaC9uTmdBdUlSc29BOWk1S1NyUjQ2OWdvSFRETjdZcmd0N0g0MwpFWEZEMDdpdW5Q
UlE0TDBUVElwbFZubHUwdTFNNXlBQ3NKdWF1ME0vZHRYU2kwVFpsQlVUSzdwZlNBQXNSd3NHCmhK
OWQwVHRvS2REcmg2MWNNczZUYmtRbHhTalJGdEVEdUdpUjZuQjY0cDhOa29PWnplNG1HSTlhS3JF
QXhsYmQKUXFwUFduRCtwRzVuN2FBaVFsb0grK3Q4NmpqVWdTMlBCZnIrOEVKMEVWZ1kwd2VnQ0ww
eXpzZWlIdkZEWmhVZApRZVVyL2xXMzRoUDBHalljajNudkVYaHhBVVJwejNFWGVKU1VpQnhyRUw1
MUNSNzJRdEZaeG9RbkpCbzVGNHRhCjJPRDBQc24wUVVuZTFBWng4VFQxS2s5aEN5REN5NlQ0M25m
aHA0L3hubVFscFZpYVVNZUZKZkJHVVpscFY0MWYKQ3JDMURjQklKaEoydEhJK1VrdUhYeFp2aHdq
V2JSSWZEOXJTVkRzdy9BbnJaSldUM0oxME02WXhHWHFNeEp3VQpMVG0zS1dQbDNGK1lRQjZmSy9I
VXlMaHNrRVpoUDhOWThZNHoxbGlGOFVwd2dQZ1NvejNJMzNabWVjTUx5WmVtCmR5d1RneTZvanhQ
RGdWRGtMa0RuNVB6N0lVVElpdS9KY2R2WmEzMWtnVTN4QncyaXpCSE1QdThRb0dwclRuaWEKei9L
YTFFUEVqdnF4SFBqb09JeVNwb3JLbFlVS3pqdlEwYjVCenZHMUdyL1R6eVlxK1dzemNReks0T3lG
Y0k4aAo5ZDhwZlFPYVJDakhaRHdUU0JoeEJKZ2l5Q2xpUFg4dmRvK1FrdFZTbHlxUTJxd21ZSEU9
Cj1YUElQCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============8183230028756227072==--