diff -u -r -N squid-5.2/aclocal.m4 squid-5.3/aclocal.m4
--- squid-5.2/aclocal.m4	2021-10-04 04:04:34.000000000 +1300
+++ squid-5.3/aclocal.m4	2021-12-08 03:11:05.000000000 +1300
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
@@ -10074,7 +10074,7 @@
 [am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.4], [],
+m4_if([$1], [1.16.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -10090,7 +10090,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.4])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -10467,6 +10467,10 @@
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+  [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
diff -u -r -N squid-5.2/ChangeLog squid-5.3/ChangeLog
--- squid-5.2/ChangeLog	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/ChangeLog	2021-12-08 03:15:52.000000000 +1300
@@ -1,3 +1,10 @@
+Changes in squid-5.3 (06 Dec 2021):
+
+	- Bug 5169: StoreMap.cc:517 "!s.reading()" assertion
+	- Bug 5158: AnyP::Uri::host() mishandles [escaped] IPv6 addresses
+	- Bug 5060: Parallel builds are not reliable
+	- Documentation updates for logformat directive
+
 Changes in squid-5.2 (03 Oct 2021):
 
 	- Bug 5164: a copy-paste typo in HttpHdrCc::hasMinFresh()
diff -u -r -N squid-5.2/compat/Makefile.in squid-5.3/compat/Makefile.in
--- squid-5.2/compat/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/compat/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/configure squid-5.3/configure
--- squid-5.2/configure	2021-10-04 04:04:42.000000000 +1300
+++ squid-5.3/configure	2021-12-08 03:11:12.000000000 +1300
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Squid Web Proxy 5.2.
+# Generated by GNU Autoconf 2.71 for Squid Web Proxy 5.3.
 #
 # Report bugs to <http://bugs.squid-cache.org/>.
 #
@@ -626,8 +626,8 @@
 # Identity of this package.
 PACKAGE_NAME='Squid Web Proxy'
 PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='5.2'
-PACKAGE_STRING='Squid Web Proxy 5.2'
+PACKAGE_VERSION='5.3'
+PACKAGE_STRING='Squid Web Proxy 5.3'
 PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
 PACKAGE_URL=''
 
@@ -1690,7 +1690,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Squid Web Proxy 5.2 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 5.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1761,7 +1761,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Squid Web Proxy 5.2:";;
+     short | recursive ) echo "Configuration of Squid Web Proxy 5.3:";;
    esac
   cat <<\_ACEOF
 
@@ -2195,7 +2195,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Squid Web Proxy configure 5.2
+Squid Web Proxy configure 5.3
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3208,7 +3208,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Squid Web Proxy $as_me 5.2, which was
+It was created by Squid Web Proxy $as_me 5.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4700,7 +4700,7 @@
 
 # Define the identity of the package.
  PACKAGE='squid'
- VERSION='5.2'
+ VERSION='5.3'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -48306,7 +48306,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Squid Web Proxy $as_me 5.2, which was
+This file was extended by Squid Web Proxy $as_me 5.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -48374,7 +48374,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Squid Web Proxy config.status 5.2
+Squid Web Proxy config.status 5.3
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff -u -r -N squid-5.2/configure.ac squid-5.3/configure.ac
--- squid-5.2/configure.ac	2021-10-04 04:04:42.000000000 +1300
+++ squid-5.3/configure.ac	2021-12-08 03:11:12.000000000 +1300
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[5.2],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[5.3],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)
diff -u -r -N squid-5.2/contrib/Makefile.in squid-5.3/contrib/Makefile.in
--- squid-5.2/contrib/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/contrib/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/doc/Makefile.in squid-5.3/doc/Makefile.in
--- squid-5.2/doc/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/doc/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/doc/manuals/Makefile.in squid-5.3/doc/manuals/Makefile.in
--- squid-5.2/doc/manuals/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/doc/manuals/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/doc/release-notes/Makefile.in squid-5.3/doc/release-notes/Makefile.in
--- squid-5.2/doc/release-notes/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/doc/release-notes/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/doc/release-notes/release-5.html squid-5.3/doc/release-notes/release-5.html
--- squid-5.2/doc/release-notes/release-5.html	2021-10-04 04:09:39.000000000 +1300
+++ squid-5.3/doc/release-notes/release-5.html	2021-12-08 03:15:57.000000000 +1300
@@ -3,10 +3,10 @@
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.82">
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <TITLE>Squid 5.2 release notes</TITLE>
+ <TITLE>Squid 5.3 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 5.2 release notes</H1>
+<H1>Squid 5.3 release notes</H1>
 
 <H2>Squid Developers</H2>
 <HR>
@@ -61,7 +61,7 @@
 <HR>
 <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
 
-<P>The Squid Team are pleased to announce the release of Squid-5.2.</P>
+<P>The Squid Team are pleased to announce the release of Squid-5.3.</P>
 <P>This new release is available for download from 
 <A HREF="http://www.squid-cache.org/Versions/v5/">http://www.squid-cache.org/Versions/v5/</A> or the
 <A HREF="http://www.squid-cache.org/Download/http-mirrors.html">mirrors</A>.</P>
diff -u -r -N squid-5.2/errors/Makefile.in squid-5.3/errors/Makefile.in
--- squid-5.2/errors/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/errors/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/icons/Makefile.in squid-5.3/icons/Makefile.in
--- squid-5.2/icons/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/icons/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/include/version.h squid-5.3/include/version.h
--- squid-5.2/include/version.h	2021-10-04 04:04:42.000000000 +1300
+++ squid-5.3/include/version.h	2021-12-08 03:11:12.000000000 +1300
@@ -7,7 +7,7 @@
  */
 
 #ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1633273471
