diff -u -r -N squid-4.10/aclocal.m4 squid-4.11/aclocal.m4
--- squid-4.10/aclocal.m4 2020-01-20 15:51:46.000000000 +1300
+++ squid-4.11/aclocal.m4 2020-04-20 00:38:59.000000000 +1200
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,8 +1055,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1506,7 +1506,7 @@
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
_LT_DECL([], [AR], [1], [The archiver])
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
@@ -10059,7 +10059,7 @@
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -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.1], [],
+m4_if([$1], [1.16.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -10090,14 +10090,14 @@
# 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.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10149,7 +10149,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10180,7 +10180,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10371,7 +10371,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10410,7 +10410,9 @@
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE="gmake" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
@@ -10437,7 +10439,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10634,7 +10636,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10655,7 +10657,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10677,7 +10679,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10712,7 +10714,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10755,7 +10757,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10794,7 +10796,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10823,7 +10825,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10870,7 +10872,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10889,7 +10891,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -10970,7 +10972,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11030,7 +11032,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11058,7 +11060,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11077,7 +11079,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -u -r -N squid-4.10/cfgaux/compile squid-4.11/cfgaux/compile
--- squid-4.10/cfgaux/compile 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/cfgaux/compile 2020-04-20 00:39:01.000000000 +1200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -u -r -N squid-4.10/cfgaux/depcomp squid-4.11/cfgaux/depcomp
--- squid-4.10/cfgaux/depcomp 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/cfgaux/depcomp 2020-04-20 00:39:05.000000000 +1200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -u -r -N squid-4.10/cfgaux/install-sh squid-4.11/cfgaux/install-sh
--- squid-4.10/cfgaux/install-sh 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/cfgaux/install-sh 2020-04-20 00:39:01.000000000 +1200
@@ -451,7 +451,18 @@
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask &&
+ { test -z "$stripcmd" || {
+ # Create $dsttmp read-write so that cp doesn't create it read-only,
+ # which would cause strip to fail.
+ if test -z "$doit"; then
+ : >"$dsttmp" # No need to fork-exec 'touch'.
+ else
+ $doit touch "$dsttmp"
+ fi
+ }
+ } &&
+ $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
diff -u -r -N squid-4.10/cfgaux/ltmain.sh squid-4.11/cfgaux/ltmain.sh
--- squid-4.10/cfgaux/ltmain.sh 2020-01-20 15:51:48.000000000 +1300
+++ squid-4.11/cfgaux/ltmain.sh 2020-04-20 00:39:00.000000000 +1200
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-11"
+VERSION="2.4.6 Debian-2.4.6-14"
package_revision=2.4.6
@@ -387,7 +387,7 @@
# putting '$debug_cmd' at the start of all your functions, you can get
# bash to show function call trace with:
#
-# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
debug_cmd=${debug_cmd-":"}
exit_cmd=:
@@ -2141,7 +2141,7 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname $scriptversion Debian-2.4.6-11
+ version: $progname $scriptversion Debian-2.4.6-14
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
@@ -7368,10 +7368,12 @@
# -stdlib=* select c++ std lib with clang
# -fsanitize=* Clang/GCC memory and address sanitizer
# -fuse-ld=* Linker select flags for GCC
+ # -static-* direct GCC to link specific libraries statically
+ # -fcilkplus Cilk Plus language extension features for C/C++
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
- -specs=*|-fsanitize=*|-fuse-ld=*)
+ -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
diff -u -r -N squid-4.10/cfgaux/missing squid-4.11/cfgaux/missing
--- squid-4.10/cfgaux/missing 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/cfgaux/missing 2020-04-20 00:39:01.000000000 +1200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
diff -u -r -N squid-4.10/cfgaux/test-driver squid-4.11/cfgaux/test-driver
--- squid-4.10/cfgaux/test-driver 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/cfgaux/test-driver 2020-04-20 00:39:05.000000000 +1200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -u -r -N squid-4.10/ChangeLog squid-4.11/ChangeLog
--- squid-4.10/ChangeLog 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/ChangeLog 2020-04-20 00:38:51.000000000 +1200
@@ -1,3 +1,15 @@
+Changes to squid-4.11 (18 Apr 2020):
+
+ - Bug 5036: capital 'L's in logs when daemon queue overflows
+ - Bug 5022: Reconfigure kills Coordinator in SMP+ufs configurations
+ - Bug 5016: systemd thinks Squid is ready before Squid listens
+ - kerberos_ldap_group: fix encryption type for cross realm check
+ - HTTP: Ignore malformed Host header in intercept and reverse proxy mode
+ - Fix Digest authentication nonce handling
+ - Supply ALE to request_header_add/reply_header_add
+ - ... and some documentation updates
+ - ... and some compile fixes
+
Changes to squid-4.10 (14 Jan 2020):
- Bug 5009: Build failure with older clang libc++
diff -u -r -N squid-4.10/compat/getnameinfo.cc squid-4.11/compat/getnameinfo.cc
--- squid-4.10/compat/getnameinfo.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/compat/getnameinfo.cc 2020-04-20 00:38:51.000000000 +1200
@@ -203,12 +203,12 @@
if (sp) {
if (strlen(sp->s_name) + 1 > servlen)
return EAI_OVERFLOW;
- strncpy(serv, sp->s_name, servlen);
+ xstrncpy(serv, sp->s_name, servlen);
} else {
snprintf(numserv, sizeof(numserv), "%u", ntohs(port));
if (strlen(numserv) + 1 > servlen)
return EAI_OVERFLOW;
- strncpy(serv, numserv, servlen);
+ xstrncpy(serv, numserv, servlen);
}
}
@@ -301,7 +301,7 @@
#endif
return EAI_OVERFLOW;
}
- strncpy(host, hp->h_name, hostlen);
+ xstrncpy(host, hp->h_name, hostlen);
#if USE_GETIPNODEBY
freehostent(hp);
#endif
@@ -351,7 +351,7 @@
numaddrlen = strlen(numaddr);
if (numaddrlen + 1 > hostlen) /* don't forget terminator */
return EAI_OVERFLOW;
- strncpy(host, numaddr, hostlen);
+ xstrncpy(host, numaddr, hostlen);
if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
char zonebuf[SQUIDHOSTNAMELEN];
diff -u -r -N squid-4.10/compat/Makefile.in squid-4.11/compat/Makefile.in
--- squid-4.10/compat/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/compat/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,6 +648,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/configure squid-4.11/configure
--- squid-4.10/configure 2020-01-20 15:51:59.000000000 +1300
+++ squid-4.11/configure 2020-04-20 00:39:06.000000000 +1200
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Squid Web Proxy 4.10.
+# Generated by GNU Autoconf 2.69 for Squid Web Proxy 4.11.
#
# Report bugs to .
#
@@ -595,8 +595,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='4.10'
-PACKAGE_STRING='Squid Web Proxy 4.10'
+PACKAGE_VERSION='4.11'
+PACKAGE_STRING='Squid Web Proxy 4.11'
PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
PACKAGE_URL=''
@@ -703,6 +703,8 @@
ENABLE_LEAKFINDER_FALSE
ENABLE_LEAKFINDER_TRUE
EPOLL_LIBS
+SYSTEMD_LIBS
+SYSTEMD_CFLAGS
LBERLIB
LDAPLIB
KRB5LIBS
@@ -1018,6 +1020,7 @@
with_mit_krb5
with_heimdal_krb5
with_gnugss
+with_systemd
enable_forw_via_db
enable_cache_digests
enable_select
@@ -1096,6 +1099,8 @@
LIBOPENSSL_LIBS
LIB_KRB5_CFLAGS
LIB_KRB5_LIBS
+SYSTEMD_CFLAGS
+SYSTEMD_LIBS
LIBCPPUNIT_CFLAGS
LIBCPPUNIT_LIBS
PO2HTML
@@ -1651,7 +1656,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 4.10 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 4.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1722,7 +1727,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 4.10:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 4.11:";;
esac
cat <<\_ACEOF
@@ -2008,6 +2013,8 @@
--without-mit-krb5 Compile without MIT Kerberos support.
--without-heimdal-krb5 Compile without Heimdal Kerberos support.
--without-gnugss Compile without the GNU gss libraries.
+ --without-systemd Do not use systemd API to send start-up completion
+ notification. Default: auto-detect
--with-nat-devpf Enable /dev/pf support for NAT on older OpenBSD and
FreeBSD kernels.
--without-netfilter-conntrack
@@ -2080,6 +2087,10 @@
C compiler flags for LIB_KRB5, overriding pkg-config
LIB_KRB5_LIBS
linker flags for LIB_KRB5, overriding pkg-config
+ SYSTEMD_CFLAGS
+ C compiler flags for SYSTEMD, overriding pkg-config
+ SYSTEMD_LIBS
+ linker flags for SYSTEMD, overriding pkg-config
LIBCPPUNIT_CFLAGS
C compiler flags for LIBCPPUNIT, overriding pkg-config
LIBCPPUNIT_LIBS
@@ -2155,7 +2166,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 4.10
+Squid Web Proxy configure 4.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3259,7 +3270,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 4.10, which was
+It was created by Squid Web Proxy $as_me 4.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4126,7 +4137,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='4.10'
+ VERSION='4.11'
cat >>confdefs.h <<_ACEOF
@@ -9545,7 +9556,7 @@
fi
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
@@ -11267,8 +11278,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
+ echo "$AR cr libconftest.a conftest.o" >&5
+ $AR cr libconftest.a conftest.o 2>&5
echo "$RANLIB libconftest.a" >&5
$RANLIB libconftest.a 2>&5
cat > conftest.c << _LT_EOF
@@ -33603,6 +33614,317 @@
+
+# Check whether --with-systemd was given.
+if test "${with_systemd+set}" = set; then :
+ withval=$with_systemd;
+case "$with_systemd" in
+ yes|no)
+ : # Nothing special to do here
+ ;;
+ *)
+ if test ! -d "$withval" ; then
+ as_fn_error $? "--with-systemd path does not point to a directory" "$LINENO" 5
+ fi
+ SYSTEMD_PATH="-L$with_systemd/lib"
+ CPPFLAGS="-I$with_systemd/include $CPPFLAGS"
+ esac
+
+fi
+
+
+if test "x$with_systemd" != "xno" -a "x$squid_host_os" = "xlinux"; then
+
+# save state, key is squid_systemd_state
+squid_systemd_state_CFLAGS="${CFLAGS}"
+squid_systemd_state_CXXFLAGS="${CXXFLAGS}"
+squid_systemd_state_LDFLAGS="${LDFLAGS}"
+squid_systemd_state_LIBS="${LIBS}"
+squid_systemd_state_CC="${CC}"
+squid_systemd_state_CXX="${CXX}"
+squid_systemd_state_CPPFLAGS="${CPPFLAGS}"
+squid_systemd_state_squid_saved_vars=""
+for squid_util_var_tosave in $squid_systemd_state_squid_saved_vars
+do
+ squid_util_var_tosave2="squid_systemd_state_${squid_util_var_tosave}"
+ eval "${squid_util_var_tosave2}=\"${squid_util_var_tosave}\""
+done
+
+
+ # User may have provided a custom location for systemd. Otherwise...
+ LIBS="$LIBS $SYSTEMD_PATH"
+
+ # auto-detect using pkg-config
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+$as_echo_n "checking for SYSTEMD... " >&6; }
+
+if test -n "$SYSTEMD_CFLAGS"; then
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LIBS"; then
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd" 2>&1`
+ else
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SYSTEMD_PKG_ERRORS" >&5
+
+
+ # systemd < 209
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+$as_echo_n "checking for SYSTEMD... " >&6; }
+
+if test -n "$SYSTEMD_CFLAGS"; then
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LIBS"; then
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd-daemon" 2>&1`
+ else
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd-daemon" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SYSTEMD_PKG_ERRORS" >&5
+
+ :
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ :
+else
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ # systemd < 209
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+$as_echo_n "checking for SYSTEMD... " >&6; }
+
+if test -n "$SYSTEMD_CFLAGS"; then
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LIBS"; then
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd-daemon" 2>&1`
+ else
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd-daemon" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SYSTEMD_PKG_ERRORS" >&5
+
+ :
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ :
+else
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+else
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+ for ac_header in systemd/sd-daemon.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
+if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSTEMD_SD_DAEMON_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+# rollback state, key is squid_systemd_state
+CFLAGS="${squid_systemd_state_CFLAGS}"
+CXXFLAGS="${squid_systemd_state_CXXFLAGS}"
+LDFLAGS="${squid_systemd_state_LDFLAGS}"
+LIBS="${squid_systemd_state_LIBS}"
+CC="${squid_systemd_state_CC}"
+CXX="${squid_systemd_state_CXX}"
+CPPFLAGS="${squid_systemd_state_CPPFLAGS}"
+for squid_util_var_tosave in $squid_systemd_state_squid_saved_vars
+do
+ squid_util_var_tosave2="\$squid_systemd_state_${squid_util_var_tosave}"
+ eval "$squid_util_var_tosave=\"${squid_util_var_tosave2}\""
+done
+
+# commit state, key is squid_systemd_state
+unset squid_systemd_state_CFLAGS
+unset squid_systemd_state_CXXFLAGS
+unset squid_systemd_state_LDFLAGS
+unset squid_systemd_state_LIBS
+unset squid_systemd_state_CC
+unset squid_systemd_state_CXX
+unset squid_systemd_state_CPPFLAGS
+for squid_util_var_tosave in $squid_systemd_state_squid_saved_vars
+do
+ unset ${squid_util_var_tosave}
+done
+
+ #de-pollute LIBS
+
+ if test "x$with_systemd" = "xyes" -a "x$SYSTEMD_LIBS" = "x"; then
+ as_fn_error $? "Required systemd library not found" "$LINENO" 5
+ fi
+ if test "x$SYSTEMD_LIBS" != "x" ; then
+ CXXFLAGS="$SYSTEMD_CFLAGS $CXXFLAGS"
+
+$as_echo "#define USE_SYSTEMD 1" >>confdefs.h
+
+ else
+ with_systemd=no
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: systemd library support: ${with_systemd:=auto} ${SYSTEMD_PATH} ${SYSTEMD_LIBS}" >&5
+$as_echo "$as_me: systemd library support: ${with_systemd:=auto} ${SYSTEMD_PATH} ${SYSTEMD_LIBS}" >&6;}
+
# Check whether --enable-forw-via-db was given.
if test "${enable_forw_via_db+set}" = set; then :
enableval=$enable_forw_via_db;
@@ -44260,7 +44582,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 4.10, which was
+This file was extended by Squid Web Proxy $as_me 4.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -44326,7 +44648,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Squid Web Proxy config.status 4.10
+Squid Web Proxy config.status 4.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -45632,7 +45954,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
diff -u -r -N squid-4.10/configure.ac squid-4.11/configure.ac
--- squid-4.10/configure.ac 2020-01-20 15:51:59.000000000 +1300
+++ squid-4.11/configure.ac 2020-04-20 00:39:06.000000000 +1200
@@ -5,7 +5,7 @@
## Please see the COPYING and CONTRIBUTORS files for details.
##
-AC_INIT([Squid Web Proxy],[4.10],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.11],[http://bugs.squid-cache.org/],[squid])
AC_PREREQ(2.61)
AC_CONFIG_HEADERS([include/autoconf.h])
AC_CONFIG_AUX_DIR(cfgaux)
@@ -2124,6 +2124,51 @@
AC_SUBST(LDAPLIB)
AC_SUBST(LBERLIB)
+AC_ARG_WITH(systemd,
+ AS_HELP_STRING([--without-systemd],
+ [Do not use systemd API to send start-up completion
+ notification. Default: auto-detect]), [
+case "$with_systemd" in
+ yes|no)
+ : # Nothing special to do here
+ ;;
+ *)
+ if test ! -d "$withval" ; then
+ AC_MSG_ERROR([--with-systemd path does not point to a directory])
+ fi
+ SYSTEMD_PATH="-L$with_systemd/lib"
+ CPPFLAGS="-I$with_systemd/include $CPPFLAGS"
+ esac
+])
+AH_TEMPLATE(USE_SYSTEMD,[systemd support is available])
+if test "x$with_systemd" != "xno" -a "x$squid_host_os" = "xlinux"; then
+ SQUID_STATE_SAVE(squid_systemd_state)
+
+ # User may have provided a custom location for systemd. Otherwise...
+ LIBS="$LIBS $SYSTEMD_PATH"
+
+ # auto-detect using pkg-config
+ PKG_CHECK_MODULES(SYSTEMD,[libsystemd],,[
+ # systemd < 209
+ PKG_CHECK_MODULES(SYSTEMD,[libsystemd-daemon],,[:])
+ ])
+
+ AC_CHECK_HEADERS(systemd/sd-daemon.h)
+
+ SQUID_STATE_ROLLBACK(squid_systemd_state) #de-pollute LIBS
+
+ if test "x$with_systemd" = "xyes" -a "x$SYSTEMD_LIBS" = "x"; then
+ AC_MSG_ERROR([Required systemd library not found])
+ fi
+ if test "x$SYSTEMD_LIBS" != "x" ; then
+ CXXFLAGS="$SYSTEMD_CFLAGS $CXXFLAGS"
+ AC_DEFINE(USE_SYSTEMD,1,[systemd support is available])
+ else
+ with_systemd=no
+ fi
+fi
+AC_MSG_NOTICE([systemd library support: ${with_systemd:=auto} ${SYSTEMD_PATH} ${SYSTEMD_LIBS}])
+
AC_ARG_ENABLE(forw-via-db,
AS_HELP_STRING([--enable-forw-via-db],[Enable Forw/Via database]), [
SQUID_YESNO([$enableval],[unrecognized argument to --enable-forw-via-db: $enableval])
diff -u -r -N squid-4.10/contrib/Makefile.in squid-4.11/contrib/Makefile.in
--- squid-4.10/contrib/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/contrib/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -344,6 +344,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/doc/Makefile.in squid-4.11/doc/Makefile.in
--- squid-4.10/doc/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/doc/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -399,6 +399,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/doc/manuals/Makefile.in squid-4.11/doc/manuals/Makefile.in
--- squid-4.10/doc/manuals/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/doc/manuals/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -339,6 +339,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/doc/release-notes/Makefile.in squid-4.11/doc/release-notes/Makefile.in
--- squid-4.10/doc/release-notes/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/doc/release-notes/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -339,6 +339,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/doc/release-notes/release-4.html squid-4.11/doc/release-notes/release-4.html
--- squid-4.10/doc/release-notes/release-4.html 2020-01-20 16:07:14.000000000 +1300
+++ squid-4.11/doc/release-notes/release-4.html 2020-04-20 00:50:33.000000000 +1200
@@ -1,11 +1,12 @@
-
- Squid 4.10 release notes
+
+
+ Squid 4.11 release notes
-Squid 4.10 release notes
+Squid 4.11 release notes
Squid Developers
@@ -63,7 +64,7 @@
-The Squid Team are pleased to announce the release of Squid-4.10.
+The Squid Team are pleased to announce the release of Squid-4.11.
This new release is available for download from
http://www.squid-cache.org/Versions/v4/ or the
mirrors.
@@ -637,6 +638,10 @@
The cppunit testing framework is auto-detected and used when available.
This option can be used to disable it explicitly.
+--without-systemd
+SystemD init environment features are auto-detected and used when available.
+This option can be used to disable systemd features explicitly.
+
diff -u -r -N squid-4.10/errors/Makefile.in squid-4.11/errors/Makefile.in
--- squid-4.10/errors/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/errors/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -340,6 +340,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/icons/Makefile.in squid-4.11/icons/Makefile.in
--- squid-4.10/icons/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/icons/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -369,6 +369,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/include/autoconf.h.in squid-4.11/include/autoconf.h.in
--- squid-4.10/include/autoconf.h.in 2020-01-20 15:51:47.000000000 +1300
+++ squid-4.11/include/autoconf.h.in 2020-04-20 00:39:00.000000000 +1200
@@ -1068,6 +1068,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_SYSLOG_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYSTEMD_SD_DAEMON_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_BITYPES_H
@@ -1570,6 +1573,9 @@
/* Use ssl-crtd daemon */
#undef USE_SSL_CRTD
+/* systemd support is available */
+#undef USE_SYSTEMD
+
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
diff -u -r -N squid-4.10/include/version.h squid-4.11/include/version.h
--- squid-4.10/include/version.h 2020-01-20 15:51:59.000000000 +1300
+++ squid-4.11/include/version.h 2020-04-20 00:39:06.000000000 +1200
@@ -7,7 +7,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1579488704
+#define SQUID_RELEASE_TIME 1587299937
#endif
/*
diff -u -r -N squid-4.10/lib/libTrie/Makefile.in squid-4.11/lib/libTrie/Makefile.in
--- squid-4.10/lib/libTrie/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/lib/libTrie/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -668,6 +668,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/lib/libTrie/test/Makefile.in squid-4.11/lib/libTrie/test/Makefile.in
--- squid-4.10/lib/libTrie/test/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/lib/libTrie/test/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -599,6 +599,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/lib/Makefile.in squid-4.11/lib/Makefile.in
--- squid-4.10/lib/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/lib/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -718,6 +718,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/lib/ntlmauth/Makefile.in squid-4.11/lib/ntlmauth/Makefile.in
--- squid-4.10/lib/ntlmauth/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/lib/ntlmauth/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -619,6 +619,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/lib/profiler/Makefile.in squid-4.11/lib/profiler/Makefile.in
--- squid-4.10/lib/profiler/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/lib/profiler/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -623,6 +623,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/lib/rfcnb/Makefile.in squid-4.11/lib/rfcnb/Makefile.in
--- squid-4.10/lib/rfcnb/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/lib/rfcnb/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -600,6 +600,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/lib/smblib/Makefile.in squid-4.11/lib/smblib/Makefile.in
--- squid-4.10/lib/smblib/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/lib/smblib/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -602,6 +602,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/lib/snmplib/Makefile.in squid-4.11/lib/snmplib/Makefile.in
--- squid-4.10/lib/snmplib/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/lib/snmplib/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -396,6 +396,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/libltdl/aclocal.m4 squid-4.11/libltdl/aclocal.m4
--- squid-4.10/libltdl/aclocal.m4 2020-01-20 15:52:52.000000000 +1300
+++ squid-4.11/libltdl/aclocal.m4 2020-04-20 00:39:32.000000000 +1200
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -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.1], [],
+m4_if([$1], [1.16.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@
# 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.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,7 +332,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -371,7 +371,9 @@
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE="gmake" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
@@ -398,7 +400,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -595,7 +597,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -616,7 +618,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -637,7 +639,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +682,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -719,7 +721,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -748,7 +750,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -795,7 +797,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -814,7 +816,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -895,7 +897,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -955,7 +957,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -983,7 +985,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1002,7 +1004,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -u -r -N squid-4.10/libltdl/configure squid-4.11/libltdl/configure
--- squid-4.10/libltdl/configure 2020-01-20 15:52:52.000000000 +1300
+++ squid-4.11/libltdl/configure 2020-04-20 00:39:33.000000000 +1200
@@ -5626,7 +5626,7 @@
fi
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
@@ -7347,8 +7347,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
+ echo "$AR cr libconftest.a conftest.o" >&5
+ $AR cr libconftest.a conftest.o 2>&5
echo "$RANLIB libconftest.a" >&5
$RANLIB libconftest.a 2>&5
cat > conftest.c << _LT_EOF
@@ -14952,7 +14952,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
diff -u -r -N squid-4.10/libltdl/m4/libtool.m4 squid-4.11/libltdl/m4/libtool.m4
--- squid-4.10/libltdl/m4/libtool.m4 2020-01-20 15:51:48.000000000 +1300
+++ squid-4.11/libltdl/m4/libtool.m4 2020-04-20 00:39:00.000000000 +1200
@@ -1041,8 +1041,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1492,7 +1492,7 @@
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
_LT_DECL([], [AR], [1], [The archiver])
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
diff -u -r -N squid-4.10/libltdl/Makefile.in squid-4.11/libltdl/Makefile.in
--- squid-4.10/libltdl/Makefile.in 2020-01-20 15:52:52.000000000 +1300
+++ squid-4.11/libltdl/Makefile.in 2020-04-20 00:39:33.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -273,8 +273,8 @@
am__ltdlinclude_HEADERS_DIST = libltdl/lt_system.h libltdl/lt_error.h \
libltdl/lt_dlloader.h
HEADERS = $(include_HEADERS) $(ltdlinclude_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config-h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+ config-h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -975,6 +975,10 @@
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
+dist-zstd: distdir
+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+ $(am__post_remove_distdir)
+
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@@ -1017,6 +1021,8 @@
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
+ *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -1248,8 +1254,8 @@
check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
clean-libtool clean-noinstLTLIBRARIES cscope cscopelist-am \
ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
diff -u -r -N squid-4.10/Makefile.in squid-4.11/Makefile.in
--- squid-4.10/Makefile.in 2020-01-20 15:51:49.000000000 +1300
+++ squid-4.11/Makefile.in 2020-04-20 00:39:01.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -427,6 +427,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
@@ -764,6 +766,10 @@
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
+dist-zstd: distdir
+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+ $(am__post_remove_distdir)
+
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@@ -806,6 +812,8 @@
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
+ *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -984,7 +992,7 @@
am--refresh check check-am clean clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
+ dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
diff -u -r -N squid-4.10/RELEASENOTES.html squid-4.11/RELEASENOTES.html
--- squid-4.10/RELEASENOTES.html 2020-01-20 16:07:14.000000000 +1300
+++ squid-4.11/RELEASENOTES.html 2020-04-20 00:50:33.000000000 +1200
@@ -1,11 +1,12 @@
-
- Squid 4.10 release notes
+
+
+ Squid 4.11 release notes
-Squid 4.10 release notes
+Squid 4.11 release notes
Squid Developers
@@ -63,7 +64,7 @@
-The Squid Team are pleased to announce the release of Squid-4.10.
+The Squid Team are pleased to announce the release of Squid-4.11.
This new release is available for download from
http://www.squid-cache.org/Versions/v4/ or the
mirrors.
@@ -637,6 +638,10 @@
The cppunit testing framework is auto-detected and used when available.
This option can be used to disable it explicitly.
+--without-systemd
+SystemD init environment features are auto-detected and used when available.
+This option can be used to disable systemd features explicitly.
+
diff -u -r -N squid-4.10/scripts/Makefile.in squid-4.11/scripts/Makefile.in
--- squid-4.10/scripts/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/scripts/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -342,6 +342,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/AD_group/Makefile.in squid-4.11/src/acl/external/AD_group/Makefile.in
--- squid-4.10/src/acl/external/AD_group/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/acl/external/AD_group/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -609,6 +609,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/delayer/ext_delayer_acl.8 squid-4.11/src/acl/external/delayer/ext_delayer_acl.8
--- squid-4.10/src/acl/external/delayer/ext_delayer_acl.8 2020-01-20 16:07:17.000000000 +1300
+++ squid-4.11/src/acl/external/delayer/ext_delayer_acl.8 2020-04-20 00:50:35.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_DELAYER_ACL 8"
-.TH EXT_DELAYER_ACL 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH EXT_DELAYER_ACL 8 "2020-04-19" "perl v5.28.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-4.10/src/acl/external/delayer/Makefile.in squid-4.11/src/acl/external/delayer/Makefile.in
--- squid-4.10/src/acl/external/delayer/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/delayer/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/eDirectory_userip/Makefile.in squid-4.11/src/acl/external/eDirectory_userip/Makefile.in
--- squid-4.10/src/acl/external/eDirectory_userip/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/eDirectory_userip/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -612,6 +612,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/file_userip/Makefile.in squid-4.11/src/acl/external/file_userip/Makefile.in
--- squid-4.10/src/acl/external/file_userip/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/file_userip/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -610,6 +610,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/kerberos_ldap_group/Makefile.in squid-4.11/src/acl/external/kerberos_ldap_group/Makefile.in
--- squid-4.10/src/acl/external/kerberos_ldap_group/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/kerberos_ldap_group/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,6 +645,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/kerberos_ldap_group/support_krb5.cc squid-4.11/src/acl/external/kerberos_ldap_group/support_krb5.cc
--- squid-4.10/src/acl/external/kerberos_ldap_group/support_krb5.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/acl/external/kerberos_ldap_group/support_krb5.cc 2020-04-20 00:38:51.000000000 +1200
@@ -465,6 +465,12 @@
k5_error("Error while initialising TGT credentials", code);
goto loop_end;
}
+
+ // overwrite limitation of enctypes
+ creds->keyblock.enctype = 0;
+ if (creds->keyblock.contents)
+ krb5_free_keyblock_contents(kparam.context, &creds->keyblock);
+
code = krb5_get_credentials(kparam.context, 0, kparam.cc[ccindex], creds, &tgt_creds);
if (code) {
k5_error("Error while getting tgt", code);
diff -u -r -N squid-4.10/src/acl/external/LDAP_group/Makefile.in squid-4.11/src/acl/external/LDAP_group/Makefile.in
--- squid-4.10/src/acl/external/LDAP_group/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/acl/external/LDAP_group/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -612,6 +612,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/LM_group/Makefile.in squid-4.11/src/acl/external/LM_group/Makefile.in
--- squid-4.10/src/acl/external/LM_group/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/acl/external/LM_group/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -610,6 +610,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/Makefile.in squid-4.11/src/acl/external/Makefile.in
--- squid-4.10/src/acl/external/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/acl/external/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -398,6 +398,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/session/Makefile.in squid-4.11/src/acl/external/session/Makefile.in
--- squid-4.10/src/acl/external/session/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/session/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -607,6 +607,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/SQL_session/ext_sql_session_acl.8 squid-4.11/src/acl/external/SQL_session/ext_sql_session_acl.8
--- squid-4.10/src/acl/external/SQL_session/ext_sql_session_acl.8 2020-01-20 16:07:17.000000000 +1300
+++ squid-4.11/src/acl/external/SQL_session/ext_sql_session_acl.8 2020-04-20 00:50:35.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_SQL_SESSION_ACL 8"
-.TH EXT_SQL_SESSION_ACL 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH EXT_SQL_SESSION_ACL 8 "2020-04-19" "perl v5.28.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-4.10/src/acl/external/SQL_session/Makefile.in squid-4.11/src/acl/external/SQL_session/Makefile.in
--- squid-4.10/src/acl/external/SQL_session/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/SQL_session/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/time_quota/Makefile.in squid-4.11/src/acl/external/time_quota/Makefile.in
--- squid-4.10/src/acl/external/time_quota/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/time_quota/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -608,6 +608,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/unix_group/Makefile.in squid-4.11/src/acl/external/unix_group/Makefile.in
--- squid-4.10/src/acl/external/unix_group/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/unix_group/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -610,6 +610,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 squid-4.11/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8
--- squid-4.10/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2020-01-20 16:07:17.000000000 +1300
+++ squid-4.11/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2020-04-20 00:50:36.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_WBINFO_GROUP_ACL 8"
-.TH EXT_WBINFO_GROUP_ACL 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL 8 "2020-04-19" "perl v5.28.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-4.10/src/acl/external/wbinfo_group/Makefile.in squid-4.11/src/acl/external/wbinfo_group/Makefile.in
--- squid-4.10/src/acl/external/wbinfo_group/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/acl/external/wbinfo_group/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/acl/Makefile.in squid-4.11/src/acl/Makefile.in
--- squid-4.10/src/acl/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/acl/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -758,6 +758,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/adaptation/ecap/Makefile.in squid-4.11/src/adaptation/ecap/Makefile.in
--- squid-4.10/src/adaptation/ecap/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/adaptation/ecap/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -630,6 +630,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/adaptation/icap/Makefile.in squid-4.11/src/adaptation/icap/Makefile.in
--- squid-4.10/src/adaptation/icap/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/adaptation/icap/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,6 +626,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/adaptation/Makefile.in squid-4.11/src/adaptation/Makefile.in
--- squid-4.10/src/adaptation/Makefile.in 2020-01-20 15:51:51.000000000 +1300
+++ squid-4.11/src/adaptation/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -673,6 +673,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/anyp/Makefile.in squid-4.11/src/anyp/Makefile.in
--- squid-4.10/src/anyp/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/anyp/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,6 +621,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/DB/basic_db_auth.8 squid-4.11/src/auth/basic/DB/basic_db_auth.8
--- squid-4.10/src/auth/basic/DB/basic_db_auth.8 2020-01-20 16:07:18.000000000 +1300
+++ squid-4.11/src/auth/basic/DB/basic_db_auth.8 2020-04-20 00:50:36.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_DB_AUTH 8"
-.TH BASIC_DB_AUTH 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 8 "2020-04-19" "perl v5.28.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-4.10/src/auth/basic/DB/Makefile.in squid-4.11/src/auth/basic/DB/Makefile.in
--- squid-4.10/src/auth/basic/DB/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/DB/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/fake/Makefile.in squid-4.11/src/auth/basic/fake/Makefile.in
--- squid-4.10/src/auth/basic/fake/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/basic/fake/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -604,6 +604,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/getpwnam/Makefile.in squid-4.11/src/auth/basic/getpwnam/Makefile.in
--- squid-4.10/src/auth/basic/getpwnam/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/basic/getpwnam/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -610,6 +610,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/LDAP/Makefile.in squid-4.11/src/auth/basic/LDAP/Makefile.in
--- squid-4.10/src/auth/basic/LDAP/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/LDAP/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -610,6 +610,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/Makefile.in squid-4.11/src/auth/basic/Makefile.in
--- squid-4.10/src/auth/basic/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -660,6 +660,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/NCSA/Makefile.in squid-4.11/src/auth/basic/NCSA/Makefile.in
--- squid-4.10/src/auth/basic/NCSA/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/NCSA/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -632,6 +632,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/NIS/Makefile.in squid-4.11/src/auth/basic/NIS/Makefile.in
--- squid-4.10/src/auth/basic/NIS/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/NIS/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -627,6 +627,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/PAM/Makefile.in squid-4.11/src/auth/basic/PAM/Makefile.in
--- squid-4.10/src/auth/basic/PAM/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/PAM/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -609,6 +609,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/POP3/basic_pop3_auth.8 squid-4.11/src/auth/basic/POP3/basic_pop3_auth.8
--- squid-4.10/src/auth/basic/POP3/basic_pop3_auth.8 2020-01-20 16:07:18.000000000 +1300
+++ squid-4.11/src/auth/basic/POP3/basic_pop3_auth.8 2020-04-20 00:50:37.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_POP3_AUTH 8"
-.TH BASIC_POP3_AUTH 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH BASIC_POP3_AUTH 8 "2020-04-19" "perl v5.28.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-4.10/src/auth/basic/POP3/Makefile.in squid-4.11/src/auth/basic/POP3/Makefile.in
--- squid-4.10/src/auth/basic/POP3/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/POP3/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/RADIUS/Makefile.in squid-4.11/src/auth/basic/RADIUS/Makefile.in
--- squid-4.10/src/auth/basic/RADIUS/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/RADIUS/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -632,6 +632,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/SASL/Makefile.in squid-4.11/src/auth/basic/SASL/Makefile.in
--- squid-4.10/src/auth/basic/SASL/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/SASL/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -610,6 +610,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/SMB/Makefile.in squid-4.11/src/auth/basic/SMB/Makefile.in
--- squid-4.10/src/auth/basic/SMB/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/SMB/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -614,6 +614,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/SMB_LM/Makefile.in squid-4.11/src/auth/basic/SMB_LM/Makefile.in
--- squid-4.10/src/auth/basic/SMB_LM/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/basic/SMB_LM/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -627,6 +627,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/basic/SSPI/Makefile.in squid-4.11/src/auth/basic/SSPI/Makefile.in
--- squid-4.10/src/auth/basic/SSPI/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/basic/SSPI/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -636,6 +636,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/digest/Config.cc squid-4.11/src/auth/digest/Config.cc
--- squid-4.10/src/auth/digest/Config.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/auth/digest/Config.cc 2020-04-20 00:38:51.000000000 +1200
@@ -94,9 +94,6 @@
static void authenticateDigestNonceSetup(void);
static void authDigestNonceEncode(digest_nonce_h * nonce);
static void authDigestNonceLink(digest_nonce_h * nonce);
-#if NOT_USED
-static int authDigestNonceLinks(digest_nonce_h * nonce);
-#endif
static void authDigestNonceUserUnlink(digest_nonce_h * nonce);
static void
@@ -155,10 +152,10 @@
* really bad timing with expiry and creation). Using a random
* component in the nonce allows us to loop to find a unique nonce.
* We use H(nonce_data) so the nonce is meaningless to the reciever.
- * So our nonce looks like hex(H(timestamp,pointertohash,randomdata))
+ * So our nonce looks like hex(H(timestamp,randomdata))
* And even if our randomness is not very random we don't really care
- * - the timestamp and memory pointer also guarantee local uniqueness
- * in the input to the hash function.
+ * - the timestamp also guarantees local uniqueness in the input to
+ * the hash function.
*/
// NP: this will likely produce the same randomness sequences for each worker
// since they should all start within the 1-second resolution of seed value.
@@ -168,7 +165,6 @@
/* create a new nonce */
newnonce->nc = 0;
newnonce->flags.valid = true;
- newnonce->noncedata.self = newnonce;
newnonce->noncedata.creationtime = current_time.tv_sec;
newnonce->noncedata.randomdata = newRandomData(mt);
@@ -290,21 +286,10 @@
{
assert(nonce != NULL);
++nonce->references;
+ assert(nonce->references != 0); // no overflows
debugs(29, 9, "nonce '" << nonce << "' now at '" << nonce->references << "'.");
}
-#if NOT_USED
-static int
-authDigestNonceLinks(digest_nonce_h * nonce)
-{
- if (!nonce)
- return -1;
-
- return nonce->references;
-}
-
-#endif
-
void
authDigestNonceUnlink(digest_nonce_h * nonce)
{
diff -u -r -N squid-4.10/src/auth/digest/Config.h squid-4.11/src/auth/digest/Config.h
--- squid-4.10/src/auth/digest/Config.h 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/auth/digest/Config.h 2020-04-20 00:38:51.000000000 +1200
@@ -32,8 +32,6 @@
/* data to be encoded into the nonce's hex representation */
struct _digest_nonce_data {
time_t creationtime;
- /* in memory address of the nonce struct (similar purpose to an ETag) */
- digest_nonce_h *self;
uint32_t randomdata;
};
@@ -44,7 +42,7 @@
/* number of uses we've seen of this nonce */
unsigned long nc;
/* reference count */
- short references;
+ uint64_t references;
/* the auth_user this nonce has been tied to */
Auth::Digest::User *user;
/* has this nonce been invalidated ? */
diff -u -r -N squid-4.10/src/auth/digest/eDirectory/Makefile.in squid-4.11/src/auth/digest/eDirectory/Makefile.in
--- squid-4.10/src/auth/digest/eDirectory/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/digest/eDirectory/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -629,6 +629,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/digest/file/Makefile.in squid-4.11/src/auth/digest/file/Makefile.in
--- squid-4.10/src/auth/digest/file/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/digest/file/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -632,6 +632,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/digest/LDAP/Makefile.in squid-4.11/src/auth/digest/LDAP/Makefile.in
--- squid-4.10/src/auth/digest/LDAP/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/digest/LDAP/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -629,6 +629,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/digest/Makefile.in squid-4.11/src/auth/digest/Makefile.in
--- squid-4.10/src/auth/digest/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/digest/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -660,6 +660,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/Makefile.in squid-4.11/src/auth/Makefile.in
--- squid-4.10/src/auth/Makefile.in 2020-01-20 15:51:52.000000000 +1300
+++ squid-4.11/src/auth/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -670,6 +670,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/negotiate/kerberos/Makefile.in squid-4.11/src/auth/negotiate/kerberos/Makefile.in
--- squid-4.10/src/auth/negotiate/kerberos/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/negotiate/kerberos/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -654,6 +654,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/negotiate/Makefile.in squid-4.11/src/auth/negotiate/Makefile.in
--- squid-4.10/src/auth/negotiate/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/negotiate/Makefile.in 2020-04-20 00:39:03.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -661,6 +661,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/negotiate/SSPI/Makefile.in squid-4.11/src/auth/negotiate/SSPI/Makefile.in
--- squid-4.10/src/auth/negotiate/SSPI/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/negotiate/SSPI/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -610,6 +610,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/negotiate/wrapper/Makefile.in squid-4.11/src/auth/negotiate/wrapper/Makefile.in
--- squid-4.10/src/auth/negotiate/wrapper/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/negotiate/wrapper/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -607,6 +607,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/ntlm/fake/Makefile.in squid-4.11/src/auth/ntlm/fake/Makefile.in
--- squid-4.10/src/auth/ntlm/fake/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/auth/ntlm/fake/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -609,6 +609,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/ntlm/Makefile.in squid-4.11/src/auth/ntlm/Makefile.in
--- squid-4.10/src/auth/ntlm/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/ntlm/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -660,6 +660,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/ntlm/SMB_LM/Makefile.in squid-4.11/src/auth/ntlm/SMB_LM/Makefile.in
--- squid-4.10/src/auth/ntlm/SMB_LM/Makefile.in 2020-01-20 15:51:53.000000000 +1300
+++ squid-4.11/src/auth/ntlm/SMB_LM/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -611,6 +611,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/auth/ntlm/SSPI/Makefile.in squid-4.11/src/auth/ntlm/SSPI/Makefile.in
--- squid-4.10/src/auth/ntlm/SSPI/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/auth/ntlm/SSPI/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -612,6 +612,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/base/Makefile.in squid-4.11/src/base/Makefile.in
--- squid-4.10/src/base/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/base/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -625,6 +625,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/cf.data.pre squid-4.11/src/cf.data.pre
--- squid-4.10/src/cf.data.pre 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/cf.data.pre 2020-04-20 00:38:51.000000000 +1200
@@ -7609,7 +7609,7 @@
DEFAULT_DOC: Address selected by the operating system.
IFDEF: USE_WCCP
DOC_START
- Use this option if you require WCCPv2 to use a specific
+ Use this option if you require WCCP(v1) to use a specific
interface address.
The default behavior is to not bind to any specific address.
@@ -7622,7 +7622,7 @@
DEFAULT_DOC: Address selected by the operating system.
IFDEF: USE_WCCPv2
DOC_START
- Use this option if you require WCCP to use a specific
+ Use this option if you require WCCPv2 to use a specific
interface address.
The default behavior is to not bind to any specific address.
diff -u -r -N squid-4.10/src/clients/FtpGateway.cc squid-4.11/src/clients/FtpGateway.cc
--- squid-4.10/src/clients/FtpGateway.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/clients/FtpGateway.cc 2020-04-20 00:38:51.000000000 +1200
@@ -564,8 +564,6 @@
n_tokens = 0;
- memset(tokens, 0, sizeof(tokens));
-
xbuf = xstrdup(buf);
if (flags.tried_nlst) {
diff -u -r -N squid-4.10/src/clients/Makefile.in squid-4.11/src/clients/Makefile.in
--- squid-4.10/src/clients/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/clients/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,6 +621,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/client_side.cc squid-4.11/src/client_side.cc
--- squid-4.10/src/client_side.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/client_side.cc 2020-04-20 00:38:51.000000000 +1200
@@ -136,6 +136,10 @@
#include
#include
+#if HAVE_SYSTEMD_SD_DAEMON_H
+#include
+#endif
+
#if LINGERING_CLOSE
#define comm_close comm_lingering_close
#endif
@@ -3646,6 +3650,20 @@
<< s->listenConn);
Must(AddOpenedHttpSocket(s->listenConn)); // otherwise, we have received a fd we did not ask for
+
+#if USE_SYSTEMD
+ // When the very first port opens, tell systemd we are able to serve connections.
+ // Subsequent sd_notify() calls, including calls during reconfiguration,
+ // do nothing because the first call parameter is 1.
+ // XXX: Send the notification only after opening all configured ports.
+ if (opt_foreground || opt_no_daemon) {
+ const auto result = sd_notify(1, "READY=1");
+ if (result < 0) {
+ debugs(1, DBG_IMPORTANT, "WARNING: failed to send start-up notification to systemd" <<
+ Debug::Extra << "sd_notify() error: " << xstrerr(-result));
+ }
+ }
+#endif
}
void
diff -u -r -N squid-4.10/src/comm/Makefile.in squid-4.11/src/comm/Makefile.in
--- squid-4.10/src/comm/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/comm/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -628,6 +628,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/DiskIO/AIO/Makefile.in squid-4.11/src/DiskIO/AIO/Makefile.in
--- squid-4.10/src/DiskIO/AIO/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/DiskIO/AIO/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -630,6 +630,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/DiskIO/Blocking/Makefile.in squid-4.11/src/DiskIO/Blocking/Makefile.in
--- squid-4.10/src/DiskIO/Blocking/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/DiskIO/Blocking/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -622,6 +622,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/DiskIO/DiskDaemon/Makefile.in squid-4.11/src/DiskIO/DiskDaemon/Makefile.in
--- squid-4.10/src/DiskIO/DiskDaemon/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/DiskIO/DiskDaemon/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -639,6 +639,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/DiskIO/DiskThreads/Makefile.in squid-4.11/src/DiskIO/DiskThreads/Makefile.in
--- squid-4.10/src/DiskIO/DiskThreads/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/DiskIO/DiskThreads/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -634,6 +634,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/DiskIO/IpcIo/Makefile.in squid-4.11/src/DiskIO/IpcIo/Makefile.in
--- squid-4.10/src/DiskIO/IpcIo/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/DiskIO/IpcIo/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,6 +621,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/DiskIO/Makefile.in squid-4.11/src/DiskIO/Makefile.in
--- squid-4.10/src/DiskIO/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/DiskIO/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,6 +683,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/DiskIO/Mmapped/Makefile.in squid-4.11/src/DiskIO/Mmapped/Makefile.in
--- squid-4.10/src/DiskIO/Mmapped/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/DiskIO/Mmapped/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,6 +621,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/dns/Makefile.in squid-4.11/src/dns/Makefile.in
--- squid-4.10/src/dns/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/dns/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -622,6 +622,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/esi/Context.h squid-4.11/src/esi/Context.h
--- squid-4.10/src/esi/Context.h 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/esi/Context.h 2020-04-20 00:38:51.000000000 +1200
@@ -12,6 +12,7 @@
#include "clientStream.h"
#include "err_type.h"
#include "esi/Element.h"
+#include "esi/Esi.h"
#include "esi/Parser.h"
#include "http/forward.h"
#include "http/StatusCode.h"
@@ -113,7 +114,7 @@
{
public:
- ESIElement::Pointer stack[10]; /* a stack of esi elements that are open */
+ ESIElement::Pointer stack[ESI_STACK_DEPTH_LIMIT]; /* a stack of esi elements that are open */
int stackdepth; /* self explanatory */
ESIParser::Pointer theParser;
ESIElement::Pointer top();
diff -u -r -N squid-4.10/src/esi/Esi.cc squid-4.11/src/esi/Esi.cc
--- squid-4.10/src/esi/Esi.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/esi/Esi.cc 2020-04-20 00:38:51.000000000 +1200
@@ -29,6 +29,7 @@
#include "esi/Expression.h"
#include "esi/Segment.h"
#include "esi/VarState.h"
+#include "FadingCounter.h"
#include "fatal.h"
#include "http/Stream.h"
#include "HttpHdrSc.h"
@@ -930,13 +931,18 @@
ESIContext::addStackElement (ESIElement::Pointer element)
{
/* Put on the stack to allow skipping of 'invalid' markup */
- assert (parserState.stackdepth <11);
+
+ // throw an error if the stack location would be invalid
+ if (parserState.stackdepth >= ESI_STACK_DEPTH_LIMIT)
+ throw Esi::Error("ESI Too many nested elements");
+ if (parserState.stackdepth < 0)
+ throw Esi::Error("ESI elements stack error, probable error in ESI template");
+
assert (!failed());
debugs(86, 5, "ESIContext::addStackElement: About to add ESI Node " << element.getRaw());
if (!parserState.top()->addElement(element)) {
- debugs(86, DBG_IMPORTANT, "ESIContext::addStackElement: failed to add esi node, probable error in ESI template");
- flags.error = 1;
+ throw Esi::Error("ESIContext::addStackElement failed, probable error in ESI template");
} else {
/* added ok, push onto the stack */
parserState.stack[parserState.stackdepth] = element;
@@ -1188,13 +1194,10 @@
assert (len);
debugs(86, 5, "literal length is " << len);
/* give a literal to the current element */
- assert (parserState.stackdepth <11);
ESIElement::Pointer element (new esiLiteral (this, s, len));
- if (!parserState.top()->addElement(element)) {
- debugs(86, DBG_IMPORTANT, "ESIContext::addLiteral: failed to add esi node, probable error in ESI template");
- flags.error = 1;
- }
+ if (!parserState.top()->addElement(element))
+ throw Esi::Error("ESIContext::addLiteral failed, probable error in ESI template");
}
void
@@ -1256,8 +1259,24 @@
PROF_start(esiParsing);
- while (buffered.getRaw() && !flags.error)
- parseOneBuffer();
+ try {
+ while (buffered.getRaw() && !flags.error)
+ parseOneBuffer();
+
+ } catch (Esi::ErrorDetail &errMsg) { // FIXME: non-const for c_str()
+ // level-2: these are protocol/syntax errors from upstream
+ debugs(86, 2, "WARNING: ESI syntax error: " << errMsg);
+ setError();
+ setErrorMessage(errMsg.c_str());
+
+ } catch (...) {
+ // DBG_IMPORTANT because these are local issues the admin needs to fix
+ static FadingCounter logEntries; // TODO: set horizon less than infinity
+ if (logEntries.count(1) < 100)
+ debugs(86, DBG_IMPORTANT, "ERROR: ESI parser: " << CurrentException);
+ setError();
+ setErrorMessage("ESI parser error");
+ }
PROF_stop(esiParsing);
diff -u -r -N squid-4.10/src/esi/Esi.h squid-4.11/src/esi/Esi.h
--- squid-4.10/src/esi/Esi.h 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/esi/Esi.h 2020-04-20 00:38:51.000000000 +1200
@@ -10,6 +10,11 @@
#define SQUID_ESI_H
#include "clientStream.h"
+#include "sbuf/SBuf.h"
+
+#if !defined(ESI_STACK_DEPTH_LIMIT)
+#define ESI_STACK_DEPTH_LIMIT 20
+#endif
/* ESI.c */
extern CSR esiStreamRead;
@@ -18,5 +23,14 @@
extern CSS esiStreamStatus;
int esiEnableProcessing (HttpReply *);
+namespace Esi
+{
+
+typedef SBuf ErrorDetail;
+/// prepare an Esi::ErrorDetail for throw on ESI parser internal errors
+inline Esi::ErrorDetail Error(const char *msg) { return ErrorDetail(msg); }
+
+} // namespace Esi
+
#endif /* SQUID_ESI_H */
diff -u -r -N squid-4.10/src/esi/Expression.cc squid-4.11/src/esi/Expression.cc
--- squid-4.10/src/esi/Expression.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/esi/Expression.cc 2020-04-20 00:38:51.000000000 +1200
@@ -10,6 +10,7 @@
#include "squid.h"
#include "Debug.h"
+#include "esi/Esi.h"
#include "esi/Expression.h"
#include "profiler/Profiler.h"
@@ -97,6 +98,17 @@
cleanmember(&s[*depth]);
}
+static void
+stackpush(stackmember *stack, stackmember &item, int *depth)
+{
+ if (*depth < 0)
+ throw Esi::Error("ESIExpression stack has negative size");
+ if (*depth >= ESI_STACK_DEPTH_LIMIT)
+ throw Esi::Error("ESIExpression stack is full, cannot push");
+
+ stack[(*depth)++] = item;
+}
+
static evaluate evalnegate;
static evaluate evalliteral;
static evaluate evalor;
@@ -208,6 +220,11 @@
/* invalid stack */
return 1;
+ if (whereAmI < 0)
+ throw Esi::Error("negate expression location too small");
+ if (*depth >= ESI_STACK_DEPTH_LIMIT)
+ throw Esi::Error("negate expression too complex");
+
if (stack[whereAmI + 1].valuetype != ESI_EXPR_EXPR)
/* invalid operand */
return 1;
@@ -280,7 +297,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -327,7 +344,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -373,7 +390,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -421,7 +438,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -469,7 +486,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -517,7 +534,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -566,7 +583,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -613,7 +630,7 @@
srv.precedence = 1;
- stack[(*depth)++] = srv;
+ stackpush(stack, srv, depth);
/* we're out of way, try adding now */
if (!addmember(stack, depth, candidate))
@@ -953,6 +970,9 @@
/* !(!(a==b))) is why thats safe */
/* strictly less than until we unwind */
+ if (*stackdepth >= ESI_STACK_DEPTH_LIMIT)
+ throw Esi::Error("ESI expression too complex to add member");
+
if (candidate->precedence < stack[*stackdepth - 1].precedence ||
candidate->precedence < stack[*stackdepth - 2].precedence) {
/* must be an operator */
@@ -968,10 +988,10 @@
return 0;
}
} else {
- stack[(*stackdepth)++] = *candidate;
+ stackpush(stack, *candidate, stackdepth);
}
} else if (candidate->valuetype != ESI_EXPR_INVALID)
- stack[(*stackdepth)++] = *candidate;
+ stackpush(stack, *candidate, stackdepth);
return 1;
}
@@ -979,7 +999,7 @@
int
ESIExpression::Evaluate(char const *s)
{
- stackmember stack[20];
+ stackmember stack[ESI_STACK_DEPTH_LIMIT];
int stackdepth = 0;
char const *end;
PROF_start(esiExpressionEval);
diff -u -r -N squid-4.10/src/esi/Makefile.in squid-4.11/src/esi/Makefile.in
--- squid-4.10/src/esi/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/esi/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -643,6 +643,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/eui/Makefile.in squid-4.11/src/eui/Makefile.in
--- squid-4.10/src/eui/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/eui/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,6 +621,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/format/Makefile.in squid-4.11/src/format/Makefile.in
--- squid-4.10/src/format/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/format/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -620,6 +620,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/fs/Makefile.in squid-4.11/src/fs/Makefile.in
--- squid-4.10/src/fs/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/fs/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,6 +648,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/fs/ufs/UFSSwapDir.cc squid-4.11/src/fs/ufs/UFSSwapDir.cc
--- squid-4.10/src/fs/ufs/UFSSwapDir.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/fs/ufs/UFSSwapDir.cc 2020-04-20 00:38:51.000000000 +1200
@@ -724,6 +724,9 @@
void
Fs::Ufs::UFSSwapDir::openLog()
{
+ if (!IamWorkerProcess())
+ return;
+
assert(NumberOfUFSDirs || !UFSDirToGlobalDirMapping);
++NumberOfUFSDirs;
assert(NumberOfUFSDirs <= Config.cacheSwap.n_configured);
diff -u -r -N squid-4.10/src/ftp/Makefile.in squid-4.11/src/ftp/Makefile.in
--- squid-4.10/src/ftp/Makefile.in 2020-01-20 15:51:54.000000000 +1300
+++ squid-4.11/src/ftp/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -619,6 +619,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/FwdState.cc squid-4.11/src/FwdState.cc
--- squid-4.10/src/FwdState.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/FwdState.cc 2020-04-20 00:38:51.000000000 +1200
@@ -587,6 +587,9 @@
if (!entry->isEmpty())
return false;
+ if (request->flags.pinned && !pinnedCanRetry())
+ return false;
+
if (exhaustedTries())
return false;
@@ -1068,6 +1071,11 @@
debugs(17, 3, HERE << e->url() << "?" );
+ if (request->flags.pinned && !pinnedCanRetry()) {
+ debugs(17, 3, "pinned connection; cannot retry");
+ return 0;
+ }
+
if (!EBIT_TEST(e->flags, ENTRY_FWD_HDR_WAIT)) {
debugs(17, 3, HERE << "No, ENTRY_FWD_HDR_WAIT isn't set");
return 0;
@@ -1229,6 +1237,28 @@
return n_tries >= Config.forward_max_tries;
}
+bool
+FwdState::pinnedCanRetry() const
+{
+ assert(request->flags.pinned);
+
+ // pconn race on pinned connection: Currently we do not have any mechanism
+ // to retry current pinned connection path.
+ if (pconnRace == raceHappened)
+ return false;
+
+ // If a bumped connection was pinned, then the TLS client was given our peer
+ // details. Do not retry because we do not ensure that those details stay
+ // constant. Step1-bumped connections do not get our TLS peer details, are
+ // never pinned, and, hence, never reach this method.
+ if (request->flags.sslBumped)
+ return false;
+
+ // The other pinned cases are FTP proxying and connection-based HTTP
+ // authentication. TODO: Do these cases have restrictions?
+ return true;
+}
+
/**** PRIVATE NON-MEMBER FUNCTIONS ********************************************/
/*
diff -u -r -N squid-4.10/src/FwdState.h squid-4.11/src/FwdState.h
--- squid-4.10/src/FwdState.h 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/FwdState.h 2020-04-20 00:38:51.000000000 +1200
@@ -117,6 +117,11 @@
void doneWithRetries();
void completed();
void retryOrBail();
+
+ /// whether a pinned to-peer connection can be replaced with another one
+ /// (in order to retry or reforward a failed request)
+ bool pinnedCanRetry() const;
+
ErrorState *makeConnectingError(const err_type type) const;
void connectedToPeer(Security::EncryptorAnswer &answer);
static void RegisterWithCacheManager(void);
diff -u -r -N squid-4.10/src/helper/Makefile.in squid-4.11/src/helper/Makefile.in
--- squid-4.10/src/helper/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/helper/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -620,6 +620,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/http/Makefile.in squid-4.11/src/http/Makefile.in
--- squid-4.10/src/http/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/http/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -664,6 +664,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/http/one/Makefile.in squid-4.11/src/http/one/Makefile.in
--- squid-4.10/src/http/one/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/http/one/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -622,6 +622,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/http/url_rewriters/fake/Makefile.in squid-4.11/src/http/url_rewriters/fake/Makefile.in
--- squid-4.10/src/http/url_rewriters/fake/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/http/url_rewriters/fake/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -606,6 +606,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/http/url_rewriters/LFS/Makefile.in squid-4.11/src/http/url_rewriters/LFS/Makefile.in
--- squid-4.10/src/http/url_rewriters/LFS/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/http/url_rewriters/LFS/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/http/url_rewriters/LFS/url_lfs_rewrite.8 squid-4.11/src/http/url_rewriters/LFS/url_lfs_rewrite.8
--- squid-4.10/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2020-01-20 16:07:19.000000000 +1300
+++ squid-4.11/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2020-04-20 00:50:37.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "URL_LFS_REWRITE 8"
-.TH URL_LFS_REWRITE 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH URL_LFS_REWRITE 8 "2020-04-19" "perl v5.28.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-4.10/src/http/url_rewriters/Makefile.in squid-4.11/src/http/url_rewriters/Makefile.in
--- squid-4.10/src/http/url_rewriters/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/http/url_rewriters/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -398,6 +398,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/HttpHeaderTools.cc squid-4.11/src/HttpHeaderTools.cc
--- squid-4.10/src/HttpHeaderTools.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/HttpHeaderTools.cc 2020-04-20 00:38:51.000000000 +1200
@@ -477,6 +477,12 @@
{
ACLFilledChecklist checklist(NULL, request, NULL);
+ checklist.al = al;
+ if (al && al->reply) {
+ checklist.reply = al->reply;
+ HTTPMSGLOCK(checklist.reply);
+ }
+
for (HeaderWithAclList::const_iterator hwa = headersAdd.begin(); hwa != headersAdd.end(); ++hwa) {
if (!hwa->aclList || checklist.fastCheck(hwa->aclList).allowed()) {
const char *fieldValue = NULL;
diff -u -r -N squid-4.10/src/icmp/Makefile.in squid-4.11/src/icmp/Makefile.in
--- squid-4.10/src/icmp/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/icmp/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -654,6 +654,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/ident/Makefile.in squid-4.11/src/ident/Makefile.in
--- squid-4.10/src/ident/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/ident/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -619,6 +619,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/ip/Makefile.in squid-4.11/src/ip/Makefile.in
--- squid-4.10/src/ip/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/ip/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,6 +621,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/ipc/Makefile.in squid-4.11/src/ipc/Makefile.in
--- squid-4.10/src/ipc/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/ipc/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -637,6 +637,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/log/DB/log_db_daemon.8 squid-4.11/src/log/DB/log_db_daemon.8
--- squid-4.10/src/log/DB/log_db_daemon.8 2020-01-20 16:07:19.000000000 +1300
+++ squid-4.11/src/log/DB/log_db_daemon.8 2020-04-20 00:50:38.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "LOG_DB_DAEMON 8"
-.TH LOG_DB_DAEMON 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH LOG_DB_DAEMON 8 "2020-04-19" "perl v5.28.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-4.10/src/log/DB/Makefile.in squid-4.11/src/log/DB/Makefile.in
--- squid-4.10/src/log/DB/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/log/DB/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/log/file/Makefile.in squid-4.11/src/log/file/Makefile.in
--- squid-4.10/src/log/file/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/log/file/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -606,6 +606,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/log/Makefile.in squid-4.11/src/log/Makefile.in
--- squid-4.10/src/log/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/log/Makefile.in 2020-04-20 00:39:04.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -673,6 +673,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/log/ModDaemon.cc squid-4.11/src/log/ModDaemon.cc
--- squid-4.10/src/log/ModDaemon.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/log/ModDaemon.cc 2020-04-20 00:38:51.000000000 +1200
@@ -298,8 +298,14 @@
}
return;
}
- /* Append this data to the end buffer; create a new one if needed */
+
/* Are we eol? If so, prefix with our logfile command byte */
+ if (ll->eol == 1) {
+ logfile_mod_daemon_append(lf, "L", 1);
+ ll->eol = 0;
+ }
+
+ /* Append this data to the end buffer; create a new one if needed */
logfile_mod_daemon_append(lf, buf, len);
}
@@ -307,12 +313,8 @@
logfile_mod_daemon_linestart(Logfile * lf)
{
l_daemon_t *ll = static_cast(lf->data);
- char tb[2];
assert(ll->eol == 1);
- ll->eol = 0;
- tb[0] = 'L';
- tb[1] = '\0';
- logfile_mod_daemon_append(lf, tb, 1);
+ // logfile_mod_daemon_writeline() sends the starting command
}
static void
@@ -320,7 +322,8 @@
{
l_daemon_t *ll = static_cast(lf->data);
logfile_buffer_t *b;
- assert(ll->eol == 0);
+ if (ll->eol == 1) // logfile_mod_daemon_writeline() wrote nothing
+ return;
ll->eol = 1;
/* Kick a write off if the head buffer is -full- */
if (ll->bufs.head != NULL) {
diff -u -r -N squid-4.10/src/Makefile.am squid-4.11/src/Makefile.am
--- squid-4.10/src/Makefile.am 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/Makefile.am 2020-04-20 00:38:51.000000000 +1200
@@ -576,6 +576,7 @@
$(EPOLL_LIBS) \
$(MINGW_LIBS) \
$(KRB5LIBS) \
+ $(SYSTEMD_LIBS) \
$(COMPAT_LIB) \
$(XTRA_LIBS)
diff -u -r -N squid-4.10/src/Makefile.in squid-4.11/src/Makefile.in
--- squid-4.10/src/Makefile.in 2020-01-20 15:51:50.000000000 +1300
+++ squid-4.11/src/Makefile.in 2020-04-20 00:39:02.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -431,8 +431,8 @@
$(top_builddir)/lib/libmiscutil.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
squid_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(squid_LDFLAGS) $(LDFLAGS) -o $@
@@ -2800,6 +2800,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
@@ -3140,8 +3142,8 @@
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la $(ATOMICLIB) $(SSLLIB) \
- $(EPOLL_LIBS) $(MINGW_LIBS) $(KRB5LIBS) $(COMPAT_LIB) \
- $(XTRA_LIBS) $(am__append_10)
+ $(EPOLL_LIBS) $(MINGW_LIBS) $(KRB5LIBS) $(SYSTEMD_LIBS) \
+ $(COMPAT_LIB) $(XTRA_LIBS) $(am__append_10)
@ENABLE_LOADABLE_MODULES_TRUE@squid_LDFLAGS = -export-dynamic -dlopen force
unlinkd_SOURCES = unlinkd_daemon.cc
unlinkd_LDADD = \
diff -u -r -N squid-4.10/src/mem/Makefile.in squid-4.11/src/mem/Makefile.in
--- squid-4.10/src/mem/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/mem/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -622,6 +622,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/mgr/Makefile.in squid-4.11/src/mgr/Makefile.in
--- squid-4.10/src/mgr/Makefile.in 2020-01-20 15:51:55.000000000 +1300
+++ squid-4.11/src/mgr/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -637,6 +637,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/parser/Makefile.in squid-4.11/src/parser/Makefile.in
--- squid-4.10/src/parser/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/parser/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -620,6 +620,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/peer_select.cc squid-4.11/src/peer_select.cc
--- squid-4.10/src/peer_select.cc 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/src/peer_select.cc 2020-04-20 00:38:51.000000000 +1200
@@ -274,6 +274,20 @@
return;
}
+ if (fs && fs->code == PINNED) {
+ // Send an empty IP address marked as PINNED
+ const Comm::ConnectionPointer p = new Comm::Connection();
+ p->peerType = PINNED;
+ // Caller requires to check for pinned connections through
+ // CachePeer object:
+ p->setPeer(fs->_peer.get());
+ psstate->paths->push_back(p);
+ psstate->servers = fs->next;
+ delete fs;
+ peerSelectDnsPaths(psstate);
+ return;
+ }
+
// convert the list of FwdServer destinations into destinations IP addresses
if (fs && psstate->paths->size() < (unsigned int)Config.forward_max_tries) {
// send the next one off for DNS lookup.
diff -u -r -N squid-4.10/src/repl/Makefile.in squid-4.11/src/repl/Makefile.in
--- squid-4.10/src/repl/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/repl/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -632,6 +632,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/sbuf/Makefile.in squid-4.11/src/sbuf/Makefile.in
--- squid-4.10/src/sbuf/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/sbuf/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -623,6 +623,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/security/cert_generators/file/Makefile.in squid-4.11/src/security/cert_generators/file/Makefile.in
--- squid-4.10/src/security/cert_generators/file/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/security/cert_generators/file/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -633,6 +633,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/security/cert_generators/Makefile.in squid-4.11/src/security/cert_generators/Makefile.in
--- squid-4.10/src/security/cert_generators/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/security/cert_generators/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -398,6 +398,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/security/cert_validators/fake/Makefile.in squid-4.11/src/security/cert_validators/fake/Makefile.in
--- squid-4.10/src/security/cert_validators/fake/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/security/cert_validators/fake/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/security/cert_validators/fake/security_fake_certverify.8 squid-4.11/src/security/cert_validators/fake/security_fake_certverify.8
--- squid-4.10/src/security/cert_validators/fake/security_fake_certverify.8 2020-01-20 16:07:19.000000000 +1300
+++ squid-4.11/src/security/cert_validators/fake/security_fake_certverify.8 2020-04-20 00:50:38.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "SECURITY_FAKE_CERTVERIFY 8"
-.TH SECURITY_FAKE_CERTVERIFY 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH SECURITY_FAKE_CERTVERIFY 8 "2020-04-19" "perl v5.28.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-4.10/src/security/cert_validators/Makefile.in squid-4.11/src/security/cert_validators/Makefile.in
--- squid-4.10/src/security/cert_validators/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/security/cert_validators/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -398,6 +398,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/security/Makefile.in squid-4.11/src/security/Makefile.in
--- squid-4.10/src/security/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/security/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -666,6 +666,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/servers/Makefile.in squid-4.11/src/servers/Makefile.in
--- squid-4.10/src/servers/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/servers/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -620,6 +620,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/snmp/Makefile.in squid-4.11/src/snmp/Makefile.in
--- squid-4.10/src/snmp/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/snmp/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -623,6 +623,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/ssl/Makefile.in squid-4.11/src/ssl/Makefile.in
--- squid-4.10/src/ssl/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/ssl/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -632,6 +632,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/store/id_rewriters/file/Makefile.in squid-4.11/src/store/id_rewriters/file/Makefile.in
--- squid-4.10/src/store/id_rewriters/file/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/store/id_rewriters/file/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/store/id_rewriters/file/storeid_file_rewrite.8 squid-4.11/src/store/id_rewriters/file/storeid_file_rewrite.8
--- squid-4.10/src/store/id_rewriters/file/storeid_file_rewrite.8 2020-01-20 16:07:17.000000000 +1300
+++ squid-4.11/src/store/id_rewriters/file/storeid_file_rewrite.8 2020-04-20 00:50:36.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "STOREID_FILE_REWRITE 8"
-.TH STOREID_FILE_REWRITE 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH STOREID_FILE_REWRITE 8 "2020-04-19" "perl v5.28.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-4.10/src/store/id_rewriters/Makefile.in squid-4.11/src/store/id_rewriters/Makefile.in
--- squid-4.10/src/store/id_rewriters/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/store/id_rewriters/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -398,6 +398,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/src/store/Makefile.in squid-4.11/src/store/Makefile.in
--- squid-4.10/src/store/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/src/store/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -661,6 +661,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/test-suite/Makefile.in squid-4.11/test-suite/Makefile.in
--- squid-4.10/test-suite/Makefile.in 2020-01-20 15:51:56.000000000 +1300
+++ squid-4.11/test-suite/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -711,6 +711,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/tools/apparmor/Makefile.in squid-4.11/tools/apparmor/Makefile.in
--- squid-4.10/tools/apparmor/Makefile.in 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/tools/apparmor/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -339,6 +339,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/tools/helper-mux/helper-mux.8 squid-4.11/tools/helper-mux/helper-mux.8
--- squid-4.10/tools/helper-mux/helper-mux.8 2020-01-20 16:07:20.000000000 +1300
+++ squid-4.11/tools/helper-mux/helper-mux.8 2020-04-20 00:50:38.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "HELPER-MUX 8"
-.TH HELPER-MUX 8 "2020-01-20" "perl v5.28.1" "User Contributed Perl Documentation"
+.TH HELPER-MUX 8 "2020-04-19" "perl v5.28.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-4.10/tools/helper-mux/Makefile.in squid-4.11/tools/helper-mux/Makefile.in
--- squid-4.10/tools/helper-mux/Makefile.in 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/tools/helper-mux/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -557,6 +557,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/tools/Makefile.in squid-4.11/tools/Makefile.in
--- squid-4.10/tools/Makefile.in 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/tools/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -694,6 +694,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/tools/purge/Makefile.in squid-4.11/tools/purge/Makefile.in
--- squid-4.10/tools/purge/Makefile.in 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/tools/purge/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -631,6 +631,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/tools/squidclient/Makefile.in squid-4.11/tools/squidclient/Makefile.in
--- squid-4.10/tools/squidclient/Makefile.in 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/tools/squidclient/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -681,6 +681,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/tools/systemd/Makefile.in squid-4.11/tools/systemd/Makefile.in
--- squid-4.10/tools/systemd/Makefile.in 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/tools/systemd/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -339,6 +339,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
diff -u -r -N squid-4.10/tools/systemd/squid.service squid-4.11/tools/systemd/squid.service
--- squid-4.10/tools/systemd/squid.service 2020-01-20 15:51:40.000000000 +1300
+++ squid-4.11/tools/systemd/squid.service 2020-04-20 00:38:51.000000000 +1200
@@ -11,12 +11,13 @@
After=network.target network-online.target nss-lookup.target
[Service]
-Type=forking
+Type=notify
PIDFile=/var/run/squid.pid
ExecStartPre=/usr/sbin/squid --foreground -z
-ExecStart=/usr/sbin/squid -sYC
+ExecStart=/usr/sbin/squid --foreground -sYC
ExecReload=/bin/kill -HUP $MAINPID
KillMode=mixed
+NotifyAccess=all
[Install]
WantedBy=multi-user.target
diff -u -r -N squid-4.10/tools/sysvinit/Makefile.in squid-4.11/tools/sysvinit/Makefile.in
--- squid-4.10/tools/sysvinit/Makefile.in 2020-01-20 15:51:57.000000000 +1300
+++ squid-4.11/tools/sysvinit/Makefile.in 2020-04-20 00:39:05.000000000 +1200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -339,6 +339,8 @@
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
STORE_TESTS = @STORE_TESTS@
STRIP = @STRIP@
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+SYSTEMD_LIBS = @SYSTEMD_LIBS@
TR = @TR@
TRUE = @TRUE@
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@