[PATCH] squid: Update from 5.2 => 5.4.1

[PATCH] squid: Update from 5.2 => 5.4.1

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1885 bytes --]

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 => 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 => squid/01_squid-gcc11.patch}      | 0
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename src/patches/{squid-gcc11.patch => 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 @@
 
 include Config
 
-VER        = 5.2
+VER        = 5.4.1
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 102984f3ea382a1fa5bd917c2ee155ec
+$(DL_FILE)_MD5 = a6d55b34ee8d32052026db1db98f4d0d
 
 install : $(TARGET)
 
@@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
 
-	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
 
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
-- 
2.25.1

Re: [PATCH] squid: Update from 5.2 => 5.4.1

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 2232 bytes --]

Hello Matthias,

thank you for submitting this. It looks good to me.

Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

@Arne: Please apply this patch to Core Update 164 as well. Thank you!

Thanks, and best regards,
Peter Müller


> 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 => 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 => squid/01_squid-gcc11.patch}      | 0
>  2 files changed, 4 insertions(+), 3 deletions(-)
>  rename src/patches/{squid-gcc11.patch => 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 @@
>  
>  include Config
>  
> -VER        = 5.2
> +VER        = 5.4.1
>  
>  THISAPP    = squid-$(VER)
>  DL_FILE    = $(THISAPP).tar.xz
> @@ -46,7 +46,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 102984f3ea382a1fa5bd917c2ee155ec
> +$(DL_FILE)_MD5 = a6d55b34ee8d32052026db1db98f4d0d
>  
>  install : $(TARGET)
>  
> @@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
>  
> -	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
>  
> 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