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 to 5.8
Date: Sat, 04 Mar 2023 13:38:37 +0000
Message-ID: <4925275b-73f1-78f5-6b04-f4e472adc498@ipfire.org>
In-Reply-To: <20230304123723.3435405-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1840146270095895980=="
List-Id: <development.lists.ipfire.org>

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

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

> For details see:
> https://github.com/squid-cache/squid/commits/v5
>=20
> Please note:
> Updating 'squid' to 5.8 required some lfs adjustments, as the translations =
are no longer
> included in the source code.
>=20
> I had to integrate the 'squid-langpack' file.
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  lfs/squid | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
>=20
> diff --git a/lfs/squid b/lfs/squid
> index 7a7b775ff..5d79bf382 100644
> --- a/lfs/squid
> +++ b/lfs/squid
> @@ -1,7 +1,7 @@
>  ##########################################################################=
#####
>  #                                                                         =
    #
>  # IPFire.org - A linux based firewall                                     =
    #
> -# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>               =
      #
> +# Copyright (C) 2007-2023  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    =
    #
> @@ -24,7 +24,8 @@
> =20
>  include Config
> =20
> -VER        =3D 5.7
> +VER        =3D 5.8
> +LANGPACK   =3D 20230225
> =20
>  THISAPP    =3D squid-$(VER)
>  DL_FILE    =3D $(THISAPP).tar.xz
> @@ -42,11 +43,14 @@ endif
>  # Top-level Rules
>  ##########################################################################=
#####
> =20
> -objects =3D $(DL_FILE)
> +objects =3D $(DL_FILE) \
> +	squid-langpack-$(LANGPACK).tar.gz
> =20
> -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> +$(DL_FILE)					=3D $(URL_IPFIRE)/$(DL_FILE)
> +squid-langpack-$(LANGPACK).tar.gz	=3D $(URL_IPFIRE)/squid-langpack-$(LANGP=
ACK).tar.gz
> =20
> -$(DL_FILE)_BLAKE2 =3D 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e=
83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299
> +$(DL_FILE)_BLAKE2 =3D c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946=
c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68
> +squid-langpack-$(LANGPACK).tar.gz_BLAKE2 =3D 169a05d16770f56e515fd633658e8=
bcd9464fb01ccba76256b119932c833af7bc22e3e8d3a7d5fde37638546f15822a4d1548a78af=
13be9f4e3b8989758250b6
> =20
>  install : $(TARGET)
> =20
> @@ -76,6 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
> +	cd $(DIR_APP)/errors && tar zxf $(DIR_DL)/squid-langpack-$(LANGPACK).tar.=
gz
> =20
>  	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11=
.patch
> =20

--===============1840146270095895980==--