[1/2] squid: Update to 5.1

Message ID 20210908160152.3223-1-matthias.fischer@ipfire.org
State Superseded
Headers show
Series [1/2] squid: Update to 5.1 | expand

Commit Message

Matthias Fischer Sept. 8, 2021, 4:01 p.m. UTC
For details see:
http://www.squid-cache.org/Versions/v5/changesets/

There is still no official announcement.

Nevertheless, since 31 Jul 2021, 'squid 5.1' has become "stable"
and is listed under "Current versions suitable for production use".

The only problem I found during testing deals with 'privoxy'.

Since 'privoxy' - as parent cache_peer - sometimes replies with a '403',
'squid 5.1' handles this cache_peer connection as 'dead' which is then
logged in 'cache_log'. See discussion on list.

Actually this is something that got fixed from 'squid 4.16' to '5.1' - its
no bug - its a feature. Everything else works as expected,'squid' and
'privoxy' developers were informed.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/common/squid | 50 +++++++++++++++++++++++++++++++++--
 lfs/squid                     |  5 ++--
 2 files changed, 50 insertions(+), 5 deletions(-)

Comments

Peter Müller Sept. 9, 2021, 8:27 p.m. UTC | #1
Hello Matthias,

first, thank you very much. Having Squid 5.x available is certainly an improvement! :-)

There is some kind of overwiev available at https://wiki.squid-cache.org/Squid-5, but
a decent release announcement is missing indeed. Also, I have seen WebSocket support
landing in Squid 5.x, but https://wiki.squid-cache.org/WebSockets gives me a 404 albeit
referred otherwise.

I am looking forward to this patch being accepted.

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

Thanks, and best regards,
Peter Müller