+#define SQUID_RELEASE_TIME 1638886262
 #endif
 
 /*
diff -u -r -N squid-5.2/lib/libTrie/Makefile.in squid-5.3/lib/libTrie/Makefile.in
--- squid-5.2/lib/libTrie/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/libTrie/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/lib/libTrie/test/Makefile.in squid-5.3/lib/libTrie/test/Makefile.in
--- squid-5.2/lib/libTrie/test/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/libTrie/test/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/lib/Makefile.in squid-5.3/lib/Makefile.in
--- squid-5.2/lib/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/lib/ntlmauth/Makefile.in squid-5.3/lib/ntlmauth/Makefile.in
--- squid-5.2/lib/ntlmauth/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/ntlmauth/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/lib/profiler/Makefile.in squid-5.3/lib/profiler/Makefile.in
--- squid-5.2/lib/profiler/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/profiler/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/lib/rfcnb/Makefile.in squid-5.3/lib/rfcnb/Makefile.in
--- squid-5.2/lib/rfcnb/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/rfcnb/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/lib/smblib/Makefile.in squid-5.3/lib/smblib/Makefile.in
--- squid-5.2/lib/smblib/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/smblib/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/lib/snmplib/Makefile.in squid-5.3/lib/snmplib/Makefile.in
--- squid-5.2/lib/snmplib/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/lib/snmplib/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/libltdl/aclocal.m4 squid-5.3/libltdl/aclocal.m4
--- squid-5.2/libltdl/aclocal.m4	2021-10-04 04:05:20.000000000 +1300
+++ squid-5.3/libltdl/aclocal.m4	2021-12-08 03:11:43.000000000 +1300
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@
 [am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.4], [],
+m4_if([$1], [1.16.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.4])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -428,6 +428,10 @@
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+  [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
diff -u -r -N squid-5.2/libltdl/Makefile.in squid-5.3/libltdl/Makefile.in
--- squid-5.2/libltdl/Makefile.in	2021-10-04 04:05:21.000000000 +1300
+++ squid-5.3/libltdl/Makefile.in	2021-12-08 03:11:43.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -1093,6 +1093,8 @@
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
+install-EXTRALTLIBRARIES: install-libLTLIBRARIES
+
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
diff -u -r -N squid-5.2/Makefile.in squid-5.3/Makefile.in
--- squid-5.2/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/RELEASENOTES.html squid-5.3/RELEASENOTES.html
--- squid-5.2/RELEASENOTES.html	2021-10-04 04:09:39.000000000 +1300
+++ squid-5.3/RELEASENOTES.html	2021-12-08 03:15:57.000000000 +1300
@@ -3,10 +3,10 @@
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.82">
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <TITLE>Squid 5.2 release notes</TITLE>
+ <TITLE>Squid 5.3 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 5.2 release notes</H1>
+<H1>Squid 5.3 release notes</H1>
 
 <H2>Squid Developers</H2>
 <HR>
@@ -61,7 +61,7 @@
 <HR>
 <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
 
-<P>The Squid Team are pleased to announce the release of Squid-5.2.</P>
+<P>The Squid Team are pleased to announce the release of Squid-5.3.</P>
 <P>This new release is available for download from 
 <A HREF="http://www.squid-cache.org/Versions/v5/">http://www.squid-cache.org/Versions/v5/</A> or the
 <A HREF="http://www.squid-cache.org/Download/http-mirrors.html">mirrors</A>.</P>
diff -u -r -N squid-5.2/scripts/Makefile.in squid-5.3/scripts/Makefile.in
--- squid-5.2/scripts/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/scripts/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/AD_group/Makefile.in squid-5.3/src/acl/external/AD_group/Makefile.in
--- squid-5.2/src/acl/external/AD_group/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/AD_group/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/delayer/ext_delayer_acl.8 squid-5.3/src/acl/external/delayer/ext_delayer_acl.8
--- squid-5.2/src/acl/external/delayer/ext_delayer_acl.8	2021-10-04 04:09:42.000000000 +1300
+++ squid-5.3/src/acl/external/delayer/ext_delayer_acl.8	2021-12-08 03:15:59.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXT_DELAYER_ACL 8"
-.TH EXT_DELAYER_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH EXT_DELAYER_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/acl/external/delayer/Makefile.in squid-5.3/src/acl/external/delayer/Makefile.in
--- squid-5.2/src/acl/external/delayer/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/delayer/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/eDirectory_userip/Makefile.in squid-5.3/src/acl/external/eDirectory_userip/Makefile.in
--- squid-5.2/src/acl/external/eDirectory_userip/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/eDirectory_userip/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/file_userip/Makefile.in squid-5.3/src/acl/external/file_userip/Makefile.in
--- squid-5.2/src/acl/external/file_userip/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/file_userip/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/kerberos_ldap_group/Makefile.in squid-5.3/src/acl/external/kerberos_ldap_group/Makefile.in
--- squid-5.2/src/acl/external/kerberos_ldap_group/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/kerberos_ldap_group/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 squid-5.3/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8
--- squid-5.2/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8	2021-10-04 04:09:42.000000000 +1300
+++ squid-5.3/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8	2021-12-08 03:15:59.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXT_KERBEROS_SID_GROUP_ACL 8"
-.TH EXT_KERBEROS_SID_GROUP_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH EXT_KERBEROS_SID_GROUP_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/acl/external/kerberos_sid_group/Makefile.in squid-5.3/src/acl/external/kerberos_sid_group/Makefile.in
--- squid-5.2/src/acl/external/kerberos_sid_group/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/kerberos_sid_group/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/LDAP_group/Makefile.in squid-5.3/src/acl/external/LDAP_group/Makefile.in
--- squid-5.2/src/acl/external/LDAP_group/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/LDAP_group/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/LM_group/Makefile.in squid-5.3/src/acl/external/LM_group/Makefile.in
--- squid-5.2/src/acl/external/LM_group/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/LM_group/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/Makefile.in squid-5.3/src/acl/external/Makefile.in
--- squid-5.2/src/acl/external/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/session/Makefile.in squid-5.3/src/acl/external/session/Makefile.in
--- squid-5.2/src/acl/external/session/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/session/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/SQL_session/ext_sql_session_acl.8 squid-5.3/src/acl/external/SQL_session/ext_sql_session_acl.8
--- squid-5.2/src/acl/external/SQL_session/ext_sql_session_acl.8	2021-10-04 04:09:42.000000000 +1300
+++ squid-5.3/src/acl/external/SQL_session/ext_sql_session_acl.8	2021-12-08 03:15:59.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXT_SQL_SESSION_ACL 8"
-.TH EXT_SQL_SESSION_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH EXT_SQL_SESSION_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/acl/external/SQL_session/Makefile.in squid-5.3/src/acl/external/SQL_session/Makefile.in
--- squid-5.2/src/acl/external/SQL_session/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/SQL_session/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/time_quota/Makefile.in squid-5.3/src/acl/external/time_quota/Makefile.in
--- squid-5.2/src/acl/external/time_quota/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/time_quota/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/unix_group/Makefile.in squid-5.3/src/acl/external/unix_group/Makefile.in
--- squid-5.2/src/acl/external/unix_group/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/unix_group/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 squid-5.3/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8
--- squid-5.2/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8	2021-10-04 04:09:42.000000000 +1300
+++ squid-5.3/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8	2021-12-08 03:15:59.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXT_WBINFO_GROUP_ACL 8"
-.TH EXT_WBINFO_GROUP_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/acl/external/wbinfo_group/Makefile.in squid-5.3/src/acl/external/wbinfo_group/Makefile.in
--- squid-5.2/src/acl/external/wbinfo_group/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/acl/external/wbinfo_group/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/acl/Makefile.in squid-5.3/src/acl/Makefile.in
--- squid-5.2/src/acl/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/acl/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/adaptation/ecap/Makefile.in squid-5.3/src/adaptation/ecap/Makefile.in
--- squid-5.2/src/adaptation/ecap/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/adaptation/ecap/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/adaptation/icap/Makefile.in squid-5.3/src/adaptation/icap/Makefile.in
--- squid-5.2/src/adaptation/icap/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/adaptation/icap/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/adaptation/Makefile.in squid-5.3/src/adaptation/Makefile.in
--- squid-5.2/src/adaptation/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/adaptation/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/anyp/Makefile.in squid-5.3/src/anyp/Makefile.in
--- squid-5.2/src/anyp/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/anyp/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/anyp/Uri.cc squid-5.3/src/anyp/Uri.cc
--- squid-5.2/src/anyp/Uri.cc	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/src/anyp/Uri.cc	2021-12-08 03:15:52.000000000 +1300
@@ -97,8 +97,7 @@
 void
 AnyP::Uri::host(const char *src)
 {
-    hostAddr_.setEmpty();
-    hostAddr_ = src;
+    hostAddr_.fromHost(src);
     if (hostAddr_.isAnyAddr()) {
         xstrncpy(host_, src, sizeof(host_));
         hostIsNumeric_ = false;
@@ -113,10 +112,11 @@
 SBuf
 AnyP::Uri::hostOrIp() const
 {
-    static char ip[MAX_IPSTRLEN];
-    if (hostIsNumeric())
-        return SBuf(hostIP().toStr(ip, sizeof(ip)));
-    else
+    if (hostIsNumeric()) {
+        static char ip[MAX_IPSTRLEN];
+        const auto hostStrLen = hostIP().toHostStr(ip, sizeof(ip));
+        return SBuf(ip, hostStrLen);
+    } else
         return SBuf(host());
 }
 
diff -u -r -N squid-5.2/src/anyp/Uri.h squid-5.3/src/anyp/Uri.h
--- squid-5.2/src/anyp/Uri.h	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/src/anyp/Uri.h	2021-12-08 03:15:52.000000000 +1300
@@ -87,8 +87,8 @@
     Ip::Address const & hostIP(void) const {return hostAddr_;}
 
     /// \returns the host subcomponent of the authority component
-    /// If the host is an IPv6 address, returns that IP address without
-    /// [brackets]! See RFC 3986 Section 3.2.2.
+    /// If the host is an IPv6 address, returns that IP address with
+    /// [brackets]. See RFC 3986 Section 3.2.2.
     SBuf hostOrIp() const;
 
     void port(unsigned short p) {port_=p; touch();}
diff -u -r -N squid-5.2/src/auth/basic/DB/basic_db_auth.8 squid-5.3/src/auth/basic/DB/basic_db_auth.8
--- squid-5.2/src/auth/basic/DB/basic_db_auth.8	2021-10-04 04:09:43.000000000 +1300
+++ squid-5.3/src/auth/basic/DB/basic_db_auth.8	2021-12-08 03:16:00.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BASIC_DB_AUTH 8"
-.TH BASIC_DB_AUTH 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/auth/basic/DB/Makefile.in squid-5.3/src/auth/basic/DB/Makefile.in
--- squid-5.2/src/auth/basic/DB/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/DB/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/fake/Makefile.in squid-5.3/src/auth/basic/fake/Makefile.in
--- squid-5.2/src/auth/basic/fake/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/basic/fake/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/getpwnam/Makefile.in squid-5.3/src/auth/basic/getpwnam/Makefile.in
--- squid-5.2/src/auth/basic/getpwnam/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/basic/getpwnam/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/LDAP/Makefile.in squid-5.3/src/auth/basic/LDAP/Makefile.in
--- squid-5.2/src/auth/basic/LDAP/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/LDAP/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/Makefile.in squid-5.3/src/auth/basic/Makefile.in
--- squid-5.2/src/auth/basic/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/NCSA/Makefile.in squid-5.3/src/auth/basic/NCSA/Makefile.in
--- squid-5.2/src/auth/basic/NCSA/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/NCSA/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/NIS/Makefile.in squid-5.3/src/auth/basic/NIS/Makefile.in
--- squid-5.2/src/auth/basic/NIS/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/NIS/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/PAM/Makefile.in squid-5.3/src/auth/basic/PAM/Makefile.in
--- squid-5.2/src/auth/basic/PAM/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/PAM/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/POP3/basic_pop3_auth.8 squid-5.3/src/auth/basic/POP3/basic_pop3_auth.8
--- squid-5.2/src/auth/basic/POP3/basic_pop3_auth.8	2021-10-04 04:09:44.000000000 +1300
+++ squid-5.3/src/auth/basic/POP3/basic_pop3_auth.8	2021-12-08 03:16:00.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BASIC_POP3_AUTH 8"
-.TH BASIC_POP3_AUTH 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH BASIC_POP3_AUTH 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/auth/basic/POP3/Makefile.in squid-5.3/src/auth/basic/POP3/Makefile.in
--- squid-5.2/src/auth/basic/POP3/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/POP3/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/RADIUS/Makefile.in squid-5.3/src/auth/basic/RADIUS/Makefile.in
--- squid-5.2/src/auth/basic/RADIUS/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/RADIUS/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/SASL/Makefile.in squid-5.3/src/auth/basic/SASL/Makefile.in
--- squid-5.2/src/auth/basic/SASL/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/SASL/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/SMB/Makefile.in squid-5.3/src/auth/basic/SMB/Makefile.in
--- squid-5.2/src/auth/basic/SMB/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/SMB/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/SMB_LM/Makefile.in squid-5.3/src/auth/basic/SMB_LM/Makefile.in
--- squid-5.2/src/auth/basic/SMB_LM/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/SMB_LM/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/basic/SSPI/Makefile.in squid-5.3/src/auth/basic/SSPI/Makefile.in
--- squid-5.2/src/auth/basic/SSPI/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/basic/SSPI/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/digest/eDirectory/Makefile.in squid-5.3/src/auth/digest/eDirectory/Makefile.in
--- squid-5.2/src/auth/digest/eDirectory/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/digest/eDirectory/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/digest/file/Makefile.in squid-5.3/src/auth/digest/file/Makefile.in
--- squid-5.2/src/auth/digest/file/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/digest/file/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/digest/LDAP/Makefile.in squid-5.3/src/auth/digest/LDAP/Makefile.in
--- squid-5.2/src/auth/digest/LDAP/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/digest/LDAP/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/digest/Makefile.in squid-5.3/src/auth/digest/Makefile.in
--- squid-5.2/src/auth/digest/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/digest/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/Makefile.in squid-5.3/src/auth/Makefile.in
--- squid-5.2/src/auth/Makefile.in	2021-10-04 04:04:38.000000000 +1300
+++ squid-5.3/src/auth/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/negotiate/kerberos/Makefile.in squid-5.3/src/auth/negotiate/kerberos/Makefile.in
--- squid-5.2/src/auth/negotiate/kerberos/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/negotiate/kerberos/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/negotiate/Makefile.in squid-5.3/src/auth/negotiate/Makefile.in
--- squid-5.2/src/auth/negotiate/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/negotiate/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/negotiate/SSPI/Makefile.in squid-5.3/src/auth/negotiate/SSPI/Makefile.in
--- squid-5.2/src/auth/negotiate/SSPI/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/negotiate/SSPI/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/negotiate/wrapper/Makefile.in squid-5.3/src/auth/negotiate/wrapper/Makefile.in
--- squid-5.2/src/auth/negotiate/wrapper/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/negotiate/wrapper/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/ntlm/fake/Makefile.in squid-5.3/src/auth/ntlm/fake/Makefile.in
--- squid-5.2/src/auth/ntlm/fake/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/ntlm/fake/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/ntlm/Makefile.in squid-5.3/src/auth/ntlm/Makefile.in
--- squid-5.2/src/auth/ntlm/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/ntlm/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/ntlm/SMB_LM/Makefile.in squid-5.3/src/auth/ntlm/SMB_LM/Makefile.in
--- squid-5.2/src/auth/ntlm/SMB_LM/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/ntlm/SMB_LM/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/auth/ntlm/SSPI/Makefile.in squid-5.3/src/auth/ntlm/SSPI/Makefile.in
--- squid-5.2/src/auth/ntlm/SSPI/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/auth/ntlm/SSPI/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/base/Makefile.in squid-5.3/src/base/Makefile.in
--- squid-5.2/src/base/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/base/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/cf.data.pre squid-5.3/src/cf.data.pre
--- squid-5.2/src/cf.data.pre	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/src/cf.data.pre	2021-12-08 03:15:52.000000000 +1300
@@ -4907,10 +4907,29 @@
 	If ICAP is enabled, the following code becomes available (as
 	well as ICAP log codes documented with the icap_log option):
 
-		icap::tt        Total ICAP processing time for the HTTP
-				transaction. The timer ticks when ICAP
-				ACLs are checked and when ICAP
-				transaction is in progress.
+		icap::tt Total ICAP "blocking" time for the HTTP transaction. The
+				timer ticks while Squid checks adaptation_access and while
+				ICAP transaction(s) expect ICAP response headers, including
+				the embedded adapted HTTP message headers (where applicable).
+				This measurement is meant to estimate ICAP impact on HTTP
+				transaction response times, but it does not currently account
+				for slow ICAP response body delivery blocking HTTP progress.
+
+				Once Squid receives the final ICAP response headers (e.g.,
+				ICAP 200 or 204) and the associated adapted HTTP message
+				headers (if any) from the ICAP service, the corresponding ICAP
+				transaction stops affecting this measurement, even though the
+				transaction itself may continue for a long time (e.g., to
+				finish sending the ICAP request and/or to finish receiving the
+				ICAP response body).
+
+				When "blocking" sections of multiple concurrent ICAP
+				transactions overlap in time, the overlapping segment is
+				counted only once.
+
+				To see complete ICAP transaction response times (rather than
+				the cumulative effect of their blocking sections) use the
+				%adapt::all_trs logformat code or the icap_log directive.
 
 	If adaptation is enabled the following codes become available:
 
@@ -4929,11 +4948,12 @@
 				milliseconds.  When a failed transaction is
 				being retried or repeated, its time is not
 				logged individually but added to the
-				replacement (next) transaction. See also:
-				adapt::all_trs.
+				replacement (next) transaction. Lifetimes of individually
+				listed adaptation transactions may overlap.
+				See also: %icap::tt and %adapt::all_trs.
 
 		adapt::all_trs All adaptation transaction response times.
-				Same as adaptation_strs but response times of
+				Same as %adapt::sum_trs but response times of
 				individual transactions are never added
 				together. Instead, all transaction response
 				times are recorded individually.
diff -u -r -N squid-5.2/src/clients/Makefile.in squid-5.3/src/clients/Makefile.in
--- squid-5.2/src/clients/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/clients/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/comm/Makefile.in squid-5.3/src/comm/Makefile.in
--- squid-5.2/src/comm/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/comm/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/DiskIO/AIO/Makefile.in squid-5.3/src/DiskIO/AIO/Makefile.in
--- squid-5.2/src/DiskIO/AIO/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/DiskIO/AIO/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/DiskIO/Blocking/Makefile.in squid-5.3/src/DiskIO/Blocking/Makefile.in
--- squid-5.2/src/DiskIO/Blocking/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/DiskIO/Blocking/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/DiskIO/DiskDaemon/Makefile.in squid-5.3/src/DiskIO/DiskDaemon/Makefile.in
--- squid-5.2/src/DiskIO/DiskDaemon/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/DiskIO/DiskDaemon/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/DiskIO/DiskThreads/Makefile.in squid-5.3/src/DiskIO/DiskThreads/Makefile.in
--- squid-5.2/src/DiskIO/DiskThreads/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/DiskIO/DiskThreads/Makefile.in	2021-12-08 03:11:07.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/DiskIO/IpcIo/Makefile.in squid-5.3/src/DiskIO/IpcIo/Makefile.in
--- squid-5.2/src/DiskIO/IpcIo/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/DiskIO/IpcIo/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/DiskIO/Makefile.in squid-5.3/src/DiskIO/Makefile.in
--- squid-5.2/src/DiskIO/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/DiskIO/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/DiskIO/Mmapped/Makefile.in squid-5.3/src/DiskIO/Mmapped/Makefile.in
--- squid-5.2/src/DiskIO/Mmapped/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/DiskIO/Mmapped/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/dns/Makefile.in squid-5.3/src/dns/Makefile.in
--- squid-5.2/src/dns/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/dns/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/error/Makefile.in squid-5.3/src/error/Makefile.in
--- squid-5.2/src/error/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/error/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/esi/Makefile.in squid-5.3/src/esi/Makefile.in
--- squid-5.2/src/esi/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/esi/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/eui/Makefile.in squid-5.3/src/eui/Makefile.in
--- squid-5.2/src/eui/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/eui/Makefile.in	2021-12-08 03:11:09.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/format/Makefile.in squid-5.3/src/format/Makefile.in
--- squid-5.2/src/format/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/format/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/fs/Makefile.in squid-5.3/src/fs/Makefile.in
--- squid-5.2/src/fs/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/fs/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/ftp/Makefile.in squid-5.3/src/ftp/Makefile.in
--- squid-5.2/src/ftp/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/ftp/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/helper/Makefile.in squid-5.3/src/helper/Makefile.in
--- squid-5.2/src/helper/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/helper/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/http/Makefile.in squid-5.3/src/http/Makefile.in
--- squid-5.2/src/http/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/http/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/http/one/Makefile.in squid-5.3/src/http/one/Makefile.in
--- squid-5.2/src/http/one/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/http/one/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/http/url_rewriters/fake/Makefile.in squid-5.3/src/http/url_rewriters/fake/Makefile.in
--- squid-5.2/src/http/url_rewriters/fake/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/http/url_rewriters/fake/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/http/url_rewriters/LFS/Makefile.in squid-5.3/src/http/url_rewriters/LFS/Makefile.in
--- squid-5.2/src/http/url_rewriters/LFS/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/http/url_rewriters/LFS/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/http/url_rewriters/LFS/url_lfs_rewrite.8 squid-5.3/src/http/url_rewriters/LFS/url_lfs_rewrite.8
--- squid-5.2/src/http/url_rewriters/LFS/url_lfs_rewrite.8	2021-10-04 04:09:44.000000000 +1300
+++ squid-5.3/src/http/url_rewriters/LFS/url_lfs_rewrite.8	2021-12-08 03:16:01.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "URL_LFS_REWRITE 8"
-.TH URL_LFS_REWRITE 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH URL_LFS_REWRITE 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/http/url_rewriters/Makefile.in squid-5.3/src/http/url_rewriters/Makefile.in
--- squid-5.2/src/http/url_rewriters/Makefile.in	2021-10-04 04:04:39.000000000 +1300
+++ squid-5.3/src/http/url_rewriters/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/icmp/Makefile.am squid-5.3/src/icmp/Makefile.am
--- squid-5.2/src/icmp/Makefile.am	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/src/icmp/Makefile.am	2021-12-08 03:15:52.000000000 +1300
@@ -95,17 +95,20 @@
 SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc
 	cp $(top_srcdir)/src/SquidConfig.cc $@
 
-tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
+tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc | tests
 	cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@
 
-tests/stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc
+tests/stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc | tests
 	cp $(top_srcdir)/src/tests/stub_fd.cc $@
 
-tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests
 	cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-tests/stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc
+tests/stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc | tests
 	cp $(top_srcdir)/src/tests/stub_SBuf.cc $@
 
-tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
 	cp $(top_srcdir)/src/tests/STUB.h $@
+
+tests:
+	mkdir -p $@
diff -u -r -N squid-5.2/src/icmp/Makefile.in squid-5.3/src/icmp/Makefile.in
--- squid-5.2/src/icmp/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/icmp/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -1439,21 +1439,24 @@
 SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc
 	cp $(top_srcdir)/src/SquidConfig.cc $@
 
-tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
+tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc | tests
 	cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@
 
-tests/stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc
+tests/stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc | tests
 	cp $(top_srcdir)/src/tests/stub_fd.cc $@
 
-tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests
 	cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-tests/stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc
+tests/stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc | tests
 	cp $(top_srcdir)/src/tests/stub_SBuf.cc $@
 
-tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
 	cp $(top_srcdir)/src/tests/STUB.h $@
 
+tests:
+	mkdir -p $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -u -r -N squid-5.2/src/ident/Makefile.in squid-5.3/src/ident/Makefile.in
--- squid-5.2/src/ident/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/ident/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/ip/Address.cc squid-5.3/src/ip/Address.cc
--- squid-5.2/src/ip/Address.cc	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/src/ip/Address.cc	2021-12-08 03:15:52.000000000 +1300
@@ -788,16 +788,6 @@
     return prt;
 }
 
-/**
- * toStr Given a buffer writes a readable ascii version of the IPA and/or port stored
- *
- * Buffer must be of a size large enough to hold the converted address.
- * This size is provided in the form of a global defined variable MAX_IPSTRLEN
- * Should a buffer shorter be provided the string result will be truncated
- * at the length of the available buffer.
- *
- * A copy of the buffer is also returned for simple immediate display.
- */
 char *
 Ip::Address::toStr(char* buf, const unsigned int blen, int force) const
 {
diff -u -r -N squid-5.2/src/ip/Makefile.in squid-5.3/src/ip/Makefile.in
--- squid-5.2/src/ip/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/ip/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/ipc/Makefile.in squid-5.3/src/ipc/Makefile.in
--- squid-5.2/src/ipc/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/ipc/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/ipc/ReadWriteLock.cc squid-5.3/src/ipc/ReadWriteLock.cc
--- squid-5.2/src/ipc/ReadWriteLock.cc	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/src/ipc/ReadWriteLock.cc	2021-12-08 03:15:52.000000000 +1300
@@ -20,6 +20,23 @@
     assert(flag.test_and_set(std::memory_order_relaxed));
 }
 
