diff -u -r -N squid-3.5.6/aclocal.m4 squid-3.5.7/aclocal.m4 --- squid-3.5.6/aclocal.m4 2015-07-03 02:13:45.000000000 -0700 +++ squid-3.5.7/aclocal.m4 2015-07-31 23:09:05.000000000 -0700 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9520,7 +9520,7 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9532,10 +9532,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' 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.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9551,14 +9551,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.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])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-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9610,7 +9610,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9641,7 +9641,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9832,7 +9832,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9908,7 +9908,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9998,8 +9998,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -10073,6 +10073,9 @@ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -10102,7 +10105,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10113,7 +10116,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -10123,7 +10126,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10145,7 +10148,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10180,7 +10183,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10230,7 +10233,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10269,7 +10272,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10298,7 +10301,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10345,7 +10348,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10364,7 +10367,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10445,7 +10448,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10505,7 +10508,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10533,7 +10536,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10552,7 +10555,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 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-3.5.6/cfgaux/compile squid-3.5.7/cfgaux/compile --- squid-3.5.6/cfgaux/compile 2015-07-03 02:14:18.000000000 -0700 +++ squid-3.5.7/cfgaux/compile 2015-07-31 23:09:32.000000000 -0700 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -u -r -N squid-3.5.6/cfgaux/depcomp squid-3.5.7/cfgaux/depcomp --- squid-3.5.6/cfgaux/depcomp 2015-07-03 02:15:13.000000000 -0700 +++ squid-3.5.7/cfgaux/depcomp 2015-07-31 23:10:14.000000000 -0700 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 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-3.5.6/cfgaux/install-sh squid-3.5.7/cfgaux/install-sh --- squid-3.5.6/cfgaux/install-sh 2015-07-03 02:14:19.000000000 -0700 +++ squid-3.5.7/cfgaux/install-sh 2015-07-31 23:09:32.000000000 -0700 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -u -r -N squid-3.5.6/cfgaux/missing squid-3.5.7/cfgaux/missing --- squid-3.5.6/cfgaux/missing 2015-07-03 02:14:19.000000000 -0700 +++ squid-3.5.7/cfgaux/missing 2015-07-31 23:09:32.000000000 -0700 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 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-3.5.6/cfgaux/test-driver squid-3.5.7/cfgaux/test-driver --- squid-3.5.6/cfgaux/test-driver 2015-07-03 02:15:14.000000000 -0700 +++ squid-3.5.7/cfgaux/test-driver 2015-07-31 23:10:15.000000000 -0700 @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 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 @@ -106,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -u -r -N squid-3.5.6/ChangeLog squid-3.5.7/ChangeLog --- squid-3.5.6/ChangeLog 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/ChangeLog 2015-07-31 23:08:17.000000000 -0700 @@ -1,3 +1,21 @@ +Changes to squid-3.5.7 (01 Aug 2015): + + - Bug 4293: wrong SNI sent to server after URL-rewrite + - Bug 4251: incorrect instance name for memory segments in /dev/shm + - Bug 4227: invalid key in AuthUserHashPointer causing assertation failure + - Bug 3345: support %un (any available user name) format code for external ACLs. + - basic_smb_auth: Fix several old issues identified by Debian users + - Support ssl-bump splicing to origin cache_peer + - Fix SSL errors relayed using invalid certificates + - Fix crash in TcpAccepter with profiler enabled + - Fix some cases of ssl_crtd SSL certificate DB corruption + - Fix performance regression in SBuf::chop operations + - Improve handling of client connections on shutdown + - Handle exceptions during squid.conf parse + - Make pod2man an optional dependency + - ... and polishing for several cache.log notification messages + - ... and all fixes from squid 3.4.14 + Changes to squid-3.5.6 (03 Jul 2015): - Bug 4274: ssl_crtd.8 not being installed @@ -182,6 +200,10 @@ - ... and many error page translation updates - ... and much code cleanup and polishing +Changes to squid-3.4.14 (01 Aug 2015): + + - Do not blindly forward cache peer CONNECT responses (CVE-2015-5400) + Changes to squid-3.4.13 (01 May 2015): - Bug 4212: ssl_crtd crashes with corrupt database diff -u -r -N squid-3.5.6/compat/Makefile.in squid-3.5.7/compat/Makefile.in --- squid-3.5.6/compat/Makefile.in 2015-07-03 02:14:20.000000000 -0700 +++ squid-3.5.7/compat/Makefile.in 2015-07-31 23:09:33.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,10 +92,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am initgroups.c tempnam.c drand48.c \ - strtoll.c strerror.c psignal.c $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testPreCompiler$(EXEEXT) TESTS = testPreCompiler$(EXEEXT) testHeaders @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -151,6 +157,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -459,6 +466,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + drand48.c initgroups.c psignal.c strerror.c strtoll.c \ + tempnam.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -797,7 +808,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign compat/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign compat/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -806,7 +816,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1013,7 +1023,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1311,6 +1321,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/configure squid-3.5.7/configure --- squid-3.5.6/configure 2015-07-03 02:15:26.000000000 -0700 +++ squid-3.5.7/configure 2015-07-31 23:10:24.000000000 -0700 @@ -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 3.5.6. +# Generated by GNU Autoconf 2.69 for Squid Web Proxy 3.5.7. # # Report bugs to . # @@ -595,8 +595,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.5.6' -PACKAGE_STRING='Squid Web Proxy 3.5.6' +PACKAGE_VERSION='3.5.7' +PACKAGE_STRING='Squid Web Proxy 3.5.7' PACKAGE_BUGREPORT='http://bugs.squid-cache.org/' PACKAGE_URL='' @@ -826,6 +826,8 @@ ENABLE_LOADABLE_MODULES_TRUE AR_R AR +ENABLE_POD2MAN_DOC_FALSE +ENABLE_POD2MAN_DOC_TRUE POD2MAN PERL CPPUNITCONFIG @@ -1617,7 +1619,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 3.5.6 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.5.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1687,7 +1689,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.5.6:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.5.7:";; esac cat <<\_ACEOF @@ -2094,7 +2096,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.5.6 +Squid Web Proxy configure 3.5.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3198,7 +3200,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 3.5.6, which was +It was created by Squid Web Proxy $as_me 3.5.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3579,7 +3581,7 @@ -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3771,7 +3773,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -4065,7 +4067,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.5.6' + VERSION='3.5.7' cat >>confdefs.h <<_ACEOF @@ -4099,8 +4101,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -6217,8 +6219,8 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: CPU -march=native optimization enabled: ${enable_arch_native:=auto}" >&5 -$as_echo "$as_me: CPU -march=native optimization enabled: ${enable_arch_native:=auto}" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: CPU arch native optimization enabled: ${enable_arch_native:=auto}" >&5 +$as_echo "$as_me: CPU arch native optimization enabled: ${enable_arch_native:=auto}" >&6;} if test "x${enable_arch_native}" != "xno"; then @@ -7834,6 +7836,14 @@ fi + if test "x${ac_cv_path_POD2MAN}" != "x$FALSE"; then + ENABLE_POD2MAN_DOC_TRUE= + ENABLE_POD2MAN_DOC_FALSE='#' +else + ENABLE_POD2MAN_DOC_TRUE='#' + ENABLE_POD2MAN_DOC_FALSE= +fi + if test "x$AR" = "x"; then # Extract the first word of "ar", so it can be a program name with args. @@ -31841,9 +31851,14 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="DB" fi +if test "x$POD2MAN" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pod2man not found. basic_db_auth man(8) page will not be built" >&5 +$as_echo "$as_me: WARNING: pod2man not found. basic_db_auth man(8) page will not be built" >&2;} +fi + elif test "x$helper" = "xLDAP" ; then @@ -32085,9 +32100,14 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="POP3" fi +if test "x$POD2MAN" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pod2man not found. basic_pop3_auth man(8) page will not be built" >&5 +$as_echo "$as_me: WARNING: pod2man not found. basic_pop3_auth man(8) page will not be built" >&2;} +fi + elif test "x$helper" = "xRADIUS" ; then @@ -33049,9 +33069,14 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="DB" fi +if test "x$POD2MAN" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pod2man not found. log_db_daemon man(8) page will not be built" >&5 +$as_echo "$as_me: WARNING: pod2man not found. log_db_daemon man(8) page will not be built" >&2;} +fi + elif test "x$helper" = "xfile" ; then @@ -33221,9 +33246,14 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="delayer" fi +if test "x$POD2MAN" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pod2man not found. ext_delayer_acl man(8) page will not be built" >&5 +$as_echo "$as_me: WARNING: pod2man not found. ext_delayer_acl man(8) page will not be built" >&2;} +fi + elif test "x$helper" = "xSQL_session" ; then @@ -33234,9 +33264,14 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="SQL_session" fi +if test "x$POD2MAN" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pod2man not found. ext_sql_session_acl man(8) page will not be built" >&5 +$as_echo "$as_me: WARNING: pod2man not found. ext_sql_session_acl man(8) page will not be built" >&2;} +fi + elif test "x$helper" = "xeDirectory_userip" ; then @@ -33599,9 +33634,14 @@ fi # allow script install anyway when perl is present -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="wbinfo_group" fi +if test "x$POD2MAN" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pod2man not found. ext_wbinfo_group_acl man(8) page will not be built" >&5 +$as_echo "$as_me: WARNING: pod2man not found. ext_wbinfo_group_acl man(8) page will not be built" >&2;} +fi + # modules not yet converted to autoconf macros (or third party drop-in's) @@ -33761,9 +33801,14 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="file" fi +if test "x$POD2MAN" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pod2man not found. storeid_file_rewrite man(8) page will not be built" >&5 +$as_echo "$as_me: WARNING: pod2man not found. storeid_file_rewrite man(8) page will not be built" >&2;} +fi + # modules not yet converted to autoconf macros (or third party drop-in's) @@ -40344,6 +40389,10 @@ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_POD2MAN_DOC_TRUE}" && test -z "${ENABLE_POD2MAN_DOC_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_POD2MAN_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_LOADABLE_MODULES_TRUE}" && test -z "${ENABLE_LOADABLE_MODULES_FALSE}"; then as_fn_error $? "conditional \"ENABLE_LOADABLE_MODULES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -40919,7 +40968,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 3.5.6, which was +This file was extended by Squid Web Proxy $as_me 3.5.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -40985,7 +41034,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 3.5.6 +Squid Web Proxy config.status 3.5.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -u -r -N squid-3.5.6/configure.ac squid-3.5.7/configure.ac --- squid-3.5.6/configure.ac 2015-07-03 02:15:26.000000000 -0700 +++ squid-3.5.7/configure.ac 2015-07-31 23:10:24.000000000 -0700 @@ -5,7 +5,7 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AC_INIT([Squid Web Proxy],[3.5.6],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.5.7],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) @@ -55,7 +55,7 @@ SQUID_YESNO([$enableval], [Unrecognized argument to --disable-arch-native: $enableval]) ]) -AC_MSG_NOTICE([CPU -march=native optimization enabled: ${enable_arch_native:=auto}]) +AC_MSG_NOTICE([CPU arch native optimization enabled: ${enable_arch_native:=auto}]) if test "x${enable_arch_native}" != "xno"; then SQUID_CC_CHECK_ARGUMENT([squid_cv_check_marchnative],[-march=native]) fi @@ -132,6 +132,7 @@ AC_MSG_FAILURE([Perl is required to compile Squid. Please install Perl and then re-run configure ]) fi AC_PATH_PROG(POD2MAN, pod2man, $FALSE) +AM_CONDITIONAL(ENABLE_POD2MAN_DOC, test "x${ac_cv_path_POD2MAN}" != "x$FALSE") dnl set $(AR) if not provided by the build environment if test "x$AR" = "x"; then diff -u -r -N squid-3.5.6/contrib/Makefile.in squid-3.5.7/contrib/Makefile.in --- squid-3.5.6/contrib/Makefile.in 2015-07-03 02:14:20.000000000 -0700 +++ squid-3.5.7/contrib/Makefile.in 2015-07-31 23:09:33.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,17 @@ # using a SVR4-based startup mechanism/file system layout # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,7 +93,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -145,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -169,6 +179,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -429,7 +440,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign contrib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -603,6 +613,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + all: diff -u -r -N squid-3.5.6/doc/Makefile.in squid-3.5.7/doc/Makefile.in --- squid-3.5.6/doc/Makefile.in 2015-07-03 02:14:20.000000000 -0700 +++ squid-3.5.7/doc/Makefile.in 2015-07-31 23:09:33.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -199,6 +209,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -472,7 +483,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -767,6 +777,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/doc/manuals/Makefile.in squid-3.5.7/doc/manuals/Makefile.in --- squid-3.5.6/doc/manuals/Makefile.in 2015-07-03 02:14:20.000000000 -0700 +++ squid-3.5.7/doc/manuals/Makefile.in 2015-07-31 23:09:33.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,8 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/language.list $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am subdir = doc/manuals ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -141,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -165,6 +174,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/language.list DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -423,7 +433,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/manuals/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/manuals/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -432,7 +441,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/language.list: +$(srcdir)/language.list $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -599,6 +608,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/errors/Makefile.in squid-3.5.7/errors/Makefile.in --- squid-3.5.6/errors/Makefile.in 2015-07-03 02:14:21.000000000 -0700 +++ squid-3.5.7/errors/Makefile.in 2015-07-31 23:09:33.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,8 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/template.list $(srcdir)/language.list \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = errors ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -141,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -165,6 +174,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/language.list \ + $(srcdir)/template.list DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -509,7 +520,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign errors/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign errors/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -518,7 +528,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/template.list $(srcdir)/language.list: +$(srcdir)/template.list $(srcdir)/language.list $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -688,6 +698,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am uninstall-local +.PRECIOUS: Makefile + all: all-am diff -u -r -N squid-3.5.6/helpers/basic_auth/DB/basic_db_auth.8 squid-3.5.7/helpers/basic_auth/DB/basic_db_auth.8 --- squid-3.5.6/helpers/basic_auth/DB/basic_db_auth.8 2015-07-03 03:13:13.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/DB/basic_db_auth.8 2015-07-31 23:57:34.000000000 -0700 @@ -132,8 +132,8 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "BASIC_DB_AUTH 1" -.TH BASIC_DB_AUTH 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.IX Title "BASIC_DB_AUTH 8" +.TH BASIC_DB_AUTH 8 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/basic_auth/DB/Makefile.am squid-3.5.7/helpers/basic_auth/DB/Makefile.am --- squid-3.5.6/helpers/basic_auth/DB/Makefile.am 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/DB/Makefile.am 2015-07-31 23:08:17.000000000 -0700 @@ -7,17 +7,21 @@ include $(top_srcdir)/src/Common.am libexec_SCRIPTS = basic_db_auth -man_MANS = basic_db_auth.8 +CLEANFILES += basic_db_auth EXTRA_DIST= \ - basic_db_auth.8 \ passwd.sql \ basic_db_auth.pl.in \ required.m4 -basic_db_auth.8: basic_db_auth - pod2man basic_db_auth basic_db_auth.8 - basic_db_auth: basic_db_auth.pl.in $(subst_perlshell) -CLEANFILES += basic_db_auth basic_db_auth.8 +if ENABLE_POD2MAN_DOC +man_MANS = basic_db_auth.8 +CLEANFILES += basic_db_auth.8 +EXTRA_DIST += basic_db_auth.8 + +basic_db_auth.8: basic_db_auth + pod2man --section=8 basic_db_auth basic_db_auth.8 + +endif diff -u -r -N squid-3.5.6/helpers/basic_auth/DB/Makefile.in squid-3.5.7/helpers/basic_auth/DB/Makefile.in --- squid-3.5.6/helpers/basic_auth/DB/Makefile.in 2015-07-03 02:14:21.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/DB/Makefile.in 2015-07-31 23:09:34.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) +@ENABLE_POD2MAN_DOC_TRUE@am__append_2 = basic_db_auth.8 +@ENABLE_POD2MAN_DOC_TRUE@am__append_3 = basic_db_auth.8 subdir = helpers/basic_auth/DB ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -145,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +387,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -604,7 +617,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(SQUID_CFLAGS) AM_CXXFLAGS = $(SQUID_CXXFLAGS) -CLEANFILES = basic_db_auth basic_db_auth.8 +CLEANFILES = basic_db_auth $(am__append_2) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/lib -I$(top_srcdir)/src \ -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) $(KRB5INCS) \ @@ -614,13 +627,9 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) libexec_SCRIPTS = basic_db_auth -man_MANS = basic_db_auth.8 -EXTRA_DIST = \ - basic_db_auth.8 \ - passwd.sql \ - basic_db_auth.pl.in \ - required.m4 - +EXTRA_DIST = passwd.sql basic_db_auth.pl.in required.m4 \ + $(am__append_3) +@ENABLE_POD2MAN_DOC_TRUE@man_MANS = basic_db_auth.8 all: all-am .SUFFIXES: @@ -637,7 +646,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/DB/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/DB/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -646,7 +654,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -786,7 +794,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1070,15 +1078,17 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile -$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h -basic_db_auth.8: basic_db_auth - pod2man basic_db_auth basic_db_auth.8 +$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h basic_db_auth: basic_db_auth.pl.in $(subst_perlshell) +@ENABLE_POD2MAN_DOC_TRUE@basic_db_auth.8: basic_db_auth +@ENABLE_POD2MAN_DOC_TRUE@ pod2man --section=8 basic_db_auth basic_db_auth.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -u -r -N squid-3.5.6/helpers/basic_auth/DB/required.m4 squid-3.5.7/helpers/basic_auth/DB/required.m4 --- squid-3.5.6/helpers/basic_auth/DB/required.m4 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/DB/required.m4 2015-07-31 23:08:17.000000000 -0700 @@ -5,6 +5,10 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="DB" fi +if test "x$POD2MAN" = "x"; then + AC_MSG_WARN([pod2man not found. basic_db_auth man(8) page will not be built]) +fi + diff -u -r -N squid-3.5.6/helpers/basic_auth/fake/Makefile.in squid-3.5.7/helpers/basic_auth/fake/Makefile.in --- squid-3.5.6/helpers/basic_auth/fake/Makefile.in 2015-07-03 02:14:27.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/fake/Makefile.in 2015-07-31 23:09:39.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -426,6 +434,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -682,7 +692,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/fake/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/fake/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -691,7 +700,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -881,7 +890,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1169,6 +1178,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/getpwnam/Makefile.in squid-3.5.7/helpers/basic_auth/getpwnam/Makefile.in --- squid-3.5.6/helpers/basic_auth/getpwnam/Makefile.in 2015-07-03 02:14:28.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/getpwnam/Makefile.in 2015-07-31 23:09:39.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -431,6 +439,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -692,7 +702,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/getpwnam/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/getpwnam/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -701,7 +710,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -934,7 +943,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1224,6 +1233,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/LDAP/Makefile.in squid-3.5.7/helpers/basic_auth/LDAP/Makefile.in --- squid-3.5.6/helpers/basic_auth/LDAP/Makefile.in 2015-07-03 02:14:22.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/LDAP/Makefile.in 2015-07-31 23:09:34.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -432,6 +440,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -694,7 +704,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/LDAP/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/LDAP/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -703,7 +712,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -936,7 +945,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1226,6 +1235,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/Makefile.in squid-3.5.7/helpers/basic_auth/Makefile.in --- squid-3.5.6/helpers/basic_auth/Makefile.in 2015-07-03 02:14:22.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/Makefile.in 2015-07-31 23:09:35.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/basic_auth -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -482,7 +493,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -777,6 +787,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8 squid-3.5.7/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8 --- squid-3.5.6/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8 2015-07-03 03:13:18.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.8 2015-07-31 23:57:39.000000000 -0700 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_MSNT_MULTI_DOMAIN_AUTH 1" -.TH BASIC_MSNT_MULTI_DOMAIN_AUTH 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.TH BASIC_MSNT_MULTI_DOMAIN_AUTH 1 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/basic_auth/MSNT-multi-domain/Makefile.in squid-3.5.7/helpers/basic_auth/MSNT-multi-domain/Makefile.in --- squid-3.5.6/helpers/basic_auth/MSNT-multi-domain/Makefile.in 2015-07-03 02:14:22.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/MSNT-multi-domain/Makefile.in 2015-07-31 23:09:35.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,8 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -145,6 +153,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +385,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -637,7 +648,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/MSNT-multi-domain/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/MSNT-multi-domain/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -646,7 +656,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -786,7 +796,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1070,6 +1080,8 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/NCSA/Makefile.in squid-3.5.7/helpers/basic_auth/NCSA/Makefile.in --- squid-3.5.6/helpers/basic_auth/NCSA/Makefile.in 2015-07-03 02:14:23.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/NCSA/Makefile.in 2015-07-31 23:09:35.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -453,6 +461,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -718,7 +728,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/NCSA/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/NCSA/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -727,7 +736,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -961,7 +970,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1251,6 +1260,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/NIS/Makefile.in squid-3.5.7/helpers/basic_auth/NIS/Makefile.in --- squid-3.5.6/helpers/basic_auth/NIS/Makefile.in 2015-07-03 02:14:23.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/NIS/Makefile.in 2015-07-31 23:09:36.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -447,6 +455,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -712,7 +722,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/NIS/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/NIS/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -721,7 +730,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -912,7 +921,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1200,6 +1209,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/PAM/Makefile.in squid-3.5.7/helpers/basic_auth/PAM/Makefile.in --- squid-3.5.6/helpers/basic_auth/PAM/Makefile.in 2015-07-03 02:14:24.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/PAM/Makefile.in 2015-07-31 23:09:36.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -430,6 +438,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -692,7 +702,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/PAM/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/PAM/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -701,7 +710,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -934,7 +943,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1224,6 +1233,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/POP3/basic_pop3_auth.8 squid-3.5.7/helpers/basic_auth/POP3/basic_pop3_auth.8 --- squid-3.5.6/helpers/basic_auth/POP3/basic_pop3_auth.8 2015-07-03 03:13:24.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/POP3/basic_pop3_auth.8 2015-07-31 23:57:43.000000000 -0700 @@ -132,8 +132,8 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "BASIC_POP3_AUTH 1" -.TH BASIC_POP3_AUTH 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.IX Title "BASIC_POP3_AUTH 8" +.TH BASIC_POP3_AUTH 8 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/basic_auth/POP3/Makefile.am squid-3.5.7/helpers/basic_auth/POP3/Makefile.am --- squid-3.5.6/helpers/basic_auth/POP3/Makefile.am 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/POP3/Makefile.am 2015-07-31 23:08:17.000000000 -0700 @@ -8,16 +8,20 @@ include $(top_srcdir)/src/Common.am libexec_SCRIPTS = basic_pop3_auth -man_MANS= basic_pop3_auth.8 +CLEANFILES += basic_pop3_auth EXTRA_DIST= \ - basic_pop3_auth.8 \ basic_pop3_auth.pl.in \ required.m4 basic_pop3_auth: basic_pop3_auth.pl.in $(subst_perlshell) +if ENABLE_POD2MAN_DOC +man_MANS = basic_pop3_auth.8 +CLEANFILES += basic_pop3_auth.8 +EXTRA_DIST += basic_pop3_auth.8 + basic_pop3_auth.8: basic_pop3_auth - pod2man basic_pop3_auth basic_pop3_auth.8 + pod2man --section=8 basic_pop3_auth basic_pop3_auth.8 -CLEANFILES += basic_pop3_auth basic_pop3_auth.8 +endif diff -u -r -N squid-3.5.6/helpers/basic_auth/POP3/Makefile.in squid-3.5.7/helpers/basic_auth/POP3/Makefile.in --- squid-3.5.6/helpers/basic_auth/POP3/Makefile.in 2015-07-03 02:14:24.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/POP3/Makefile.in 2015-07-31 23:09:36.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) +@ENABLE_POD2MAN_DOC_TRUE@am__append_2 = basic_pop3_auth.8 +@ENABLE_POD2MAN_DOC_TRUE@am__append_3 = basic_pop3_auth.8 subdir = helpers/basic_auth/POP3 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -145,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +387,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -604,7 +617,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(SQUID_CFLAGS) AM_CXXFLAGS = $(SQUID_CXXFLAGS) -CLEANFILES = basic_pop3_auth basic_pop3_auth.8 +CLEANFILES = basic_pop3_auth $(am__append_2) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/lib -I$(top_srcdir)/src \ -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) $(KRB5INCS) \ @@ -614,12 +627,8 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) libexec_SCRIPTS = basic_pop3_auth -man_MANS = basic_pop3_auth.8 -EXTRA_DIST = \ - basic_pop3_auth.8 \ - basic_pop3_auth.pl.in \ - required.m4 - +EXTRA_DIST = basic_pop3_auth.pl.in required.m4 $(am__append_3) +@ENABLE_POD2MAN_DOC_TRUE@man_MANS = basic_pop3_auth.8 all: all-am .SUFFIXES: @@ -636,7 +645,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/POP3/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/POP3/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -645,7 +653,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -785,7 +793,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1069,14 +1077,16 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h basic_pop3_auth: basic_pop3_auth.pl.in $(subst_perlshell) -basic_pop3_auth.8: basic_pop3_auth - pod2man basic_pop3_auth basic_pop3_auth.8 +@ENABLE_POD2MAN_DOC_TRUE@basic_pop3_auth.8: basic_pop3_auth +@ENABLE_POD2MAN_DOC_TRUE@ pod2man --section=8 basic_pop3_auth basic_pop3_auth.8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/basic_auth/POP3/required.m4 squid-3.5.7/helpers/basic_auth/POP3/required.m4 --- squid-3.5.6/helpers/basic_auth/POP3/required.m4 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/POP3/required.m4 2015-07-31 23:08:17.000000000 -0700 @@ -5,6 +5,10 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="POP3" fi +if test "x$POD2MAN" = "x"; then + AC_MSG_WARN([pod2man not found. basic_pop3_auth man(8) page will not be built]) +fi + diff -u -r -N squid-3.5.6/helpers/basic_auth/RADIUS/Makefile.in squid-3.5.7/helpers/basic_auth/RADIUS/Makefile.in --- squid-3.5.6/helpers/basic_auth/RADIUS/Makefile.in 2015-07-03 02:14:25.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/RADIUS/Makefile.in 2015-07-31 23:09:37.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -451,6 +459,9 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -719,7 +730,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/RADIUS/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/RADIUS/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -728,7 +738,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -962,7 +972,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1252,6 +1262,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/SASL/Makefile.in squid-3.5.7/helpers/basic_auth/SASL/Makefile.in --- squid-3.5.6/helpers/basic_auth/SASL/Makefile.in 2015-07-03 02:14:25.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/SASL/Makefile.in 2015-07-31 23:09:37.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -431,6 +439,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -698,7 +708,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/SASL/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/SASL/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -707,7 +716,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -940,7 +949,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1230,6 +1239,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/SMB/basic_smb_auth.sh squid-3.5.7/helpers/basic_auth/SMB/basic_smb_auth.sh --- squid-3.5.6/helpers/basic_auth/SMB/basic_smb_auth.sh 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/SMB/basic_smb_auth.sh 2015-07-31 23:08:17.000000000 -0700 @@ -30,7 +30,7 @@ read AUTHSHARE read AUTHFILE read SMBUSER -read SMBPASS +read -r SMBPASS # Find domain controller echo "Domain name: $DOMAINNAME" @@ -53,7 +53,7 @@ addropt="" fi echo "Query address options: $addropt" -dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` +dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` echo "Domain controller IP address: $dcip" [ -n "$dcip" ] || exit 1 @@ -64,8 +64,12 @@ [ -n "$dcname" ] || exit 1 # Pass password to smbclient through environment. Not really safe. -USER="$SMBUSER%$SMBPASS" +# NOTE: this differs from what the smbclient documentation says. +# But works when the smbclient documented way does not. +USER="$SMBUSER" +PASSWD="$SMBPASS" export USER +export PASSWD # Read the contents of the file $AUTHFILE on the $AUTHSHARE share authfilebs=`echo "$AUTHFILE" | tr / '\\\\'` diff -u -r -N squid-3.5.6/helpers/basic_auth/SMB/Makefile.in squid-3.5.7/helpers/basic_auth/SMB/Makefile.in --- squid-3.5.6/helpers/basic_auth/SMB/Makefile.in 2015-07-03 02:14:26.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/SMB/Makefile.in 2015-07-31 23:09:38.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,9 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver ChangeLog check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -149,6 +156,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -434,6 +442,9 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + ChangeLog DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -696,7 +707,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/SMB/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/SMB/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -705,7 +715,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -944,7 +954,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1233,6 +1243,8 @@ uninstall-am uninstall-libexecPROGRAMS \ uninstall-libexecSCRIPTS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/SMB_LM/Makefile.in squid-3.5.7/helpers/basic_auth/SMB_LM/Makefile.in --- squid-3.5.6/helpers/basic_auth/SMB_LM/Makefile.in 2015-07-03 02:14:26.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/SMB_LM/Makefile.in 2015-07-31 23:09:38.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -449,6 +457,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -720,7 +730,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/SMB_LM/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/SMB_LM/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -729,7 +738,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -920,7 +929,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1208,6 +1217,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/basic_auth/SSPI/Makefile.in squid-3.5.7/helpers/basic_auth/SSPI/Makefile.in --- squid-3.5.6/helpers/basic_auth/SSPI/Makefile.in 2015-07-03 02:14:27.000000000 -0700 +++ squid-3.5.7/helpers/basic_auth/SSPI/Makefile.in 2015-07-31 23:09:38.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -148,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -455,6 +463,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -723,7 +733,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/basic_auth/SSPI/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/basic_auth/SSPI/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -732,7 +741,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -994,7 +1003,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1284,6 +1293,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/digest_auth/eDirectory/Makefile.in squid-3.5.7/helpers/digest_auth/eDirectory/Makefile.in --- squid-3.5.6/helpers/digest_auth/eDirectory/Makefile.in 2015-07-03 02:14:29.000000000 -0700 +++ squid-3.5.7/helpers/digest_auth/eDirectory/Makefile.in 2015-07-31 23:09:40.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -449,6 +457,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -720,7 +730,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/digest_auth/eDirectory/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/digest_auth/eDirectory/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -729,7 +738,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -921,7 +930,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1209,6 +1218,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/digest_auth/file/Makefile.in squid-3.5.7/helpers/digest_auth/file/Makefile.in --- squid-3.5.6/helpers/digest_auth/file/Makefile.in 2015-07-03 02:14:30.000000000 -0700 +++ squid-3.5.7/helpers/digest_auth/file/Makefile.in 2015-07-31 23:09:41.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -453,6 +461,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -722,7 +732,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/digest_auth/file/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/digest_auth/file/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -731,7 +740,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -965,7 +974,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1255,6 +1264,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/digest_auth/LDAP/Makefile.in squid-3.5.7/helpers/digest_auth/LDAP/Makefile.in --- squid-3.5.6/helpers/digest_auth/LDAP/Makefile.in 2015-07-03 02:14:28.000000000 -0700 +++ squid-3.5.7/helpers/digest_auth/LDAP/Makefile.in 2015-07-31 23:09:40.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -449,6 +457,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -718,7 +728,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/digest_auth/LDAP/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/digest_auth/LDAP/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -727,7 +736,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -918,7 +927,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1206,6 +1215,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/digest_auth/Makefile.in squid-3.5.7/helpers/digest_auth/Makefile.in --- squid-3.5.6/helpers/digest_auth/Makefile.in 2015-07-03 02:14:29.000000000 -0700 +++ squid-3.5.7/helpers/digest_auth/Makefile.in 2015-07-31 23:09:40.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/digest_auth -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -471,7 +482,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/digest_auth/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/digest_auth/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -766,6 +776,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/external_acl/AD_group/Makefile.in squid-3.5.7/helpers/external_acl/AD_group/Makefile.in --- squid-3.5.6/helpers/external_acl/AD_group/Makefile.in 2015-07-03 02:14:30.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/AD_group/Makefile.in 2015-07-31 23:09:41.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -431,6 +439,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -705,7 +715,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/AD_group/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/AD_group/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,7 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -947,7 +956,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1237,6 +1246,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/delayer/ext_delayer_acl.8 squid-3.5.7/helpers/external_acl/delayer/ext_delayer_acl.8 --- squid-3.5.6/helpers/external_acl/delayer/ext_delayer_acl.8 2015-07-03 03:13:40.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/delayer/ext_delayer_acl.8 2015-07-31 23:57:58.000000000 -0700 @@ -132,8 +132,8 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "EXT_DELAYER_ACL 1" -.TH EXT_DELAYER_ACL 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.IX Title "EXT_DELAYER_ACL 8" +.TH EXT_DELAYER_ACL 8 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/external_acl/delayer/Makefile.am squid-3.5.7/helpers/external_acl/delayer/Makefile.am --- squid-3.5.6/helpers/external_acl/delayer/Makefile.am 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/delayer/Makefile.am 2015-07-31 23:08:17.000000000 -0700 @@ -8,12 +8,20 @@ include $(top_srcdir)/src/Common.am libexec_SCRIPTS = ext_delayer_acl -CLEANFILES += ext_delayer_acl ext_delayer_acl.8 +CLEANFILES += ext_delayer_acl +EXTRA_DIST= \ + required.m4 \ + ext_delayer_acl.pl.in + +ext_delayer_acl: ext_delayer_acl.pl.in + $(subst_perlshell) + +if ENABLE_POD2MAN_DOC man_MANS = ext_delayer_acl.8 -EXTRA_DIST = ext_delayer_acl.pl.in ext_delayer_acl.8 required.m4 +CLEANFILES += ext_delayer_acl.8 +EXTRA_DIST += ext_delayer_acl.8 ext_delayer_acl.8: ext_delayer_acl - pod2man ext_delayer_acl ext_delayer_acl.8 + pod2man --section=8 ext_delayer_acl ext_delayer_acl.8 -ext_delayer_acl: ext_delayer_acl.pl.in - $(subst_perlshell) +endif diff -u -r -N squid-3.5.6/helpers/external_acl/delayer/Makefile.in squid-3.5.7/helpers/external_acl/delayer/Makefile.in --- squid-3.5.6/helpers/external_acl/delayer/Makefile.in 2015-07-03 02:14:32.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/delayer/Makefile.in 2015-07-31 23:09:43.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) +@ENABLE_POD2MAN_DOC_TRUE@am__append_2 = ext_delayer_acl.8 +@ENABLE_POD2MAN_DOC_TRUE@am__append_3 = ext_delayer_acl.8 subdir = helpers/external_acl/delayer ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -145,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +387,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -604,7 +617,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(SQUID_CFLAGS) AM_CXXFLAGS = $(SQUID_CXXFLAGS) -CLEANFILES = ext_delayer_acl ext_delayer_acl.8 +CLEANFILES = ext_delayer_acl $(am__append_2) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/lib -I$(top_srcdir)/src \ -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) $(KRB5INCS) \ @@ -614,8 +627,8 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) libexec_SCRIPTS = ext_delayer_acl -man_MANS = ext_delayer_acl.8 -EXTRA_DIST = ext_delayer_acl.pl.in ext_delayer_acl.8 required.m4 +EXTRA_DIST = required.m4 ext_delayer_acl.pl.in $(am__append_3) +@ENABLE_POD2MAN_DOC_TRUE@man_MANS = ext_delayer_acl.8 all: all-am .SUFFIXES: @@ -632,7 +645,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/delayer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/delayer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -641,7 +653,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -781,7 +793,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1065,15 +1077,17 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile -$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h -ext_delayer_acl.8: ext_delayer_acl - pod2man ext_delayer_acl ext_delayer_acl.8 +$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h ext_delayer_acl: ext_delayer_acl.pl.in $(subst_perlshell) +@ENABLE_POD2MAN_DOC_TRUE@ext_delayer_acl.8: ext_delayer_acl +@ENABLE_POD2MAN_DOC_TRUE@ pod2man --section=8 ext_delayer_acl ext_delayer_acl.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -u -r -N squid-3.5.6/helpers/external_acl/delayer/required.m4 squid-3.5.7/helpers/external_acl/delayer/required.m4 --- squid-3.5.6/helpers/external_acl/delayer/required.m4 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/delayer/required.m4 2015-07-31 23:08:17.000000000 -0700 @@ -5,6 +5,10 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="delayer" fi +if test "x$POD2MAN" = "x"; then + AC_MSG_WARN([pod2man not found. ext_delayer_acl man(8) page will not be built]) +fi + diff -u -r -N squid-3.5.6/helpers/external_acl/eDirectory_userip/Makefile.in squid-3.5.7/helpers/external_acl/eDirectory_userip/Makefile.in --- squid-3.5.6/helpers/external_acl/eDirectory_userip/Makefile.in 2015-07-03 02:14:33.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/eDirectory_userip/Makefile.in 2015-07-31 23:09:43.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -433,6 +441,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -697,7 +707,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/eDirectory_userip/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/eDirectory_userip/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -706,7 +715,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -939,7 +948,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1229,6 +1238,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/file_userip/Makefile.in squid-3.5.7/helpers/external_acl/file_userip/Makefile.in --- squid-3.5.6/helpers/external_acl/file_userip/Makefile.in 2015-07-03 02:14:33.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/file_userip/Makefile.in 2015-07-31 23:09:43.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -432,6 +440,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -698,7 +708,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/file_userip/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/file_userip/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -707,7 +716,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -940,7 +949,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1230,6 +1239,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/kerberos_ldap_group/Makefile.in squid-3.5.7/helpers/external_acl/kerberos_ldap_group/Makefile.in --- squid-3.5.6/helpers/external_acl/kerberos_ldap_group/Makefile.in 2015-07-03 02:14:34.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/kerberos_ldap_group/Makefile.in 2015-07-31 23:09:44.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,9 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -148,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -476,6 +484,9 @@ b='$*';; \ esac DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -780,7 +791,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/kerberos_ldap_group/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/kerberos_ldap_group/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -789,7 +799,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1070,7 +1080,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1385,6 +1395,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-libexecSCRIPTS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/LDAP_group/Makefile.in squid-3.5.7/helpers/external_acl/LDAP_group/Makefile.in --- squid-3.5.6/helpers/external_acl/LDAP_group/Makefile.in 2015-07-03 02:14:31.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/LDAP_group/Makefile.in 2015-07-31 23:09:41.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver ChangeLog check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -433,6 +441,9 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + ChangeLog DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -696,7 +707,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/LDAP_group/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/LDAP_group/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -705,7 +715,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -938,7 +948,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1228,6 +1238,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/LM_group/Makefile.in squid-3.5.7/helpers/external_acl/LM_group/Makefile.in --- squid-3.5.6/helpers/external_acl/LM_group/Makefile.in 2015-07-03 02:14:31.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/LM_group/Makefile.in 2015-07-31 23:09:42.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -432,6 +440,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -696,7 +706,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/LM_group/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/LM_group/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -705,7 +714,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -938,7 +947,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1228,6 +1237,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/Makefile.in squid-3.5.7/helpers/external_acl/Makefile.in --- squid-3.5.6/helpers/external_acl/Makefile.in 2015-07-03 02:14:31.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/Makefile.in 2015-07-31 23:09:42.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/external_acl -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -479,7 +490,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -774,6 +784,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/external_acl/session/Makefile.in squid-3.5.7/helpers/external_acl/session/Makefile.in --- squid-3.5.6/helpers/external_acl/session/Makefile.in 2015-07-03 02:14:34.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/session/Makefile.in 2015-07-31 23:09:44.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -431,6 +439,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -691,7 +701,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/session/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/session/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -700,7 +709,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -933,7 +942,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1223,6 +1232,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/SQL_session/ext_sql_session_acl.8 squid-3.5.7/helpers/external_acl/SQL_session/ext_sql_session_acl.8 --- squid-3.5.6/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2015-07-03 03:13:49.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2015-07-31 23:58:05.000000000 -0700 @@ -132,8 +132,8 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "EXT_SQL_SESSION_ACL 1" -.TH EXT_SQL_SESSION_ACL 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.IX Title "EXT_SQL_SESSION_ACL 8" +.TH EXT_SQL_SESSION_ACL 8 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/external_acl/SQL_session/Makefile.am squid-3.5.7/helpers/external_acl/SQL_session/Makefile.am --- squid-3.5.6/helpers/external_acl/SQL_session/Makefile.am 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/SQL_session/Makefile.am 2015-07-31 23:08:17.000000000 -0700 @@ -8,15 +8,20 @@ include $(top_srcdir)/src/Common.am libexec_SCRIPTS = ext_sql_session_acl -CLEANFILES += ext_sql_session_acl ext_sql_session_acl.8 -man_MANS = ext_sql_session_acl.8 +CLEANFILES += ext_sql_session_acl EXTRA_DIST= \ - ext_sql_session_acl.8 \ ext_sql_session_acl.pl.in \ required.m4 -ext_sql_session_acl.8: ext_sql_session_acl - pod2man ext_sql_session_acl ext_sql_session_acl.8 - ext_sql_session_acl: ext_sql_session_acl.pl.in $(subst_perlshell) + +if ENABLE_POD2MAN_DOC +man_MANS = ext_sql_session_acl.8 +CLEANFILES += ext_sql_session_acl.8 +EXTRA_DIST += ext_sql_session_acl.8 + +ext_sql_session_acl.8: ext_sql_session_acl + pod2man --section=8 ext_sql_session_acl ext_sql_session_acl.8 + +endif diff -u -r -N squid-3.5.6/helpers/external_acl/SQL_session/Makefile.in squid-3.5.7/helpers/external_acl/SQL_session/Makefile.in --- squid-3.5.6/helpers/external_acl/SQL_session/Makefile.in 2015-07-03 02:14:32.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/SQL_session/Makefile.in 2015-07-31 23:09:42.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) +@ENABLE_POD2MAN_DOC_TRUE@am__append_2 = ext_sql_session_acl.8 +@ENABLE_POD2MAN_DOC_TRUE@am__append_3 = ext_sql_session_acl.8 subdir = helpers/external_acl/SQL_session ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -145,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +387,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -604,7 +617,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(SQUID_CFLAGS) AM_CXXFLAGS = $(SQUID_CXXFLAGS) -CLEANFILES = ext_sql_session_acl ext_sql_session_acl.8 +CLEANFILES = ext_sql_session_acl $(am__append_2) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/lib -I$(top_srcdir)/src \ -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) $(KRB5INCS) \ @@ -614,12 +627,8 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) libexec_SCRIPTS = ext_sql_session_acl -man_MANS = ext_sql_session_acl.8 -EXTRA_DIST = \ - ext_sql_session_acl.8 \ - ext_sql_session_acl.pl.in \ - required.m4 - +EXTRA_DIST = ext_sql_session_acl.pl.in required.m4 $(am__append_3) +@ENABLE_POD2MAN_DOC_TRUE@man_MANS = ext_sql_session_acl.8 all: all-am .SUFFIXES: @@ -636,7 +645,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/SQL_session/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/SQL_session/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -645,7 +653,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -785,7 +793,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1069,15 +1077,17 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile -$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h -ext_sql_session_acl.8: ext_sql_session_acl - pod2man ext_sql_session_acl ext_sql_session_acl.8 +$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h ext_sql_session_acl: ext_sql_session_acl.pl.in $(subst_perlshell) +@ENABLE_POD2MAN_DOC_TRUE@ext_sql_session_acl.8: ext_sql_session_acl +@ENABLE_POD2MAN_DOC_TRUE@ pod2man --section=8 ext_sql_session_acl ext_sql_session_acl.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -u -r -N squid-3.5.6/helpers/external_acl/SQL_session/required.m4 squid-3.5.7/helpers/external_acl/SQL_session/required.m4 --- squid-3.5.6/helpers/external_acl/SQL_session/required.m4 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/SQL_session/required.m4 2015-07-31 23:08:17.000000000 -0700 @@ -5,6 +5,10 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="SQL_session" fi +if test "x$POD2MAN" = "x"; then + AC_MSG_WARN([pod2man not found. ext_sql_session_acl man(8) page will not be built]) +fi + diff -u -r -N squid-3.5.6/helpers/external_acl/time_quota/Makefile.in squid-3.5.7/helpers/external_acl/time_quota/Makefile.in --- squid-3.5.6/helpers/external_acl/time_quota/Makefile.in 2015-07-03 02:14:35.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/time_quota/Makefile.in 2015-07-31 23:09:45.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -431,6 +439,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -692,7 +702,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/time_quota/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/time_quota/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -701,7 +710,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -934,7 +943,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1224,6 +1233,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/unix_group/Makefile.in squid-3.5.7/helpers/external_acl/unix_group/Makefile.in --- squid-3.5.6/helpers/external_acl/unix_group/Makefile.in 2015-07-03 02:14:35.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/unix_group/Makefile.in 2015-07-31 23:09:45.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -432,6 +440,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -693,7 +703,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/unix_group/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/unix_group/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -702,7 +711,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -935,7 +944,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1225,6 +1234,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 squid-3.5.7/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 --- squid-3.5.6/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2015-07-03 03:13:53.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2015-07-31 23:58:08.000000000 -0700 @@ -132,8 +132,8 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "EXT_WBINFO_GROUP_ACL 1" -.TH EXT_WBINFO_GROUP_ACL 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.IX Title "EXT_WBINFO_GROUP_ACL 8" +.TH EXT_WBINFO_GROUP_ACL 8 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/external_acl/wbinfo_group/Makefile.am squid-3.5.7/helpers/external_acl/wbinfo_group/Makefile.am --- squid-3.5.6/helpers/external_acl/wbinfo_group/Makefile.am 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/wbinfo_group/Makefile.am 2015-07-31 23:08:17.000000000 -0700 @@ -8,16 +8,20 @@ include $(top_srcdir)/src/Common.am libexec_SCRIPTS= ext_wbinfo_group_acl -man_MANS= ext_wbinfo_group_acl.8 +CLEANFILES += ext_wbinfo_group_acl EXTRA_DIST= \ - ext_wbinfo_group_acl.8 \ ext_wbinfo_group_acl.pl.in \ required.m4 ext_wbinfo_group_acl: ext_wbinfo_group_acl.pl.in $(subst_perlshell) +if ENABLE_POD2MAN_DOC +man_MANS = ext_wbinfo_group_acl.8 +CLEANFILES += ext_wbinfo_group_acl.8 +EXTRA_DIST += ext_wbinfo_group_acl.8 + ext_wbinfo_group_acl.8: ext_wbinfo_group_acl - pod2man ext_wbinfo_group_acl ext_wbinfo_group_acl.8 + pod2man --section=8 ext_wbinfo_group_acl ext_wbinfo_group_acl.8 -CLEANFILES += ext_wbinfo_group_acl.8 ext_wbinfo_group_acl +endif diff -u -r -N squid-3.5.6/helpers/external_acl/wbinfo_group/Makefile.in squid-3.5.7/helpers/external_acl/wbinfo_group/Makefile.in --- squid-3.5.6/helpers/external_acl/wbinfo_group/Makefile.in 2015-07-03 02:14:36.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/wbinfo_group/Makefile.in 2015-07-31 23:09:45.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) +@ENABLE_POD2MAN_DOC_TRUE@am__append_2 = ext_wbinfo_group_acl.8 +@ENABLE_POD2MAN_DOC_TRUE@am__append_3 = ext_wbinfo_group_acl.8 subdir = helpers/external_acl/wbinfo_group ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -145,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +387,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -604,7 +617,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(SQUID_CFLAGS) AM_CXXFLAGS = $(SQUID_CXXFLAGS) -CLEANFILES = ext_wbinfo_group_acl.8 ext_wbinfo_group_acl +CLEANFILES = ext_wbinfo_group_acl $(am__append_2) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/lib -I$(top_srcdir)/src \ -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) $(KRB5INCS) \ @@ -614,12 +627,8 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) libexec_SCRIPTS = ext_wbinfo_group_acl -man_MANS = ext_wbinfo_group_acl.8 -EXTRA_DIST = \ - ext_wbinfo_group_acl.8 \ - ext_wbinfo_group_acl.pl.in \ - required.m4 - +EXTRA_DIST = ext_wbinfo_group_acl.pl.in required.m4 $(am__append_3) +@ENABLE_POD2MAN_DOC_TRUE@man_MANS = ext_wbinfo_group_acl.8 all: all-am .SUFFIXES: @@ -636,7 +645,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/external_acl/wbinfo_group/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/external_acl/wbinfo_group/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -645,7 +653,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -785,7 +793,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1069,14 +1077,16 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h ext_wbinfo_group_acl: ext_wbinfo_group_acl.pl.in $(subst_perlshell) -ext_wbinfo_group_acl.8: ext_wbinfo_group_acl - pod2man ext_wbinfo_group_acl ext_wbinfo_group_acl.8 +@ENABLE_POD2MAN_DOC_TRUE@ext_wbinfo_group_acl.8: ext_wbinfo_group_acl +@ENABLE_POD2MAN_DOC_TRUE@ pod2man --section=8 ext_wbinfo_group_acl ext_wbinfo_group_acl.8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/external_acl/wbinfo_group/required.m4 squid-3.5.7/helpers/external_acl/wbinfo_group/required.m4 --- squid-3.5.6/helpers/external_acl/wbinfo_group/required.m4 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/external_acl/wbinfo_group/required.m4 2015-07-31 23:08:17.000000000 -0700 @@ -15,6 +15,10 @@ fi # allow script install anyway when perl is present -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="wbinfo_group" fi +if test "x$POD2MAN" = "x"; then + AC_MSG_WARN([pod2man not found. ext_wbinfo_group_acl man(8) page will not be built]) +fi + diff -u -r -N squid-3.5.6/helpers/log_daemon/DB/log_db_daemon.8 squid-3.5.7/helpers/log_daemon/DB/log_db_daemon.8 --- squid-3.5.6/helpers/log_daemon/DB/log_db_daemon.8 2015-07-03 03:13:56.000000000 -0700 +++ squid-3.5.7/helpers/log_daemon/DB/log_db_daemon.8 2015-07-31 23:58:10.000000000 -0700 @@ -132,8 +132,8 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "LOG_DB_DAEMON 1" -.TH LOG_DB_DAEMON 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.IX Title "LOG_DB_DAEMON 8" +.TH LOG_DB_DAEMON 8 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/log_daemon/DB/Makefile.am squid-3.5.7/helpers/log_daemon/DB/Makefile.am --- squid-3.5.6/helpers/log_daemon/DB/Makefile.am 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/log_daemon/DB/Makefile.am 2015-07-31 23:08:17.000000000 -0700 @@ -8,17 +8,22 @@ include $(top_srcdir)/src/Common.am libexec_SCRIPTS = log_db_daemon -CLEANFILES += log_db_daemon log_db_daemon.8 -man_MANS = log_db_daemon.8 +CLEANFILES += log_db_daemon EXTRA_DIST= \ required.m4 \ doc/views.sql \ doc/date_day_column.sql \ - log_db_daemon.8 \ log_db_daemon.pl.in -log_db_daemon.8: log_db_daemon - pod2man log_db_daemon log_db_daemon.8 - log_db_daemon: log_db_daemon.pl.in $(subst_perlshell) + +if ENABLE_POD2MAN_DOC +man_MANS = log_db_daemon.8 +CLEANFILES += log_db_daemon.8 +EXTRA_DIST += log_db_daemon.8 + +log_db_daemon.8: log_db_daemon + pod2man --section=8 log_db_daemon log_db_daemon.8 + +endif diff -u -r -N squid-3.5.6/helpers/log_daemon/DB/Makefile.in squid-3.5.7/helpers/log_daemon/DB/Makefile.in --- squid-3.5.6/helpers/log_daemon/DB/Makefile.in 2015-07-03 02:14:36.000000000 -0700 +++ squid-3.5.7/helpers/log_daemon/DB/Makefile.in 2015-07-31 23:09:46.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) +@ENABLE_POD2MAN_DOC_TRUE@am__append_2 = log_db_daemon.8 +@ENABLE_POD2MAN_DOC_TRUE@am__append_3 = log_db_daemon.8 subdir = helpers/log_daemon/DB ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -145,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +387,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -604,7 +617,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(SQUID_CFLAGS) AM_CXXFLAGS = $(SQUID_CXXFLAGS) -CLEANFILES = log_db_daemon log_db_daemon.8 +CLEANFILES = log_db_daemon $(am__append_2) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/lib -I$(top_srcdir)/src \ -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) $(KRB5INCS) \ @@ -614,14 +627,9 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) libexec_SCRIPTS = log_db_daemon -man_MANS = log_db_daemon.8 -EXTRA_DIST = \ - required.m4 \ - doc/views.sql \ - doc/date_day_column.sql \ - log_db_daemon.8 \ - log_db_daemon.pl.in - +EXTRA_DIST = required.m4 doc/views.sql doc/date_day_column.sql \ + log_db_daemon.pl.in $(am__append_3) +@ENABLE_POD2MAN_DOC_TRUE@man_MANS = log_db_daemon.8 all: all-am .SUFFIXES: @@ -638,7 +646,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/log_daemon/DB/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/log_daemon/DB/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -647,7 +654,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -787,7 +794,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1071,15 +1078,17 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile -$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h -log_db_daemon.8: log_db_daemon - pod2man log_db_daemon log_db_daemon.8 +$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h log_db_daemon: log_db_daemon.pl.in $(subst_perlshell) +@ENABLE_POD2MAN_DOC_TRUE@log_db_daemon.8: log_db_daemon +@ENABLE_POD2MAN_DOC_TRUE@ pod2man --section=8 log_db_daemon log_db_daemon.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -u -r -N squid-3.5.6/helpers/log_daemon/DB/required.m4 squid-3.5.7/helpers/log_daemon/DB/required.m4 --- squid-3.5.6/helpers/log_daemon/DB/required.m4 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/log_daemon/DB/required.m4 2015-07-31 23:08:17.000000000 -0700 @@ -5,6 +5,10 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="DB" fi +if test "x$POD2MAN" = "x"; then + AC_MSG_WARN([pod2man not found. log_db_daemon man(8) page will not be built]) +fi + diff -u -r -N squid-3.5.6/helpers/log_daemon/file/Makefile.in squid-3.5.7/helpers/log_daemon/file/Makefile.in --- squid-3.5.6/helpers/log_daemon/file/Makefile.in 2015-07-03 02:14:37.000000000 -0700 +++ squid-3.5.7/helpers/log_daemon/file/Makefile.in 2015-07-31 23:09:46.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -427,6 +435,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -686,7 +696,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/log_daemon/file/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/log_daemon/file/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -695,7 +704,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -885,7 +894,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1173,6 +1182,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/log_daemon/Makefile.in squid-3.5.7/helpers/log_daemon/Makefile.in --- squid-3.5.6/helpers/log_daemon/Makefile.in 2015-07-03 02:14:37.000000000 -0700 +++ squid-3.5.7/helpers/log_daemon/Makefile.in 2015-07-31 23:09:46.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/log_daemon -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -470,7 +481,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/log_daemon/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/log_daemon/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -765,6 +775,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/Makefile.in squid-3.5.7/helpers/Makefile.in --- squid-3.5.6/helpers/Makefile.in 2015-07-03 02:14:21.000000000 -0700 +++ squid-3.5.7/helpers/Makefile.in 2015-07-31 23:09:34.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,7 +90,6 @@ @ENABLE_AUTH_NTLM_TRUE@am__append_1 = ntlm_auth @ENABLE_SSL_TRUE@am__append_2 = ssl subdir = helpers -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -142,6 +151,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -200,6 +210,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -481,7 +492,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -776,6 +786,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/negotiate_auth/kerberos/Makefile.in squid-3.5.7/helpers/negotiate_auth/kerberos/Makefile.in --- squid-3.5.6/helpers/negotiate_auth/kerberos/Makefile.in 2015-07-03 02:14:39.000000000 -0700 +++ squid-3.5.7/helpers/negotiate_auth/kerberos/Makefile.in 2015-07-31 23:09:47.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -148,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -488,6 +496,9 @@ b='$*';; \ esac DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -787,7 +798,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/negotiate_auth/kerberos/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/negotiate_auth/kerberos/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -796,7 +806,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1082,7 +1092,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1399,6 +1409,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/negotiate_auth/Makefile.in squid-3.5.7/helpers/negotiate_auth/Makefile.in --- squid-3.5.6/helpers/negotiate_auth/Makefile.in 2015-07-03 02:14:38.000000000 -0700 +++ squid-3.5.7/helpers/negotiate_auth/Makefile.in 2015-07-31 23:09:46.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/negotiate_auth -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -466,7 +477,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/negotiate_auth/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/negotiate_auth/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -761,6 +771,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/negotiate_auth/SSPI/Makefile.in squid-3.5.7/helpers/negotiate_auth/SSPI/Makefile.in --- squid-3.5.6/helpers/negotiate_auth/SSPI/Makefile.in 2015-07-03 02:14:38.000000000 -0700 +++ squid-3.5.7/helpers/negotiate_auth/SSPI/Makefile.in 2015-07-31 23:09:47.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -429,6 +437,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -691,7 +701,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/negotiate_auth/SSPI/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/negotiate_auth/SSPI/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -700,7 +709,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -890,7 +899,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1178,6 +1187,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/negotiate_auth/wrapper/Makefile.in squid-3.5.7/helpers/negotiate_auth/wrapper/Makefile.in --- squid-3.5.6/helpers/negotiate_auth/wrapper/Makefile.in 2015-07-03 02:14:39.000000000 -0700 +++ squid-3.5.7/helpers/negotiate_auth/wrapper/Makefile.in 2015-07-31 23:09:48.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -428,6 +436,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -689,7 +699,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/negotiate_auth/wrapper/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/negotiate_auth/wrapper/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -698,7 +707,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -888,7 +897,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1176,6 +1185,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/ntlm_auth/fake/Makefile.in squid-3.5.7/helpers/ntlm_auth/fake/Makefile.in --- squid-3.5.6/helpers/ntlm_auth/fake/Makefile.in 2015-07-03 02:14:40.000000000 -0700 +++ squid-3.5.7/helpers/ntlm_auth/fake/Makefile.in 2015-07-31 23:09:49.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -430,6 +438,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -695,7 +705,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/ntlm_auth/fake/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/ntlm_auth/fake/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -704,7 +713,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -894,7 +903,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1182,6 +1191,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/ntlm_auth/Makefile.in squid-3.5.7/helpers/ntlm_auth/Makefile.in --- squid-3.5.6/helpers/ntlm_auth/Makefile.in 2015-07-03 02:14:39.000000000 -0700 +++ squid-3.5.7/helpers/ntlm_auth/Makefile.in 2015-07-31 23:09:48.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/ntlm_auth -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -467,7 +478,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/ntlm_auth/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/ntlm_auth/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -762,6 +772,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/ntlm_auth/smb_lm/Makefile.in squid-3.5.7/helpers/ntlm_auth/smb_lm/Makefile.in --- squid-3.5.6/helpers/ntlm_auth/smb_lm/Makefile.in 2015-07-03 02:14:41.000000000 -0700 +++ squid-3.5.7/helpers/ntlm_auth/smb_lm/Makefile.in 2015-07-31 23:09:49.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -432,6 +440,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -697,7 +707,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/ntlm_auth/smb_lm/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/ntlm_auth/smb_lm/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -706,7 +715,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -896,7 +905,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1184,6 +1193,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/ntlm_auth/SSPI/Makefile.in squid-3.5.7/helpers/ntlm_auth/SSPI/Makefile.in --- squid-3.5.6/helpers/ntlm_auth/SSPI/Makefile.in 2015-07-03 02:14:40.000000000 -0700 +++ squid-3.5.7/helpers/ntlm_auth/SSPI/Makefile.in 2015-07-31 23:09:48.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -433,6 +441,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -698,7 +708,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/ntlm_auth/SSPI/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/ntlm_auth/SSPI/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -707,7 +716,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -940,7 +949,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1230,6 +1239,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-man uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/ssl/Makefile.in squid-3.5.7/helpers/ssl/Makefile.in --- squid-3.5.6/helpers/ssl/Makefile.in 2015-07-03 02:14:41.000000000 -0700 +++ squid-3.5.7/helpers/ssl/Makefile.in 2015-07-31 23:09:49.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,8 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -145,6 +153,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -373,6 +382,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -630,7 +641,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/ssl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/ssl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -639,7 +649,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -736,7 +746,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1018,6 +1028,8 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/storeid_rewrite/file/Makefile.am squid-3.5.7/helpers/storeid_rewrite/file/Makefile.am --- squid-3.5.6/helpers/storeid_rewrite/file/Makefile.am 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/storeid_rewrite/file/Makefile.am 2015-07-31 23:08:17.000000000 -0700 @@ -8,15 +8,20 @@ include $(top_srcdir)/src/Common.am libexec_SCRIPTS = storeid_file_rewrite -CLEANFILES += storeid_file_rewrite storeid_file_rewrite.8 -man_MANS = storeid_file_rewrite.8 +CLEANFILES += storeid_file_rewrite EXTRA_DIST= \ - storeid_file_rewrite.8 \ storeid_file_rewrite.pl.in \ required.m4 -storeid_file_rewrite.8: storeid_file_rewrite - pod2man storeid_file_rewrite storeid_file_rewrite.8 - storeid_file_rewrite: storeid_file_rewrite.pl.in $(subst_perlshell) + +if ENABLE_POD2MAN_DOC +man_MANS = storeid_file_rewrite.8 +CLEANFILES += storeid_file_rewrite.8 +EXTRA_DIST += storeid_file_rewrite.8 + +storeid_file_rewrite.8: storeid_file_rewrite + pod2man --section=8 storeid_file_rewrite storeid_file_rewrite.8 + +endif diff -u -r -N squid-3.5.6/helpers/storeid_rewrite/file/Makefile.in squid-3.5.7/helpers/storeid_rewrite/file/Makefile.in --- squid-3.5.6/helpers/storeid_rewrite/file/Makefile.in 2015-07-03 02:14:42.000000000 -0700 +++ squid-3.5.7/helpers/storeid_rewrite/file/Makefile.in 2015-07-31 23:09:50.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) +@ENABLE_POD2MAN_DOC_TRUE@am__append_2 = storeid_file_rewrite.8 +@ENABLE_POD2MAN_DOC_TRUE@am__append_3 = storeid_file_rewrite.8 subdir = helpers/storeid_rewrite/file ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -145,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -376,6 +387,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -604,7 +617,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(SQUID_CFLAGS) AM_CXXFLAGS = $(SQUID_CXXFLAGS) -CLEANFILES = storeid_file_rewrite storeid_file_rewrite.8 +CLEANFILES = storeid_file_rewrite $(am__append_2) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/lib -I$(top_srcdir)/src \ -I$(top_builddir)/include $(SQUID_CPPUNIT_INC) $(KRB5INCS) \ @@ -614,12 +627,8 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1) libexec_SCRIPTS = storeid_file_rewrite -man_MANS = storeid_file_rewrite.8 -EXTRA_DIST = \ - storeid_file_rewrite.8 \ - storeid_file_rewrite.pl.in \ - required.m4 - +EXTRA_DIST = storeid_file_rewrite.pl.in required.m4 $(am__append_3) +@ENABLE_POD2MAN_DOC_TRUE@man_MANS = storeid_file_rewrite.8 all: all-am .SUFFIXES: @@ -636,7 +645,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/storeid_rewrite/file/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/storeid_rewrite/file/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -645,7 +653,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -785,7 +793,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1069,15 +1077,17 @@ ps ps-am recheck tags-am uninstall uninstall-am \ uninstall-libexecSCRIPTS uninstall-man uninstall-man8 +.PRECIOUS: Makefile -$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h -storeid_file_rewrite.8: storeid_file_rewrite - pod2man storeid_file_rewrite storeid_file_rewrite.8 +$(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h storeid_file_rewrite: storeid_file_rewrite.pl.in $(subst_perlshell) +@ENABLE_POD2MAN_DOC_TRUE@storeid_file_rewrite.8: storeid_file_rewrite +@ENABLE_POD2MAN_DOC_TRUE@ pod2man --section=8 storeid_file_rewrite storeid_file_rewrite.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -u -r -N squid-3.5.6/helpers/storeid_rewrite/file/required.m4 squid-3.5.7/helpers/storeid_rewrite/file/required.m4 --- squid-3.5.6/helpers/storeid_rewrite/file/required.m4 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/helpers/storeid_rewrite/file/required.m4 2015-07-31 23:08:17.000000000 -0700 @@ -5,6 +5,10 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -if test "x$PERL" != "x" -a "x$POD2MAN" != "x"; then +if test "x$PERL" != "x"; then BUILD_HELPER="file" fi +if test "x$POD2MAN" = "x"; then + AC_MSG_WARN([pod2man not found. storeid_file_rewrite man(8) page will not be built]) +fi + diff -u -r -N squid-3.5.6/helpers/storeid_rewrite/file/storeid_file_rewrite.8 squid-3.5.7/helpers/storeid_rewrite/file/storeid_file_rewrite.8 --- squid-3.5.6/helpers/storeid_rewrite/file/storeid_file_rewrite.8 2015-07-03 03:14:11.000000000 -0700 +++ squid-3.5.7/helpers/storeid_rewrite/file/storeid_file_rewrite.8 2015-07-31 23:58:23.000000000 -0700 @@ -132,8 +132,8 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "STOREID_FILE_REWRITE 1" -.TH STOREID_FILE_REWRITE 1 "2015-07-03" "perl v5.20.2" "User Contributed Perl Documentation" +.IX Title "STOREID_FILE_REWRITE 8" +.TH STOREID_FILE_REWRITE 8 "2015-08-01" "perl v5.20.2" "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-3.5.6/helpers/storeid_rewrite/Makefile.in squid-3.5.7/helpers/storeid_rewrite/Makefile.in --- squid-3.5.6/helpers/storeid_rewrite/Makefile.in 2015-07-03 02:14:41.000000000 -0700 +++ squid-3.5.7/helpers/storeid_rewrite/Makefile.in 2015-07-31 23:09:50.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/storeid_rewrite -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -466,7 +477,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/storeid_rewrite/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/storeid_rewrite/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -761,6 +771,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/helpers/url_rewrite/fake/Makefile.in squid-3.5.7/helpers/url_rewrite/fake/Makefile.in --- squid-3.5.6/helpers/url_rewrite/fake/Makefile.in 2015-07-03 02:14:43.000000000 -0700 +++ squid-3.5.7/helpers/url_rewrite/fake/Makefile.in 2015-07-31 23:09:50.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,9 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -148,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -427,6 +435,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -684,7 +694,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/url_rewrite/fake/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/url_rewrite/fake/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -693,7 +702,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -918,7 +927,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1207,6 +1216,8 @@ uninstall-am uninstall-libexecPROGRAMS \ uninstall-libexecSCRIPTS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/helpers/url_rewrite/Makefile.in squid-3.5.7/helpers/url_rewrite/Makefile.in --- squid-3.5.6/helpers/url_rewrite/Makefile.in 2015-07-03 02:14:42.000000000 -0700 +++ squid-3.5.7/helpers/url_rewrite/Makefile.in 2015-07-31 23:09:50.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = helpers/url_rewrite -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -198,6 +208,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -466,7 +477,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign helpers/url_rewrite/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign helpers/url_rewrite/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -761,6 +771,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/icons/Makefile.in squid-3.5.7/icons/Makefile.in --- squid-3.5.6/icons/Makefile.in 2015-07-03 02:14:43.000000000 -0700 +++ squid-3.5.7/icons/Makefile.in 2015-07-31 23:09:51.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,8 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/icons/icon.list $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am subdir = icons ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ @@ -142,6 +150,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -195,6 +204,7 @@ am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/icons/icon.list DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -492,7 +502,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icons/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign icons/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -501,7 +510,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/icons/icon.list: +$(top_srcdir)/icons/icon.list $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -694,6 +703,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-iconDATA uninstall-local +.PRECIOUS: Makefile + install-data-local: SN.png install-iconDATA $(INSTALL_DATA) $(srcdir)/SN.png "$(DESTDIR)$(datadir)/icons/" diff -u -r -N squid-3.5.6/include/version.h squid-3.5.7/include/version.h --- squid-3.5.6/include/version.h 2015-07-03 02:15:26.000000000 -0700 +++ squid-3.5.7/include/version.h 2015-07-31 23:10:24.000000000 -0700 @@ -7,7 +7,7 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1435914765 +#define SQUID_RELEASE_TIME 1438409280 #endif /* diff -u -r -N squid-3.5.6/lib/libTrie/Makefile.in squid-3.5.7/lib/libTrie/Makefile.in --- squid-3.5.6/lib/libTrie/Makefile.in 2015-07-03 02:14:44.000000000 -0700 +++ squid-3.5.7/lib/libTrie/Makefile.in 2015-07-31 23:09:52.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,10 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(noinst_HEADERS) $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = lib/libTrie @@ -147,6 +153,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -463,6 +471,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -752,7 +763,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libTrie/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/libTrie/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -761,7 +771,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -954,7 +964,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1271,6 +1281,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/lib/libTrie/test/Makefile.in squid-3.5.7/lib/libTrie/test/Makefile.in --- squid-3.5.6/lib/libTrie/test/Makefile.in 2015-07-03 02:14:45.000000000 -0700 +++ squid-3.5.7/lib/libTrie/test/Makefile.in 2015-07-31 23:09:52.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,9 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = trie$(EXEEXT) TESTS = trie$(EXEEXT) @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -145,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -420,6 +428,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -675,7 +685,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libTrie/test/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/libTrie/test/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -684,7 +693,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -825,7 +834,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1115,6 +1124,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/lib/Makefile.in squid-3.5.7/lib/Makefile.in --- squid-3.5.6/lib/Makefile.in 2015-07-03 02:14:44.000000000 -0700 +++ squid-3.5.7/lib/Makefile.in 2015-07-31 23:09:51.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = tests/testRFC1035$(EXEEXT) tests/testRFC1738$(EXEEXT) TESTS = tests/testRFC1035$(EXEEXT) tests/testRFC1738$(EXEEXT) \ testHeaders @@ -159,6 +166,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -513,6 +521,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -860,7 +870,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -869,7 +878,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1151,7 +1160,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1473,6 +1482,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/lib/ntlmauth/Makefile.in squid-3.5.7/lib/ntlmauth/Makefile.in --- squid-3.5.6/lib/ntlmauth/Makefile.in 2015-07-03 02:14:46.000000000 -0700 +++ squid-3.5.7/lib/ntlmauth/Makefile.in 2015-07-31 23:09:53.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = lib/ntlmauth @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -701,7 +711,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/ntlmauth/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/ntlmauth/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -710,7 +719,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -861,7 +870,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1152,6 +1161,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/lib/profiler/Makefile.in squid-3.5.7/lib/profiler/Makefile.in --- squid-3.5.6/lib/profiler/Makefile.in 2015-07-03 02:14:46.000000000 -0700 +++ squid-3.5.7/lib/profiler/Makefile.in 2015-07-31 23:09:53.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = lib/profiler @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -444,6 +451,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -707,7 +717,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/profiler/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/profiler/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -716,7 +725,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -867,7 +876,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1158,6 +1167,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/lib/rfcnb/Makefile.in squid-3.5.7/lib/rfcnb/Makefile.in --- squid-3.5.6/lib/rfcnb/Makefile.in 2015-07-03 02:14:47.000000000 -0700 +++ squid-3.5.7/lib/rfcnb/Makefile.in 2015-07-31 23:09:53.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -146,6 +153,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -420,6 +428,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -688,7 +698,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/rfcnb/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/rfcnb/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -697,7 +706,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -850,7 +859,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1134,6 +1143,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/lib/smblib/Makefile.in squid-3.5.7/lib/smblib/Makefile.in --- squid-3.5.6/lib/smblib/Makefile.in 2015-07-03 02:14:48.000000000 -0700 +++ squid-3.5.7/lib/smblib/Makefile.in 2015-07-31 23:09:54.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -146,6 +153,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -421,6 +429,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -689,7 +699,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/smblib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/smblib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -698,7 +707,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -853,7 +862,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1137,6 +1146,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/lib/snmplib/Makefile.in squid-3.5.7/lib/snmplib/Makefile.in --- squid-3.5.6/lib/snmplib/Makefile.in 2015-07-03 02:14:48.000000000 -0700 +++ squid-3.5.7/lib/snmplib/Makefile.in 2015-07-31 23:09:54.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/snmplib -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/cfgaux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -142,6 +150,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -216,6 +225,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -472,7 +482,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/snmplib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/snmplib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -753,6 +762,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/Makefile.in squid-3.5.7/Makefile.in --- squid-3.5.6/Makefile.in 2015-07-03 02:14:19.000000000 -0700 +++ squid-3.5.7/Makefile.in 2015-07-31 23:09:32.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,15 +89,6 @@ host_triplet = @host@ @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(top_srcdir)/include/autoconf.h.in COPYING ChangeLog INSTALL \ - README cfgaux/compile cfgaux/config.guess cfgaux/config.sub \ - cfgaux/install-sh cfgaux/missing cfgaux/ltmain.sh \ - $(top_srcdir)/cfgaux/compile $(top_srcdir)/cfgaux/config.guess \ - $(top_srcdir)/cfgaux/config.sub \ - $(top_srcdir)/cfgaux/install-sh $(top_srcdir)/cfgaux/ltmain.sh \ - $(top_srcdir)/cfgaux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -149,6 +150,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -210,6 +213,14 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/compile \ + $(top_srcdir)/cfgaux/config.guess \ + $(top_srcdir)/cfgaux/config.sub \ + $(top_srcdir)/cfgaux/install-sh $(top_srcdir)/cfgaux/ltmain.sh \ + $(top_srcdir)/cfgaux/missing \ + $(top_srcdir)/include/autoconf.h.in COPYING ChangeLog INSTALL \ + README cfgaux/compile cfgaux/config.guess cfgaux/config.sub \ + cfgaux/install-sh cfgaux/ltmain.sh cfgaux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -513,7 +524,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -746,15 +756,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -790,17 +800,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -978,6 +988,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + dist-hook: @ for subdir in include; do \ diff -u -r -N squid-3.5.6/RELEASENOTES.html squid-3.5.7/RELEASENOTES.html --- squid-3.5.6/RELEASENOTES.html 2015-07-03 03:15:40.000000000 -0700 +++ squid-3.5.7/RELEASENOTES.html 2015-07-31 23:59:36.000000000 -0700 @@ -2,10 +2,10 @@ - Squid 3.5.6 release notes + Squid 3.5.7 release notes -

