diff -u -r -N squid-6.9/aclocal.m4 squid-6.10/aclocal.m4 --- squid-6.9/aclocal.m4 2024-04-08 05:53:52.000000000 +0000 +++ squid-6.10/aclocal.m4 2024-06-08 14:46:33.000000000 +0000 @@ -1186,7 +1186,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -1217,7 +1218,7 @@ # along with this program. If not, see . ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -1367,6 +1368,7 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -1405,8 +1407,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -1957,7 +1959,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -2219,8 +2221,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -2244,17 +2246,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -2303,12 +2300,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -2422,7 +2419,8 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -2439,7 +2437,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -2469,7 +2467,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -2486,7 +2484,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -2498,7 +2496,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -2520,7 +2518,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -2528,7 +2526,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -2536,7 +2534,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -2556,14 +2554,14 @@ # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -2631,7 +2629,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -2670,9 +2668,22 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -2891,7 +2902,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -2934,7 +2945,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -3384,26 +3395,35 @@ striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -3726,7 +3746,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -3736,14 +3756,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -3762,7 +3782,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -3799,7 +3819,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -3832,7 +3852,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -4643,7 +4663,7 @@ bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -4677,14 +4697,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -4698,7 +4718,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -4745,7 +4765,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -4872,13 +4892,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -4904,7 +4924,7 @@ # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -5144,7 +5164,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -5162,20 +5182,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -5199,7 +5219,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -5217,9 +5237,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -5507,7 +5527,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -5590,7 +5610,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -5932,7 +5952,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -6115,7 +6135,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -6123,7 +6143,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -6183,15 +6203,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -6246,7 +6266,7 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -6358,6 +6378,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -6372,7 +6393,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -6415,7 +6436,7 @@ _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -6427,13 +6448,14 @@ if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -6443,7 +6465,7 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -6575,7 +6597,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -6758,12 +6780,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -6804,7 +6826,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -6852,7 +6874,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -6993,6 +7015,7 @@ # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; @@ -7064,6 +7087,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -7830,8 +7854,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -7929,6 +7953,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -7959,7 +7984,7 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -8096,7 +8121,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -8236,13 +8261,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -9380,6 +9405,14 @@ AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -9559,16 +9592,19 @@ # Portability macros for glibc argz. -*- Autoconf -*- # -# Copyright (C) 2004-2007, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004-2007, 2011-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 1 ltargz.m4 +# serial 2 ltargz.m4 AC_DEFUN([LT_FUNC_ARGZ], [ +dnl Required for use of '$SED' in Cygwin configuration. +AC_REQUIRE([AC_PROG_SED])dnl AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT]) AC_CHECK_TYPES([error_t], @@ -9607,7 +9643,7 @@ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' save_IFS=$IFS IFS=-. - set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` + set x `uname -r | $SED -e "$lt_sed_extract_leading_digits"` IFS=$save_IFS lt_os_major=${2-0} lt_os_minor=${3-0} @@ -9634,14 +9670,15 @@ # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- # -# Copyright (C) 1999-2008, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2008, 2011-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Thomas Tanner, 1999 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 20 LTDL_INIT +# serial 21 LTDL_INIT # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) # ------------------------------------------ @@ -9969,7 +10006,7 @@ if test -n "$_LT_LIBOBJS"; then # Remove the extension. _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do + for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | $SED "$_lt_sed_drop_objext" | sort -u`; do _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" done @@ -10107,7 +10144,7 @@ # If you are looking for one http://www.opendarwin.org/projects/dlcompat lt_cv_sys_dlopen_deplibs=yes ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) lt_cv_sys_dlopen_deplibs=yes ;; gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu) @@ -10544,8 +10581,8 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -10976,7 +11013,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -11101,7 +11138,8 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -11110,23 +11148,23 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff -u -r -N squid-6.9/cfgaux/ltmain.sh squid-6.10/cfgaux/ltmain.sh --- squid-6.9/cfgaux/ltmain.sh 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/cfgaux/ltmain.sh 2024-06-08 14:46:34.000000000 +0000 @@ -1,12 +1,12 @@ -#! /bin/sh +#! /usr/bin/env sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.6 +# libtool (GNU libtool) 2.4.7 # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-15build2" -package_revision=2.4.6 +VERSION="2.4.7 Debian-2.4.7-7build1" +package_revision=2.4.7 ## ------ ## @@ -64,34 +64,25 @@ # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-01-20.17; # UTC +scriptversion=2019-02-19.15; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# 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 -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# As a special exception to the GNU General Public License, if you distribute -# this file as part of a program or library that is built using GNU Libtool, -# you may include this file under the same distribution terms that you use -# for the rest of that program. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2004-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# Please report bugs or propose patches to gary@gnu.org. +# Please report bugs or propose patches to: +# ## ------ ## @@ -139,9 +130,12 @@ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL # Make sure IFS has a sensible default sp=' ' @@ -159,6 +153,26 @@ fi +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} + + +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH + +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS + ## ------------------------- ## ## Locate command utilities. ## @@ -259,7 +273,7 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" rm -f conftest.sed SED=$func_path_progs_result } @@ -295,7 +309,7 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" GREP=$func_path_progs_result } @@ -360,6 +374,35 @@ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () +{ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false + ;; + '') + break + ;; + *) + check_ifs_backshlash_broken=: + break + ;; + esac + done + IFS=$_G_save_IFS + require_check_ifs_backslash=: +} + ## ----------------- ## ## Global variables. ## @@ -529,27 +572,15 @@ # --------------------- # Append VALUE onto the existing contents of VAR. - # We should try to minimise forks, especially on Windows where they are - # unreasonably slow, so skip the feature probes when bash or zsh are - # being used: - if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then - : ${_G_HAVE_ARITH_OP="yes"} - : ${_G_HAVE_XSI_OPS="yes"} - # The += operator was introduced in bash 3.1 - case $BASH_VERSION in - [12].* | 3.0 | 3.0*) ;; - *) - : ${_G_HAVE_PLUSEQ_OP="yes"} - ;; - esac - fi - # _G_HAVE_PLUSEQ_OP # Can be empty, in which case the shell is probed, "yes" if += is # useable or anything else if it does not work. - test -z "$_G_HAVE_PLUSEQ_OP" \ - && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ - && _G_HAVE_PLUSEQ_OP=yes + if test -z "$_G_HAVE_PLUSEQ_OP" && \ + __PLUSEQ_TEST="a" && \ + __PLUSEQ_TEST+=" b" 2>/dev/null && \ + test "a b" = "$__PLUSEQ_TEST"; then + _G_HAVE_PLUSEQ_OP=yes + fi if test yes = "$_G_HAVE_PLUSEQ_OP" then @@ -580,16 +611,16 @@ { $debug_cmd - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" }' else func_append_quoted () { $debug_cmd - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" } fi @@ -1091,85 +1122,203 @@ } -# func_quote_for_eval ARG... -# -------------------------- -# Aesthetically quote ARGs to be evaled later. -# This function returns two values: -# i) func_quote_for_eval_result -# double-quoted, suitable for a subsequent eval -# ii) func_quote_for_eval_unquoted_result -# has all characters that are still active within double -# quotes backslashified. -func_quote_for_eval () +# func_quote_portable EVAL ARG +# ---------------------------- +# Internal function to portably implement func_quote_arg. Note that we still +# keep attention to performance here so we as much as possible try to avoid +# calling sed binary (so far O(N) complexity as long as func_append is O(1)). +func_quote_portable () { $debug_cmd - func_quote_for_eval_unquoted_result= - func_quote_for_eval_result= - while test 0 -lt $#; do - case $1 in - *[\\\`\"\$]*) - _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; - *) - _G_unquoted_arg=$1 ;; - esac - if test -n "$func_quote_for_eval_unquoted_result"; then - func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" - else - func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + $require_check_ifs_backslash + + func_quote_portable_result=$2 + + # one-time-loop (easy break) + while true + do + if $1; then + func_quote_portable_result=`$ECHO "$2" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` + break fi - case $_G_unquoted_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_quoted_arg=\"$_G_unquoted_arg\" + # Quote for eval. + case $func_quote_portable_result in + *[\\\`\"\$]*) + # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string + # contains the shell wildcard characters. + case $check_ifs_backshlash_broken$func_quote_portable_result in + :*|*[\[\*\?]*) + func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ + | $SED "$sed_quote_subst"` + break + ;; + esac + + func_quote_portable_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_portable_result + do + case $1 in + quote) + func_append func_quote_portable_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_portable_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac + done + done + IFS=$func_quote_portable_old_IFS ;; - *) - _G_quoted_arg=$_G_unquoted_arg - ;; + *) ;; esac - - if test -n "$func_quote_for_eval_result"; then - func_append func_quote_for_eval_result " $_G_quoted_arg" - else - func_append func_quote_for_eval_result "$_G_quoted_arg" - fi - shift + break done + + func_quote_portable_unquoted_result=$func_quote_portable_result + case $func_quote_portable_result in + # double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # many bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_portable_result=\"$func_quote_portable_result\" + ;; + esac } -# func_quote_for_expand ARG -# ------------------------- -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - $debug_cmd +# func_quotefast_eval ARG +# ----------------------- +# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +# but optimized for speed. Result is stored in $func_quotefast_eval. +if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then + printf -v _GL_test_printf_tilde %q '~' + if test '\~' = "$_GL_test_printf_tilde"; then + func_quotefast_eval () + { + printf -v func_quotefast_eval_result %q "$1" + } + else + # Broken older Bash implementations. Make those faster too if possible. + func_quotefast_eval () + { + case $1 in + '~'*) + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + ;; + *) + printf -v func_quotefast_eval_result %q "$1" + ;; + esac + } + fi +else + func_quotefast_eval () + { + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + } +fi - case $1 in - *[\\\`\"]*) - _G_arg=`$ECHO "$1" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) - _G_arg=$1 ;; + +# func_quote_arg MODEs ARG +# ------------------------ +# Quote one ARG to be evaled later. MODEs argument may contain zero or more +# specifiers listed below separated by ',' character. This function returns two +# values: +# i) func_quote_arg_result +# double-quoted (when needed), suitable for a subsequent eval +# ii) func_quote_arg_unquoted_result +# has all characters that are still active within double +# quotes backslashified. Available only if 'unquoted' is specified. +# +# Available modes: +# ---------------- +# 'eval' (default) +# - escape shell special characters +# 'expand' +# - the same as 'eval'; but do not quote variable references +# 'pretty' +# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +# be used later in func_quote to get output like: 'echo "a b"' instead +# of 'echo a\ b'. This is slower than default on some shells. +# 'unquoted' +# - produce also $func_quote_arg_unquoted_result which does not contain +# wrapping double-quotes. +# +# Examples for 'func_quote_arg pretty,unquoted string': +# +# string | *_result | *_unquoted_result +# ------------+-----------------------+------------------- +# " | \" | \" +# a b | "a b" | a b +# "a b" | "\"a b\"" | \"a b\" +# * | "*" | * +# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +# +# Examples for 'func_quote_arg pretty,unquoted,expand string': +# +# string | *_result | *_unquoted_result +# --------------+---------------------+-------------------- +# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +func_quote_arg () +{ + _G_quote_expand=false + case ,$1, in + *,expand,*) + _G_quote_expand=: + ;; esac - case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_arg=\"$_G_arg\" + case ,$1, in + *,pretty,*|*,expand,*|*,unquoted,*) + func_quote_portable $_G_quote_expand "$2" + func_quote_arg_result=$func_quote_portable_result + func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result + ;; + *) + # Faster quote-for-eval for some shells. + func_quotefast_eval "$2" + func_quote_arg_result=$func_quotefast_eval_result ;; esac +} + - func_quote_for_expand_result=$_G_arg +# func_quote MODEs ARGs... +# ------------------------ +# Quote all ARGs to be evaled later and join them into single command. See +# func_quote_arg's description for more info. +func_quote () +{ + $debug_cmd + _G_func_quote_mode=$1 ; shift + func_quote_result= + while test 0 -lt $#; do + func_quote_arg "$_G_func_quote_mode" "$1" + if test -n "$func_quote_result"; then + func_append func_quote_result " $func_quote_arg_result" + else + func_append func_quote_result "$func_quote_arg_result" + fi + shift + done } @@ -1215,8 +1364,8 @@ _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_for_expand "$_G_cmd" - eval "func_notquiet $func_quote_for_expand_result" + func_quote_arg pretty,expand "$_G_cmd" + eval "func_notquiet $func_quote_arg_result" $opt_dry_run || { eval "$_G_cmd" @@ -1241,8 +1390,8 @@ _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$_G_cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || { @@ -1369,30 +1518,26 @@ # End: #! /bin/sh -# Set a version string for this script. -scriptversion=2015-10-07.11; # UTC - # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# Copyright (C) 2010-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2010-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Please report bugs or propose patches to: +# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Please report bugs or propose patches to gary@gnu.org. +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC ## ------ ## @@ -1415,7 +1560,7 @@ # # In order for the '--version' option to work, you will need to have a # suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# warranty; '. +# starting with '# Written by ' and ending with '# Copyright'. # # For '-h' and '--help' to work, you will also need a one line # description of your script's purpose in a comment directly above the @@ -1427,7 +1572,7 @@ # to display verbose messages only when your user has specified # '--verbose'. # -# After sourcing this file, you can plug processing for additional +# After sourcing this file, you can plug in processing for additional # options by amending the variables from the 'Configuration' section # below, and following the instructions in the 'Option parsing' # section further down. @@ -1476,8 +1621,8 @@ ## ------------------------- ## # This section contains functions for adding, removing, and running hooks -# to the main code. A hook is just a named list of of function, that can -# be run in order later on. +# in the main code. A hook is just a list of function names that can be +# run in order later on. # func_hookable FUNC_NAME # ----------------------- @@ -1510,7 +1655,8 @@ # func_remove_hook FUNC_NAME HOOK_FUNC # ------------------------------------ -# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +# Remove HOOK_FUNC from the list of hook functions to be called by +# FUNC_NAME. func_remove_hook () { $debug_cmd @@ -1519,10 +1665,28 @@ } +# func_propagate_result FUNC_NAME_A FUNC_NAME_B +# --------------------------------------------- +# If the *_result variable of FUNC_NAME_A _is set_, assign its value to +# *_result variable of FUNC_NAME_B. +func_propagate_result () +{ + $debug_cmd + + func_propagate_result_result=: + if eval "test \"\${${1}_result+set}\" = set" + then + eval "${2}_result=\$${1}_result" + else + func_propagate_result_result=false + fi +} + + # func_run_hooks FUNC_NAME [ARG]... # --------------------------------- # Run all hook functions registered to FUNC_NAME. -# It is assumed that the list of hook functions contains nothing more +# It's assumed that the list of hook functions contains nothing more # than a whitespace-delimited list of legal shell function names, and # no effort is wasted trying to catch shell meta-characters or preserve # whitespace. @@ -1534,22 +1698,19 @@ case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; + *) func_fatal_error "'$1' does not support hook functions." ;; esac eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - if eval $_G_hook '"$@"'; then - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift - _G_rc_run_hooks=: + func_unset "${_G_hook}_result" + eval $_G_hook '${1+"$@"}' + func_propagate_result $_G_hook func_run_hooks + if $func_propagate_result_result; then + eval set dummy "$func_run_hooks_result"; shift fi done - - $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result } @@ -1559,14 +1720,16 @@ ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, you may remove/edit -# any options that you action, and then pass back the remaining unprocessed -# options in '_result', escaped suitably for -# 'eval'. In this case you also must return $EXIT_SUCCESS to let the -# hook's caller know that it should pay attention to -# '_result'. Returning $EXIT_FAILURE signalizes that -# arguments are left untouched by the hook and therefore caller will ignore the -# result variable. +# full positional parameter list from your hook function. You may remove +# or edit any options that you action, and then pass back the remaining +# unprocessed options in '_result', escaped +# suitably for 'eval'. +# +# The '_result' variable is automatically unset +# before your hook gets called; for best performance, only set the +# *_result variable when necessary (i.e. don't call the 'func_quote' +# function unnecessarily because it can be an expensive operation on some +# machines). # # Like this: # @@ -1578,11 +1741,8 @@ # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# # No change in '$@' (ignored completely by this hook). There is -# # no need to do the equivalent (but slower) action: -# # func_quote_for_eval ${1+"$@"} -# # my_options_prep_result=$func_quote_for_eval_result -# false +# # No change in '$@' (ignored completely by this hook). Leave +# # my_options_prep_result variable intact. # } # func_add_hook func_options_prep my_options_prep # @@ -1593,7 +1753,7 @@ # # args_changed=false # -# # Note that for efficiency, we parse as many options as we can +# # Note that, for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do @@ -1610,18 +1770,17 @@ # args_changed=: # ;; # *) # Make sure the first unrecognised option "$_G_opt" -# # is added back to "$@", we could need that later -# # if $args_changed is true. +# # is added back to "$@" in case we need it later, +# # if $args_changed was set to 'true'. # set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # +# # Only call 'func_quote' here if we processed at least one argument. # if $args_changed; then -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# func_quote eval ${1+"$@"} +# my_silent_option_result=$func_quote_result # fi -# -# $args_changed # } # func_add_hook func_parse_options my_silent_option # @@ -1632,8 +1791,6 @@ # # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." -# -# false # } # func_add_hook func_validate_options my_option_validation # @@ -1649,13 +1806,8 @@ { $debug_cmd - _G_func_options_finish_exit=false - if func_run_hooks func_options ${1+"$@"}; then - func_options_finish_result=$func_run_hooks_result - _G_func_options_finish_exit=: - fi - - $_G_func_options_finish_exit + func_run_hooks func_options ${1+"$@"} + func_propagate_result func_run_hooks func_options_finish } @@ -1668,28 +1820,27 @@ { $debug_cmd - _G_rc_options=false + _G_options_quoted=false for my_func in options_prep parse_options validate_options options_finish do - if eval func_$my_func '${1+"$@"}'; then - eval _G_res_var='$'"func_${my_func}_result" - eval set dummy "$_G_res_var" ; shift - _G_rc_options=: + func_unset func_${my_func}_result + func_unset func_run_hooks_result + eval func_$my_func '${1+"$@"}' + func_propagate_result func_$my_func func_options + if $func_propagate_result_result; then + eval set dummy "$func_options_result"; shift + _G_options_quoted=: fi done - # Save modified positional parameters for caller. As a top-level - # options-parser function we always need to set the 'func_options_result' - # variable (regardless the $_G_rc_options value). - if $_G_rc_options; then - func_options_result=$_G_res_var - else - func_quote_for_eval ${1+"$@"} - func_options_result=$func_quote_for_eval_result - fi - - $_G_rc_options + $_G_options_quoted || { + # As we (func_options) are top-level options-parser function and + # nobody quoted "$@" for us yet, we need to do it explicitly for + # caller. + func_quote eval ${1+"$@"} + func_options_result=$func_quote_result + } } @@ -1699,8 +1850,7 @@ # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and # needs to propagate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before -# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). +# modified list must be put in 'func_run_hooks_result' before returning. func_hookable func_options_prep func_options_prep () { @@ -1710,14 +1860,8 @@ opt_verbose=false opt_warning_types= - _G_rc_options_prep=false - if func_run_hooks func_options_prep ${1+"$@"}; then - _G_rc_options_prep=: - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result - fi - - $_G_rc_options_prep + func_run_hooks func_options_prep ${1+"$@"} + func_propagate_result func_run_hooks func_options_prep } @@ -1729,27 +1873,32 @@ { $debug_cmd - func_parse_options_result= - - _G_rc_parse_options=false + _G_parse_options_requote=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - if func_run_hooks func_parse_options ${1+"$@"}; then - eval set dummy "$func_run_hooks_result"; shift - _G_rc_parse_options=: + func_run_hooks func_parse_options ${1+"$@"} + func_propagate_result func_run_hooks func_parse_options + if $func_propagate_result_result; then + eval set dummy "$func_parse_options_result"; shift + # Even though we may have changed "$@", we passed the "$@" array + # down into the hook and it quoted it for us (because we are in + # this if-branch). No need to quote it again. + _G_parse_options_requote=false fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + # We expect that one of the options parsed in this function matches + # and thus we remove _G_opt from "$@" and need to re-quote. _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" + func_echo "enabling shell trace mode" >&2 $debug_cmd ;; @@ -1760,7 +1909,7 @@ --warnings|--warning|-W) if test $# = 0 && func_missing_arg $_G_opt; then - _G_rc_parse_options=: + _G_parse_options_requote=: break fi case " $warning_categories $1" in @@ -1815,7 +1964,7 @@ shift ;; - --) _G_rc_parse_options=: ; break ;; + --) _G_parse_options_requote=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; *) set dummy "$_G_opt" ${1+"$@"}; shift _G_match_parse_options=false @@ -1823,17 +1972,16 @@ ;; esac - $_G_match_parse_options && _G_rc_parse_options=: + if $_G_match_parse_options; then + _G_parse_options_requote=: + fi done - - if $_G_rc_parse_options; then + if $_G_parse_options_requote; then # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + func_parse_options_result=$func_quote_result fi - - $_G_rc_parse_options } @@ -1846,21 +1994,14 @@ { $debug_cmd - _G_rc_validate_options=false - # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if func_run_hooks func_validate_options ${1+"$@"}; then - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result - _G_rc_validate_options=: - fi + func_run_hooks func_validate_options ${1+"$@"} + func_propagate_result func_run_hooks func_validate_options # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - - $_G_rc_validate_options } @@ -1916,8 +2057,8 @@ # func_split_equals STRING # ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -# splitting STRING at the '=' sign. +# Set func_split_equals_lhs and func_split_equals_rhs shell variables +# after splitting STRING at the '=' sign. test -z "$_G_HAVE_XSI_OPS" \ && (eval 'x=a/b/c; test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ @@ -1932,8 +2073,9 @@ func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} - test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs= + if test "x$func_split_equals_lhs" = "x$1"; then + func_split_equals_rhs= + fi }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -1943,7 +2085,7 @@ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` func_split_equals_rhs= - test "x$func_split_equals_lhs" = "x$1" \ + test "x$func_split_equals_lhs=" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } fi #func_split_equals @@ -1969,7 +2111,7 @@ { $debug_cmd - func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` } fi #func_split_short_opt @@ -2011,31 +2153,44 @@ # func_version # ------------ # Echo version message to standard output and exit. +# The version message is extracted from the calling file's header +# comments, with leading '# ' stripped: +# 1. First display the progname and version +# 2. Followed by the header comment line matching /^# Written by / +# 3. Then a blank line followed by the first following line matching +# /^# Copyright / +# 4. Immediately followed by any lines between the previous matches, +# except lines preceding the intervening completely blank line. +# For example, see the header comments of this file. func_version () { $debug_cmd printf '%s\n' "$progname $scriptversion" $SED -n ' - /(C)/!b go - :more - /\./!{ - N - s|\n# | | - b more - } - :go - /^# Written by /,/# warranty; / { - s|^# || - s|^# *$|| - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - p + /^# Written by /!b + s|^# ||; p; n + + :fwd2blnk + /./ { + n + b fwd2blnk } - /^# Written by / { - s|^# || - p + p; n + + :holdwrnt + s|^# || + s|^# *$|| + /^Copyright /!{ + /./H + n + b holdwrnt } - /^warranty; /q' < "$progpath" + + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + G + s|\(\n\)\n*|\1|g + p; q' < "$progpath" exit $? } @@ -2045,12 +2200,12 @@ # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" # time-stamp-time-zone: "UTC" # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6' +scriptversion='(GNU libtool) 2.4.7' # func_echo ARG... @@ -2141,7 +2296,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-15build2 + version: $progname $scriptversion Debian-2.4.7-7build1 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2197,7 +2352,7 @@ # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2345,6 +2500,8 @@ _G_rc_lt_options_prep=: + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2375,11 +2532,9 @@ if $_G_rc_lt_options_prep; then # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_options_prep_result=$func_quote_result fi - - $_G_rc_lt_options_prep } func_add_hook func_options_prep libtool_options_prep @@ -2482,11 +2637,9 @@ if $_G_rc_lt_parse_options; then # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_parse_options_result=$func_quote_result fi - - $_G_rc_lt_parse_options } func_add_hook func_parse_options libtool_parse_options @@ -2543,8 +2696,8 @@ } # Pass back the unparsed argument list - func_quote_for_eval ${1+"$@"} - libtool_validate_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_validate_options_result=$func_quote_result } func_add_hook func_validate_options libtool_validate_options @@ -3510,8 +3663,8 @@ esac done - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ + func_quote_arg pretty "$libobj" + test "X$libobj" != "X$func_quote_arg_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3584,8 +3737,8 @@ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result + func_quote_arg pretty "$srcfile" + qsrcfile=$func_quote_arg_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -3740,7 +3893,8 @@ -prefer-non-pic try to build non-PIC objects only -shared do not build a '.o' file suitable for static linking -static only build a '.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler + -Wc,FLAG + -Xcompiler FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. @@ -3846,6 +4000,8 @@ -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wa,FLAG + -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) @@ -4188,8 +4344,8 @@ case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " + func_quote_arg pretty "$nonopt" + install_prog="$func_quote_arg_result " arg=$1 shift else @@ -4199,8 +4355,8 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog "$func_quote_arg_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4257,12 +4413,12 @@ esac # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog " $func_quote_arg_result" if test -n "$arg2"; then - func_quote_for_eval "$arg2" + func_quote_arg pretty "$arg2" fi - func_append install_shared_prog " $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_arg_result" done test -z "$install_prog" && \ @@ -4273,8 +4429,8 @@ if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" + func_quote_arg pretty "$install_override_mode" + func_append install_shared_prog " -m $func_quote_arg_result" fi fi @@ -4570,8 +4726,8 @@ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$relink_command" + eval "func_echo $func_quote_arg_result" } if eval "$relink_command"; then : else @@ -5350,7 +5506,8 @@ if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + func_quote_arg pretty "$ECHO" + qECHO=$func_quote_arg_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5360,7 +5517,7 @@ \$1 _LTECHO_EOF' } - ECHO=\"$qECHO\" + ECHO=$qECHO fi # Very basic option parsing. These options are (a) specific to @@ -6703,9 +6860,9 @@ while test "$#" -gt 0; do arg=$1 shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" + func_quote_arg pretty,unquoted "$arg" + qarg=$func_quote_arg_unquoted_result + func_append libtool_args " $func_quote_arg_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -6941,6 +7098,13 @@ prev= continue ;; + xassembler) + func_append compiler_flags " -Xassembler $qarg" + prev= + func_append compile_command " -Xassembler $qarg" + func_append finalize_command " -Xassembler $qarg" + continue + ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -7111,7 +7275,7 @@ # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7131,7 +7295,7 @@ esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7161,8 +7325,20 @@ prev=xcompiler continue ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. + -pthread) + case $host in + *solaris2*) ;; + *) + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + ;; + esac + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -7303,9 +7479,9 @@ save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $func_quote_arg_result" + func_append compiler_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7319,16 +7495,21 @@ save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $wl$func_quote_arg_result" + func_append compiler_flags " $wl$func_quote_arg_result" + func_append linker_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; + -Xassembler) + prev=xassembler + continue + ;; + -Xcompiler) prev=xcompiler continue @@ -7346,8 +7527,8 @@ # -msg_* for osf cc -msg_*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; # Flags to be passed through unchanged, with rationale: @@ -7370,12 +7551,13 @@ # -fuse-ld=* Linker select flags for GCC # -static-* direct GCC to link specific libraries statically # -fcilkplus Cilk Plus language extension features for C/C++ + # -Wa,* Pass flags directly to the assembler -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7396,15 +7578,15 @@ continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result fi ;; # Some other compiler flag. -* | +*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; *.$objext) @@ -7524,8 +7706,8 @@ *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; esac # arg @@ -8733,7 +8915,7 @@ test CXX = "$tagname" && { case $host_os in linux*) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 func_suncc_cstd_abi @@ -8906,7 +9088,7 @@ # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|osf|windows|none) + darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor @@ -9000,7 +9182,7 @@ versuffix=.$current.$revision ;; - freebsd-elf) + freebsd-elf | midnightbsd-elf) func_arith $current - $age major=.$func_arith_result versuffix=$major.$age.$revision @@ -9226,7 +9408,7 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -10037,8 +10219,8 @@ for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10131,8 +10313,8 @@ eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10606,12 +10788,13 @@ elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty "$var_value" + relink_command="$var=$func_quote_arg_result; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" + relink_command=$func_quote_arg_unquoted_result fi # Only actually do things if not in dry run mode. @@ -10851,13 +11034,15 @@ elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty,unquoted "$var_value" + relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + func_quote_arg pretty,unquoted "$relink_command" + relink_command=$func_quote_arg_unquoted_result if test yes = "$hardcode_automatic"; then relink_command= fi diff -u -r -N squid-6.9/ChangeLog squid-6.10/ChangeLog --- squid-6.9/ChangeLog 2024-04-08 05:02:07.000000000 +0000 +++ squid-6.10/ChangeLog 2024-06-08 13:28:58.000000000 +0000 @@ -1,3 +1,10 @@ +Changes in squid-6.10 (10 Jun 2024) + - Bug 5378: type mismatch in libTrie + - Disable ESI in default build + - Fix build with clang v18 [-Wvla-cxx-extension] + - ... and some unit test improvements + - ... and some documentation improvements + Changes in squid-6.9 (7 Apr 2024) - Regression Bug 5349: basic_nis_auth build error: unterminated #ifndef - Bug 5069: Keep listening after getsockname() error diff -u -r -N squid-6.9/compat/Makefile.in squid-6.10/compat/Makefile.in --- squid-6.9/compat/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/compat/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -550,6 +550,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/configure squid-6.10/configure --- squid-6.9/configure 2024-04-08 05:54:08.000000000 +0000 +++ squid-6.10/configure 2024-06-08 14:46:42.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Squid Web Proxy 6.9. +# Generated by GNU Autoconf 2.71 for Squid Web Proxy 6.10. # # Report bugs to . # @@ -626,8 +626,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='6.9' -PACKAGE_STRING='Squid Web Proxy 6.9' +PACKAGE_VERSION='6.10' +PACKAGE_STRING='Squid Web Proxy 6.10' PACKAGE_BUGREPORT='https://bugs.squid-cache.org/' PACKAGE_URL='' @@ -860,6 +860,7 @@ ac_ct_AR DLLTOOL OBJDUMP +FILECMD NM ac_ct_DUMPBIN DUMPBIN @@ -1695,7 +1696,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 6.9 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 6.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1766,7 +1767,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 6.9:";; + short | recursive ) echo "Configuration of Squid Web Proxy 6.10:";; esac cat <<\_ACEOF @@ -1830,10 +1831,12 @@ build your custom policy --enable-icmp Enable ICMP pinging and Network Measurement --enable-delay-pools Enable delay pools to limit bandwidth usage - --disable-esi Disable ESI for accelerators. ESI requires expat or + + --enable-esi Enable ESI for accelerators. ESI requires expat or xml2 library. Enabling ESI will cause squid reverse proxies to be capable of the Edge Acceleration Specification (www.esi.org). + --disable-icap-client Disable the ICAP client. --enable-ecap support loadable content adaptation modules --disable-wccp Disable Web Cache Coordination Protocol @@ -2186,7 +2189,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 6.9 +Squid Web Proxy configure 6.10 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -3199,7 +3202,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 6.9, which was +It was created by Squid Web Proxy $as_me 6.10, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4691,7 +4694,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='6.9' + VERSION='6.10' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7020,11 +7023,11 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} +if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7066,11 +7069,11 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} +if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_98=no + ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9622,8 +9625,8 @@ -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' @@ -10034,13 +10037,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -10178,7 +10181,7 @@ fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -10271,7 +10274,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -10314,7 +10317,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -10520,6 +10523,114 @@ if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + +if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -10662,7 +10773,7 @@ bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -10696,14 +10807,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -10717,7 +10828,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -10764,7 +10875,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -11137,13 +11248,29 @@ fi : ${AR=ar} -: ${AR_FLAGS=cr} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS + + + + + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + @@ -11560,7 +11687,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -11578,20 +11705,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -11615,7 +11742,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -11633,9 +11760,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -11835,7 +11962,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -11960,7 +12087,7 @@ ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -11981,7 +12108,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -11993,7 +12120,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -12019,7 +12146,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -12027,7 +12154,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -12035,7 +12162,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -12059,14 +12186,14 @@ ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -12174,7 +12301,7 @@ ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -12957,8 +13084,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cr libconftest.a conftest.o" >&5 - $AR cr libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -12985,17 +13112,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[912]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -13363,8 +13485,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -13878,7 +14000,7 @@ lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -14301,15 +14423,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -14364,7 +14486,7 @@ whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -14476,6 +14598,7 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -14490,7 +14613,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -14533,7 +14656,7 @@ compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -14545,13 +14668,14 @@ if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -14561,7 +14685,7 @@ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -14693,7 +14817,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -14964,12 +15088,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -15010,7 +15134,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -15051,8 +15175,8 @@ output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -15086,7 +15210,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -15267,6 +15391,7 @@ # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; @@ -15338,6 +15463,7 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -16030,7 +16156,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -16040,14 +16166,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -16066,7 +16192,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -16103,7 +16229,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -16136,7 +16262,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -17301,30 +17427,41 @@ old_striplib= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 printf %s "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - fi - ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; - esac + ;; + esac + fi fi @@ -18094,8 +18231,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_CXX=' ' @@ -18186,11 +18323,11 @@ output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" if test yes != "$lt_cv_apple_cc_single_mod"; then archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -18225,6 +18362,7 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes_CXX=yes + file_list_spec_CXX='@' ;; dgux*) @@ -18255,7 +18393,7 @@ archive_cmds_need_lc_CXX=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -18392,7 +18530,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -18532,13 +18670,13 @@ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' @@ -19195,7 +19333,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -19278,7 +19416,7 @@ lt_prog_compiler_static_CXX='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 lt_prog_compiler_pic_CXX='-KPIC' @@ -19665,7 +19803,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -19673,7 +19811,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -20024,7 +20162,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) @@ -20033,14 +20171,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -20059,7 +20197,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -20096,7 +20234,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -20128,7 +20266,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -21501,7 +21639,7 @@ # If you are looking for one http://www.opendarwin.org/projects/dlcompat lt_cv_sys_dlopen_deplibs=yes ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) lt_cv_sys_dlopen_deplibs=yes ;; gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu) @@ -21640,7 +21778,7 @@ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' save_IFS=$IFS IFS=-. - set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` + set x `uname -r | $SED -e "$lt_sed_extract_leading_digits"` IFS=$save_IFS lt_os_major=${2-0} lt_os_minor=${3-0} @@ -27993,14 +28131,32 @@ squid_opt_use_adaptation=no -squid_opt_use_esi=auto # Check whether --enable-esi was given. if test ${enable_esi+y} then : - enableval=$enable_esi; squid_opt_use_esi=$enableval + enableval=$enable_esi; + +squid_tmp_define="" +case "$enable_esi" in #( + yes|true|1) : + squid_tmp_define="1" ;; #( + no|false|0|"") : + squid_tmp_define="0" ;; #( + *) : + as_fn_error $? "SQUID_DEFINE_BOOL: unrecognized value for USE_SQUID_ESI: '$enable_esi'" "$LINENO" 5 + ;; +esac +printf "%s\n" "#define USE_SQUID_ESI $squid_tmp_define" >>confdefs.h + + +unset squid_tmp_define + + fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Enable ESI processor: ${enable_esi:=no (auto)}" >&5 +printf "%s\n" "$as_me: Enable ESI processor: ${enable_esi:=no (auto)}" >&6;} # ESI support libraries: expat @@ -28038,7 +28194,7 @@ fi -if test "x$squid_opt_use_esi" != "xno" -a "x$with_expat" != "xno" +if test "x$enable_esi" = "xyes" -a "x$with_expat" != "xno" then : @@ -28246,7 +28402,6 @@ if test "x$LIBEXPAT_LIBS" != "x" then : - squid_opt_use_esi=yes LIBEXPAT_LIBS="$LIBEXPAT_PATH $LIBEXPAT_LIBS" printf "%s\n" "#define HAVE_LIBEXPAT 1" >>confdefs.h @@ -28308,7 +28463,7 @@ fi -if test "x$squid_opt_use_esi" != "xno" -a "x$with_xml2" != "xno" +if test "x$enable_esi" = "xyes" -a "x$with_xml2" != "xno" then : @@ -28529,7 +28684,6 @@ if test "x$LIBXML2_LIBS" != "x" then : - squid_opt_use_esi=yes CPPFLAGS="$LIBXML2_CFLAGS $CPPFLAGS" LIBXML2_LIBS="$LIBXML2_PATH $LIBXML2_LIBS" @@ -28559,38 +28713,13 @@ -if test "x$squid_opt_use_esi" = "xyes" -then : - - if test "x$LIBXML2_LIBS" = "x" -a "x$LIBEXPAT_LIBS" = "x" +if test "x$enable_esi" = "xyes" -a "x$LIBXML2_LIBS" = "x" -a "x$LIBEXPAT_LIBS" = "x" then : - as_fn_error $? "ESI processor requires libxml2 or libexpat" "$LINENO" 5 + as_fn_error $? "ESI processor requires libxml2 or libexpat" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Enabling ESI processor: $LIBEXPAT_LIBS $LIBXML2_LIBS" >&5 -printf "%s\n" "$as_me: Enabling ESI processor: $LIBEXPAT_LIBS $LIBXML2_LIBS" >&6;} - -printf "%s\n" "#define USE_SQUID_ESI 1" >>confdefs.h - - -else $as_nop - - if test "x$squid_opt_use_esi" = "xno" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Disabling ESI processor." >&5 -printf "%s\n" "$as_me: Disabling ESI processor." >&6;} - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Disabling ESI processor. libxml2 and libexpat not found." >&5 -printf "%s\n" "$as_me: Disabling ESI processor. libxml2 and libexpat not found." >&6;} - -fi - -fi - if test "x$squid_opt_use_esi" = "xyes"; then + if test "x$enable_esi" = "xyes"; then ENABLE_ESI_TRUE= ENABLE_ESI_FALSE='#' else @@ -56143,7 +56272,7 @@ if test -n "$_LT_LIBOBJS"; then # Remove the extension. _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do + for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | $SED "$_lt_sed_drop_objext" | sort -u`; do _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" done @@ -56708,7 +56837,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 6.9, which was +This file was extended by Squid Web Proxy $as_me 6.10, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -56776,7 +56905,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Squid Web Proxy config.status 6.9 +Squid Web Proxy config.status 6.10 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -56939,6 +57068,7 @@ lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' @@ -56947,6 +57077,7 @@ DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -57121,6 +57252,7 @@ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -57129,7 +57261,6 @@ DLLTOOL \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -58234,6 +58365,9 @@ # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -58258,8 +58392,11 @@ # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -58649,7 +58786,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || diff -u -r -N squid-6.9/configure.ac squid-6.10/configure.ac --- squid-6.9/configure.ac 2024-04-08 05:54:08.000000000 +0000 +++ squid-6.10/configure.ac 2024-06-08 14:46:42.000000000 +0000 @@ -5,7 +5,7 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AC_INIT([Squid Web Proxy],[6.9],[https://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[6.10],[https://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) @@ -798,19 +798,21 @@ dnl disable generic/common adaptation support by default squid_opt_use_adaptation=no -squid_opt_use_esi=auto -AH_TEMPLATE([USE_SQUID_ESI],[Define to enable the ESI processor]) -AC_ARG_ENABLE(esi, - AS_HELP_STRING([--disable-esi], - [Disable ESI for accelerators. ESI requires expat or xml2 library. +AH_TEMPLATE([USE_SQUID_ESI],[whether to enable ESI processing]) +AC_ARG_ENABLE(esi,[ + AS_HELP_STRING([--enable-esi], + [Enable ESI for accelerators. ESI requires expat or xml2 library. Enabling ESI will cause squid reverse proxies to be capable - of the Edge Acceleration Specification (www.esi.org).]), - [squid_opt_use_esi=$enableval],[]) + of the Edge Acceleration Specification (www.esi.org).]) +],[ + SQUID_DEFINE_BOOL(USE_SQUID_ESI,$enable_esi) +]) +AC_MSG_NOTICE([Enable ESI processor: ${enable_esi:=no (auto)}]) # ESI support libraries: expat AH_TEMPLATE(HAVE_LIBEXPAT,[Define to 1 if you have the expat library]) SQUID_AUTO_LIB(expat,[ESI expat library],[LIBEXPAT]) -AS_IF([test "x$squid_opt_use_esi" != "xno" -a "x$with_expat" != "xno"],[ +AS_IF([test "x$enable_esi" = "xyes" -a "x$with_expat" != "xno"],[ SQUID_STATE_SAVE(squid_expat_state) PKG_CHECK_MODULES([LIBEXPAT],[expat],[],[ AC_CHECK_LIB([expat],[main],[LIBEXPAT_LIBS="-lexpat"]) @@ -819,7 +821,6 @@ AC_CHECK_HEADERS(expat.h) SQUID_STATE_ROLLBACK(squid_expat_state) AS_IF([test "x$LIBEXPAT_LIBS" != "x"],[ - squid_opt_use_esi=yes LIBEXPAT_LIBS="$LIBEXPAT_PATH $LIBEXPAT_LIBS" AC_DEFINE(HAVE_LIBEXPAT,1,[Define to 1 if you have the expat library]) ], @@ -833,7 +834,7 @@ # ESI support libraries: xml2 AH_TEMPLATE(HAVE_LIBXML2,[Define to 1 if you have the xml2 library]) SQUID_AUTO_LIB(xml2,[ESI xml2 library],[LIBXML2]) -AS_IF([test "x$squid_opt_use_esi" != "xno" -a "x$with_xml2" != "xno"],[ +AS_IF([test "x$enable_esi" = "xyes" -a "x$with_xml2" != "xno"],[ SQUID_STATE_SAVE([squid_libxml2_save]) PKG_CHECK_MODULES([LIBXML2],[libxml-2.0],[],[ AC_CHECK_LIB([xml2],[main],[LIBXML2_LIBS="$LIBXML2_PATH -lxml2"]) @@ -843,7 +844,6 @@ SQUID_STATE_ROLLBACK([squid_libxml2_save]) AS_IF([test "x$LIBXML2_LIBS" != "x"],[ - squid_opt_use_esi=yes CPPFLAGS="$LIBXML2_CFLAGS $CPPFLAGS" LIBXML2_LIBS="$LIBXML2_PATH $LIBXML2_LIBS" AC_DEFINE(HAVE_LIBXML2,1,[Define to 1 if you have the xml2 library]) @@ -856,20 +856,10 @@ AM_CONDITIONAL(ENABLE_LIBXML2,[test "x$LIBXML2_LIBS" != "x"]) AC_SUBST(LIBXML2_LIBS) -AS_IF([test "x$squid_opt_use_esi" = "xyes"],[ - AS_IF([test "x$LIBXML2_LIBS" = "x" -a "x$LIBEXPAT_LIBS" = "x"],[ - AC_MSG_ERROR([ESI processor requires libxml2 or libexpat]) - ]) - AC_MSG_NOTICE([Enabling ESI processor: $LIBEXPAT_LIBS $LIBXML2_LIBS]) - AC_DEFINE(USE_SQUID_ESI,1,[Compile the ESI processor]) -],[ - AS_IF(test "x$squid_opt_use_esi" = "xno",[ - AC_MSG_NOTICE([Disabling ESI processor.]) - ],[ - AC_MSG_NOTICE([Disabling ESI processor. libxml2 and libexpat not found.]) - ]) +AS_IF([test "x$enable_esi" = "xyes" -a "x$LIBXML2_LIBS" = "x" -a "x$LIBEXPAT_LIBS" = "x"],[ + AC_MSG_ERROR([ESI processor requires libxml2 or libexpat]) ]) -AM_CONDITIONAL(ENABLE_ESI, test "x$squid_opt_use_esi" = "xyes") +AM_CONDITIONAL(ENABLE_ESI,[test "x$enable_esi" = "xyes"]) AC_ARG_ENABLE(icap-client, AS_HELP_STRING([--disable-icap-client],[Disable the ICAP client.]),[ diff -u -r -N squid-6.9/contrib/Makefile.in squid-6.10/contrib/Makefile.in --- squid-6.9/contrib/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/contrib/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -248,6 +248,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/doc/Makefile.in squid-6.10/doc/Makefile.in --- squid-6.9/doc/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/doc/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -301,6 +301,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/doc/manuals/Makefile.in squid-6.10/doc/manuals/Makefile.in --- squid-6.9/doc/manuals/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/doc/manuals/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -243,6 +243,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/doc/release-notes/Makefile.in squid-6.10/doc/release-notes/Makefile.in --- squid-6.9/doc/release-notes/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/doc/release-notes/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -243,6 +243,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/doc/release-notes/release-6.html squid-6.10/doc/release-notes/release-6.html --- squid-6.9/doc/release-notes/release-6.html 2024-04-08 06:05:38.000000000 +0000 +++ squid-6.10/doc/release-notes/release-6.html 2024-06-08 14:51:53.000000000 +0000 @@ -1,12 +1,12 @@ - + - Squid 6.9 release notes + Squid 6.10 release notes -