+/// common lockExclusive() and unlockSharedAndSwitchToExclusive() logic:
+/// either finish exclusive locking or bail properly
+/// \pre The caller must (be the first to) increment writeLevel.
+/// \returns whether we got the exclusive lock
+bool
+Ipc::ReadWriteLock::finalizeExclusive()
+{
+    assert(writeLevel); // "new" readers are locked out by the caller
+    assert(!appending); // nobody can be appending without an exclusive lock
+    if (!readLevel) { // no old readers and nobody is becoming a reader
+        writing = true;
+        return true;
+    }
+    --writeLevel;
+    return false;
+}
+
 bool
 Ipc::ReadWriteLock::lockShared()
 {
@@ -35,12 +52,9 @@
 bool
 Ipc::ReadWriteLock::lockExclusive()
 {
-    if (!writeLevel++) { // we are the first writer + lock "new" readers out
-        if (!readLevel) { // no old readers and nobody is becoming one
-            writing = true;
-            return true;
-        }
-    }
+    if (!writeLevel++) // we are the first writer + lock "new" readers out
+        return finalizeExclusive(); // decrements writeLevel on failures
+
     --writeLevel;
     return false;
 }
@@ -96,17 +110,12 @@
 {
     assert(readers > 0);
     if (!writeLevel++) { // we are the first writer + lock "new" readers out
-        assert(!appending);
-        unlockShared();
-        if (!readers) {
-            writing = true;
-            return true;
-        }
-        // somebody is still reading: fall through
-    } else {
-        // somebody is still writing: just stop reading
         unlockShared();
+        return finalizeExclusive(); // decrements writeLevel on failures
     }
+
+    // somebody is still writing, so we just stop reading
+    unlockShared();
     --writeLevel;
     return false;
 }
diff -u -r -N squid-5.2/src/ipc/ReadWriteLock.h squid-5.3/src/ipc/ReadWriteLock.h
--- squid-5.2/src/ipc/ReadWriteLock.h	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/src/ipc/ReadWriteLock.h	2021-12-08 03:15:52.000000000 +1300
@@ -51,6 +51,8 @@
     std::atomic_flag updating; ///< a reader is updating metadata/headers
 
 private:
+    bool finalizeExclusive();
+
     mutable std::atomic<uint32_t> readLevel; ///< number of users reading (or trying to)
     std::atomic<uint32_t> writeLevel; ///< number of users writing (or trying to write)
 };