> For details see:
> http://www.squid-cache.org/Versions/v5/changesets/
> 
> There is still no official announcement.
> 
> Nevertheless, since 31 Jul 2021, 'squid 5.1' has become "stable"
> and is listed under "Current versions suitable for production use".
> 
> The only problem I found during testing deals with 'privoxy'.
> 
> Since 'privoxy' - as parent cache_peer - sometimes replies with a '403',
> 'squid 5.1' handles this cache_peer connection as 'dead' which is then
> logged in 'cache_log'. See discussion on list.
> 
> Actually this is something that got fixed from 'squid 4.16' to '5.1' - its
> no bug - its a feature. Everything else works as expected,'squid' and
> 'privoxy' developers were informed.
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
>  config/rootfiles/common/squid | 50 +++++++++++++++++++++++++++++++++--
>  lfs/squid                     |  5 ++--
>  2 files changed, 50 insertions(+), 5 deletions(-)
> 
> diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
> index 2a407ed44..0cfe2ace9 100644
> --- a/config/rootfiles/common/squid
> +++ b/config/rootfiles/common/squid
> @@ -521,15 +521,60 @@ usr/lib/squid/errors/en/error-details.txt
>  #usr/lib/squid/errors/es
>  #usr/lib/squid/errors/es-ar
>  #usr/lib/squid/errors/es-bo
> +#usr/lib/squid/errors/es-bz
>  #usr/lib/squid/errors/es-cl
>  #usr/lib/squid/errors/es-co
>  #usr/lib/squid/errors/es-cr
> +#usr/lib/squid/errors/es-cu
>  #usr/lib/squid/errors/es-do
>  #usr/lib/squid/errors/es-ec
>  #usr/lib/squid/errors/es-es
>  #usr/lib/squid/errors/es-gt
>  #usr/lib/squid/errors/es-hn
>  #usr/lib/squid/errors/es-mx
> +#usr/lib/squid/errors/es-mx/ERR_ACCESS_DENIED
> +#usr/lib/squid/errors/es-mx/ERR_ACL_TIME_QUOTA_EXCEEDED
> +#usr/lib/squid/errors/es-mx/ERR_AGENT_CONFIGURE
> +#usr/lib/squid/errors/es-mx/ERR_AGENT_WPAD
> +#usr/lib/squid/errors/es-mx/ERR_CACHE_ACCESS_DENIED
> +#usr/lib/squid/errors/es-mx/ERR_CACHE_MGR_ACCESS_DENIED
> +#usr/lib/squid/errors/es-mx/ERR_CANNOT_FORWARD
> +#usr/lib/squid/errors/es-mx/ERR_CONFLICT_HOST
> +#usr/lib/squid/errors/es-mx/ERR_CONNECT_FAIL
> +#usr/lib/squid/errors/es-mx/ERR_DIR_LISTING
> +#usr/lib/squid/errors/es-mx/ERR_DNS_FAIL
> +#usr/lib/squid/errors/es-mx/ERR_ESI
> +#usr/lib/squid/errors/es-mx/ERR_FORWARDING_DENIED
> +#usr/lib/squid/errors/es-mx/ERR_FTP_DISABLED
> +#usr/lib/squid/errors/es-mx/ERR_FTP_FAILURE
> +#usr/lib/squid/errors/es-mx/ERR_FTP_FORBIDDEN
> +#usr/lib/squid/errors/es-mx/ERR_FTP_NOT_FOUND
> +#usr/lib/squid/errors/es-mx/ERR_FTP_PUT_CREATED
> +#usr/lib/squid/errors/es-mx/ERR_FTP_PUT_ERROR
> +#usr/lib/squid/errors/es-mx/ERR_FTP_PUT_MODIFIED
> +#usr/lib/squid/errors/es-mx/ERR_FTP_UNAVAILABLE
> +#usr/lib/squid/errors/es-mx/ERR_GATEWAY_FAILURE
> +#usr/lib/squid/errors/es-mx/ERR_ICAP_FAILURE
> +#usr/lib/squid/errors/es-mx/ERR_INVALID_REQ
> +#usr/lib/squid/errors/es-mx/ERR_INVALID_RESP
> +#usr/lib/squid/errors/es-mx/ERR_INVALID_URL
> +#usr/lib/squid/errors/es-mx/ERR_LIFETIME_EXP
> +#usr/lib/squid/errors/es-mx/ERR_NO_RELAY
> +#usr/lib/squid/errors/es-mx/ERR_ONLY_IF_CACHED_MISS
> +#usr/lib/squid/errors/es-mx/ERR_PRECONDITION_FAILED
> +#usr/lib/squid/errors/es-mx/ERR_PROTOCOL_UNKNOWN
> +#usr/lib/squid/errors/es-mx/ERR_READ_ERROR
> +#usr/lib/squid/errors/es-mx/ERR_READ_TIMEOUT
> +#usr/lib/squid/errors/es-mx/ERR_SECURE_CONNECT_FAIL
> +#usr/lib/squid/errors/es-mx/ERR_SHUTTING_DOWN
> +#usr/lib/squid/errors/es-mx/ERR_SOCKET_FAILURE
> +#usr/lib/squid/errors/es-mx/ERR_TOO_BIG
> +#usr/lib/squid/errors/es-mx/ERR_UNSUP_HTTPVERSION
> +#usr/lib/squid/errors/es-mx/ERR_UNSUP_REQ
> +#usr/lib/squid/errors/es-mx/ERR_URN_RESOLVE
> +#usr/lib/squid/errors/es-mx/ERR_WRITE_ERROR
> +#usr/lib/squid/errors/es-mx/ERR_ZERO_SIZE_OBJECT
> +#usr/lib/squid/errors/es-mx/error-details.txt
>  #usr/lib/squid/errors/es-ni
>  #usr/lib/squid/errors/es-pa
>  #usr/lib/squid/errors/es-pe
> @@ -1673,6 +1718,7 @@ usr/lib/squid/errors/ru/error-details.txt
>  #usr/lib/squid/errors/sl/ERR_WRITE_ERROR
>  #usr/lib/squid/errors/sl/ERR_ZERO_SIZE_OBJECT
>  #usr/lib/squid/errors/sl/error-details.txt
> +#usr/lib/squid/errors/spq
>  #usr/lib/squid/errors/sr
>  #usr/lib/squid/errors/sr-cyrl
>  #usr/lib/squid/errors/sr-cyrl-cs
> @@ -2185,10 +2231,10 @@ usr/lib/squid/errors/tr/error-details.txt
>  usr/lib/squid/ext_delayer_acl
>  usr/lib/squid/ext_edirectory_userip_acl
>  usr/lib/squid/ext_file_userip_acl
> +#usr/lib/squid/ext_kerberos_sid_group_acl
>  usr/lib/squid/ext_ldap_group_acl
>  usr/lib/squid/ext_session_acl
>  usr/lib/squid/ext_sql_session_acl
> -usr/lib/squid/ext_time_quota_acl
>  usr/lib/squid/ext_unix_group_acl
>  usr/lib/squid/ext_wbinfo_group_acl
>  usr/lib/squid/helper-mux
> @@ -2273,10 +2319,10 @@ usr/sbin/updxlrator
>  #usr/share/man/man8/ext_delayer_acl.8
>  #usr/share/man/man8/ext_edirectory_userip_acl.8
>  #usr/share/man/man8/ext_file_userip_acl.8
> +#usr/share/man/man8/ext_kerberos_sid_group_acl.8
>  #usr/share/man/man8/ext_ldap_group_acl.8
>  #usr/share/man/man8/ext_session_acl.8
>  #usr/share/man/man8/ext_sql_session_acl.8
> -#usr/share/man/man8/ext_time_quota_acl.8
>  #usr/share/man/man8/ext_unix_group_acl.8
>  #usr/share/man/man8/ext_wbinfo_group_acl.8
>  #usr/share/man/man8/helper-mux.8
> diff --git a/lfs/squid b/lfs/squid
> index 98034651c..c56dca7de 100644
> --- a/lfs/squid
> +++ b/lfs/squid
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 4.15
> +VER        = 5.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 = a593de9dc888dfeca4f1f7db2cd7d3b9
> +$(DL_FILE)_MD5 = 17be9709b54fe0146452113404be7b54
>  
>  install : $(TARGET)
>  
> @@ -127,7 +127,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  		--enable-icap-client \
>  		--enable-zph-qos \
>  		--with-dl \
> -		--with-filedescriptors=$$(( 16384 * 64 )) \
>  		--with-large-files \
>  		--without-gnutls \
>  		--without-netfilter-conntrack
>

