From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] squid: Update from 5.2 => 5.4.1
Date: Sat, 12 Feb 2022 18:16:20 +0100
Message-ID: <20220212171620.23599-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4617341646087513702=="
List-Id: <development.lists.ipfire.org>

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

For details see:
http://www.squid-cache.org/Versions/v5/changesets/SQUID_5_4_1.html

This is 'squid 5.4.1', containing the previous patch for Bug #5055.

Prior to this patch I reverted my previous patches 'squid: Update 5.2 =3D> 5.=
4" and
'squid 5.4: Latest patch - Bug #5055 - from upstream' and  marked them as
'superseded' in patchwork.

For a better overview the 'squid-gcc11'-patch has been renamed again and moved
to an own squid-patch-directory.

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} (100%)

diff --git a/lfs/squid b/lfs/squid
index b25f594a9..4b723a8e1 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 5.2
+VER        =3D 5.4.1
=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 a6d55b34ee8d32052026db1db98f4d0d
=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.p=
atch
+
 	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-gcc11=
.patch
similarity index 100%
rename from src/patches/squid-gcc11.patch
rename to src/patches/squid/01_squid-gcc11.patch
--=20
2.25.1


--===============4617341646087513702==--