From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 bbca73d467bace690a1418c6c6c7202db8c8fd63
Date: Tue, 15 Feb 2022 16:29:58 +0000
Message-ID: <4JymlV2VYqz2xgZ@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8545593104268697805=="
List-Id: <ipfire-scm.lists.ipfire.org>

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  bbca73d467bace690a1418c6c6c7202db8c8fd63 (commit)
      from  cae2a37e52f68972ad4f94419481241dd687f118 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bbca73d467bace690a1418c6c6c7202db8c8fd63
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sat Feb 12 18:16:20 2022 +0100

    squid: Update from 5.2 =3D> 5.4.1
   =20
    For details see:
    http://www.squid-cache.org/Versions/v5/changesets/SQUID_5_4_1.html
   =20
    This is 'squid 5.4.1', containing the previous patch for Bug #5055.
   =20
    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.
   =20
    For a better overview the 'squid-gcc11'-patch has been renamed again and =
moved
    to an own squid-patch-directory.
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/squid                                                     | 7 ++++---
 src/patches/{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%)

Difference in files:
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


hooks/post-receive
--
IPFire 2.x development tree

--===============8545593104268697805==--