Patch

diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 2a407ed44..0cfe2ace9 100644
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -521,15 +521,60 @@  usr/lib/squid/errors/en/error-details.txt
 #usr/lib/squid/errors/es
 #usr/lib/squid/errors/es-ar
 #usr/lib/squid/errors/es-bo
+#usr/lib/squid/errors/es-bz
 #usr/lib/squid/errors/es-cl
 #usr/lib/squid/errors/es-co
 #usr/lib/squid/errors/es-cr
+#usr/lib/squid/errors/es-cu
 #usr/lib/squid/errors/es-do
 #usr/lib/squid/errors/es-ec
 #usr/lib/squid/errors/es-es
 #usr/lib/squid/errors/es-gt
 #usr/lib/squid/errors/es-hn
 #usr/lib/squid/errors/es-mx
+#usr/lib/squid/errors/es-mx/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/es-mx/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/es-mx/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/es-mx/ERR_AGENT_WPAD
+#usr/lib/squid/errors/es-mx/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/es-mx/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/es-mx/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/es-mx/ERR_CONFLICT_HOST
+#usr/lib/squid/errors/es-mx/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/es-mx/ERR_DIR_LISTING
+#usr/lib/squid/errors/es-mx/ERR_DNS_FAIL
+#usr/lib/squid/errors/es-mx/ERR_ESI
+#usr/lib/squid/errors/es-mx/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/es-mx/ERR_FTP_DISABLED
+#usr/lib/squid/errors/es-mx/ERR_FTP_FAILURE
+#usr/lib/squid/errors/es-mx/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/es-mx/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/es-mx/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/es-mx/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/es-mx/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/es-mx/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/es-mx/ERR_GATEWAY_FAILURE
+#usr/lib/squid/errors/es-mx/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/es-mx/ERR_INVALID_REQ
+#usr/lib/squid/errors/es-mx/ERR_INVALID_RESP
+#usr/lib/squid/errors/es-mx/ERR_INVALID_URL
+#usr/lib/squid/errors/es-mx/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/es-mx/ERR_NO_RELAY
+#usr/lib/squid/errors/es-mx/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/es-mx/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/es-mx/ERR_PROTOCOL_UNKNOWN
+#usr/lib/squid/errors/es-mx/ERR_READ_ERROR
+#usr/lib/squid/errors/es-mx/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/es-mx/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/es-mx/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/es-mx/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/es-mx/ERR_TOO_BIG
+#usr/lib/squid/errors/es-mx/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/es-mx/ERR_UNSUP_REQ
+#usr/lib/squid/errors/es-mx/ERR_URN_RESOLVE
+#usr/lib/squid/errors/es-mx/ERR_WRITE_ERROR
+#usr/lib/squid/errors/es-mx/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/es-mx/error-details.txt
 #usr/lib/squid/errors/es-ni
 #usr/lib/squid/errors/es-pa
 #usr/lib/squid/errors/es-pe