Squid 6.9 release notes

+

Squid 6.10 release notes

Squid Developers

@@ -59,7 +59,7 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-6.9 for testing.

+

The Squid Team are pleased to announce the release of Squid-6.10 for testing.

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

@@ -416,7 +416,9 @@

-

No ./configure options have been changed.

+
--disable-esi
+

The ESI feature is now disabled by default. +Use --enable-esi if needed.

diff -u -r -N squid-6.9/errors/Makefile.in squid-6.10/errors/Makefile.in --- squid-6.9/errors/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/errors/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -244,6 +244,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/icons/Makefile.in squid-6.10/icons/Makefile.in --- squid-6.9/icons/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/icons/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -273,6 +273,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/include/autoconf.h.in squid-6.10/include/autoconf.h.in --- squid-6.9/include/autoconf.h.in 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/include/autoconf.h.in 2024-06-08 14:46:34.000000000 +0000 @@ -1525,7 +1525,7 @@ /* Solaris Kerberos support is available */ #undef USE_SOLARIS_KRB5 -/* Compile the ESI processor */ +/* whether to enable ESI processing */ #undef USE_SQUID_ESI /* Define this to include code which lets you use ethernet addresses. This diff -u -r -N squid-6.9/include/version.h squid-6.10/include/version.h --- squid-6.9/include/version.h 2024-04-08 05:54:08.000000000 +0000 +++ squid-6.10/include/version.h 2024-06-08 14:46:42.000000000 +0000 @@ -10,7 +10,7 @@ #define SQUID_INCLUDE_VERSION_H #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1712555627 +#define SQUID_RELEASE_TIME 1717857990 #endif /* diff -u -r -N squid-6.9/lib/libTrie/Makefile.in squid-6.10/lib/libTrie/Makefile.in --- squid-6.9/lib/libTrie/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/lib/libTrie/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -571,6 +571,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/lib/libTrie/test/Makefile.in squid-6.10/lib/libTrie/test/Makefile.in --- squid-6.9/lib/libTrie/test/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/lib/libTrie/test/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -502,6 +502,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/lib/libTrie/TrieNode.cc squid-6.10/lib/libTrie/TrieNode.cc --- squid-6.9/lib/libTrie/TrieNode.cc 2024-04-08 05:02:07.000000000 +0000 +++ squid-6.10/lib/libTrie/TrieNode.cc 2024-06-08 13:28:58.000000000 +0000 @@ -32,7 +32,7 @@ /* We trust that privatedata and existent keys have already been checked */ if (theLength) { - int index = transform ? (*transform)(*aString): *aString; + const unsigned char index = transform ? (*transform)(*aString): *aString; if (!internal[index]) internal[index] = new TrieNode; diff -u -r -N squid-6.9/lib/Makefile.in squid-6.10/lib/Makefile.in --- squid-6.9/lib/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/lib/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -614,6 +614,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/lib/ntlmauth/Makefile.in squid-6.10/lib/ntlmauth/Makefile.in --- squid-6.9/lib/ntlmauth/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/lib/ntlmauth/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -522,6 +522,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/lib/rfcnb/Makefile.in squid-6.10/lib/rfcnb/Makefile.in --- squid-6.9/lib/rfcnb/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/lib/rfcnb/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -503,6 +503,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/lib/smblib/Makefile.in squid-6.10/lib/smblib/Makefile.in --- squid-6.9/lib/smblib/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/lib/smblib/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -505,6 +505,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/lib/snmplib/Makefile.in squid-6.10/lib/snmplib/Makefile.in --- squid-6.9/lib/snmplib/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/lib/snmplib/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -298,6 +298,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/libltdl/configure squid-6.10/libltdl/configure --- squid-6.9/libltdl/configure 2024-04-08 05:55:12.000000000 +0000 +++ squid-6.10/libltdl/configure 2024-06-08 14:47:27.000000000 +0000 @@ -687,6 +687,7 @@ RANLIB ac_ct_AR AR +FILECMD LN_S NM ac_ct_DUMPBIN @@ -3323,8 +3324,8 @@ -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' @@ -5201,13 +5202,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -5345,7 +5346,7 @@ fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -5449,7 +5450,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5492,7 +5493,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -5698,6 +5699,114 @@ if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + +if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -5837,7 +5946,7 @@ bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -5871,14 +5980,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -5892,7 +6001,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -5939,7 +6048,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -6310,13 +6419,29 @@ fi : ${AR=ar} -: ${AR_FLAGS=cr} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS + + + + + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + @@ -6733,7 +6858,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -6751,20 +6876,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -6788,7 +6913,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -6806,9 +6931,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -7008,7 +7133,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -7133,7 +7258,7 @@ ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -7154,7 +7279,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -7166,7 +7291,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -7192,7 +7317,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -7200,7 +7325,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -7208,7 +7333,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -7232,14 +7357,14 @@ ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -7347,7 +7472,7 @@ ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -8130,8 +8255,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cr libconftest.a conftest.o" >&5 - $AR cr libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -8158,17 +8283,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[912]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -8883,8 +9003,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -9402,7 +9522,7 @@ lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -9825,15 +9945,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -9888,7 +10008,7 @@ whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -10000,6 +10120,7 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -10014,7 +10135,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -10057,7 +10178,7 @@ compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -10069,13 +10190,14 @@ if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -10085,7 +10207,7 @@ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -10217,7 +10339,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -10488,12 +10610,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -10534,7 +10656,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -10575,8 +10697,8 @@ output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -10610,7 +10732,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -10791,6 +10913,7 @@ # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; @@ -10862,6 +10985,7 @@ emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -11554,7 +11678,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -11564,14 +11688,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -11590,7 +11714,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -11627,7 +11751,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -11660,7 +11784,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -12825,30 +12949,41 @@ old_striplib= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 printf %s "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - fi - ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; - esac + ;; + esac + fi fi @@ -13605,7 +13740,7 @@ # If you are looking for one http://www.opendarwin.org/projects/dlcompat lt_cv_sys_dlopen_deplibs=yes ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) lt_cv_sys_dlopen_deplibs=yes ;; gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu) @@ -13746,7 +13881,7 @@ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' save_IFS=$IFS IFS=-. - set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` + set x `uname -r | $SED -e "$lt_sed_extract_leading_digits"` IFS=$save_IFS lt_os_major=${2-0} lt_os_minor=${3-0} @@ -14721,12 +14856,14 @@ lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -14850,13 +14987,13 @@ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ deplibs_check_method \ file_magic_cmd \ file_magic_glob \ want_nocaseglob \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -15807,6 +15944,9 @@ # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15825,8 +15965,11 @@ # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -16202,7 +16345,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || diff -u -r -N squid-6.9/libltdl/configure.ac squid-6.10/libltdl/configure.ac --- squid-6.9/libltdl/configure.ac 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/configure.ac 2024-06-08 14:46:34.000000000 +0000 @@ -1,7 +1,7 @@ # Process this file with autoconf to create configure. -*- autoconf -*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt__alloc.h squid-6.10/libltdl/libltdl/lt__alloc.h --- squid-6.9/libltdl/libltdl/lt__alloc.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt__alloc.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,6 +1,7 @@ /* lt__alloc.h -- internal memory management interface - Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, + Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt__argz_.h squid-6.10/libltdl/libltdl/lt__argz_.h --- squid-6.9/libltdl/libltdl/lt__argz_.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt__argz_.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt__argz.h -- internal argz interface for non-glibc systems - Copyright (C) 2004, 2007-2008, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2004, 2007-2008, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt__dirent.h squid-6.10/libltdl/libltdl/lt__dirent.h --- squid-6.9/libltdl/libltdl/lt__dirent.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt__dirent.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt__dirent.h -- internal directory entry scanning interface - Copyright (C) 2001, 2004, 2006, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2001, 2004, 2006, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Bob Friesenhahn, 2001 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt_dlloader.h squid-6.10/libltdl/libltdl/lt_dlloader.h --- squid-6.9/libltdl/libltdl/lt_dlloader.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt_dlloader.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt_dlloader.h -- dynamic library loader interface - Copyright (C) 2004, 2007-2008, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2004, 2007-2008, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt_error.h squid-6.10/libltdl/libltdl/lt_error.h --- squid-6.9/libltdl/libltdl/lt_error.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt_error.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt_error.h -- error propagation interface - Copyright (C) 1999-2001, 2004, 2007, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1999-2001, 2004, 2007, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1999 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt__glibc.h squid-6.10/libltdl/libltdl/lt__glibc.h --- squid-6.9/libltdl/libltdl/lt__glibc.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt__glibc.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt__glibc.h -- support for non glibc environments - Copyright (C) 2004, 2006-2007, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2004, 2006-2007, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt__private.h squid-6.10/libltdl/libltdl/lt__private.h --- squid-6.9/libltdl/libltdl/lt__private.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt__private.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,6 +1,7 @@ /* lt__private.h -- internal apis for libltdl - Copyright (C) 2004-2008, 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2004-2008, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt__strl.h squid-6.10/libltdl/libltdl/lt__strl.h --- squid-6.9/libltdl/libltdl/lt__strl.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt__strl.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,6 +1,7 @@ /* lt__strl.h -- size-bounded string copying and concatenation - Copyright (C) 2004, 2006, 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Bob Friesenhahn, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/lt_system.h squid-6.10/libltdl/libltdl/lt_system.h --- squid-6.9/libltdl/libltdl/lt_system.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/lt_system.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,6 +1,7 @@ /* lt_system.h -- system portability abstraction layer - Copyright (C) 2004, 2007, 2010-2015 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2010-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/libltdl/slist.h squid-6.10/libltdl/libltdl/slist.h --- squid-6.9/libltdl/libltdl/slist.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/libltdl/slist.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* slist.h -- generalised singly linked lists - Copyright (C) 2000, 2004, 2009, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2000, 2004, 2009, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2000 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/loaders/dld_link.c squid-6.10/libltdl/loaders/dld_link.c --- squid-6.9/libltdl/loaders/dld_link.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/loaders/dld_link.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* loader-dld_link.c -- dynamic linking with dld - Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the @@ -112,7 +112,7 @@ { lt_module module = lt__strdup (filename); - if (dld_link (filename) != 0) + if (module && dld_link (filename) != 0) { LT__SETERROR (CANNOT_OPEN); FREE (module); diff -u -r -N squid-6.9/libltdl/loaders/dlopen.c squid-6.10/libltdl/loaders/dlopen.c --- squid-6.9/libltdl/loaders/dlopen.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/loaders/dlopen.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* loader-dlopen.c -- dynamic linking with dlopen/dlsym - Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/loaders/dyld.c squid-6.10/libltdl/loaders/dyld.c --- squid-6.9/libltdl/loaders/dyld.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/loaders/dyld.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* loader-dyld.c -- dynamic linking on darwin and OS X - Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Peter O'Gorman, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/loaders/load_add_on.c squid-6.10/libltdl/loaders/load_add_on.c --- squid-6.9/libltdl/loaders/load_add_on.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/loaders/load_add_on.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* loader-load_add_on.c -- dynamic linking for BeOS - Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/loaders/loadlibrary.c squid-6.10/libltdl/loaders/loadlibrary.c --- squid-6.9/libltdl/loaders/loadlibrary.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/loaders/loadlibrary.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* loader-loadlibrary.c -- dynamic linking for Win32 - Copyright (C) 1998-2000, 2004-2008, 2010-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004-2008, 2010-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/loaders/preopen.c squid-6.10/libltdl/loaders/preopen.c --- squid-6.9/libltdl/loaders/preopen.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/loaders/preopen.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* loader-preopen.c -- emulate dynamic linking using preloaded_symbols - Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/loaders/shl_load.c squid-6.10/libltdl/loaders/shl_load.c --- squid-6.9/libltdl/loaders/shl_load.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/loaders/shl_load.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* loader-shl_load.c -- dynamic linking with shl_load (HP-UX) - Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/lt__alloc.c squid-6.10/libltdl/lt__alloc.c --- squid-6.9/libltdl/lt__alloc.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/lt__alloc.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt__alloc.c -- internal memory management interface - Copyright (C) 2004, 2006-2007, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2004, 2006-2007, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/lt__argz.c squid-6.10/libltdl/lt__argz.c --- squid-6.9/libltdl/lt__argz.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/lt__argz.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt__argz.c -- argz implementation for non-glibc systems - Copyright (C) 2004, 2006-2008, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2004, 2006-2008, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/lt__dirent.c squid-6.10/libltdl/lt__dirent.c --- squid-6.9/libltdl/lt__dirent.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/lt__dirent.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,6 +1,7 @@ /* lt__dirent.c -- internal directory entry scanning interface - Copyright (C) 2001, 2004, 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2001, 2004, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Bob Friesenhahn, 2001 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/ltdl.c squid-6.10/libltdl/ltdl.c --- squid-6.9/libltdl/ltdl.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/ltdl.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* ltdl.c -- system independent dlopen wrapper - Copyright (C) 1998-2000, 2004-2008, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2004-2008, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/ltdl.h squid-6.10/libltdl/ltdl.h --- squid-6.9/libltdl/ltdl.h 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/ltdl.h 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* ltdl.h -- generic dlopen functions - Copyright (C) 1998-2000, 2004-2005, 2007-2008, 2011-2015 Free - Software Foundation, Inc. + Copyright (C) 1998-2000, 2004-2005, 2007-2008, 2011-2019, 2021-2022 + Free Software Foundation, Inc. Written by Thomas Tanner, 1998 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/lt_dlloader.c squid-6.10/libltdl/lt_dlloader.c --- squid-6.9/libltdl/lt_dlloader.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/lt_dlloader.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt_dlloader.c -- dynamic library loader interface - Copyright (C) 2004, 2007-2008, 2011-2015 Free Software Foundation, - Inc. + Copyright (C) 2004, 2007-2008, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Gary V. Vaughan, 2004 NOTE: The canonical source of this file is maintained with the @@ -168,6 +168,10 @@ /* Fail if there are any open modules that use this loader. */ iface = lt_dlinterface_register (id_string, NULL); + if (!iface) + /* No memory, error is already set. */ + return 0; + while ((handle = lt_dlhandle_iterate (iface, handle))) { lt_dlhandle cur = handle; diff -u -r -N squid-6.9/libltdl/lt_error.c squid-6.10/libltdl/lt_error.c --- squid-6.9/libltdl/lt_error.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/lt_error.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* lt_error.c -- error propagation interface - Copyright (C) 1999-2001, 2004-2005, 2007, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 1999-2001, 2004-2005, 2007, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Thomas Tanner, 1999 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/lt__strl.c squid-6.10/libltdl/lt__strl.c --- squid-6.9/libltdl/lt__strl.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/lt__strl.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,6 +1,7 @@ /* lt__strl.c -- size-bounded string copying and concatenation - Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, + Inc. Written by Bob Friesenhahn, 2004 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/libltdl/m4/libtool.m4 squid-6.10/libltdl/m4/libtool.m4 --- squid-6.9/libltdl/m4/libtool.m4 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/libltdl/m4/libtool.m4 2024-06-08 14:46:34.000000000 +0000 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ # along with this program. If not, see . ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -777,7 +779,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1041,8 +1043,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1066,17 +1068,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1125,12 +1122,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1244,7 +1241,8 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1261,7 +1259,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1291,7 +1289,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1308,7 +1306,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1320,7 +1318,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1342,7 +1340,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1350,7 +1348,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1358,7 +1356,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1378,14 +1376,14 @@ # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1453,7 +1451,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1492,9 +1490,22 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1713,7 +1724,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1756,7 +1767,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2206,26 +2217,35 @@ striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2548,7 +2568,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2558,14 +2578,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2584,7 +2604,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2621,7 +2641,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2654,7 +2674,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3465,7 +3485,7 @@ bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3499,14 +3519,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3520,7 +3540,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3567,7 +3587,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3694,13 +3714,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3726,7 +3746,7 @@ # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3966,7 +3986,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -3984,20 +4004,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4021,7 +4041,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4039,9 +4059,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4329,7 +4349,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4412,7 +4432,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4754,7 +4774,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4937,7 +4957,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4945,7 +4965,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5005,15 +5025,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5068,7 +5088,7 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5180,6 +5200,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5194,7 +5215,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5237,7 +5258,7 @@ _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5249,13 +5270,14 @@ if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -5265,7 +5287,7 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5397,7 +5419,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5580,12 +5602,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5626,7 +5648,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5674,7 +5696,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5815,6 +5837,7 @@ # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; @@ -5886,6 +5909,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6656,8 +6680,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6755,6 +6779,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6785,7 +6810,7 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6922,7 +6947,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7062,13 +7087,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8214,6 +8239,14 @@ AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff -u -r -N squid-6.9/libltdl/m4/ltargz.m4 squid-6.10/libltdl/m4/ltargz.m4 --- squid-6.9/libltdl/m4/ltargz.m4 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/libltdl/m4/ltargz.m4 2024-06-08 14:46:34.000000000 +0000 @@ -1,15 +1,18 @@ # Portability macros for glibc argz. -*- Autoconf -*- # -# Copyright (C) 2004-2007, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004-2007, 2011-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 1 ltargz.m4 +# serial 2 ltargz.m4 AC_DEFUN([LT_FUNC_ARGZ], [ +dnl Required for use of '$SED' in Cygwin configuration. +AC_REQUIRE([AC_PROG_SED])dnl AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT]) AC_CHECK_TYPES([error_t], @@ -48,7 +51,7 @@ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' save_IFS=$IFS IFS=-. - set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` + set x `uname -r | $SED -e "$lt_sed_extract_leading_digits"` IFS=$save_IFS lt_os_major=${2-0} lt_os_minor=${3-0} diff -u -r -N squid-6.9/libltdl/m4/ltdl.m4 squid-6.10/libltdl/m4/ltdl.m4 --- squid-6.9/libltdl/m4/ltdl.m4 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/libltdl/m4/ltdl.m4 2024-06-08 14:46:34.000000000 +0000 @@ -1,13 +1,14 @@ # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- # -# Copyright (C) 1999-2008, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2008, 2011-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Thomas Tanner, 1999 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 20 LTDL_INIT +# serial 21 LTDL_INIT # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) # ------------------------------------------ @@ -335,7 +336,7 @@ if test -n "$_LT_LIBOBJS"; then # Remove the extension. _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do + for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | $SED "$_lt_sed_drop_objext" | sort -u`; do _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" done @@ -473,7 +474,7 @@ # If you are looking for one http://www.opendarwin.org/projects/dlcompat lt_cv_sys_dlopen_deplibs=yes ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) lt_cv_sys_dlopen_deplibs=yes ;; gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu) diff -u -r -N squid-6.9/libltdl/m4/lt~obsolete.m4 squid-6.10/libltdl/m4/lt~obsolete.m4 --- squid-6.9/libltdl/m4/lt~obsolete.m4 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/m4/lt~obsolete.m4 2024-06-08 14:46:34.000000000 +0000 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff -u -r -N squid-6.9/libltdl/m4/ltoptions.m4 squid-6.10/libltdl/m4/ltoptions.m4 --- squid-6.9/libltdl/m4/ltoptions.m4 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/libltdl/m4/ltoptions.m4 2024-06-08 14:46:34.000000000 +0000 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff -u -r -N squid-6.9/libltdl/m4/ltsugar.m4 squid-6.10/libltdl/m4/ltsugar.m4 --- squid-6.9/libltdl/m4/ltsugar.m4 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/libltdl/m4/ltsugar.m4 2024-06-08 14:46:34.000000000 +0000 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff -u -r -N squid-6.9/libltdl/m4/ltversion.m4 squid-6.10/libltdl/m4/ltversion.m4 --- squid-6.9/libltdl/m4/ltversion.m4 2024-04-08 05:53:54.000000000 +0000 +++ squid-6.10/libltdl/m4/ltversion.m4 2024-06-08 14:46:34.000000000 +0000 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -u -r -N squid-6.9/libltdl/Makefile.am squid-6.10/libltdl/Makefile.am --- squid-6.9/libltdl/Makefile.am 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/Makefile.am 2024-06-08 14:46:34.000000000 +0000 @@ -1,7 +1,7 @@ ## ltdl.mk -- includable Makefile snippet ## -## Copyright (C) 2003-2005, 2007, 2011-2015 Free Software Foundation, -## Inc. +## Copyright (C) 2003-2005, 2007, 2011-2019, 2021-2022 Free Software +## Foundation, Inc. ## Written by Gary V. Vaughan, 2003 ## ## NOTE: The canonical source of this file is maintained with the @@ -48,7 +48,7 @@ -DLTDL -I. -I$(srcdir) -Ilibltdl \ -I$(srcdir)/libltdl AM_LDFLAGS += -no-undefined -LTDL_VERSION_INFO = -version-info 10:1:3 +LTDL_VERSION_INFO = -version-info 10:2:3 noinst_LTLIBRARIES += $(LT_DLLOADERS) diff -u -r -N squid-6.9/libltdl/Makefile.in squid-6.10/libltdl/Makefile.in --- squid-6.9/libltdl/Makefile.in 2024-04-08 05:55:12.000000000 +0000 +++ squid-6.10/libltdl/Makefile.in 2024-06-08 14:47:27.000000000 +0000 @@ -350,6 +350,7 @@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -470,7 +471,7 @@ CLEANFILES = libltdl.la libltdlc.la libdlloader.la $(LIBOBJS) \ $(LTLIBOBJS) MOSTLYCLEANFILES = libltdl/lt__argz.h libltdl/lt__argz.h-t -LTDL_VERSION_INFO = -version-info 10:1:3 +LTDL_VERSION_INFO = -version-info 10:2:3 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = libltdl/lt_system.h \ @INSTALL_LTDL_TRUE@ libltdl/lt_error.h \ diff -u -r -N squid-6.9/libltdl/README squid-6.10/libltdl/README --- squid-6.9/libltdl/README 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/README 2024-06-08 14:46:34.000000000 +0000 @@ -9,7 +9,8 @@ * dyld (darwin/Mac OS X) * libtool's dlpreopen -- - Copyright (C) 1999, 2003, 2011-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2011-2019, 2021-2022 Free Software + Foundation, Inc. Written by Thomas Tanner, 1999 This file is part of GNU Libtool. diff -u -r -N squid-6.9/libltdl/slist.c squid-6.10/libltdl/slist.c --- squid-6.9/libltdl/slist.c 2024-04-08 05:53:55.000000000 +0000 +++ squid-6.10/libltdl/slist.c 2024-06-08 14:46:35.000000000 +0000 @@ -1,7 +1,7 @@ /* slist.c -- generalised singly linked lists - Copyright (C) 2000, 2004, 2007-2009, 2011-2015 Free Software - Foundation, Inc. + Copyright (C) 2000, 2004, 2007-2009, 2011-2019, 2021-2022 Free + Software Foundation, Inc. Written by Gary V. Vaughan, 2000 NOTE: The canonical source of this file is maintained with the diff -u -r -N squid-6.9/Makefile.in squid-6.10/Makefile.in --- squid-6.9/Makefile.in 2024-04-08 05:53:56.000000000 +0000 +++ squid-6.10/Makefile.in 2024-06-08 14:46:35.000000000 +0000 @@ -330,6 +330,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/RELEASENOTES.html squid-6.10/RELEASENOTES.html --- squid-6.9/RELEASENOTES.html 2024-04-08 06:05:38.000000000 +0000 +++ squid-6.10/RELEASENOTES.html 2024-06-08 14:51:53.000000000 +0000 @@ -1,12 +1,12 @@ - + - Squid 6.9 release notes + Squid 6.10 release notes -

