From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] squid: Update 5.2 => 5.4
Date: Fri, 11 Feb 2022 08:52:44 +0000
Message-ID: <7adba7bd-33f7-d447-7c23-72c24bd9a014@ipfire.org>
In-Reply-To: <20220211083027.1398-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6002727521353801999=="
List-Id: <development.lists.ipfire.org>

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

Looks good to me, thank you very much for this.

@Arne: Could you pick this up for Core Update 164 please?

Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

> For details see:
> http://www.squid-cache.org/Versions/v5/changesets/
>=20
> P.S.: For a better overview the 'squid-gcc11'-patch has been renamed and mo=
ved
> to an own squid-patch-directory.
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  lfs/squid                                                  | 7 ++++---
>  .../{squid-gcc11.patch =3D> squid/01_squid-gcc11.patch}      | 0
>  2 files changed, 4 insertions(+), 3 deletions(-)
>  rename src/patches/{squid-gcc11.patch =3D> squid/01_squid-gcc11.patch} (10=
0%)
>=20
> diff --git a/lfs/squid b/lfs/squid
> index b25f594a9..034f4a3e9 100644
> --- a/lfs/squid
> +++ b/lfs/squid
> @@ -24,7 +24,7 @@
> =20
>  include Config
> =20
> -VER        =3D 5.2
> +VER        =3D 5.4
> =20
>  THISAPP    =3D squid-$(VER)
>  DL_FILE    =3D $(THISAPP).tar.xz
> @@ -46,7 +46,7 @@ objects =3D $(DL_FILE)
> =20
>  $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> =20
> -$(DL_FILE)_MD5 =3D 102984f3ea382a1fa5bd917c2ee155ec
> +$(DL_FILE)_MD5 =3D ea256e86fac6251f71ba4da529a1fd87
> =20
>  install : $(TARGET)
> =20
> @@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
> =20
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid-gcc11.patch
> +	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11=
.patch
> +
>  	cd $(DIR_APP) && autoreconf -vfi
>  	cd $(DIR_APP)/libltdl && autoreconf -vfi
> =20
> diff --git a/src/patches/squid-gcc11.patch b/src/patches/squid/01_squid-gcc=
11.patch
> similarity index 100%
> rename from src/patches/squid-gcc11.patch
> rename to src/patches/squid/01_squid-gcc11.patch

--===============6002727521353801999==--