@@ -1673,6 +1718,7 @@  usr/lib/squid/errors/ru/error-details.txt
 #usr/lib/squid/errors/sl/ERR_WRITE_ERROR
 #usr/lib/squid/errors/sl/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sl/error-details.txt
+#usr/lib/squid/errors/spq
 #usr/lib/squid/errors/sr
 #usr/lib/squid/errors/sr-cyrl
 #usr/lib/squid/errors/sr-cyrl-cs
@@ -2185,10 +2231,10 @@  usr/lib/squid/errors/tr/error-details.txt
 usr/lib/squid/ext_delayer_acl
 usr/lib/squid/ext_edirectory_userip_acl
 usr/lib/squid/ext_file_userip_acl
+#usr/lib/squid/ext_kerberos_sid_group_acl
 usr/lib/squid/ext_ldap_group_acl
 usr/lib/squid/ext_session_acl
 usr/lib/squid/ext_sql_session_acl
-usr/lib/squid/ext_time_quota_acl
 usr/lib/squid/ext_unix_group_acl
 usr/lib/squid/ext_wbinfo_group_acl
 usr/lib/squid/helper-mux
@@ -2273,10 +2319,10 @@  usr/sbin/updxlrator
 #usr/share/man/man8/ext_delayer_acl.8
 #usr/share/man/man8/ext_edirectory_userip_acl.8
 #usr/share/man/man8/ext_file_userip_acl.8
+#usr/share/man/man8/ext_kerberos_sid_group_acl.8
 #usr/share/man/man8/ext_ldap_group_acl.8
 #usr/share/man/man8/ext_session_acl.8
 #usr/share/man/man8/ext_sql_session_acl.8
-#usr/share/man/man8/ext_time_quota_acl.8
 #usr/share/man/man8/ext_unix_group_acl.8
 #usr/share/man/man8/ext_wbinfo_group_acl.8
 #usr/share/man/man8/helper-mux.8
diff --git a/lfs/squid b/lfs/squid
index 98034651c..c56dca7de 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 4.15
+VER        = 5.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 = a593de9dc888dfeca4f1f7db2cd7d3b9
+$(DL_FILE)_MD5 = 17be9709b54fe0146452113404be7b54
 
 install : $(TARGET)
 
@@ -127,7 +127,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-icap-client \
 		--enable-zph-qos \
 		--with-dl \
-		--with-filedescriptors=$$(( 16384 * 64 )) \
 		--with-large-files \
 		--without-gnutls \
 		--without-netfilter-conntrack