diff -u -r -N squid-5.2/src/log/DB/log_db_daemon.8 squid-5.3/src/log/DB/log_db_daemon.8
--- squid-5.2/src/log/DB/log_db_daemon.8	2021-10-04 04:09:45.000000000 +1300
+++ squid-5.3/src/log/DB/log_db_daemon.8	2021-12-08 03:16:01.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LOG_DB_DAEMON 8"
-.TH LOG_DB_DAEMON 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH LOG_DB_DAEMON 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/log/DB/Makefile.in squid-5.3/src/log/DB/Makefile.in
--- squid-5.2/src/log/DB/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/log/DB/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/log/file/Makefile.in squid-5.3/src/log/file/Makefile.in
--- squid-5.2/src/log/file/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/log/file/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/log/Makefile.in squid-5.3/src/log/Makefile.in
--- squid-5.2/src/log/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/log/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/Makefile.in squid-5.3/src/Makefile.in
--- squid-5.2/src/Makefile.in	2021-10-04 04:04:37.000000000 +1300
+++ squid-5.3/src/Makefile.in	2021-12-08 03:11:08.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/mem/Makefile.in squid-5.3/src/mem/Makefile.in
--- squid-5.2/src/mem/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/mem/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/mgr/Makefile.in squid-5.3/src/mgr/Makefile.in
--- squid-5.2/src/mgr/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/mgr/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/parser/Makefile.in squid-5.3/src/parser/Makefile.in
--- squid-5.2/src/parser/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/parser/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/proxyp/Makefile.in squid-5.3/src/proxyp/Makefile.in
--- squid-5.2/src/proxyp/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/proxyp/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/repl/Makefile.in squid-5.3/src/repl/Makefile.in
--- squid-5.2/src/repl/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/repl/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/sbuf/Makefile.in squid-5.3/src/sbuf/Makefile.in
--- squid-5.2/src/sbuf/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/sbuf/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/security/cert_generators/file/Makefile.in squid-5.3/src/security/cert_generators/file/Makefile.in
--- squid-5.2/src/security/cert_generators/file/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/security/cert_generators/file/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/security/cert_generators/Makefile.in squid-5.3/src/security/cert_generators/Makefile.in
--- squid-5.2/src/security/cert_generators/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/security/cert_generators/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/security/cert_validators/fake/Makefile.in squid-5.3/src/security/cert_validators/fake/Makefile.in
--- squid-5.2/src/security/cert_validators/fake/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/security/cert_validators/fake/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/security/cert_validators/fake/security_fake_certverify.8 squid-5.3/src/security/cert_validators/fake/security_fake_certverify.8
--- squid-5.2/src/security/cert_validators/fake/security_fake_certverify.8	2021-10-04 04:09:45.000000000 +1300
+++ squid-5.3/src/security/cert_validators/fake/security_fake_certverify.8	2021-12-08 03:16:02.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SECURITY_FAKE_CERTVERIFY 8"
-.TH SECURITY_FAKE_CERTVERIFY 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH SECURITY_FAKE_CERTVERIFY 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/security/cert_validators/Makefile.in squid-5.3/src/security/cert_validators/Makefile.in
--- squid-5.2/src/security/cert_validators/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/security/cert_validators/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/security/Makefile.in squid-5.3/src/security/Makefile.in
--- squid-5.2/src/security/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/security/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/servers/Makefile.in squid-5.3/src/servers/Makefile.in
--- squid-5.2/src/servers/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/servers/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/snmp/Makefile.in squid-5.3/src/snmp/Makefile.in
--- squid-5.2/src/snmp/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/snmp/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/ssl/Makefile.in squid-5.3/src/ssl/Makefile.in
--- squid-5.2/src/ssl/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/ssl/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/store/id_rewriters/file/Makefile.in squid-5.3/src/store/id_rewriters/file/Makefile.in
--- squid-5.2/src/store/id_rewriters/file/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/store/id_rewriters/file/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/store/id_rewriters/file/storeid_file_rewrite.8 squid-5.3/src/store/id_rewriters/file/storeid_file_rewrite.8
--- squid-5.2/src/store/id_rewriters/file/storeid_file_rewrite.8	2021-10-04 04:09:43.000000000 +1300
+++ squid-5.3/src/store/id_rewriters/file/storeid_file_rewrite.8	2021-12-08 03:16:00.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "STOREID_FILE_REWRITE 8"
-.TH STOREID_FILE_REWRITE 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH STOREID_FILE_REWRITE 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/src/store/id_rewriters/Makefile.in squid-5.3/src/store/id_rewriters/Makefile.in
--- squid-5.2/src/store/id_rewriters/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/store/id_rewriters/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/src/store/Makefile.in squid-5.3/src/store/Makefile.in
--- squid-5.2/src/store/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/src/store/Makefile.in	2021-12-08 03:11:10.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/test-suite/Makefile.in squid-5.3/test-suite/Makefile.in
--- squid-5.2/test-suite/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/test-suite/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/tools/apparmor/Makefile.in squid-5.3/tools/apparmor/Makefile.in
--- squid-5.2/tools/apparmor/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/tools/apparmor/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/tools/helper-mux/helper-mux.8 squid-5.3/tools/helper-mux/helper-mux.8
--- squid-5.2/tools/helper-mux/helper-mux.8	2021-10-04 04:09:45.000000000 +1300
+++ squid-5.3/tools/helper-mux/helper-mux.8	2021-12-08 03:16:02.000000000 +1300
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "HELPER-MUX 8"
-.TH HELPER-MUX 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation"
+.TH HELPER-MUX 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -u -r -N squid-5.2/tools/helper-mux/Makefile.in squid-5.3/tools/helper-mux/Makefile.in
--- squid-5.2/tools/helper-mux/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/tools/helper-mux/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/tools/Makefile.am squid-5.3/tools/Makefile.am
--- squid-5.2/tools/Makefile.am	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/tools/Makefile.am	2021-12-08 03:15:52.000000000 +1300
@@ -31,7 +31,7 @@
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
 	cp $(top_srcdir)/test-suite/test_tools.cc $@
 
-tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc | tests
 	cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 Here.cc: $(top_srcdir)/src/base/Here.cc
@@ -46,15 +46,18 @@
 time.cc: $(top_srcdir)/src/time.cc
 	cp $(top_srcdir)/src/time.cc $@
 
-tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
+tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc | tests
 	cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
 
-tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests
 	cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
 	cp $(top_srcdir)/src/tests/STUB.h $@
 
+tests:
+	mkdir -p $@
+
 # stock tools for unit tests - library independent versions of dlink_list
 # etc.
 # globals.cc is needed by test_tools.cc.
diff -u -r -N squid-5.2/tools/Makefile.in squid-5.3/tools/Makefile.in
--- squid-5.2/tools/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/tools/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -1661,7 +1661,7 @@
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
 	cp $(top_srcdir)/test-suite/test_tools.cc $@
 
-tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc | tests
 	cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 Here.cc: $(top_srcdir)/src/base/Here.cc
@@ -1676,15 +1676,18 @@
 time.cc: $(top_srcdir)/src/time.cc
 	cp $(top_srcdir)/src/time.cc $@
 
-tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
+tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc | tests
 	cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
 
-tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests
 	cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
 	cp $(top_srcdir)/src/tests/STUB.h $@
 
+tests:
+	mkdir -p $@
+
 cachemgr.cgi.8: $(srcdir)/cachemgr.cgi.8.in Makefile
 	$(SUBSTITUTE) < $(srcdir)/cachemgr.cgi.8.in > $@
 