Squid 3.5.6 release notes

+

Squid 3.5.7 release notes

Squid Developers

@@ -63,7 +63,7 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.5.6.

+

The Squid Team are pleased to announce the release of Squid-3.5.7.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.5/ or the mirrors.

@@ -531,6 +531,7 @@

New format code %ssl::>sni to send SSL client SNI.

New format code %ssl::<cert_subject to send SSL server certificate DN.

New format code %ssl::<cert_issuer to send SSL server certificate issuer DN.

+

New format code %un to send any available user name (requires 3.5.7 or later).

New response kv-pair clt_conn_tag= to associates a given tag with the client TCP connection.

forward_max_tries
diff -u -r -N squid-3.5.6/scripts/Makefile.in squid-3.5.7/scripts/Makefile.in --- squid-3.5.6/scripts/Makefile.in 2015-07-03 02:14:48.000000000 -0700 +++ squid-3.5.7/scripts/Makefile.in 2015-07-31 23:09:54.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = scripts -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_noinst_SCRIPTS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -142,6 +150,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_SCRIPTS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -167,6 +177,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -416,7 +427,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign scripts/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -591,6 +601,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/src/acl/Makefile.in squid-3.5.7/src/acl/Makefile.in --- squid-3.5.6/src/acl/Makefile.in 2015-07-03 02:14:52.000000000 -0700 +++ squid-3.5.7/src/acl/Makefile.in 2015-07-31 23:09:57.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @ENABLE_SSL_TRUE@am__append_2 = $(SSL_ACLS) @@ -153,6 +159,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -504,6 +511,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -824,7 +834,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/acl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/acl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -833,7 +842,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1053,7 +1062,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1344,6 +1353,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/adaptation/ecap/Makefile.in squid-3.5.7/src/adaptation/ecap/Makefile.in --- squid-3.5.6/src/adaptation/ecap/Makefile.in 2015-07-03 02:14:53.000000000 -0700 +++ squid-3.5.7/src/adaptation/ecap/Makefile.in 2015-07-31 23:09:58.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/adaptation/ecap @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -447,6 +454,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -720,7 +730,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/adaptation/ecap/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/adaptation/ecap/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -729,7 +738,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -919,7 +928,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1210,6 +1219,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/adaptation/icap/Makefile.in squid-3.5.7/src/adaptation/icap/Makefile.in --- squid-3.5.6/src/adaptation/icap/Makefile.in 2015-07-03 02:14:54.000000000 -0700 +++ squid-3.5.7/src/adaptation/icap/Makefile.in 2015-07-31 23:09:59.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/adaptation/icap @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -442,6 +449,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -722,7 +732,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/adaptation/icap/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/adaptation/icap/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -731,7 +740,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -892,7 +901,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1183,6 +1192,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/adaptation/Makefile.in squid-3.5.7/src/adaptation/Makefile.in --- squid-3.5.6/src/adaptation/Makefile.in 2015-07-03 02:14:52.000000000 -0700 +++ squid-3.5.7/src/adaptation/Makefile.in 2015-07-31 23:09:58.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @USE_ICAP_CLIENT_TRUE@am__append_2 = icap @@ -148,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -461,6 +468,9 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) DIST_SUBDIRS = icap ecap +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -779,7 +789,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/adaptation/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/adaptation/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -788,7 +797,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1000,7 +1009,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1317,6 +1326,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/anyp/Makefile.in squid-3.5.7/src/anyp/Makefile.in --- squid-3.5.6/src/anyp/Makefile.in 2015-07-03 02:14:54.000000000 -0700 +++ squid-3.5.7/src/anyp/Makefile.in 2015-07-31 23:09:59.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/anyp @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -706,7 +716,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/anyp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/anyp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -715,7 +724,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -868,7 +877,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1159,6 +1168,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/auth/basic/Makefile.in squid-3.5.7/src/auth/basic/Makefile.in --- squid-3.5.6/src/auth/basic/Makefile.in 2015-07-03 02:14:55.000000000 -0700 +++ squid-3.5.7/src/auth/basic/Makefile.in 2015-07-31 23:10:00.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/basic @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -705,7 +715,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/auth/basic/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/auth/basic/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,7 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -868,7 +877,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1159,6 +1168,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/auth/digest/Makefile.in squid-3.5.7/src/auth/digest/Makefile.in --- squid-3.5.6/src/auth/digest/Makefile.in 2015-07-03 02:14:56.000000000 -0700 +++ squid-3.5.7/src/auth/digest/Makefile.in 2015-07-31 23:10:01.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/digest @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -705,7 +715,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/auth/digest/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/auth/digest/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,7 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -868,7 +877,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1159,6 +1168,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/auth/Makefile.in squid-3.5.7/src/auth/Makefile.in --- squid-3.5.6/src/auth/Makefile.in 2015-07-03 02:14:55.000000000 -0700 +++ squid-3.5.7/src/auth/Makefile.in 2015-07-31 23:10:00.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -459,6 +466,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -772,7 +782,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/auth/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/auth/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -781,7 +790,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -992,7 +1001,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1309,6 +1318,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/auth/negotiate/Makefile.in squid-3.5.7/src/auth/negotiate/Makefile.in --- squid-3.5.6/src/auth/negotiate/Makefile.in 2015-07-03 02:14:57.000000000 -0700 +++ squid-3.5.7/src/auth/negotiate/Makefile.in 2015-07-31 23:10:01.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/negotiate @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -441,6 +448,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -706,7 +716,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/auth/negotiate/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/auth/negotiate/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -715,7 +724,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -869,7 +878,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1160,6 +1169,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/auth/ntlm/Makefile.in squid-3.5.7/src/auth/ntlm/Makefile.in --- squid-3.5.6/src/auth/ntlm/Makefile.in 2015-07-03 02:14:57.000000000 -0700 +++ squid-3.5.7/src/auth/ntlm/Makefile.in 2015-07-31 23:10:01.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/auth/ntlm @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -705,7 +715,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/auth/ntlm/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/auth/ntlm/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,7 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -868,7 +877,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1159,6 +1168,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/auth/User.cc squid-3.5.7/src/auth/User.cc --- squid-3.5.6/src/auth/User.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/auth/User.cc 2015-07-31 23:08:17.000000000 -0700 @@ -31,8 +31,9 @@ notes(), credentials_state(Auth::Unchecked), username_(NULL), - requestRealm_(aRequestRealm) + userKey_(NULL) { + requestRealm_ = aRequestRealm ? xstrdup(aRequestRealm) : NULL; proxy_match_cache.head = proxy_match_cache.tail = NULL; ip_list.head = ip_list.tail = NULL; debugs(29, 5, HERE << "Initialised auth_user '" << this << "'."); @@ -134,6 +135,10 @@ if (username_) xfree((char*)username_); + if (requestRealm_) + xfree((char*)requestRealm_); + if (userKey_) + xfree((char*)userKey_); /* prevent accidental reuse */ auth_type = Auth::AUTH_UNKNOWN; @@ -365,14 +370,17 @@ void Auth::User::username(char const *aString) { + SBuf key; + if (aString) { assert(!username_); username_ = xstrdup(aString); - // NP: param #2 is working around a c_str() data-copy performance regression - userKey_ = BuildUserKey(username_, (!requestRealm_.isEmpty() ? requestRealm_.c_str() : NULL)); + key = BuildUserKey(username_, requestRealm_); + // XXX; performance regression. c_str() reallocates, then xstrdup() reallocates + userKey_ = xstrdup(key.c_str()); } else { safe_free(username_); - userKey_.clear(); + safe_free(userKey_) } } diff -u -r -N squid-3.5.6/src/auth/User.h squid-3.5.7/src/auth/User.h --- squid-3.5.6/src/auth/User.h 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/auth/User.h 2015-07-31 23:08:17.000000000 -0700 @@ -66,7 +66,7 @@ void username(char const *); ///< set stored username and userKey // NP: key is set at the same time as username_. Until then both are empty/NULL. - const char *userKey() {return !userKey_.isEmpty() ? userKey_.c_str() : NULL;} + const char *userKey() {return userKey_;} /** * How long these credentials are still valid for. @@ -116,13 +116,17 @@ /** * A realm for the user depending on request, designed to identify users, * with the same username and different authentication domains. + * The requestRealm_ memory will be allocated via xstrdup(). + * It is our responsibility. */ - SBuf requestRealm_; + const char *requestRealm_; /** - * A Unique key for the user, consist by username and requestRealm_ + * A Unique key for the user, consist by username and realm. + * The userKey_ memory will be allocated via xstrdup(). + * It is our responsibility. */ - SBuf userKey_; + const char *userKey_; /** what ip addresses has this user been seen at?, plus a list length cache */ dlink_list ip_list; diff -u -r -N squid-3.5.6/src/base/Makefile.in squid-3.5.7/src/base/Makefile.in --- squid-3.5.6/src/base/Makefile.in 2015-07-03 02:14:58.000000000 -0700 +++ squid-3.5.7/src/base/Makefile.in 2015-07-31 23:10:02.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testCharacterSet$(EXEEXT) TESTS = testHeaders testCharacterSet$(EXEEXT) @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -148,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -457,6 +464,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -752,7 +762,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/base/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/base/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -761,7 +770,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -967,7 +976,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1265,6 +1274,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/base/RunnersRegistry.cc squid-3.5.7/src/base/RunnersRegistry.cc --- squid-3.5.6/src/base/RunnersRegistry.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/base/RunnersRegistry.cc 2015-07-31 23:08:17.000000000 -0700 @@ -32,6 +32,14 @@ return runners.size(); } +int +DeregisterRunner(RegisteredRunner *rr) +{ + Runners &runners = GetRunners(); + runners.erase(rr); + return runners.size(); +} + void RunRegistered(const RegisteredRunner::Method &m) { diff -u -r -N squid-3.5.6/src/base/RunnersRegistry.h squid-3.5.7/src/base/RunnersRegistry.h --- squid-3.5.6/src/base/RunnersRegistry.h 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/base/RunnersRegistry.h 2015-07-31 23:08:17.000000000 -0700 @@ -68,6 +68,12 @@ /// Meant for cleanup and state saving that may require other modules. virtual void startShutdown() {} + /// Called after shutdown_lifetime grace period ends and before stopping + /// the main loop. At least one main loop iteration is guaranteed after + /// this call. + /// Meant for cleanup and state saving that may require other modules. + virtual void endingShutdown() {} + /// Called after stopping the main loop and before releasing memory. /// Meant for quick/basic cleanup that does not require any other modules. virtual ~RegisteredRunner() {} @@ -82,6 +88,9 @@ /// registers a given runner with the given registry and returns registry count int RegisterRunner(RegisteredRunner *rr); +/// de-registers a given runner with the given registry and returns registry count +int DeregisterRunner(RegisteredRunner *rr); + /// Calls a given method of all runners. /// All runners are destroyed after the finishShutdown() call. void RunRegistered(const RegisteredRunner::Method &m); diff -u -r -N squid-3.5.6/src/cf.data.pre squid-3.5.7/src/cf.data.pre --- squid-3.5.6/src/cf.data.pre 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/cf.data.pre 2015-07-31 23:08:17.000000000 -0700 @@ -699,6 +699,12 @@ FORMAT specifications %LOGIN Authenticated user login name + %un A user name. Expands to the first available name + from the following list of information sources: + - authenticated user name, like %ul or %LOGIN + - user name sent by an external ACL, like %EXT_USER + - SSL client name, like %us in logformat + - ident user name, like %ui in logformat %EXT_USER Username from previous external acl %EXT_LOG Log details from previous external acl %EXT_TAG Tag from previous external acl @@ -4033,6 +4039,12 @@ ue User name from external acl helper ui User name from ident us User name from SSL + un A user name. Expands to the first available name + from the following list of information sources: + - authenticated user name, like %ul + - user name supplied by an external ACL, like %ue + - SSL client name, like %us + - ident user name, like %ui credentials Client credentials. The exact meaning depends on the authentication scheme: For Basic authentication, it is the password; for Digest, the realm sent by the diff -u -r -N squid-3.5.6/src/clients/Makefile.in squid-3.5.7/src/clients/Makefile.in --- squid-3.5.6/src/clients/Makefile.in 2015-07-03 02:14:59.000000000 -0700 +++ squid-3.5.7/src/clients/Makefile.in 2015-07-31 23:10:03.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/clients @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -441,6 +448,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -705,7 +715,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/clients/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/clients/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,7 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -868,7 +877,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1159,6 +1168,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/client_side.cc squid-3.5.7/src/client_side.cc --- squid-3.5.6/src/client_side.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/client_side.cc 2015-07-31 23:08:17.000000000 -0700 @@ -814,6 +814,7 @@ { debugs(33, 2, HERE << clientConnection); flags.readMore = false; + DeregisterRunner(this); clientdbEstablished(clientConnection->remote, -1); /* decrement */ assert(areAllContextsForThisConnection()); freeAllContexts(); @@ -1891,6 +1892,32 @@ return context; } +void +ConnStateData::startShutdown() +{ + // RegisteredRunner API callback - Squid has been shut down + + // if connection is idle terminate it now, + // otherwise wait for grace period to end + if (getConcurrentRequestCount() == 0) + endingShutdown(); +} + +void +ConnStateData::endingShutdown() +{ + // RegisteredRunner API callback - Squid shutdown grace period is over + + // force the client connection to close immediately + // swanSong() in the close handler will cleanup. + if (Comm::IsConnOpen(clientConnection)) + clientConnection->close(); + + // deregister now to ensure finalShutdown() does not kill us prematurely. + // fd_table purge will cleanup if close handler was not fast enough. + DeregisterRunner(this); +} + char * skipLeadingSpace(char *aString) { @@ -3519,6 +3546,10 @@ port = xact->squidPort; log_addr = xact->tcpClient->remote; log_addr.applyMask(Config.Addrs.client_netmask); + + // register to receive notice of Squid signal events + // which may affect long persisting client connections + RegisterRunner(this); } void diff -u -r -N squid-3.5.6/src/client_side.h squid-3.5.7/src/client_side.h --- squid-3.5.6/src/client_side.h 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/client_side.h 2015-07-31 23:08:17.000000000 -0700 @@ -11,6 +11,7 @@ #ifndef SQUID_CLIENTSIDE_H #define SQUID_CLIENTSIDE_H +#include "base/RunnersRegistry.h" #include "clientStreamForward.h" #include "comm.h" #include "helper/forward.h" @@ -169,7 +170,7 @@ * * If the above can be confirmed accurate we can call this object PipelineManager or similar */ -class ConnStateData : public BodyProducer, public HttpControlMsgSink +class ConnStateData : public BodyProducer, public HttpControlMsgSink, public RegisteredRunner { public: @@ -399,6 +400,10 @@ /// stop parsing the request and create context for relaying error info ClientSocketContext *abortRequestParsing(const char *const errUri); + /* Registered Runner API */ + virtual void startShutdown(); + virtual void endingShutdown(); + protected: void startDechunkingRequest(); void finishDechunkingRequest(bool withSuccess); diff -u -r -N squid-3.5.6/src/comm/Makefile.in squid-3.5.7/src/comm/Makefile.in --- squid-3.5.6/src/comm/Makefile.in 2015-07-03 02:14:59.000000000 -0700 +++ squid-3.5.7/src/comm/Makefile.in 2015-07-31 23:10:03.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/comm @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -443,6 +450,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -726,7 +736,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/comm/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/comm/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -735,7 +744,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -898,7 +907,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1189,6 +1198,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/comm/TcpAcceptor.cc squid-3.5.7/src/comm/TcpAcceptor.cc --- squid-3.5.6/src/comm/TcpAcceptor.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/comm/TcpAcceptor.cc 2015-07-31 23:08:17.000000000 -0700 @@ -366,6 +366,7 @@ if (clientdbEstablished(details->remote, 0) > Config.client_ip_max_connections) { debugs(50, DBG_IMPORTANT, "WARNING: " << details->remote << " attempting more than " << Config.client_ip_max_connections << " connections."); Ip::Address::FreeAddr(gai); + PROF_stop(comm_accept); return Comm::COMM_ERROR; } } @@ -376,6 +377,7 @@ if (getsockname(sock, gai->ai_addr, &gai->ai_addrlen) != 0) { debugs(50, DBG_IMPORTANT, "ERROR: getsockname() failed to locate local-IP on " << details << ": " << xstrerror()); Ip::Address::FreeAddr(gai); + PROF_stop(comm_accept); return Comm::COMM_ERROR; } details->local = *gai; @@ -404,7 +406,9 @@ // Perform NAT or TPROXY operations to retrieve the real client/dest IP addresses if (conn->flags&(COMM_TRANSPARENT|COMM_INTERCEPTION) && !Ip::Interceptor.Lookup(details, conn)) { + debugs(50, DBG_IMPORTANT, "ERROR: NAT/TPROXY lookup failed to locate original IPs on " << details); // Failed. + PROF_stop(comm_accept); return Comm::COMM_ERROR; } diff -u -r -N squid-3.5.6/src/DiskIO/DiskThreads/aiops.cc squid-3.5.7/src/DiskIO/DiskThreads/aiops.cc --- squid-3.5.6/src/DiskIO/DiskThreads/aiops.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/DiskIO/DiskThreads/aiops.cc 2015-07-31 23:08:17.000000000 -0700 @@ -500,13 +500,13 @@ } if (request_queue2.head) { - static int filter = 0; - static int filter_limit = 8; + static uint64_t filter = 0; + static uint64_t filter_limit = 8192; if (++filter >= filter_limit) { filter_limit += filter; filter = 0; - debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion"); + debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion (growing to " << filter_limit << ")"); } } diff -u -r -N squid-3.5.6/src/DiskIO/DiskThreads/aiops_win32.cc squid-3.5.7/src/DiskIO/DiskThreads/aiops_win32.cc --- squid-3.5.6/src/DiskIO/DiskThreads/aiops_win32.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/DiskIO/DiskThreads/aiops_win32.cc 2015-07-31 23:08:17.000000000 -0700 @@ -581,13 +581,13 @@ } if (request_queue2.head) { - static int filter = 0; - static int filter_limit = 8; + static uint64_t filter = 0; + static uint64_t filter_limit = 8196; if (++filter >= filter_limit) { filter_limit += filter; filter = 0; - debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion"); + debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion (growing to " << filter_limit << ")"); } } diff -u -r -N squid-3.5.6/src/esi/Makefile.in squid-3.5.7/src/esi/Makefile.in --- squid-3.5.6/src/esi/Makefile.in 2015-07-03 02:15:00.000000000 -0700 +++ squid-3.5.7/src/esi/Makefile.in 2015-07-31 23:10:04.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @HAVE_LIBEXPAT_TRUE@am__append_2 = \ @@ -154,6 +160,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -460,6 +467,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -746,7 +756,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/esi/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/esi/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -755,7 +764,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -918,7 +927,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1209,6 +1218,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/eui/Makefile.in squid-3.5.7/src/eui/Makefile.in --- squid-3.5.6/src/eui/Makefile.in 2015-07-03 02:15:00.000000000 -0700 +++ squid-3.5.7/src/eui/Makefile.in 2015-07-31 23:10:04.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/eui @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -441,6 +448,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -705,7 +715,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/eui/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/eui/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,7 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -867,7 +876,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1158,6 +1167,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/external_acl.cc squid-3.5.7/src/external_acl.cc --- squid-3.5.6/src/external_acl.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/external_acl.cc 2015-07-31 23:08:17.000000000 -0700 @@ -403,6 +403,10 @@ else if (strcmp(token, "%EXT_USER") == 0 || strcmp(token, "%ue") == 0) format->type = Format::LFT_USER_EXTERNAL; #endif +#if USE_AUTH || defined(USE_OPENSSL) || defined(USE_IDENT) + else if (strcmp(token, "%un") == 0) + format->type = Format::LFT_USER_NAME; +#endif else if (strcmp(token, "%EXT_LOG") == 0 || strcmp(token, "%ea") == 0) format->type = Format::LFT_EXT_LOG; else if (strcmp(token, "%TAG") == 0 || strcmp(token, "%et") == 0) @@ -508,6 +512,7 @@ break #if USE_AUTH DUMP_EXT_ACL_TYPE_FMT(USER_LOGIN," %%ul"); + DUMP_EXT_ACL_TYPE_FMT(USER_NAME," %%un"); #endif #if USE_IDENT @@ -875,6 +880,18 @@ dlinkAdd(e, &entry->lru, &def->lru_list); } +#if USE_OPENSSL +static const char * +external_acl_ssl_get_user_attribute(const ACLFilledChecklist &ch, const char *attr) +{ + if (ch.conn() != NULL && Comm::IsConnOpen(ch.conn()->clientConnection)) { + if (SSL *ssl = fd_table[ch.conn()->clientConnection->fd].ssl) + return sslGetUserAttribute(ssl, attr); + } + return NULL; +} +#endif + static char * makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data) { @@ -1038,14 +1055,7 @@ break; case Format::LFT_EXT_ACL_USER_CERT: - - if (ch->conn() != NULL && Comm::IsConnOpen(ch->conn()->clientConnection)) { - SSL *ssl = fd_table[ch->conn()->clientConnection->fd].ssl; - - if (ssl) - str = sslGetUserAttribute(ssl, format->header); - } - + str = external_acl_ssl_get_user_attribute(*ch, format->header); break; case Format::LFT_EXT_ACL_USER_CA_CERT: @@ -1091,6 +1101,24 @@ str = request->extacl_user.termedBuf(); break; #endif + case Format::LFT_USER_NAME: + /* find the first available name from various sources */ +#if USE_AUTH + if (ch->auth_user_request != NULL) + str = ch->auth_user_request->username(); + if ((!str || !*str) && + (request->extacl_user.size() > 0 && request->extacl_user[0] != '-')) + str = request->extacl_user.termedBuf(); +#endif +#if USE_OPENSSL + if (!str || !*str) + str = external_acl_ssl_get_user_attribute(*ch, "CN"); +#endif +#if USE_IDENT + if (!str || !*str) + str = ch->rfc931; +#endif + break; case Format::LFT_EXT_LOG: str = request->extacl_log.termedBuf(); break; diff -u -r -N squid-3.5.6/src/format/Makefile.in squid-3.5.7/src/format/Makefile.in --- squid-3.5.6/src/format/Makefile.in 2015-07-03 02:15:01.000000000 -0700 +++ squid-3.5.7/src/format/Makefile.in 2015-07-31 23:10:05.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/format @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -707,7 +717,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/format/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/format/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -716,7 +725,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -870,7 +879,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1161,6 +1170,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/fs/Makefile.in squid-3.5.7/src/fs/Makefile.in --- squid-3.5.6/src/fs/Makefile.in 2015-07-03 02:15:02.000000000 -0700 +++ squid-3.5.7/src/fs/Makefile.in 2015-07-31 23:10:05.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/fs @@ -145,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -458,6 +466,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -759,7 +769,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/fs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/fs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -768,7 +777,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1011,7 +1020,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1310,6 +1319,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/ftp/Makefile.in squid-3.5.7/src/ftp/Makefile.in --- squid-3.5.6/src/ftp/Makefile.in 2015-07-03 02:15:02.000000000 -0700 +++ squid-3.5.7/src/ftp/Makefile.in 2015-07-31 23:10:06.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/ftp @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -701,7 +711,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ftp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/ftp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -710,7 +719,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -862,7 +871,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1153,6 +1162,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/FwdState.cc squid-3.5.7/src/FwdState.cc --- squid-3.5.6/src/FwdState.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/FwdState.cc 2015-07-31 23:08:17.000000000 -0700 @@ -683,10 +683,14 @@ #if USE_OPENSSL if (!request->flags.pinned) { - if ((serverConnection()->getPeer() && serverConnection()->getPeer()->use_ssl) || - (!serverConnection()->getPeer() && request->url.getScheme() == AnyP::PROTO_HTTPS) || - request->flags.sslPeek) { - + const CachePeer *p = serverConnection()->getPeer(); + const bool peerWantsTls = p && p->use_ssl; + // userWillSslToPeerForUs assumes CONNECT == HTTPS + const bool userWillTlsToPeerForUs = p && p->options.originserver && + request->method == Http::METHOD_CONNECT; + const bool needTlsToPeer = peerWantsTls && !userWillTlsToPeerForUs; + const bool needTlsToOrigin = !p && request->url.getScheme() == AnyP::PROTO_HTTPS; + if (needTlsToPeer || needTlsToOrigin || request->flags.sslPeek) { HttpRequest::Pointer requestPointer = request; AsyncCall::Pointer callback = asyncCall(17,4, "FwdState::ConnectedToPeer", @@ -782,7 +786,9 @@ request->hier.startPeerClock(); - if (serverDestinations[0]->getPeer() && request->flags.sslBumped) { + // Do not fowrward bumped connections to parent proxy unless it is an + // origin server + if (serverDestinations[0]->getPeer() && !serverDestinations[0]->getPeer()->options.originserver && request->flags.sslBumped) { debugs(50, 4, "fwdConnectStart: Ssl bumped connections through parent proxy are not allowed"); ErrorState *anErr = new ErrorState(ERR_CANNOT_FORWARD, Http::scServiceUnavailable, request); fail(anErr); diff -u -r -N squid-3.5.6/src/helper/Makefile.in squid-3.5.7/src/helper/Makefile.in --- squid-3.5.6/src/helper/Makefile.in 2015-07-03 02:15:03.000000000 -0700 +++ squid-3.5.7/src/helper/Makefile.in 2015-07-31 23:10:06.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/helper @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -704,7 +714,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/helper/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/helper/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -713,7 +722,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -865,7 +874,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1156,6 +1165,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/http/Makefile.in squid-3.5.7/src/http/Makefile.in --- squid-3.5.6/src/http/Makefile.in 2015-07-03 02:15:04.000000000 -0700 +++ squid-3.5.7/src/http/Makefile.in 2015-07-31 23:10:07.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/http @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -441,6 +448,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -705,7 +715,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/http/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/http/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,7 +723,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -867,7 +876,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1158,6 +1167,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/icmp/Makefile.in squid-3.5.7/src/icmp/Makefile.in --- squid-3.5.6/src/icmp/Makefile.in 2015-07-03 02:15:04.000000000 -0700 +++ squid-3.5.7/src/icmp/Makefile.in 2015-07-31 23:10:07.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,10 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testIcmp$(EXEEXT) TESTS = testHeaders testIcmp$(EXEEXT) @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -150,6 +156,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -475,6 +482,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -820,7 +830,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/icmp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/icmp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -829,7 +838,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1167,7 +1176,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1469,6 +1478,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/ident/Makefile.in squid-3.5.7/src/ident/Makefile.in --- squid-3.5.6/src/ident/Makefile.in 2015-07-03 02:15:05.000000000 -0700 +++ squid-3.5.7/src/ident/Makefile.in 2015-07-31 23:10:08.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/ident @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -702,7 +712,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ident/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/ident/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -711,7 +720,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -863,7 +872,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1154,6 +1163,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/ip/Makefile.in squid-3.5.7/src/ip/Makefile.in --- squid-3.5.6/src/ip/Makefile.in 2015-07-03 02:15:06.000000000 -0700 +++ squid-3.5.7/src/ip/Makefile.in 2015-07-31 23:10:08.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testIpAddress$(EXEEXT) TESTS = testHeaders testIpAddress$(EXEEXT) @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +153,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -458,6 +465,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -741,7 +751,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ip/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/ip/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -750,7 +759,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -939,7 +948,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1237,6 +1246,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/ip/tools.cc squid-3.5.7/src/ip/tools.cc --- squid-3.5.6/src/ip/tools.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/ip/tools.cc 2015-07-31 23:08:17.000000000 -0700 @@ -30,7 +30,6 @@ void Ip::ProbeTransport() { -#if USE_IPV6 // check for usable IPv6 sockets int s = socket(PF_INET6, SOCK_STREAM, 0); if (s < 0) { @@ -56,12 +55,18 @@ debugs(3, 2, "Missing RFC 3493 compliance - attempting split IPv4 and IPv6 stacks ..."); EnableIpv6 |= IPV6_SPECIAL_SPLITSTACK; #endif + // TODO: attempt to use the socket to connect somewhere ? + // needs to be safe to contact and with guaranteed working IPv6 at the other end. close(s); +#if USE_IPV6 debugs(3, 2, "IPv6 transport " << (EnableIpv6?"Enabled":"Disabled")); #else - debugs(3, 2, "IPv6 transport forced OFF by build parameters."); - EnableIpv6 = IPV6_OFF; + debugs(3, 2, "IPv6 transport " << (EnableIpv6?"Available":"Disabled")); + if (EnableIpv6 != IPV6_OFF) { + debugs(3, DBG_CRITICAL, "WARNING: BCP 177 violation. IPv6 transport forced OFF by build parameters."); + EnableIpv6 = IPV6_OFF; + } #endif } diff -u -r -N squid-3.5.6/src/ipc/Makefile.in squid-3.5.7/src/ipc/Makefile.in --- squid-3.5.6/src/ipc/Makefile.in 2015-07-03 02:15:06.000000000 -0700 +++ squid-3.5.7/src/ipc/Makefile.in 2015-07-31 23:10:09.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/ipc @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -446,6 +453,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -760,7 +770,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ipc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/ipc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -769,7 +778,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -960,7 +969,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1253,6 +1262,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/ipc/mem/Segment.cc squid-3.5.7/src/ipc/mem/Segment.cc --- squid-3.5.6/src/ipc/mem/Segment.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/ipc/mem/Segment.cc 2015-07-31 23:08:17.000000000 -0700 @@ -213,8 +213,11 @@ name.append(BasePath); if (name[name.size()-1] != '/') name.append('/'); - } else - name.append("/squid-"); + } else { + name.append('/'); + name.append(service_name.c_str()); + name.append('-'); + } // append id, replacing slashes with dots for (const char *slash = strchr(id, '/'); slash; slash = strchr(id, '/')) { diff -u -r -N squid-3.5.6/src/log/Makefile.in squid-3.5.7/src/log/Makefile.in --- squid-3.5.6/src/log/Makefile.in 2015-07-03 02:15:07.000000000 -0700 +++ squid-3.5.7/src/log/Makefile.in 2015-07-31 23:10:09.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/log @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -444,6 +451,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -727,7 +737,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/log/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/log/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -736,7 +745,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -902,7 +911,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1193,6 +1202,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/main.cc squid-3.5.7/src/main.cc --- squid-3.5.6/src/main.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/main.cc 2015-07-31 23:08:17.000000000 -0700 @@ -203,6 +203,18 @@ EventLoop::Running->stop(); } + static void FinalShutdownRunners(void *) { + RunRegisteredHere(RegisteredRunner::endingShutdown); + + // XXX: this should be a Runner. +#if USE_AUTH + /* detach the auth components (only do this on full shutdown) */ + Auth::Scheme::FreeAll(); +#endif + + eventAdd("SquidTerminate", &StopEventLoop, NULL, 0, 1, false); + } + void doShutdown(time_t wait); }; @@ -244,13 +256,8 @@ /* run the closure code which can be shared with reconfigure */ serverConnectionsClose(); -#if USE_AUTH - /* detach the auth components (only do this on full shutdown) */ - Auth::Scheme::FreeAll(); -#endif - RunRegisteredHere(RegisteredRunner::startShutdown); - eventAdd("SquidShutdown", &StopEventLoop, this, (double) (wait + 1), 1, false); + eventAdd("SquidShutdown", &FinalShutdownRunners, this, (double) (wait + 1), 1, false); } static void @@ -774,10 +781,18 @@ // parse the config returns a count of errors encountered. const int oldWorkers = Config.workers; - if ( parseConfigFile(ConfigFile) != 0) { + try { + if (parseConfigFile(ConfigFile) != 0) { + // for now any errors are a fatal condition... + self_destruct(); + } + } catch (...) { // for now any errors are a fatal condition... + debugs(1, DBG_CRITICAL, "FATAL: Unhandled exception parsing config file. " << + " Run squid -k parse and check for errors."); self_destruct(); } + if (oldWorkers != Config.workers) { debugs(1, DBG_CRITICAL, "WARNING: Changing 'workers' (from " << oldWorkers << " to " << Config.workers << @@ -1386,7 +1401,14 @@ Format::Token::Init(); // XXX: temporary. Use a runners registry of pre-parse runners instead. - parse_err = parseConfigFile(ConfigFile); + try { + parse_err = parseConfigFile(ConfigFile); + } catch (...) { + // for now any errors are a fatal condition... + debugs(1, DBG_CRITICAL, "FATAL: Unhandled exception parsing config file." << + (opt_parse_cfg_only ? " Run squid -k parse and check for errors." : "")); + parse_err = 1; + } Mem::Report(); diff -u -r -N squid-3.5.6/src/Makefile.in squid-3.5.7/src/Makefile.in --- squid-3.5.6/src/Makefile.in 2015-07-03 02:14:51.000000000 -0700 +++ squid-3.5.7/src/Makefile.in 2015-07-31 23:09:56.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,10 +92,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/tests/Stub.list \ - $(top_srcdir)/doc/manuals/Substitute.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(noinst_HEADERS) $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = $(am__EXEEXT_1) tests/testBoilerplate$(EXEEXT) \ tests/testCacheManager$(EXEEXT) tests/testDiskIO$(EXEEXT) \ tests/testEvent$(EXEEXT) tests/testEventLoop$(EXEEXT) \ @@ -177,6 +183,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -2319,6 +2327,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/tests/Stub.list \ + $(top_srcdir)/cfgaux/depcomp $(top_srcdir)/cfgaux/test-driver \ + $(top_srcdir)/doc/manuals/Substitute.am \ + $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -6002,7 +6014,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -6011,7 +6022,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(srcdir)/tests/Stub.list $(top_srcdir)/doc/manuals/Substitute.am: +$(top_srcdir)/src/Common.am $(srcdir)/tests/Stub.list $(top_srcdir)/doc/manuals/Substitute.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -7220,7 +7231,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -7716,6 +7727,8 @@ uninstall-man uninstall-man8 uninstall-sbinPROGRAMS \ uninstall-sysconfDATA +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h cf_gen.$(OBJEXT): cf_gen_defines.cci diff -u -r -N squid-3.5.6/src/mgr/Makefile.in squid-3.5.7/src/mgr/Makefile.in --- squid-3.5.6/src/mgr/Makefile.in 2015-07-03 02:15:08.000000000 -0700 +++ squid-3.5.7/src/mgr/Makefile.in 2015-07-31 23:10:10.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/mgr @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -445,6 +452,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -752,7 +762,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mgr/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/mgr/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -761,7 +770,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -934,7 +943,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1225,6 +1234,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/neighbors.cc squid-3.5.7/src/neighbors.cc --- squid-3.5.6/src/neighbors.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/neighbors.cc 2015-07-31 23:08:17.000000000 -0700 @@ -161,7 +161,7 @@ // CONNECT requests are proxy requests. Not to be forwarded to origin servers. // Unless the destination port matches, in which case we MAY perform a 'DIRECT' to this CachePeer. - if (p->options.originserver && request->method == Http::METHOD_CONNECT && request->port != p->in_addr.port()) + if (p->options.originserver && request->method == Http::METHOD_CONNECT && request->port != p->http_port) return false; if (p->peer_domain == NULL && p->access == NULL) diff -u -r -N squid-3.5.6/src/parser/Makefile.in squid-3.5.7/src/parser/Makefile.in --- squid-3.5.6/src/parser/Makefile.in 2015-07-03 02:15:09.000000000 -0700 +++ squid-3.5.7/src/parser/Makefile.in 2015-07-31 23:10:11.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testTokenizer$(EXEEXT) TESTS = testHeaders testTokenizer$(EXEEXT) @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -148,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -459,6 +466,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -753,7 +763,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/parser/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/parser/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -762,7 +771,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1053,7 +1062,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1351,6 +1360,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/repl/Makefile.in squid-3.5.7/src/repl/Makefile.in --- squid-3.5.6/src/repl/Makefile.in 2015-07-03 02:15:09.000000000 -0700 +++ squid-3.5.7/src/repl/Makefile.in 2015-07-31 23:10:11.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/repl @@ -145,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -451,6 +459,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -712,7 +722,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/repl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/repl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -721,7 +730,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -896,7 +905,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1191,6 +1200,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/SBuf.cc squid-3.5.7/src/SBuf.cc --- squid-3.5.6/src/SBuf.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/SBuf.cc 2015-07-31 23:08:17.000000000 -0700 @@ -541,12 +541,18 @@ SBuf& SBuf::chop(size_type pos, size_type n) { - if (pos == npos || pos > length() || n == 0) { + if (pos == npos || pos > length()) + pos = length(); + + if (n == npos || (pos+n) > length()) + n = length() - pos; + + // if there will be nothing left, reset the buffer while we can + if (pos == length() || n == 0) { clear(); return *this; } - if (n == npos || (pos+n) > length()) - n = length()-pos; + ++stats.chop; off_ += pos; len_ = n; diff -u -r -N squid-3.5.6/src/servers/Makefile.in squid-3.5.7/src/servers/Makefile.in --- squid-3.5.6/src/servers/Makefile.in 2015-07-03 02:15:10.000000000 -0700 +++ squid-3.5.7/src/servers/Makefile.in 2015-07-31 23:10:12.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/servers @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -440,6 +447,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -701,7 +711,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/servers/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/servers/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -710,7 +719,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -862,7 +871,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1153,6 +1162,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/snmp/Makefile.in squid-3.5.7/src/snmp/Makefile.in --- squid-3.5.6/src/snmp/Makefile.in 2015-07-03 02:15:11.000000000 -0700 +++ squid-3.5.7/src/snmp/Makefile.in 2015-07-31 23:10:12.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) subdir = src/snmp @@ -146,6 +152,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -441,6 +448,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -713,7 +723,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/snmp/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/snmp/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -722,7 +731,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -879,7 +888,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1170,6 +1179,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/squid.8.in squid-3.5.7/src/squid.8.in --- squid-3.5.6/src/squid.8.in 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/squid.8.in 2015-07-31 23:08:17.000000000 -0700 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH squid 8 . .SH NAME -.if !'po4a'hide' .B squid -.if !'po4a'hide' \- -HTTP web proxy caching server +squid \- HTTP web proxy caching server . .SH SYNOPSIS .if !'po4a'hide' .B squid diff -u -r -N squid-3.5.6/src/ssl/certificate_db.cc squid-3.5.7/src/ssl/certificate_db.cc --- squid-3.5.6/src/ssl/certificate_db.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/ssl/certificate_db.cc 2015-07-31 23:08:17.000000000 -0700 @@ -320,18 +320,25 @@ } // check db size while trying to minimize calls to size() - while (size() > max_db_size) { - if (deleteInvalidCertificate()) - continue; // try to find another invalid certificate if needed - - // there are no more invalid ones, but there must be valid certificates - do { - if (!deleteOldestCertificate()) { - save(); // Some entries may have been removed. Update the index file. - return false; // errors prevented us from freeing enough space - } - } while (size() > max_db_size); - break; + size_t dbSize = size(); + if ((dbSize == 0 && hasRows()) || + (dbSize > 0 && !hasRows()) || + (dbSize > 10 * max_db_size)) { + // Invalid database size, rebuild + dbSize = rebuildSize(); + } + while (dbSize > max_db_size && deleteInvalidCertificate()) { + dbSize = size(); // get the current database size + // and try to find another invalid certificate if needed + } + // there are no more invalid ones, but there must be valid certificates + while (dbSize > max_db_size) { + if (!deleteOldestCertificate()) { + rebuildSize(); // No certificates in database.Update the size file. + save(); // Some entries may have been removed. Update the index file. + return false; // errors prevented us from freeing enough space + } + dbSize = size(); // get the current database size } row.setValue(cnlType, "V"); @@ -456,7 +463,8 @@ void Ssl::CertificateDb::subSize(std::string const & filename) { // readSize will rebuild 'size' file if missing or it is corrupted size_t dbSize = readSize(); - dbSize -= getFileSize(filename); + const size_t fileSize = getFileSize(filename); + dbSize = dbSize > fileSize ? dbSize - fileSize : 0; writeSize(dbSize); } @@ -480,8 +488,10 @@ if (!file) return 0; file.seekg(0, std::ios_base::end); - size_t file_size = file.tellg(); - return ((file_size + fs_block_size - 1) / fs_block_size) * fs_block_size; + const std::streampos file_size = file.tellg(); + if (file_size < 0) + return 0; + return ((static_cast(file_size) + fs_block_size - 1) / fs_block_size) * fs_block_size; } void Ssl::CertificateDb::load() { @@ -561,15 +571,9 @@ return true; } -bool Ssl::CertificateDb::deleteOldestCertificate() { - if (!db) - return false; - -#if SQUID_SSLTXTDB_PSTRINGDATA - if (sk_OPENSSL_PSTRING_num(db.get()->data) == 0) -#else - if (sk_num(db.get()->data) == 0) -#endif +bool Ssl::CertificateDb::deleteOldestCertificate() +{ + if (!hasRows()) return false; #if SQUID_SSLTXTDB_PSTRINGDATA @@ -610,6 +614,20 @@ return false; } +bool Ssl::CertificateDb::hasRows() const +{ + if (!db) + return false; + +#if SQUID_SSLTXTDB_PSTRINGDATA + if (sk_OPENSSL_PSTRING_num(db.get()->data) == 0) +#else + if (sk_num(db.get()->data) == 0) +#endif + return false; + return true; +} + bool Ssl::CertificateDb::IsEnabledDiskStore() const { return enabled_disk_store; } diff -u -r -N squid-3.5.6/src/ssl/certificate_db.h squid-3.5.7/src/ssl/certificate_db.h --- squid-3.5.6/src/ssl/certificate_db.h 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/ssl/certificate_db.h 2015-07-31 23:08:17.000000000 -0700 @@ -127,6 +127,7 @@ bool deleteInvalidCertificate(); ///< Delete invalid certificate. bool deleteOldestCertificate(); ///< Delete oldest certificate. bool deleteByHostname(std::string const & host); ///< Delete using host name. + bool hasRows() const; ///< Whether the TXT_DB has stored items. /// Removes the first matching row from TXT_DB. Ignores failures. static void sq_TXT_DB_delete(TXT_DB *db, const char **row); diff -u -r -N squid-3.5.6/src/ssl/Makefile.in squid-3.5.7/src/ssl/Makefile.in --- squid-3.5.6/src/ssl/Makefile.in 2015-07-03 02:15:11.000000000 -0700 +++ squid-3.5.7/src/ssl/Makefile.in 2015-07-31 23:10:13.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,10 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/src/TestHeaders.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) EXTRA_PROGRAMS = ssl_crtd$(EXEEXT) @@ -149,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -468,6 +475,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + $(top_srcdir)/src/TestHeaders.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -760,7 +770,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ssl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/ssl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -769,7 +778,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/src/TestHeaders.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1032,7 +1041,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1330,6 +1339,8 @@ uninstall uninstall-am uninstall-libexecPROGRAMS uninstall-man \ uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/src/ssl/PeerConnector.cc squid-3.5.7/src/ssl/PeerConnector.cc --- squid-3.5.6/src/ssl/PeerConnector.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/ssl/PeerConnector.cc 2015-07-31 23:08:17.000000000 -0700 @@ -189,8 +189,13 @@ // Use SNI TLS extension only when we connect directly // to the origin server and we know the server host name. - const char *sniServer = hostName ? hostName->c_str() : - (!request->GetHostIsNumeric() ? request->GetHost() : NULL); + const char *sniServer = NULL; + const bool redirected = request->flags.redirected && ::Config.onoff.redir_rewrites_host; + if (!hostName || redirected) + sniServer = !request->GetHostIsNumeric() ? request->GetHost() : NULL; + else + sniServer = hostName->c_str(); + if (sniServer) Ssl::setClientSNI(ssl, sniServer); } @@ -274,10 +279,6 @@ serverCertificateHandled = true; - csd->resetSslCommonName(Ssl::CommonHostName(serverCert.get())); - debugs(83, 5, "HTTPS server CN: " << csd->sslCommonName() << - " bumped: " << *serverConnection()); - // remember the server certificate for later use if (Ssl::ServerBump *serverBump = csd->serverBump()) { serverBump->serverCert.reset(serverCert.release()); @@ -285,6 +286,26 @@ } } +void +Ssl::PeerConnector::serverCertificateVerified() +{ + if (ConnStateData *csd = request->clientConnectionManager.valid()) { + Ssl::X509_Pointer serverCert; + if(Ssl::ServerBump *serverBump = csd->serverBump()) + serverCert.resetAndLock(serverBump->serverCert.get()); + else { + const int fd = serverConnection()->fd; + SSL *ssl = fd_table[fd].ssl; + serverCert.reset(SSL_get_peer_certificate(ssl)); + } + if (serverCert.get()) { + csd->resetSslCommonName(Ssl::CommonHostName(serverCert.get())); + debugs(83, 5, "HTTPS server CN: " << csd->sslCommonName() << + " bumped: " << *serverConnection()); + } + } +} + bool Ssl::PeerConnector::sslFinalized() { @@ -338,6 +359,8 @@ return true; } } + + serverCertificateVerified(); return true; } @@ -435,6 +458,7 @@ validatorFailed = true; if (!errDetails && !validatorFailed) { + serverCertificateVerified(); if (splice) switchToTunnel(request.getRaw(), clientConn, serverConn); else diff -u -r -N squid-3.5.6/src/ssl/PeerConnector.h squid-3.5.7/src/ssl/PeerConnector.h --- squid-3.5.6/src/ssl/PeerConnector.h 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/ssl/PeerConnector.h 2015-07-31 23:08:17.000000000 -0700 @@ -158,6 +158,10 @@ /// if the server certificate was received from the server. void handleServerCertificate(); + /// Runs after the server certificate verified to update client + /// connection manager members + void serverCertificateVerified(); + /// Callback function called when squid receive message from cert validator helper static void sslCrtvdHandleReplyWrapper(void *data, Ssl::CertValidationResponse const &); diff -u -r -N squid-3.5.6/src/ssl/ssl_crtd.cc squid-3.5.7/src/ssl/ssl_crtd.cc --- squid-3.5.6/src/ssl/ssl_crtd.cc 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/src/ssl/ssl_crtd.cc 2015-07-31 23:08:17.000000000 -0700 @@ -205,7 +205,13 @@ Ssl::EVP_PKEY_Pointer pkey; std::string &cert_subject = certProperties.dbKey(); - db.find(cert_subject, cert, pkey); + bool dbFailed = false; + try { + db.find(cert_subject, cert, pkey); + } catch (std::runtime_error &err) { + dbFailed = true; + error = err.what(); + } if (cert.get()) { if (!Ssl::certificateMatchesProperties(cert.get(), certProperties)) { @@ -221,10 +227,22 @@ if (!Ssl::generateSslCertificate(cert, pkey, certProperties)) throw std::runtime_error("Cannot create ssl certificate or private key."); - if (!db.addCertAndPrivateKey(cert, pkey, cert_subject) && db.IsEnabledDiskStore()) - throw std::runtime_error("Cannot add certificate to db."); + if (!dbFailed && db.IsEnabledDiskStore()) { + try { + if (!db.addCertAndPrivateKey(cert, pkey, cert_subject)) { + dbFailed = true; + error = "Cannot add certificate to db."; + } + } catch (const std::runtime_error &err) { + dbFailed = true; + error = err.what(); + } + } } + if (dbFailed) + std::cerr << "ssl_crtd helper database '" << db_path << "' failed: " << error << std::endl; + std::string bufferToWrite; if (!Ssl::writeCertAndPrivateKeyToMemory(cert, pkey, bufferToWrite)) throw std::runtime_error("Cannot write ssl certificate or/and private key to memory."); diff -u -r -N squid-3.5.6/test-suite/Makefile.in squid-3.5.7/test-suite/Makefile.in --- squid-3.5.6/test-suite/Makefile.in 2015-07-03 02:15:12.000000000 -0700 +++ squid-3.5.7/test-suite/Makefile.in 2015-07-31 23:10:13.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,9 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = debug$(EXEEXT) $(am__EXEEXT_2) MemPoolTest$(EXEEXT) \ mem_node_test$(EXEEXT) mem_hdr_test$(EXEEXT) splay$(EXEEXT) \ syntheticoperators$(EXEEXT) VirtualDeleteOperator$(EXEEXT) @@ -152,6 +159,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -522,6 +530,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/cfgaux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -813,7 +823,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test-suite/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign test-suite/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -822,7 +831,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1042,7 +1051,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1388,6 +1397,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/tools/cachemgr.cgi.8 squid-3.5.7/tools/cachemgr.cgi.8 --- squid-3.5.6/tools/cachemgr.cgi.8 2015-07-03 03:15:33.000000000 -0700 +++ squid-3.5.7/tools/cachemgr.cgi.8 2015-07-31 23:59:30.000000000 -0700 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH cachemgr.cgi 8 . .SH NAME -.if !'po4a'hide' .B cachemgr.cgi -.if !'po4a'hide' \- -Squid HTTP proxy manager CGI web interface +cachemgr.cgi \- Squid HTTP proxy manager CGI web interface . .SH SYNOPSIS .if !'po4a'hide' .B http://your.server/cgi-bin/cachemgr.cgi diff -u -r -N squid-3.5.6/tools/cachemgr.cgi.8.in squid-3.5.7/tools/cachemgr.cgi.8.in --- squid-3.5.6/tools/cachemgr.cgi.8.in 2015-07-03 02:12:52.000000000 -0700 +++ squid-3.5.7/tools/cachemgr.cgi.8.in 2015-07-31 23:08:17.000000000 -0700 @@ -1,9 +1,7 @@ .if !'po4a'hide' .TH cachemgr.cgi 8 . .SH NAME -.if !'po4a'hide' .B cachemgr.cgi -.if !'po4a'hide' \- -Squid HTTP proxy manager CGI web interface +cachemgr.cgi \- Squid HTTP proxy manager CGI web interface . .SH SYNOPSIS .if !'po4a'hide' .B http://your.server/cgi-bin/cachemgr.cgi diff -u -r -N squid-3.5.6/tools/Makefile.in squid-3.5.7/tools/Makefile.in --- squid-3.5.6/tools/Makefile.in 2015-07-03 02:15:13.000000000 -0700 +++ squid-3.5.7/tools/Makefile.in 2015-07-31 23:10:14.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,10 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/doc/manuals/Substitute.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -149,6 +155,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -461,6 +468,10 @@ b='$*';; \ esac DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver \ + $(top_srcdir)/doc/manuals/Substitute.am \ + $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -775,7 +786,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tools/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -784,7 +794,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/doc/manuals/Substitute.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/doc/manuals/Substitute.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1161,7 +1171,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1482,6 +1492,8 @@ uninstall-libexecSCRIPTS uninstall-local uninstall-man \ uninstall-man8 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/tools/purge/Makefile.in squid-3.5.7/tools/purge/Makefile.in --- squid-3.5.6/tools/purge/Makefile.in 2015-07-03 02:15:13.000000000 -0700 +++ squid-3.5.7/tools/purge/Makefile.in 2015-07-31 23:10:14.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,9 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver README check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -147,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -446,6 +454,9 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver $(top_srcdir)/src/Common.am \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -719,7 +730,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/purge/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tools/purge/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -728,7 +738,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am: +$(top_srcdir)/src/Common.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -924,7 +934,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1212,6 +1222,8 @@ recheck tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/tools/squidclient/Makefile.in squid-3.5.7/tools/squidclient/Makefile.in --- squid-3.5.6/tools/squidclient/Makefile.in 2015-07-03 02:15:14.000000000 -0700 +++ squid-3.5.7/tools/squidclient/Makefile.in 2015-07-31 23:10:15.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,10 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/src/Common.am \ - $(top_srcdir)/doc/manuals/Substitute.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/cfgaux/depcomp \ - $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = TESTS = @ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL) @@ -148,6 +154,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -471,6 +478,10 @@ b='$*';; \ esac DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/cfgaux/depcomp \ + $(top_srcdir)/cfgaux/test-driver \ + $(top_srcdir)/doc/manuals/Substitute.am \ + $(top_srcdir)/src/Common.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -790,7 +801,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/squidclient/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tools/squidclient/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -799,7 +809,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/Common.am $(top_srcdir)/doc/manuals/Substitute.am: +$(top_srcdir)/src/Common.am $(top_srcdir)/doc/manuals/Substitute.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1088,7 +1098,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1406,6 +1416,8 @@ uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \ uninstall-man1 +.PRECIOUS: Makefile + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff -u -r -N squid-3.5.6/tools/systemd/Makefile.in squid-3.5.7/tools/systemd/Makefile.in --- squid-3.5.6/tools/systemd/Makefile.in 2015-07-03 02:15:14.000000000 -0700 +++ squid-3.5.7/tools/systemd/Makefile.in 2015-07-31 23:10:15.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = tools/systemd -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -164,6 +174,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -407,7 +418,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/systemd/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tools/systemd/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -582,6 +592,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -u -r -N squid-3.5.6/tools/sysvinit/Makefile.in squid-3.5.7/tools/sysvinit/Makefile.in --- squid-3.5.6/tools/sysvinit/Makefile.in 2015-07-03 02:15:14.000000000 -0700 +++ squid-3.5.7/tools/sysvinit/Makefile.in 2015-07-31 23:10:15.000000000 -0700 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = tools/sysvinit -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \ $(top_srcdir)/acinclude/init.m4 \ @@ -140,6 +149,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -164,6 +174,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADAPTATION_LIBS = @ADAPTATION_LIBS@ @@ -407,7 +418,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/sysvinit/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tools/sysvinit/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -582,6 +592,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.