Squid 6.9 release notes

+

Squid 6.10 release notes

Squid Developers

@@ -59,7 +59,7 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-6.9 for testing.

+

The Squid Team are pleased to announce the release of Squid-6.10 for testing.

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

@@ -416,7 +416,9 @@

-

No ./configure options have been changed.

+
--disable-esi
+

The ESI feature is now disabled by default. +Use --enable-esi if needed.

diff -u -r -N squid-6.9/scripts/Makefile.in squid-6.10/scripts/Makefile.in --- squid-6.9/scripts/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/scripts/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -246,6 +246,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/AD_group/Makefile.in squid-6.10/src/acl/external/AD_group/Makefile.in --- squid-6.9/src/acl/external/AD_group/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/AD_group/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -510,6 +510,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/delayer/ext_delayer_acl.8 squid-6.10/src/acl/external/delayer/ext_delayer_acl.8 --- squid-6.9/src/acl/external/delayer/ext_delayer_acl.8 2024-04-08 06:05:44.000000000 +0000 +++ squid-6.10/src/acl/external/delayer/ext_delayer_acl.8 2024-06-08 14:51:57.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,109 +52,47 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "EXT_DELAYER_ACL 8" -.TH EXT_DELAYER_ACL 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH EXT_DELAYER_ACL 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& delayer \- Squid external ACL helper adding artificial delay to requests .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& delayer [\-\-help] [\-\-debug] [\-\-log file] [\-\-wait msec] .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" -Squid external acl helper; causes squid to delay responding to \s-1HTTP\s0 requests. +Squid external acl helper; causes squid to delay responding to HTTP requests. .PP By carefully crafting the ACLs of a Squid setup it is possible to selectively delay requests received by a proxy. After the configured amount -of time, it will always return \*(L"true\*(R". -.SH "OPTIONS" +of time, it will always return "true". +.SH OPTIONS .IX Header "OPTIONS" .IP "\fB\-\-help\fR or \fB\-h\fR" 12 .IX Item "--help or -h" Print help message to stdout .IP "\fB\-\-debug\fR or \fB\-d\fR" 12 .IX Item "--debug or -d" -Emit debugging output to \s-1STDERR\s0 and ultimately cache.log +Emit debugging output to STDERR and ultimately cache.log .IP "\fB\-\-log /path/to/file\fR or \fB\-l /path/to/file\fR" 12 .IX Item "--log /path/to/file or -l /path/to/file" -Emit debugging output to specified file instead of \s-1STDERR.\s0 Also turns on debugging +Emit debugging output to specified file instead of STDERR. Also turns on debugging .IP "\fB\-\-wait msec\fR or \fB\-w msec\fR" 12 .IX Item "--wait msec or -w msec" Delay each request by the specified amount of msec. Unless this option is specified, by default each submitted request will be delayed by half a second (500 msec). -.SH "CONFIGURATION" +.SH CONFIGURATION .IX Header "CONFIGURATION" To engage it, this snippet of configuration template can be used in squid.conf: .PP @@ -183,19 +105,19 @@ It is important that the acl referencing the delayer be the penultimate clause in the http_access line. It will cause delay to all requests that match all the preceding acls in the line. The !all clause at the end of the line will make it -so that no traffic is authorized by this \s-1ACL,\s0 only the delay to evaluate +so that no traffic is authorized by this ACL, only the delay to evaluate the delay clause will be inserted before evaluating following http_access lines. It is also important to place the http_access line carefully in the sequence of all http_access_lines; it should be near the beginning, but be careful not to insert unwanted slow acls (especially proxy_auth). .PP It is possible to customize how delay is calculated for each request by -modifying the \*(L"calc_delay\*(R" \s-1PERL\s0 function in the script, documentation on this +modifying the "calc_delay" PERL function in the script, documentation on this is embedded in the source code comments. -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This software is written by Francesco Chemolli -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -210,7 +132,7 @@ \& terms of the GNU General Public License version 2, or (at your opinion) any \& later version. .Ve -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -225,8 +147,8 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/acl/external/delayer/Makefile.in squid-6.10/src/acl/external/delayer/Makefile.in --- squid-6.9/src/acl/external/delayer/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/delayer/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/eDirectory_userip/Makefile.in squid-6.10/src/acl/external/eDirectory_userip/Makefile.in --- squid-6.9/src/acl/external/eDirectory_userip/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/eDirectory_userip/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -512,6 +512,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/file_userip/Makefile.in squid-6.10/src/acl/external/file_userip/Makefile.in --- squid-6.9/src/acl/external/file_userip/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/file_userip/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -511,6 +511,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/kerberos_ldap_group/Makefile.in squid-6.10/src/acl/external/kerberos_ldap_group/Makefile.in --- squid-6.9/src/acl/external/kerberos_ldap_group/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/kerberos_ldap_group/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -545,6 +545,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 squid-6.10/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 --- squid-6.9/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 2024-04-08 06:05:44.000000000 +0000 +++ squid-6.10/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 2024-06-08 14:51:58.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,116 +52,54 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "EXT_KERBEROS_SID_GROUP_ACL 8" -.TH EXT_KERBEROS_SID_GROUP_ACL 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH EXT_KERBEROS_SID_GROUP_ACL 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& ext_kerberos_sid_group_acl \- external ACL helper for Squid to verify AD Domain group membership using sid. .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& ext_kerberos_sid_group_acl [\-d] [\-h] \-p Principal Name \-D Domain Controller \-b Base DN \-G Group1:Group2 .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" \&\fBext_kerberos_sid_group_acl\fR is an installed executable script. -It uses \fBldapsearch\fR from Openldap to lookup the name of a \s-1AD\s0 group sid. +It uses \fBldapsearch\fR from Openldap to lookup the name of a AD group sid. .PP This helper must be used in with the negotiate_kerberos_auth helper in a -Microsoft \s-1AD\s0 or Samba environment. +Microsoft AD or Samba environment. .PP It reads from the standard input the domain username and a list of group sids -and tries to match the group SIDs to the \s-1AD\s0 group sids. -.SH "OPTIONS" +and tries to match the group SIDs to the AD group sids. +.SH OPTIONS .IX Header "OPTIONS" -.IP "\fB\-d\fR" 12 +.IP \fB\-d\fR 12 .IX Item "-d" Write debug info to stderr. -.IP "\fB\-h\fR" 12 +.IP \fB\-h\fR 12 .IX Item "-h" Print the help. .IP "\fB\-p principal name\fR" 12 .IX Item "-p principal name" -Principal name in squid keytab to use for ldap authentication to \s-1AD\s0 +Principal name in squid keytab to use for ldap authentication to AD .IP "\fB\-D domain controller\fR" 12 .IX Item "-D domain controller" -Domain controller to contact to lookup group \s-1SID\s0 -.IP "\fB\-b base \s-1DN\s0\fR" 12 +Domain controller to contact to lookup group SID +.IP "\fB\-b base DN\fR" 12 .IX Item "-b base DN" -Base \s-1DN\s0 for ldap search -.IP "\fB\-G \s-1AD\s0 group name\fR" 12 +Base DN for ldap search +.IP "\fB\-G AD group name\fR" 12 .IX Item "-G AD group name" -\&\s-1AD\s0 group name to be used for \s-1SID\s0 lookup. List separated by a colon (:) -.SH "CONFIGURATION" +AD group name to be used for SID lookup. List separated by a colon (:) +.SH CONFIGURATION .IX Header "CONFIGURATION" .Vb 7 \& auth_param negotiate program /path/to/negotiate_wrapper_auth \-d \e @@ -194,12 +116,12 @@ .Vb 1 \& external_acl_type sid_check %LOGIN %note{group} /path/to/perl /path/to/kerberos_sid_group_acl \-p principal \-D dc1.example.com \-b "DC=example,DC=com" \-G Group1:Group2 .Ve -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program was written by Markus Moeller .PP This manual was written by Markus Moeller -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -213,7 +135,7 @@ \& be useful, but WITHOUT ANY WARRANTY; without even the implied warranty \& of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .Ve -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -230,6 +152,6 @@ .IX Header "SEE ALSO" \&\fBnegotiate_kerberos_auth\fR\|(8) .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/acl/external/kerberos_sid_group/Makefile.in squid-6.10/src/acl/external/kerberos_sid_group/Makefile.in --- squid-6.9/src/acl/external/kerberos_sid_group/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/kerberos_sid_group/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/LDAP_group/Makefile.in squid-6.10/src/acl/external/LDAP_group/Makefile.in --- squid-6.9/src/acl/external/LDAP_group/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/LDAP_group/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -512,6 +512,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/LM_group/Makefile.in squid-6.10/src/acl/external/LM_group/Makefile.in --- squid-6.9/src/acl/external/LM_group/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/LM_group/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -511,6 +511,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/Makefile.in squid-6.10/src/acl/external/Makefile.in --- squid-6.9/src/acl/external/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -300,6 +300,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/session/Makefile.in squid-6.10/src/acl/external/session/Makefile.in --- squid-6.9/src/acl/external/session/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/acl/external/session/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -510,6 +510,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/SQL_session/ext_sql_session_acl.8 squid-6.10/src/acl/external/SQL_session/ext_sql_session_acl.8 --- squid-6.9/src/acl/external/SQL_session/ext_sql_session_acl.8 2024-04-08 06:05:44.000000000 +0000 +++ squid-6.10/src/acl/external/SQL_session/ext_sql_session_acl.8 2024-06-08 14:51:58.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,134 +52,72 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "EXT_SQL_SESSION_ACL 8" -.TH EXT_SQL_SESSION_ACL 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH EXT_SQL_SESSION_ACL 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& ext_sql_session_acl \- SQL Database session lookup helper for Squid .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& ext_sql_session_acl [options] .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" -Validates an \s-1HTTP\s0 requests access authorization with a session database. +Validates an HTTP requests access authorization with a session database. .PP Taking an identity token to be validated (as determined by the external_acl_type format) it returns a username or tag associated with the identity token passed in. .PP -Common forms of identifiers are \s-1IP\s0 address, \s-1EUI\s0 (\s-1MAC\s0) address, passwords, or \s-1UUID\s0 tokens. +Common forms of identifiers are IP address, EUI (MAC) address, passwords, or UUID tokens. .PP This program uses Squid concurrency support. -.SH "OPTIONS" +.SH OPTIONS .IX Header "OPTIONS" -.IP "\fB\-\-dsn\fR" 12 +.IP \fB\-\-dsn\fR 12 .IX Item "--dsn" -Database \s-1DSN.\s0 Default \*(L"DBI:mysql:database=squid\*(R" -.IP "\fB\-\-user\fR" 12 +Database DSN. Default "DBI:mysql:database=squid" +.IP \fB\-\-user\fR 12 .IX Item "--user" Database User -.IP "\fB\-\-password\fR" 12 +.IP \fB\-\-password\fR 12 .IX Item "--password" Database password -.IP "\fB\-\-table\fR" 12 +.IP \fB\-\-table\fR 12 .IX Item "--table" -Database table. Default \*(L"passwd\*(R". -.IP "\fB\-\-uidcol\fR" 12 +Database table. Default "passwd". +.IP \fB\-\-uidcol\fR 12 .IX Item "--uidcol" -Unique Session Identifier column. Default \*(L"id\*(R". -.IP "\fB\-\-usercol\fR" 12 +Unique Session Identifier column. Default "id". +.IP \fB\-\-usercol\fR 12 .IX Item "--usercol" -External \s-1ACL\s0 user= result column. -.IP "\fB\-\-tagcol\fR" 12 +External ACL user= result column. +.IP \fB\-\-tagcol\fR 12 .IX Item "--tagcol" -External \s-1ACL\s0 tag= result column. -.IP "\fB\-\-cond\fR" 12 +External ACL tag= result column. +.IP \fB\-\-cond\fR 12 .IX Item "--cond" Condition, defaults to enabled=1. Specify 1 or "" for no condition -.IP "\fB\-\-persist\fR" 12 +.IP \fB\-\-persist\fR 12 .IX Item "--persist" Keep a persistent database connection open between queries. -.IP "\fB\-\-debug\fR" 12 +.IP \fB\-\-debug\fR 12 .IX Item "--debug" Write debug info to stderr. -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program and documentation was written by \fIAmos Jeffries .PP Based on original work in DB_auth by Henrik Nordstrom With assistance of Nishant Sharma -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -210,7 +132,7 @@ \& terms of the GNU General Public License version 2, or (at your opinion) any \& later version. .Ve -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -225,8 +147,8 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/acl/external/SQL_session/Makefile.in squid-6.10/src/acl/external/SQL_session/Makefile.in --- squid-6.9/src/acl/external/SQL_session/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/external/SQL_session/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/time_quota/Makefile.in squid-6.10/src/acl/external/time_quota/Makefile.in --- squid-6.9/src/acl/external/time_quota/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/acl/external/time_quota/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -511,6 +511,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/unix_group/Makefile.in squid-6.10/src/acl/external/unix_group/Makefile.in --- squid-6.9/src/acl/external/unix_group/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/acl/external/unix_group/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -511,6 +511,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 squid-6.10/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 --- squid-6.9/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2024-04-08 06:05:44.000000000 +0000 +++ squid-6.10/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2024-06-08 14:51:58.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,108 +52,46 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "EXT_WBINFO_GROUP_ACL 8" -.TH EXT_WBINFO_GROUP_ACL 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH EXT_WBINFO_GROUP_ACL 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& ext_wbinfo_group_acl \- external ACL helper for Squid to verify NT Domain group membership using wbinfo. .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& ext_wbinfo_group_acl [\-dhK] .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" \&\fBext_wbinfo_group_acl\fR is an installed executable script. It uses \fBwbinfo\fR from Samba to lookup group membership of logged in users. .PP This helper must be used in with an authentication scheme (typically -Basic or \s-1NTLM\s0) based on Windows \s-1NT/2000\s0 domain users. +Basic or NTLM) based on Windows NT/2000 domain users. .PP It reads from the standard input the domain username and a list of groups and tries to match each against the groups membership of the specified username. -.SH "OPTIONS" +.SH OPTIONS .IX Header "OPTIONS" -.IP "\fB\-d\fR" 12 +.IP \fB\-d\fR 12 .IX Item "-d" Write debug info to stderr. -.IP "\fB\-h\fR" 12 +.IP \fB\-h\fR 12 .IX Item "-h" Print the help. -.IP "\fB\-K\fR" 12 +.IP \fB\-K\fR 12 .IX Item "-K" -Downgrade Kerberos credentials to \s-1NTLM.\s0 -.SH "CONFIGURATION" +Downgrade Kerberos credentials to NTLM. +.SH CONFIGURATION .IX Header "CONFIGURATION" .Vb 3 \& external_acl_type wbinfo_check %LOGIN /path/to/ext_wbinfo_group_acl @@ -182,12 +104,12 @@ .Vb 1 \& external_acl_type wbinfo_check %LOGIN /path/to/perl /path/to/ext_wbinfo_group_acl .Ve -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program was written by Jerry Murdock .PP This manual was written by Amos Jeffries -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -201,7 +123,7 @@ \& be useful, but WITHOUT ANY WARRANTY; without even the implied warranty \& of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .Ve -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -216,6 +138,6 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/acl/external/wbinfo_group/Makefile.in squid-6.10/src/acl/external/wbinfo_group/Makefile.in --- squid-6.9/src/acl/external/wbinfo_group/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/acl/external/wbinfo_group/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/acl/Makefile.in squid-6.10/src/acl/Makefile.in --- squid-6.9/src/acl/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/acl/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -667,6 +667,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/adaptation/ecap/Makefile.in squid-6.10/src/adaptation/ecap/Makefile.in --- squid-6.9/src/adaptation/ecap/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/adaptation/ecap/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -533,6 +533,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/adaptation/icap/Makefile.in squid-6.10/src/adaptation/icap/Makefile.in --- squid-6.9/src/adaptation/icap/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/adaptation/icap/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -529,6 +529,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/adaptation/Makefile.in squid-6.10/src/adaptation/Makefile.in --- squid-6.9/src/adaptation/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/adaptation/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -576,6 +576,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/anyp/Makefile.in squid-6.10/src/anyp/Makefile.in --- squid-6.9/src/anyp/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/anyp/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -524,6 +524,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/DB/basic_db_auth.8 squid-6.10/src/auth/basic/DB/basic_db_auth.8 --- squid-6.9/src/auth/basic/DB/basic_db_auth.8 2024-04-08 06:05:46.000000000 +0000 +++ squid-6.10/src/auth/basic/DB/basic_db_auth.8 2024-06-08 14:51:59.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,142 +52,80 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "BASIC_DB_AUTH 8" -.TH BASIC_DB_AUTH 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH BASIC_DB_AUTH 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& basic_db_auth \- Database auth helper for Squid .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& basic_db_auth [options] .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" This program verifies username & password to a database -.SH "OPTIONS" +.SH OPTIONS .IX Header "OPTIONS" -.IP "\fB\-\-debug\fR" 12 +.IP \fB\-\-debug\fR 12 .IX Item "--debug" Write debug info to stderr. -.IP "\fB\-\-dsn\fR" 12 +.IP \fB\-\-dsn\fR 12 .IX Item "--dsn" -Database \s-1DSN.\s0 Default \*(L"DBI:mysql:database=squid\*(R" -.IP "\fB\-\-user\fR" 12 +Database DSN. Default "DBI:mysql:database=squid" +.IP \fB\-\-user\fR 12 .IX Item "--user" Database User -.IP "\fB\-\-password\fR" 12 +.IP \fB\-\-password\fR 12 .IX Item "--password" Database password -.IP "\fB\-\-table\fR" 12 +.IP \fB\-\-table\fR 12 .IX Item "--table" -Database table. Default \*(L"passwd\*(R". -.IP "\fB\-\-usercol\fR" 12 +Database table. Default "passwd". +.IP \fB\-\-usercol\fR 12 .IX Item "--usercol" -Username column. Default \*(L"user\*(R". -.IP "\fB\-\-passwdcol\fR" 12 +Username column. Default "user". +.IP \fB\-\-passwdcol\fR 12 .IX Item "--passwdcol" -Password column. Default \*(L"password\*(R". -.IP "\fB\-\-cond\fR" 12 +Password column. Default "password". +.IP \fB\-\-cond\fR 12 .IX Item "--cond" Condition, defaults to enabled=1. Specify 1 or "" for no condition If you use \-\-joomla flag, this condition will be changed to block=0 -.IP "\fB\-\-plaintext\fR" 12 +.IP \fB\-\-plaintext\fR 12 .IX Item "--plaintext" Database contains plain-text passwords -.IP "\fB\-\-md5\fR" 12 +.IP \fB\-\-md5\fR 12 .IX Item "--md5" -Database contains unsalted \s-1MD5\s0 passwords -.IP "\fB\-\-sha1\fR" 12 +Database contains unsalted MD5 passwords +.IP \fB\-\-sha1\fR 12 .IX Item "--sha1" -Database contains unsalted \s-1SHA1\s0 passwords -.IP "\fB\-\-salt\fR" 12 +Database contains unsalted SHA1 passwords +.IP \fB\-\-salt\fR 12 .IX Item "--salt" Selects the correct salt to evaluate passwords -.IP "\fB\-\-persist\fR" 12 +.IP \fB\-\-persist\fR 12 .IX Item "--persist" Keep a persistent database connection open between queries. -.IP "\fB\-\-joomla\fR" 12 +.IP \fB\-\-joomla\fR 12 .IX Item "--joomla" -Tells helper that user database is Joomla \s-1DB.\s0 So their unusual salt +Tells helper that user database is Joomla DB. So their unusual salt hashing is understood. -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program was written by \&\fIHenrik Nordstrom and \&\fILuis Daniel Lucio Quiroz .PP This manual was written by \fIHenrik Nordstrom -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -216,9 +138,9 @@ Copyright (C) 2007 Henrik Nordstrom Copyright (C) 2010 Luis Daniel Lucio Quiroz (Joomla support) This program is free software. You may redistribute copies of it under the -terms of the \s-1GNU\s0 General Public License version 2, or (at your opinion) any +terms of the GNU General Public License version 2, or (at your opinion) any later version. -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -233,8 +155,8 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/auth/basic/DB/Makefile.in squid-6.10/src/auth/basic/DB/Makefile.in --- squid-6.9/src/auth/basic/DB/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/auth/basic/DB/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/fake/Makefile.in squid-6.10/src/auth/basic/fake/Makefile.in --- squid-6.9/src/auth/basic/fake/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/fake/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -505,6 +505,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/getpwnam/Makefile.in squid-6.10/src/auth/basic/getpwnam/Makefile.in --- squid-6.9/src/auth/basic/getpwnam/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/getpwnam/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -511,6 +511,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/LDAP/Makefile.in squid-6.10/src/auth/basic/LDAP/Makefile.in --- squid-6.9/src/auth/basic/LDAP/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/auth/basic/LDAP/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -510,6 +510,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/Makefile.in squid-6.10/src/auth/basic/Makefile.in --- squid-6.9/src/auth/basic/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/auth/basic/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -563,6 +563,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/NCSA/Makefile.in squid-6.10/src/auth/basic/NCSA/Makefile.in --- squid-6.9/src/auth/basic/NCSA/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/auth/basic/NCSA/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -533,6 +533,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/NIS/Makefile.in squid-6.10/src/auth/basic/NIS/Makefile.in --- squid-6.9/src/auth/basic/NIS/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/NIS/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -528,6 +528,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/PAM/Makefile.in squid-6.10/src/auth/basic/PAM/Makefile.in --- squid-6.9/src/auth/basic/PAM/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/PAM/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -510,6 +510,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/POP3/basic_pop3_auth.8 squid-6.10/src/auth/basic/POP3/basic_pop3_auth.8 --- squid-6.9/src/auth/basic/POP3/basic_pop3_auth.8 2024-04-08 06:05:47.000000000 +0000 +++ squid-6.10/src/auth/basic/POP3/basic_pop3_auth.8 2024-06-08 14:52:00.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,97 +52,35 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "BASIC_POP3_AUTH 8" -.TH BASIC_POP3_AUTH 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH BASIC_POP3_AUTH 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& basic_pop3_auth \- POP3 authenticator for Squid .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& basic_pop3_auth server .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" -\&\fBbasic_pop3_auth\fR authenticates user credentials against a \s-1POP3\s0 server. -.SH "OPTIONS" +\&\fBbasic_pop3_auth\fR authenticates user credentials against a POP3 server. +.SH OPTIONS .IX Header "OPTIONS" -The only option this helper takes is the name of the \s-1POP3\s0 server to validate against. -.SH "AUTHOR" +The only option this helper takes is the name of the POP3 server to validate against. +.SH AUTHOR .IX Header "AUTHOR" This program was written by \fIHenrik Nordstrom .PP This manual was written by \fIAmos Jeffries -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -187,7 +109,7 @@ \& # 2006\-12\-10 henrik Initial revision \& # .Ve -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -202,8 +124,8 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/auth/basic/POP3/Makefile.in squid-6.10/src/auth/basic/POP3/Makefile.in --- squid-6.9/src/auth/basic/POP3/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/POP3/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/RADIUS/Makefile.in squid-6.10/src/auth/basic/RADIUS/Makefile.in --- squid-6.9/src/auth/basic/RADIUS/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/RADIUS/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -534,6 +534,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/SASL/Makefile.in squid-6.10/src/auth/basic/SASL/Makefile.in --- squid-6.9/src/auth/basic/SASL/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/SASL/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -511,6 +511,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/SMB/Makefile.in squid-6.10/src/auth/basic/SMB/Makefile.in --- squid-6.9/src/auth/basic/SMB/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/SMB/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -515,6 +515,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/SMB_LM/Makefile.in squid-6.10/src/auth/basic/SMB_LM/Makefile.in --- squid-6.9/src/auth/basic/SMB_LM/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/SMB_LM/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -528,6 +528,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/basic/SSPI/Makefile.in squid-6.10/src/auth/basic/SSPI/Makefile.in --- squid-6.9/src/auth/basic/SSPI/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/basic/SSPI/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -537,6 +537,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/digest/eDirectory/Makefile.in squid-6.10/src/auth/digest/eDirectory/Makefile.in --- squid-6.9/src/auth/digest/eDirectory/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/digest/eDirectory/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -530,6 +530,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/digest/file/Makefile.in squid-6.10/src/auth/digest/file/Makefile.in --- squid-6.9/src/auth/digest/file/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/digest/file/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -533,6 +533,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/digest/LDAP/Makefile.in squid-6.10/src/auth/digest/LDAP/Makefile.in --- squid-6.9/src/auth/digest/LDAP/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/digest/LDAP/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -530,6 +530,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/digest/Makefile.in squid-6.10/src/auth/digest/Makefile.in --- squid-6.9/src/auth/digest/Makefile.in 2024-04-08 05:54:00.000000000 +0000 +++ squid-6.10/src/auth/digest/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -563,6 +563,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/Makefile.in squid-6.10/src/auth/Makefile.in --- squid-6.9/src/auth/Makefile.in 2024-04-08 05:53:59.000000000 +0000 +++ squid-6.10/src/auth/Makefile.in 2024-06-08 14:46:37.000000000 +0000 @@ -575,6 +575,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/negotiate/kerberos/Makefile.in squid-6.10/src/auth/negotiate/kerberos/Makefile.in --- squid-6.9/src/auth/negotiate/kerberos/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/negotiate/kerberos/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -547,6 +547,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/negotiate/Makefile.in squid-6.10/src/auth/negotiate/Makefile.in --- squid-6.9/src/auth/negotiate/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/negotiate/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -564,6 +564,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/negotiate/SSPI/Makefile.in squid-6.10/src/auth/negotiate/SSPI/Makefile.in --- squid-6.9/src/auth/negotiate/SSPI/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/negotiate/SSPI/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -511,6 +511,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/negotiate/wrapper/Makefile.in squid-6.10/src/auth/negotiate/wrapper/Makefile.in --- squid-6.9/src/auth/negotiate/wrapper/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/negotiate/wrapper/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -508,6 +508,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/ntlm/fake/Makefile.in squid-6.10/src/auth/ntlm/fake/Makefile.in --- squid-6.9/src/auth/ntlm/fake/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/ntlm/fake/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -510,6 +510,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/ntlm/Makefile.in squid-6.10/src/auth/ntlm/Makefile.in --- squid-6.9/src/auth/ntlm/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/ntlm/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -563,6 +563,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/ntlm/SMB_LM/Makefile.in squid-6.10/src/auth/ntlm/SMB_LM/Makefile.in --- squid-6.9/src/auth/ntlm/SMB_LM/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/ntlm/SMB_LM/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -512,6 +512,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/auth/ntlm/SSPI/Makefile.in squid-6.10/src/auth/ntlm/SSPI/Makefile.in --- squid-6.9/src/auth/ntlm/SSPI/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/auth/ntlm/SSPI/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -513,6 +513,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/base/Makefile.in squid-6.10/src/base/Makefile.in --- squid-6.9/src/base/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/base/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -535,6 +535,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/cf.data.pre squid-6.10/src/cf.data.pre --- squid-6.9/src/cf.data.pre 2024-04-08 05:02:07.000000000 +0000 +++ squid-6.10/src/cf.data.pre 2024-06-08 13:28:58.000000000 +0000 @@ -1258,18 +1258,29 @@ # Referer is highly unreliable, so use with care acl aclname ident [-i] username ... - acl aclname ident_regex [-i] pattern ... # string match on ident output [slow] # use REQUIRED to accept any non-null ident. + # + # See also: ident_regex. The two ACLs differ only in their parameter + # syntax and ident output matching algorithm. + + acl aclname ident_regex [-i] username_pattern ... + # regex match on ident output [slow] acl aclname proxy_auth [-i] username ... - acl aclname proxy_auth_regex [-i] pattern ... # perform http authentication challenge to the client and match against # supplied credentials [slow] # # takes a list of allowed usernames. # use REQUIRED to accept any valid username. # + # See proxy_auth_regex for more information. The two ACLs differ only in + # their parameter syntax and username matching algorithm. + + acl aclname proxy_auth_regex [-i] username_pattern ... + # perform http authentication challenge to the client and regex match + # supplied username [slow] + # # Will use proxy authentication in forward-proxy scenarios, and plain # http authentication in reverse-proxy scenarios # @@ -1353,9 +1364,14 @@ # attribute is one of DN/C/O/CN/L/ST or a numerical OID [fast] acl aclname ext_user [-i] username ... - acl aclname ext_user_regex [-i] pattern ... # string match on username returned by external acl helper [slow] # use REQUIRED to accept any non-null user name. + # + # See also: ext_user_regex. The two ACLs differ only in their parameter + # syntax and username matching algorithm. + + acl aclname ext_user_regex [-i] username_pattern ... + # regex match on username returned by external acl helper [slow] acl aclname tag tagvalue ... # string match on tag returned by external acl helper [fast] diff -u -r -N squid-6.9/src/clients/Makefile.in squid-6.10/src/clients/Makefile.in --- squid-6.9/src/clients/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/clients/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -526,6 +526,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/comm/Makefile.in squid-6.10/src/comm/Makefile.in --- squid-6.9/src/comm/Makefile.in 2024-04-08 05:54:01.000000000 +0000 +++ squid-6.10/src/comm/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -535,6 +535,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/debug/Makefile.in squid-6.10/src/debug/Makefile.in --- squid-6.9/src/debug/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/debug/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -522,6 +522,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/DiskIO/AIO/Makefile.in squid-6.10/src/DiskIO/AIO/Makefile.in --- squid-6.9/src/DiskIO/AIO/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/src/DiskIO/AIO/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -533,6 +533,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/DiskIO/Blocking/Makefile.in squid-6.10/src/DiskIO/Blocking/Makefile.in --- squid-6.9/src/DiskIO/Blocking/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/src/DiskIO/Blocking/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -525,6 +525,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/DiskIO/DiskDaemon/Makefile.in squid-6.10/src/DiskIO/DiskDaemon/Makefile.in --- squid-6.9/src/DiskIO/DiskDaemon/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/src/DiskIO/DiskDaemon/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -538,6 +538,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/DiskIO/DiskThreads/Makefile.in squid-6.10/src/DiskIO/DiskThreads/Makefile.in --- squid-6.9/src/DiskIO/DiskThreads/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/src/DiskIO/DiskThreads/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -537,6 +537,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/DiskIO/IpcIo/Makefile.in squid-6.10/src/DiskIO/IpcIo/Makefile.in --- squid-6.9/src/DiskIO/IpcIo/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/src/DiskIO/IpcIo/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -524,6 +524,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/DiskIO/Makefile.in squid-6.10/src/DiskIO/Makefile.in --- squid-6.9/src/DiskIO/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/src/DiskIO/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -586,6 +586,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/DiskIO/Mmapped/Makefile.in squid-6.10/src/DiskIO/Mmapped/Makefile.in --- squid-6.9/src/DiskIO/Mmapped/Makefile.in 2024-04-08 05:53:57.000000000 +0000 +++ squid-6.10/src/DiskIO/Mmapped/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -524,6 +524,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/dns/Makefile.in squid-6.10/src/dns/Makefile.in --- squid-6.9/src/dns/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/dns/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -525,6 +525,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/error/Makefile.in squid-6.10/src/error/Makefile.in --- squid-6.9/src/error/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/error/Makefile.in 2024-06-08 14:46:38.000000000 +0000 @@ -526,6 +526,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/esi/Makefile.in squid-6.10/src/esi/Makefile.in --- squid-6.9/src/esi/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/esi/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -546,6 +546,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/eui/Makefile.in squid-6.10/src/eui/Makefile.in --- squid-6.9/src/eui/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/eui/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -524,6 +524,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/format/Makefile.in squid-6.10/src/format/Makefile.in --- squid-6.9/src/format/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/format/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -523,6 +523,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/fs/Makefile.in squid-6.10/src/fs/Makefile.in --- squid-6.9/src/fs/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/fs/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -551,6 +551,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/fs/rock/RockSwapDir.cc squid-6.10/src/fs/rock/RockSwapDir.cc --- squid-6.9/src/fs/rock/RockSwapDir.cc 2024-04-08 05:02:07.000000000 +0000 +++ squid-6.10/src/fs/rock/RockSwapDir.cc 2024-06-08 13:28:58.000000000 +0000 @@ -37,8 +37,6 @@ #include #endif -const int64_t Rock::SwapDir::HeaderSize = 16*1024; - Rock::SwapDir::SwapDir(): ::SwapDir("rock"), slotSize(HeaderSize), filePath(nullptr), map(nullptr), io(nullptr), waitingForPage(nullptr) diff -u -r -N squid-6.9/src/fs/rock/RockSwapDir.h squid-6.10/src/fs/rock/RockSwapDir.h --- squid-6.9/src/fs/rock/RockSwapDir.h 2024-04-08 05:02:07.000000000 +0000 +++ squid-6.10/src/fs/rock/RockSwapDir.h 2024-06-08 13:28:58.000000000 +0000 @@ -148,7 +148,7 @@ /* configurable options */ DiskFile::Config fileConfig; ///< file-level configuration options - static const int64_t HeaderSize; ///< on-disk db header size + static const int64_t HeaderSize = 16*1024; ///< on-disk db header size }; /// initializes shared memory segments used by Rock::SwapDir diff -u -r -N squid-6.9/src/ftp/Makefile.in squid-6.10/src/ftp/Makefile.in --- squid-6.9/src/ftp/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/ftp/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -522,6 +522,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/helper/Makefile.in squid-6.10/src/helper/Makefile.in --- squid-6.9/src/helper/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/helper/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -523,6 +523,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/http/Makefile.in squid-6.10/src/http/Makefile.in --- squid-6.9/src/http/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/http/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -568,6 +568,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/http/one/Makefile.in squid-6.10/src/http/one/Makefile.in --- squid-6.9/src/http/one/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/http/one/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -525,6 +525,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/http/url_rewriters/fake/Makefile.in squid-6.10/src/http/url_rewriters/fake/Makefile.in --- squid-6.9/src/http/url_rewriters/fake/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/http/url_rewriters/fake/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -507,6 +507,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/http/url_rewriters/LFS/Makefile.in squid-6.10/src/http/url_rewriters/LFS/Makefile.in --- squid-6.9/src/http/url_rewriters/LFS/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/http/url_rewriters/LFS/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/http/url_rewriters/LFS/url_lfs_rewrite.8 squid-6.10/src/http/url_rewriters/LFS/url_lfs_rewrite.8 --- squid-6.9/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2024-04-08 06:05:48.000000000 +0000 +++ squid-6.10/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2024-06-08 14:52:01.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,116 +52,54 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "URL_LFS_REWRITE 8" -.TH URL_LFS_REWRITE 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH URL_LFS_REWRITE 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& url_lfs_rewrite \- a URL\-rewriter based on local file existence .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& url_lfs_rewrite [\-\-debug] \-\-local\-dir=/var/www/ [options] .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" Direct all request to files who are in a local directory to a local web server hosting this directory. .PP This program uses Squid concurrency support. -.SH "OPTIONS" +.SH OPTIONS .IX Header "OPTIONS" -.IP "\fB\-\-debug\fR" 12 +.IP \fB\-\-debug\fR 12 .IX Item "--debug" Write debug info to stderr. -.IP "\fB\-\-local\-dir\fR" 12 +.IP \fB\-\-local\-dir\fR 12 .IX Item "--local-dir" Directory path under which the scripts searches for files. -.IP "\fB\-\-to\-scheme\fR" 12 +.IP \fB\-\-to\-scheme\fR 12 .IX Item "--to-scheme" -Scheme to use for the redirected \s-1URL.\s0 +Scheme to use for the redirected URL. .Sp .Vb 1 \& Default: http .Ve -.IP "\fB\-\-to\-host\fR" 12 +.IP \fB\-\-to\-host\fR 12 .IX Item "--to-host" -Domain name to use for the redirected \s-1URL.\s0 +Domain name to use for the redirected URL. .Sp .Vb 1 \& Default: localhost .Ve -.IP "\fB\-\-to\-path\fR" 12 +.IP \fB\-\-to\-path\fR 12 .IX Item "--to-path" -\&\s-1URL\s0 path to add as prefix for the redirected \s-1URL\s0 path. +URL path to add as prefix for the redirected URL path. .Sp If set it must end with a '/'. .Sp @@ -189,17 +111,17 @@ * The \-\-local\-dir parameter must end with a '/'. Otherwise no file paths will be found. .PP -* \s-1URL\s0 with no filename in the path can match directories on the local +* URL with no filename in the path can match directories on the local filesystem and be wrongly redirected to the local web server. .PP -* Any scheme name accepted by the Perl \s-1URL\s0 library can be used +* Any scheme name accepted by the Perl URL library can be used as the \-\-to\-scheme parameter. However only schemes supported by Squid will work. .PP -* \s-1URL\s0 containing query-string are not handled well and will not +* URL containing query-string are not handled well and will not be rewritten even if the base script or file exists on the local system. -.SH "CONFIGURATION" +.SH CONFIGURATION .IX Header "CONFIGURATION" .Vb 4 \& url_rewrite_program /path/to/url_lfs_rewrite \-\-local\-dir=\evar\ewww\elocalhost @@ -209,17 +131,17 @@ .Ve .PP This helper can redirect to any web server but only does so if there is -a file matching the \s-1URL\s0 path segment in the local filesystem. Normal +a file matching the URL path segment in the local filesystem. Normal configuration requires a web server running on localhost serving up files from a local disk (eg. \evar\ewww\elocalhost). Configuration of that web server is not covered here. -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program and documentation was written by \fIAmos Jeffries .PP Based on prior work in \fBrredir.pl\fR by \fIPeter Eisenhauer . First Version: 26. May 1997 -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -240,8 +162,8 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/http/url_rewriters/Makefile.in squid-6.10/src/http/url_rewriters/Makefile.in --- squid-6.9/src/http/url_rewriters/Makefile.in 2024-04-08 05:54:02.000000000 +0000 +++ squid-6.10/src/http/url_rewriters/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -300,6 +300,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/icmp/Makefile.in squid-6.10/src/icmp/Makefile.in --- squid-6.9/src/icmp/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/icmp/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -558,6 +558,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/ident/Makefile.in squid-6.10/src/ident/Makefile.in --- squid-6.9/src/ident/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/ident/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -522,6 +522,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/ip/Makefile.in squid-6.10/src/ip/Makefile.in --- squid-6.9/src/ip/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/ip/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -525,6 +525,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/ipc/Makefile.in squid-6.10/src/ipc/Makefile.in --- squid-6.9/src/ipc/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/ipc/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -542,6 +542,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/log/DB/log_db_daemon.8 squid-6.10/src/log/DB/log_db_daemon.8 --- squid-6.9/src/log/DB/log_db_daemon.8 2024-04-08 06:05:49.000000000 +0000 +++ squid-6.10/src/log/DB/log_db_daemon.8 2024-06-08 14:52:01.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,84 +52,22 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "LOG_DB_DAEMON 8" -.TH LOG_DB_DAEMON 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH LOG_DB_DAEMON 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME log_db_daemon \- Database logging daemon for Squid .PP Version 0.5. -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" -log_db_daemon \s-1DSN\s0 [options] -.SH "DESCRIPTION" +log_db_daemon DSN [options] +.SH DESCRIPTION .IX Header "DESCRIPTION" This program writes Squid access.log entries to a database. Presently only accepts the \fBsquid\fR native log format. @@ -161,11 +83,11 @@ .IP "OpenSUSE 10.2" 4 .IX Item "OpenSUSE 10.2" .PD -.SH "OPTIONS" +.SH OPTIONS .IX Header "OPTIONS" -.IP "\fB\s-1DSN\s0\fR" 12 +.IP \fBDSN\fR 12 .IX Item "DSN" -Database \s-1DSN\s0 encoded as a path. This is sent as the access_log file path. +Database DSN encoded as a path. This is sent as the access_log file path. .Sp Sample configuration: access_log daemon:/host/database/table/username/password squid @@ -175,11 +97,11 @@ \& access_log daemon://database/table/username/password squid .Ve .Sp -Default \*(L"DBI:mysql:database=squid\*(R" -.IP "\fB\-\-debug\fR" 12 +Default "DBI:mysql:database=squid" +.IP \fB\-\-debug\fR 12 .IX Item "--debug" Write debug info to stderr. -.SH "CONFIGURATION" +.SH CONFIGURATION .IX Header "CONFIGURATION" .SS "Squid configuration" .IX Subsection "Squid configuration" @@ -196,19 +118,19 @@ .PP The last parameter tells squid which log format to use when writing lines to the log daemon. Presently \fBsquid\fR format is supported. -.IP "mysql_host:port" 4 +.IP mysql_host:port 4 .IX Item "mysql_host:port" Host where the mysql server is running. If left empty, 'localhost' is assumed. -.IP "database" 4 +.IP database 4 .IX Item "database" Name of the database to connect to. If left empty, 'squid_log' is assumed. -.IP "table" 4 +.IP table 4 .IX Item "table" Name of the database table where log lines are stored. If left empty, 'access_log' is assumed. -.IP "username" 4 +.IP username 4 .IX Item "username" Username to use when connecting to the database. If left empty, 'squid' is assumed. -.IP "password" 4 +.IP password 4 .IX Item "password" Password to use when connecting to the database. If left empty, no password is used. .PP @@ -257,7 +179,7 @@ \& FLUSH PRIVILEGES; .Ve .PP -Note that only \s-1CREATE, INSERT\s0 and \s-1SELECT\s0 privileges are granted to the 'squid' user. This ensures that the logfile daemon script cannot change or modify the log entries. +Note that only CREATE, INSERT and SELECT privileges are granted to the 'squid' user. This ensures that the logfile daemon script cannot change or modify the log entries. .PP \fITable\fR .IX Subsection "Table" @@ -396,25 +318,25 @@ .IX Header "KNOWN ISSUES" .SS "Speed issues" .IX Subsection "Speed issues" -The MyISAM storage engine is known to be faster than the InnoDB one, so although it doesn't support transactions and referential integrity, it might be more appropriate in this scenario. You might want to append \*(L"ENGINE=MYISAM\*(R" at the end of the table creation code in the above \s-1SQL\s0 script. +The MyISAM storage engine is known to be faster than the InnoDB one, so although it doesn't support transactions and referential integrity, it might be more appropriate in this scenario. You might want to append "ENGINE=MYISAM" at the end of the table creation code in the above SQL script. .PP -Indexes should be created according to the queries that are more frequently run. The \s-1DDL\s0 script only creates an implicit index for the primary key column. +Indexes should be created according to the queries that are more frequently run. The DDL script only creates an implicit index for the primary key column. .SS "Table cleanup" .IX Subsection "Table cleanup" -This script currently implements only the \f(CW\*(C`L\*(C'\fR (i.e. \*(L"append a line to the log\*(R") command, therefore the log lines are never purged from the table. This approach has an obvious scalability problem. +This script currently implements only the \f(CW\*(C`L\*(C'\fR (i.e. "append a line to the log") command, therefore the log lines are never purged from the table. This approach has an obvious scalability problem. .PP -One solution would be to implement e.g. the \*(L"rotate log\*(R" command in a way that would calculate some summary values, put them in a \*(L"summary table\*(R" and then delete the lines used to calculate those values. +One solution would be to implement e.g. the "rotate log" command in a way that would calculate some summary values, put them in a "summary table" and then delete the lines used to calculate those values. .PP Similar cleanup code could be implemented in an external script and run periodically independently from squid log commands. -.SS "Testing" +.SS Testing .IX Subsection "Testing" This script has only been tested in low-volume scenarios (single client, less than 10 req/s). Tests in high volume environments could reveal performance bottlenecks and bugs. -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program was written by \&\fIMarcello Romani , \&\fIAmos Jeffries -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -429,7 +351,7 @@ This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.8.8 or, at your option, any later version of Perl 5 you may have available. -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -444,8 +366,8 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/log/DB/Makefile.in squid-6.10/src/log/DB/Makefile.in --- squid-6.9/src/log/DB/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/log/DB/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/log/file/Makefile.in squid-6.10/src/log/file/Makefile.in --- squid-6.9/src/log/file/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/log/file/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -507,6 +507,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/log/Makefile.in squid-6.10/src/log/Makefile.in --- squid-6.9/src/log/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/log/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -577,6 +577,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/Makefile.in squid-6.10/src/Makefile.in --- squid-6.9/src/Makefile.in 2024-04-08 05:53:58.000000000 +0000 +++ squid-6.10/src/Makefile.in 2024-06-08 14:46:36.000000000 +0000 @@ -2453,6 +2453,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/mem/Makefile.in squid-6.10/src/mem/Makefile.in --- squid-6.9/src/mem/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/mem/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -532,6 +532,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/mgr/Makefile.in squid-6.10/src/mgr/Makefile.in --- squid-6.9/src/mgr/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/mgr/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -540,6 +540,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/parser/Makefile.in squid-6.10/src/parser/Makefile.in --- squid-6.9/src/parser/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/parser/Makefile.in 2024-06-08 14:46:39.000000000 +0000 @@ -523,6 +523,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/proxyp/Makefile.in squid-6.10/src/proxyp/Makefile.in --- squid-6.9/src/proxyp/Makefile.in 2024-04-08 05:54:03.000000000 +0000 +++ squid-6.10/src/proxyp/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -523,6 +523,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/repl/Makefile.in squid-6.10/src/repl/Makefile.in --- squid-6.9/src/repl/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/repl/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -535,6 +535,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/sbuf/Makefile.in squid-6.10/src/sbuf/Makefile.in --- squid-6.9/src/sbuf/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/sbuf/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -525,6 +525,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/security/cert_generators/file/Makefile.in squid-6.10/src/security/cert_generators/file/Makefile.in --- squid-6.9/src/security/cert_generators/file/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/security/cert_generators/file/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -541,6 +541,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/security/cert_generators/Makefile.in squid-6.10/src/security/cert_generators/Makefile.in --- squid-6.9/src/security/cert_generators/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/security/cert_generators/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -300,6 +300,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/security/cert_validators/fake/Makefile.in squid-6.10/src/security/cert_validators/fake/Makefile.in --- squid-6.9/src/security/cert_validators/fake/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/security/cert_validators/fake/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/security/cert_validators/fake/security_fake_certverify.8 squid-6.10/src/security/cert_validators/fake/security_fake_certverify.8 --- squid-6.9/src/security/cert_validators/fake/security_fake_certverify.8 2024-04-08 06:05:50.000000000 +0000 +++ squid-6.10/src/security/cert_validators/fake/security_fake_certverify.8 2024-06-08 14:52:02.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,85 +52,23 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "SECURITY_FAKE_CERTVERIFY 8" -.TH SECURITY_FAKE_CERTVERIFY 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH SECURITY_FAKE_CERTVERIFY 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME security_fake_certverify \- A fake cert validation helper for Squid -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" security_fake_certverify [\-d | \-\-debug] [\-h | \-\-help] -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" -Retrieves the \s-1SSL\s0 certificate error list from Squid and echo back without any change. -.SH "OPTIONS" +Retrieves the SSL certificate error list from Squid and echo back without any change. +.SH OPTIONS .IX Header "OPTIONS" .IP "\fB\-h | \-\-help\fR" 8 .IX Item "-h | --help" @@ -154,11 +76,11 @@ .IP "\fB\-d | \-\-debug\fR" 8 .IX Item "-d | --debug" enable debug messages to stderr -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program and documentation was written by \&\fIChristos Tsantilas -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -171,9 +93,9 @@ (C) 2012 The Measurement Factory, Author: Tsantilas Christos .PP This program is free software. You may redistribute copies of it under the -terms of the \s-1GNU\s0 General Public License version 2, or (at your opinion) any +terms of the GNU General Public License version 2, or (at your opinion) any later version. -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -188,8 +110,8 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP -The Squid \s-1FAQ\s0 wiki https://wiki.squid\-cache.org/SquidFaq +The Squid FAQ wiki https://wiki.squid\-cache.org/SquidFaq .PP The Squid Configuration Manual http://www.squid\-cache.org/Doc/config/ diff -u -r -N squid-6.9/src/security/cert_validators/Makefile.in squid-6.10/src/security/cert_validators/Makefile.in --- squid-6.9/src/security/cert_validators/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/security/cert_validators/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -300,6 +300,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/security/Makefile.in squid-6.10/src/security/Makefile.in --- squid-6.9/src/security/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/security/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -575,6 +575,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/servers/Makefile.in squid-6.10/src/servers/Makefile.in --- squid-6.9/src/servers/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/servers/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -523,6 +523,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/snmp/Makefile.in squid-6.10/src/snmp/Makefile.in --- squid-6.9/src/snmp/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/snmp/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -526,6 +526,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/ssl/Makefile.in squid-6.10/src/ssl/Makefile.in --- squid-6.9/src/ssl/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/ssl/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -535,6 +535,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/store/id_rewriters/file/Makefile.in squid-6.10/src/store/id_rewriters/file/Makefile.in --- squid-6.9/src/store/id_rewriters/file/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/store/id_rewriters/file/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/store/id_rewriters/file/storeid_file_rewrite.8 squid-6.10/src/store/id_rewriters/file/storeid_file_rewrite.8 --- squid-6.9/src/store/id_rewriters/file/storeid_file_rewrite.8 2024-04-08 06:05:45.000000000 +0000 +++ squid-6.10/src/store/id_rewriters/file/storeid_file_rewrite.8 2024-06-08 14:51:59.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,93 +52,31 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "STOREID_FILE_REWRITE 8" -.TH STOREID_FILE_REWRITE 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH STOREID_FILE_REWRITE 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME .Vb 1 \& storeid_file_rewrite \- File based Store\-ID helper for Squid .Ve -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" .Vb 1 \& storeid_file_rewrite filepath .Ve -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" This program acts as a store_id helper program, rewriting URLs passed by Squid into storage-ids that can be used to achieve better caching for websites that use different URLs for the same content. .PP It takes a text file with two tab separated columns. -Column 1: Regular expression to match against the \s-1URL\s0 +Column 1: Regular expression to match against the URL Column 2: Rewrite rule to generate a Store-ID Eg: ^http:\e/\e/[^\e.]+\e.dl\e.sourceforge\e.net\e/(.*) http://dl.sourceforge.net.squid.internal/$1 @@ -164,15 +86,15 @@ .PP This program will automatically detect the existence of a concurrency channel-ID and adjust appropriately. It may be used with any value 0 or above for the store_id_children concurrency= parameter. -.SH "OPTIONS" +.SH OPTIONS .IX Header "OPTIONS" The only command line parameter this helper takes is the regex rules file name. -.SH "AUTHOR" +.SH AUTHOR .IX Header "AUTHOR" This program and documentation was written by \fIAlan Mizrahi .PP Based on prior work by \fIEliezer Croitoru -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors @@ -198,7 +120,7 @@ \& along with this program; if not, write to the Free Software \& Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111\-1307, USA. .Ve -.SH "QUESTIONS" +.SH QUESTIONS .IX Header "QUESTIONS" Questions on the usage of this program can be sent to the \fISquid Users mailing list .SH "REPORTING BUGS" @@ -213,7 +135,7 @@ Report ideas for new improvements to the \fISquid Developers mailing list .SH "SEE ALSO" .IX Header "SEE ALSO" -squid (8), \s-1GPL\s0 (7), +squid (8), GPL (7), .PP The Squid wiki https://wiki.squid\-cache.org/Features/StoreID .PP diff -u -r -N squid-6.9/src/store/id_rewriters/Makefile.in squid-6.10/src/store/id_rewriters/Makefile.in --- squid-6.9/src/store/id_rewriters/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/store/id_rewriters/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -300,6 +300,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/store/Makefile.in squid-6.10/src/store/Makefile.in --- squid-6.9/src/store/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/store/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -569,6 +569,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/src/tests/testCacheManager.cc squid-6.10/src/tests/testCacheManager.cc --- squid-6.9/src/tests/testCacheManager.cc 2024-04-08 05:02:07.000000000 +0000 +++ squid-6.10/src/tests/testCacheManager.cc 2024-06-08 13:28:58.000000000 +0000 @@ -33,26 +33,13 @@ void CacheManagerInternals::testValidUrl(const AnyP::Uri &url) { - try { - (void)ParseUrl(url); - } catch (...) { - std::cerr << "\nFAIL: " << url << - Debug::Extra << "error: " << CurrentException << "\n"; - CPPUNIT_FAIL("rejected a valid URL"); - } + CPPUNIT_ASSERT_NO_THROW(ParseUrl(url)); } void CacheManagerInternals::testInvalidUrl(const AnyP::Uri &url, const char *const problem) { - try { - (void)ParseUrl(url); - std::cerr << "\nFAIL: " << url << - Debug::Extra << "error: should be rejected due to '" << problem << "'\n"; - } catch (const TextException &) { - return; // success -- the parser signaled bad input - } - CPPUNIT_FAIL("failed to reject an invalid URL"); + CPPUNIT_ASSERT_THROW_MESSAGE(problem, ParseUrl(url), TextException); } void testCacheManager::setUp() diff -u -r -N squid-6.9/src/tests/testRandomUuid.cc squid-6.10/src/tests/testRandomUuid.cc --- squid-6.9/src/tests/testRandomUuid.cc 2024-04-08 05:02:07.000000000 +0000 +++ squid-6.10/src/tests/testRandomUuid.cc 2024-06-08 13:28:58.000000000 +0000 @@ -78,15 +78,7 @@ TestRandomUuid::testInvalidIds() { for (const auto &id: InvalidIds) { - try { - RandomUuid uuid(id.second); - std::cerr << std::endl - << "FAIL: " << id.first - << Debug::Extra << "error: should be rejected" << std::endl; - } catch (const TextException &e) { - continue; // success, caught a malformed UUID - } - CPPUNIT_FAIL("failed to reject an invalid UUID"); + CPPUNIT_ASSERT_THROW(RandomUuid uuid(id.second), TextException); } } diff -u -r -N squid-6.9/src/time/Makefile.in squid-6.10/src/time/Makefile.in --- squid-6.9/src/time/Makefile.in 2024-04-08 05:54:04.000000000 +0000 +++ squid-6.10/src/time/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -523,6 +523,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/test-suite/Makefile.in squid-6.10/test-suite/Makefile.in --- squid-6.9/test-suite/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/test-suite/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -593,6 +593,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/tools/apparmor/Makefile.in squid-6.10/tools/apparmor/Makefile.in --- squid-6.9/tools/apparmor/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/tools/apparmor/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -243,6 +243,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/tools/helper-mux/helper-mux.8 squid-6.10/tools/helper-mux/helper-mux.8 --- squid-6.9/tools/helper-mux/helper-mux.8 2024-04-08 06:05:51.000000000 +0000 +++ squid-6.10/tools/helper-mux/helper-mux.8 2024-06-08 14:52:03.000000000 +0000 @@ -1,4 +1,5 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -15,29 +16,12 @@ .ft R .fi .. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. .ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' . ds C` . ds C' 'br\} @@ -68,82 +52,20 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "HELPER-MUX 8" -.TH HELPER-MUX 8 "2024-04-08" "perl v5.34.0" "User Contributed Perl Documentation" +.TH HELPER-MUX 8 2024-06-08 "perl v5.38.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 .nh -.SH "NAME" +.SH NAME helper\-mux \- Concurrency protocol multiplexer for Squid helpers -.SH "SYNOPSIS" +.SH SYNOPSIS .IX Header "SYNOPSIS" \&\fBhelper-mux\fR helper-path [helper\-options ...] -.SH "DESCRIPTION" +.SH DESCRIPTION .IX Header "DESCRIPTION" \&\fBhelper-mux\fR purpose is to relieve some of the burden \&\fBsquid\fR has when dealing with slow helpers. It does so by acting as a @@ -156,13 +78,13 @@ to start. .PP The helper can be controlled using various signals: -\&\- \s-1SIGHUP:\s0 dump the state of all helpers to \s-1STDERR\s0 -.SH "OPTIONS" +\&\- SIGHUP: dump the state of all helpers to STDERR +.SH OPTIONS .IX Header "OPTIONS" -.IP "\fBhelper-path\fR" 8 +.IP \fBhelper-path\fR 8 .IX Item "helper-path" Path to the helper being multiplexed. -.IP "\fBhelper-options\fR" 8 +.IP \fBhelper-options\fR 8 .IX Item "helper-options" Command line options for the helper being multiplexed. .SH "KNOWN ISSUES" @@ -171,7 +93,7 @@ and as such cannot yet compensate for broken helpers. .PP It is not yet able to manage dying helpers. -.SH "COPYRIGHT" +.SH COPYRIGHT .IX Header "COPYRIGHT" .Vb 5 \& * Copyright (C) 1996\-2023 The Squid Software Foundation and contributors diff -u -r -N squid-6.9/tools/helper-mux/Makefile.in squid-6.10/tools/helper-mux/Makefile.in --- squid-6.9/tools/helper-mux/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/tools/helper-mux/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -462,6 +462,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/tools/Makefile.in squid-6.10/tools/Makefile.in --- squid-6.9/tools/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/tools/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -598,6 +598,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/tools/purge/Makefile.in squid-6.10/tools/purge/Makefile.in --- squid-6.9/tools/purge/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/tools/purge/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -532,6 +532,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/tools/squidclient/Makefile.in squid-6.10/tools/squidclient/Makefile.in --- squid-6.9/tools/squidclient/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/tools/squidclient/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -585,6 +585,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/tools/systemd/Makefile.in squid-6.10/tools/systemd/Makefile.in --- squid-6.9/tools/systemd/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/tools/systemd/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -243,6 +243,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@ diff -u -r -N squid-6.9/tools/sysvinit/Makefile.in squid-6.10/tools/sysvinit/Makefile.in --- squid-6.9/tools/sysvinit/Makefile.in 2024-04-08 05:54:05.000000000 +0000 +++ squid-6.10/tools/sysvinit/Makefile.in 2024-06-08 14:46:40.000000000 +0000 @@ -243,6 +243,7 @@ EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@ FALSE = @FALSE@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ HAVE_CXX17 = @HAVE_CXX17@ INCLTDL = @INCLTDL@