diff -u -r -N squid-5.2/tools/purge/Makefile.in squid-5.3/tools/purge/Makefile.in
--- squid-5.2/tools/purge/Makefile.in	2021-10-04 04:04:40.000000000 +1300
+++ squid-5.3/tools/purge/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/tools/squidclient/Makefile.am squid-5.3/tools/squidclient/Makefile.am
--- squid-5.2/tools/squidclient/Makefile.am	2021-10-04 04:07:36.000000000 +1300
+++ squid-5.3/tools/squidclient/Makefile.am	2021-12-08 03:15:52.000000000 +1300
@@ -30,18 +30,21 @@
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
 	cp $(top_srcdir)/test-suite/test_tools.cc $@
 
-tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc | tests
 	cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 time.cc: $(top_srcdir)/src/time.cc
 	cp $(top_srcdir)/src/time.cc $@
 
-tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests
 	cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
 	cp $(top_srcdir)/src/tests/STUB.h $@
 
+tests:
+	mkdir -p $@
+
 # stock tools for unit tests - library independent versions of dlink_list
 # etc.
 # globals.cc is needed by test_tools.cc.
diff -u -r -N squid-5.2/tools/squidclient/Makefile.in squid-5.3/tools/squidclient/Makefile.in
--- squid-5.2/tools/squidclient/Makefile.in	2021-10-04 04:04:41.000000000 +1300
+++ squid-5.3/tools/squidclient/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -1515,18 +1515,21 @@
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
 	cp $(top_srcdir)/test-suite/test_tools.cc $@
 
-tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc | tests
 	cp $(top_srcdir)/src/tests/stub_debug.cc $@
 
 time.cc: $(top_srcdir)/src/time.cc
 	cp $(top_srcdir)/src/time.cc $@
 
-tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests
 	cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
 	cp $(top_srcdir)/src/tests/STUB.h $@
 
+tests:
+	mkdir -p $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -u -r -N squid-5.2/tools/systemd/Makefile.in squid-5.3/tools/systemd/Makefile.in
--- squid-5.2/tools/systemd/Makefile.in	2021-10-04 04:04:41.000000000 +1300
+++ squid-5.3/tools/systemd/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
diff -u -r -N squid-5.2/tools/sysvinit/Makefile.in squid-5.3/tools/sysvinit/Makefile.in
--- squid-5.2/tools/sysvinit/Makefile.in	2021-10-04 04:04:41.000000000 +1300
+++ squid-5.3/tools/sysvinit/Makefile.in	2021-12-08 03:11:11.000000000 +1300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2021 Free Software Foundation, Inc.