diff -u -r -N squid-6.10/acinclude/ax_cxx_compile_stdcxx.m4 squid-6.11/acinclude/ax_cxx_compile_stdcxx.m4 --- squid-6.10/acinclude/ax_cxx_compile_stdcxx.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/ax_cxx_compile_stdcxx.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/ax_with_prog.m4 squid-6.11/acinclude/ax_with_prog.m4 --- squid-6.10/acinclude/ax_with_prog.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/ax_with_prog.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/compiler-flags.m4 squid-6.11/acinclude/compiler-flags.m4 --- squid-6.10/acinclude/compiler-flags.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/compiler-flags.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/init.m4 squid-6.11/acinclude/init.m4 --- squid-6.10/acinclude/init.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/init.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/krb5.m4 squid-6.11/acinclude/krb5.m4 --- squid-6.10/acinclude/krb5.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/krb5.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -33,7 +33,7 @@ AC_CACHE_CHECK([for broken Heimdal krb5.h],squid_cv_broken_heimdal_krb5_h, [ SQUID_STATE_SAVE(squid_krb5_heimdal_test) CPPFLAGS="-I${srcdir:-.} $CPPFLAGS" - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + AC_LINK_IFELSE([AC_LANG_SOURCE([[ #include int main(void) @@ -45,7 +45,7 @@ return 0; } ]])], [ squid_cv_broken_heimdal_krb5_h=no ], [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + AC_LINK_IFELSE([AC_LANG_SOURCE([[ #define HAVE_BROKEN_HEIMDAL_KRB5_H 1 #include "compat/krb5.h" int @@ -130,7 +130,7 @@ dnl checks that gssapi is ok, and sets squid_cv_working_gssapi accordingly AC_DEFUN([SQUID_CHECK_WORKING_GSSAPI], [ AC_CACHE_CHECK([for working gssapi], squid_cv_working_gssapi, [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + AC_LINK_IFELSE([AC_LANG_SOURCE([[ #if USE_HEIMDAL_KRB5 #if HAVE_GSSAPI_GSSAPI_H #include @@ -231,7 +231,7 @@ AC_CACHE_CHECK([for working krb5], squid_cv_working_krb5, [ SQUID_STATE_SAVE(squid_krb5_test) CPPFLAGS="-I${srcdir:-.} $CPPFLAGS" - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + AC_LINK_IFELSE([AC_LANG_SOURCE([[ #include "compat/krb5.h" int main(void) diff -u -r -N squid-6.10/acinclude/ldap.m4 squid-6.11/acinclude/ldap.m4 --- squid-6.10/acinclude/ldap.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/ldap.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2023 The Squid Software Foundation and contributors +# Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/lib-checks.m4 squid-6.11/acinclude/lib-checks.m4 --- squid-6.10/acinclude/lib-checks.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/lib-checks.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/nettle.m4 squid-6.11/acinclude/nettle.m4 --- squid-6.10/acinclude/nettle.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/nettle.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/os-deps.m4 squid-6.11/acinclude/os-deps.m4 --- squid-6.10/acinclude/os-deps.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/os-deps.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/pam.m4 squid-6.11/acinclude/pam.m4 --- squid-6.10/acinclude/pam.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/pam.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/pkg.m4 squid-6.11/acinclude/pkg.m4 --- squid-6.10/acinclude/pkg.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/pkg.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/squid-util.m4 squid-6.11/acinclude/squid-util.m4 --- squid-6.10/acinclude/squid-util.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/squid-util.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/acinclude/tdb.m4 squid-6.11/acinclude/tdb.m4 --- squid-6.10/acinclude/tdb.m4 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/acinclude/tdb.m4 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/bootstrap.sh squid-6.11/bootstrap.sh --- squid-6.10/bootstrap.sh 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/bootstrap.sh 2024-09-15 20:54:35.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/ChangeLog squid-6.11/ChangeLog --- squid-6.10/ChangeLog 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/ChangeLog 2024-09-15 20:54:35.000000000 +0000 @@ -1,3 +1,10 @@ +Changes in squid-6.11 (15 Sep 2024) + - Fix Kerberos detection when cross-compiling + - Improve robustness of DNS code on reconfigure + - Prevent slow memory leak in TCP DNS queries + - Improve errors emitted when invalid ACLs are parsed + - Remove some unused code and obsolete compatiblity hacks + Changes in squid-6.10 (10 Jun 2024) - Bug 5378: type mismatch in libTrie - Disable ESI in default build diff -u -r -N squid-6.10/compat/assert.cc squid-6.11/compat/assert.cc --- squid-6.10/compat/assert.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/assert.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/assert.h squid-6.11/compat/assert.h --- squid-6.10/compat/assert.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/assert.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/cmsg.h squid-6.11/compat/cmsg.h --- squid-6.10/compat/cmsg.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/cmsg.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/compat.cc squid-6.11/compat/compat.cc --- squid-6.10/compat/compat.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/compat.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/compat.h squid-6.11/compat/compat.h --- squid-6.10/compat/compat.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/compat.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -84,10 +84,6 @@ #include "compat/assert.h" #include "compat/compat_shared.h" -#include "compat/getaddrinfo.h" -#include "compat/getnameinfo.h" -#include "compat/inet_ntop.h" -#include "compat/inet_pton.h" #include "compat/stdvarargs.h" /* cstdio has a bunch of problems with 64-bit definitions */ diff -u -r -N squid-6.10/compat/compat_shared.h squid-6.11/compat/compat_shared.h --- squid-6.10/compat/compat_shared.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/compat_shared.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/cppunit.h squid-6.11/compat/cppunit.h --- squid-6.10/compat/cppunit.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/cppunit.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/cpu.h squid-6.11/compat/cpu.h --- squid-6.10/compat/cpu.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/cpu.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/debug.cc squid-6.11/compat/debug.cc --- squid-6.10/compat/debug.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/debug.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/debug.h squid-6.11/compat/debug.h --- squid-6.10/compat/debug.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/debug.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/eui64_aton.c squid-6.11/compat/eui64_aton.c --- squid-6.10/compat/eui64_aton.c 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/eui64_aton.c 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/eui64_aton.h squid-6.11/compat/eui64_aton.h --- squid-6.10/compat/eui64_aton.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/eui64_aton.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/fdsetsize.h squid-6.11/compat/fdsetsize.h --- squid-6.10/compat/fdsetsize.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/fdsetsize.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/getaddrinfo.cc squid-6.11/compat/getaddrinfo.cc --- squid-6.10/compat/getaddrinfo.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/getaddrinfo.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,335 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -/* - * Shamelessly duplicated from the fetchmail public sources - * for use by the Squid Project under GNU Public License. - * - * Update/Maintenance History: - * - * 15-Aug-2007 : Copied from fetchmail 6.3.8 - * - added protection around library headers - * - * 16-Aug-2007 : Altered configure checks - * Un-hacked slightly to use system gethostbyname() - * - * 06-Oct-2007 : Various fixes to allow the build on MinGW - * - * 13-Jan-2015 : Various fixed for C++ and MinGW native build - * - * Original License and code follows. - */ -#include "squid.h" - -/* - * This file is part of libESMTP, a library for submission of RFC 2822 - * formatted electronic mail messages using the SMTP protocol described - * in RFC 2821. - * - * Copyright (C) 2001,2002 Brian Stafford - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* An emulation of the RFC 2553 / Posix getaddrinfo resolver interface. - */ - -#if !HAVE_DECL_GETADDRINFO - -/* Need to turn off Posix features in glibc to build this */ -#undef _POSIX_C_SOURCE -#undef _XOPEN_SOURCE - -#if HAVE_STRING_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif - -static struct addrinfo * -dup_addrinfo (struct addrinfo *info, void *addr, size_t addrlen) { - struct addrinfo *ret; - - ret = (struct addrinfo *)malloc(sizeof (struct addrinfo)); - if (!ret) - return nullptr; - memcpy (ret, info, sizeof (struct addrinfo)); - ret->ai_addr = (struct sockaddr*)malloc(addrlen); - if (!ret->ai_addr) { - free (ret); - return nullptr; - } - memcpy (ret->ai_addr, addr, addrlen); - ret->ai_addrlen = addrlen; - return ret; -} - -int -xgetaddrinfo (const char *nodename, const char *servname, - const struct addrinfo *hints, struct addrinfo **res) -{ - struct hostent *hp; - struct servent *servent; - const char *socktype; - int port; - struct addrinfo hint, result; - struct addrinfo *ai, *sai, *eai; - char **addrs; - - if (!servname && !nodename) - return EAI_NONAME; - - memset (&result, 0, sizeof result); - - /* default for hints */ - if (!hints) { - memset (&hint, 0, sizeof hint); - hint.ai_family = PF_UNSPEC; - hints = &hint; - } - - if (!servname) - port = 0; - else { - /* check for tcp or udp sockets only */ - if (hints->ai_socktype == SOCK_STREAM) - socktype = "tcp"; - else if (hints->ai_socktype == SOCK_DGRAM) - socktype = "udp"; - else - return EAI_SERVICE; - result.ai_socktype = hints->ai_socktype; - - /* Note: maintain port in host byte order to make debugging easier */ - if (isdigit (*servname)) - port = strtol (servname, nullptr, 10); - else if ((servent = getservbyname (servname, socktype))) - port = ntohs (servent->s_port); - else - return EAI_NONAME; - } - - /* if !nodename, refer to the local host for a client or any - for a server */ - if (!nodename) { - struct sockaddr_in sin; - - /* check protocol family is PF_UNSPEC or PF_INET - could try harder - for IPv6 but that's more code than I'm prepared to write */ - if (hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET) - result.ai_family = AF_INET; - else - return EAI_FAMILY; - - sin.sin_family = result.ai_family; - sin.sin_port = htons (port); - if (hints->ai_flags & AI_PASSIVE) - sin.sin_addr.s_addr = htonl (INADDR_ANY); - else - sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); - /* Duplicate result and addr and return */ - *res = dup_addrinfo (&result, &sin, sizeof sin); - return (!*res) ? EAI_MEMORY : 0; - } - - /* If AI_NUMERIC is specified, use inet_pton to translate numbers and - dots notation. */ - if (hints->ai_flags & AI_NUMERICHOST) { - struct sockaddr_in sin; - - /* check protocol family is PF_UNSPEC or PF_INET */ - if (hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET) - result.ai_family = AF_INET; - else - return EAI_FAMILY; - - sin.sin_family = result.ai_family; - sin.sin_port = htons (port); - if (inet_pton(result.ai_family, nodename, &sin.sin_addr) != 1) - return EAI_NONAME; - sin.sin_addr.s_addr = inet_addr (nodename); - /* Duplicate result and addr and return */ - *res = dup_addrinfo (&result, &sin, sizeof sin); - return (!*res) ? EAI_MEMORY : 0; - } - -#if HAVE_H_ERRNO - h_errno = 0; -#endif - errno = 0; - hp = gethostbyname(nodename); - if (!hp) { -#ifdef EAI_SYSTEM - if (errno != 0) { - return EAI_SYSTEM; - } -#endif - switch (h_errno) { - case HOST_NOT_FOUND: - return EAI_NODATA; - case NO_DATA: - return EAI_NODATA; -#if defined(NO_ADDRESS) && NO_ADDRESS != NO_DATA - case NO_ADDRESS: - return EAI_NODATA; -#endif - case NO_RECOVERY: - return EAI_FAIL; - case TRY_AGAIN: - return EAI_AGAIN; - default: - return EAI_FAIL; - } - return EAI_FAIL; - } - - /* Check that the address family is acceptable. - */ - switch (hp->h_addrtype) { - case AF_INET: - if (!(hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET)) - return EAI_FAMILY; - break; - case AF_INET6: - if (!(hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET6)) - return EAI_FAMILY; - break; - default: - return EAI_FAMILY; - } - - /* For each element pointed to by hp, create an element in the - result linked list. */ - sai = eai = nullptr; - for (addrs = hp->h_addr_list; *addrs; addrs++) { - struct sockaddr sa; - size_t addrlen; - - if (hp->h_length < 1) - continue; - sa.sa_family = hp->h_addrtype; - switch (hp->h_addrtype) { - case AF_INET: - ((struct sockaddr_in *) &sa)->sin_port = htons (port); - memcpy (&((struct sockaddr_in *) &sa)->sin_addr, - *addrs, hp->h_length); - addrlen = sizeof (struct sockaddr_in); - break; - case AF_INET6: -#if SIN6_LEN - ((struct sockaddr_in6 *) &sa)->sin6_len = hp->h_length; -#endif - ((struct sockaddr_in6 *) &sa)->sin6_port = htons (port); - memcpy (&((struct sockaddr_in6 *) &sa)->sin6_addr, - *addrs, hp->h_length); - addrlen = sizeof (struct sockaddr_in6); - break; - default: - continue; - } - - result.ai_family = hp->h_addrtype; - ai = dup_addrinfo (&result, &sa, addrlen); - if (!ai) { - xfreeaddrinfo (sai); - return EAI_MEMORY; - } - if (!sai) - sai = ai; - else - eai->ai_next = ai; - eai = ai; - } - - if (!sai) { - return EAI_NODATA; - } - - if (hints->ai_flags & AI_CANONNAME) { - sai->ai_canonname = (char *)malloc(strlen(hp->h_name) + 1); - if (!sai->ai_canonname) { - xfreeaddrinfo (sai); - return EAI_MEMORY; - } - strcpy (sai->ai_canonname, hp->h_name); - } - - *res = sai; - return 0; -} - -void -xfreeaddrinfo (struct addrinfo *ai) -{ - struct addrinfo *next; - - while (ai) { - next = ai->ai_next; - if (ai->ai_canonname) - free (ai->ai_canonname); - if (ai->ai_addr) - free (ai->ai_addr); - free (ai); - ai = next; - } -} - -const char * -xgai_strerror (int ecode) -{ - static const char *eai_descr[] = { - "no error", - "address family for nodename not supported", /* EAI_ADDRFAMILY */ - "temporary failure in name resolution", /* EAI_AGAIN */ - "invalid value for ai_flags", /* EAI_BADFLAGS */ - "non-recoverable failure in name resolution", /* EAI_FAIL */ - "ai_family not supported", /* EAI_FAMILY */ - "memory allocation failure", /* EAI_MEMORY */ - "no address associated with nodename", /* EAI_NODATA */ - "nodename nor servname provided, or not known", /* EAI_NONAME */ - "servname not supported for ai_socktype", /* EAI_SERVICE */ - "ai_socktype not supported", /* EAI_SOCKTYPE */ - "system error returned in errno", /* EAI_SYSTEM */ - "argument buffer overflow", /* EAI_OVERFLOW */ - }; - - if (ecode < 0 || ecode > (int) (sizeof eai_descr/ sizeof eai_descr[0])) - return "unknown error"; - return eai_descr[ecode]; -} - -#endif /* HAVE_DECL_GETADDRINFO */ - diff -u -r -N squid-6.10/compat/getaddrinfo.h squid-6.11/compat/getaddrinfo.h --- squid-6.10/compat/getaddrinfo.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/getaddrinfo.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -#ifndef SQUID_COMPAT_GETADDRINFO_H -#define SQUID_COMPAT_GETADDRINFO_H - -/* - * Shamelessly duplicated from the fetchmail public sources - * for use by the Squid Project under GNU Public License. - * - * Update/Maintenance History: - * - * 15-Aug-2007 : Copied from fetchmail 6.3.8 - * - added protection around library headers - * - * 16-Aug-2007 : Altered configure checks - * Un-hacked slightly to use system gethostbyname() - * - * Original License and code follows. - */ - -/* - * This file is part of libESMTP, a library for submission of RFC 2822 - * formatted electronic mail messages using the SMTP protocol described - * in RFC 2821. - * - * Copyright (C) 2001,2002 Brian Stafford - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* Structure and prototypes taken from RFC 2553 */ - -/* These functions are provided by the OS */ -#if !HAVE_DECL_GETADDRINFO - -#ifndef EAI_SYSTEM -/* Not defined on mingw32. */ -#define EAI_SYSTEM 11 /* System error returned in `errno'. */ -#endif -#ifndef EAI_OVERFLOW -/* Not defined on mingw32. */ -#define EAI_OVERFLOW 12 /* Argument buffer overflow. */ -#endif - -#ifndef IN_EXPERIMENTAL -#define IN_EXPERIMENTAL(a) \ - ((((long int) (a)) & 0xf0000000) == 0xf0000000) -#endif - -/* RFC 2553 / Posix resolver */ -SQUIDCEXTERN int xgetaddrinfo (const char *nodename, const char *servname, - const struct addrinfo *hints, struct addrinfo **res); -#define getaddrinfo xgetaddrinfo - -/* Free addrinfo structure and associated storage */ -SQUIDCEXTERN void xfreeaddrinfo (struct addrinfo *ai); -#define freeaddrinfo xfreeaddrinfo - -/* Convert error return from getaddrinfo() to string */ -SQUIDCEXTERN const char *xgai_strerror (int code); -#if !defined(gai_strerror) -#define gai_strerror xgai_strerror -#endif - -#endif /* HAVE_DECL_GETADDRINFO */ -#endif /* SQUID_COMPAT_GETADDRINFO_H */ - diff -u -r -N squid-6.10/compat/getnameinfo.cc squid-6.11/compat/getnameinfo.cc --- squid-6.10/compat/getnameinfo.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/getnameinfo.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,392 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -/* - * Shamelessly duplicated from the fetchmail public sources - * for use by the Squid Project under GNU Public License. - * - * Update/Maintenance History: - * - * 16-Aug-2007 : Copied from fetchmail 6.3.8 - * - added protection around library headers - * - added use of alternative name xgetnameinfo - * to split from any OS-provided. - * - * 06-Oct-2007 : Various fixes to allow the build on MinGW - * - use srtncpy instead of strlcpy - * - use xinet_ntop instead of inet_ntop - * - use SQUIDHOSTNAMELEN instead of MAXHOSTNAMELEN - * - * 13-Jan-2015 : Various fixed for C++ and MinGW native build - * - * Original License and code follows. - */ -#include "squid.h" - -/* KAME: getnameinfo.c,v 1.72 2005/01/13 04:12:03 itojun Exp */ - -/* - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Issues to be discussed: - * - RFC2553 says that we should raise error on short buffer. X/Open says - * we need to truncate the result. We obey RFC2553 (and X/Open should be - * modified). ipngwg rough consensus seems to follow RFC2553. RFC3493 says - * nothing about it, but defines a new error code EAI_OVERFLOW which seems - * to be intended the code for this case. - * - What is "local" in NI_NOFQDN? (see comments in the code) - * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other. - * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if - * sin6_scope_id is filled - standardization status? - * - what should we do if we should do getservbyport("sctp")? - */ - -/* - * Considerations about thread-safeness - * The code in this file is thread-safe, and so the thread-safeness of - * getnameinfo() depends on the property of backend functions. - * - getservbyport() is not thread safe for most systems we are targeting. - * - getipnodebyaddr() is thread safe. However, many resolver libraries - * used in the function are not thread safe. - * - gethostbyaddr() is usually not thread safe. - */ - -#if !HAVE_DECL_GETNAMEINFO - -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NET_IF_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_ARPA_NAMESER_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_RESOLV_H -#include -#endif -#if HAVE_STRING_H -#include -#endif -#if HAVE_STDDEF_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_INTTYPES_H -#include -#endif - -#if _SQUID_WINDOWS_ -#undef IN_ADDR -#include -#endif - -static const struct afd { - int a_af; - int a_addrlen; - int a_socklen; - int a_off; - int a_portoff; -} afdl [] = { -#if INET6 - { PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6), - offsetof(struct sockaddr_in6, sin6_addr), - offsetof(struct sockaddr_in6, sin6_port) - }, -#endif - { PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in), - offsetof(struct sockaddr_in, sin_addr), - offsetof(struct sockaddr_in, sin_port) - }, - {0, 0, 0, 0, 0}, -}; - -#if INET6 -static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *, - size_t, int)); -static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int)); -#endif - -int -xgetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags) -{ - const struct afd *afd; - struct servent *sp; - struct hostent *hp; - unsigned short port; - int family, i; - const char *addr; - uint32_t v4a; - char numserv[512]; - - if (!sa) - return EAI_FAIL; - -#if HAVE_SA_LEN /*XXX*/ - if (sa->sa_len != salen) - return EAI_FAIL; -#endif - - family = sa->sa_family; - for (i = 0; afdl[i].a_af; i++) - if (afdl[i].a_af == family) { - afd = &afdl[i]; - goto found; - } - return EAI_FAMILY; - -found: - if (salen != afd->a_socklen) - return EAI_FAIL; - - /* network byte order */ - memcpy(&port, (const char *)sa + afd->a_portoff, sizeof(port)); - addr = (const char *)sa + afd->a_off; - - if (!serv || servlen == 0) { - /* - * do nothing in this case. - * in case you are wondering if "&&" is more correct than - * "||" here: RFC3493 says that !serv OR servlen == 0 - * means that the caller does not want the result. - */ - } else { - if (flags & NI_NUMERICSERV) - sp = nullptr; - else { - sp = getservbyport(port, - (flags & NI_DGRAM) ? "udp" : "tcp"); - } - if (sp) { - if (strlen(sp->s_name) + 1 > servlen) - return EAI_OVERFLOW; - xstrncpy(serv, sp->s_name, servlen); - } else { - snprintf(numserv, sizeof(numserv), "%u", ntohs(port)); - if (strlen(numserv) + 1 > servlen) - return EAI_OVERFLOW; - xstrncpy(serv, numserv, servlen); - } - } - - switch (sa->sa_family) { - case AF_INET: - v4a = (uint32_t) - ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr); - if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a)) - flags |= NI_NUMERICHOST; - v4a >>= IN_CLASSA_NSHIFT; - if (v4a == 0) - flags |= NI_NUMERICHOST; - break; -#if INET6 - case AF_INET6: { - const struct sockaddr_in6 *sin6; - sin6 = (const struct sockaddr_in6 *)sa; - switch (sin6->sin6_addr.s6_addr[0]) { - case 0x00: - if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) - ; - else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)) - ; - else - flags |= NI_NUMERICHOST; - break; - default: - if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) - flags |= NI_NUMERICHOST; - else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) - flags |= NI_NUMERICHOST; - break; - } - } - break; -#endif - } - if (!host || hostlen == 0) { - /* - * do nothing in this case. - * in case you are wondering if "&&" is more correct than - * "||" here: RFC3493 says that !host or hostlen == 0 - * means that the caller does not want the result. - */ - } else if (flags & NI_NUMERICHOST) { - /* NUMERICHOST and NAMEREQD conflicts with each other */ - if (flags & NI_NAMEREQD) - return EAI_NONAME; - - goto numeric; - } else { -#if USE_GETIPNODEBY - int h_error = 0; - hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error); -#else - hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af); -#endif - - if (hp) { - if (strlen(hp->h_name) + 1 > hostlen) { -#if USE_GETIPNODEBY - freehostent(hp); -#endif - return EAI_OVERFLOW; - } - xstrncpy(host, hp->h_name, hostlen); -#if USE_GETIPNODEBY - freehostent(hp); -#endif - } else { - if (flags & NI_NAMEREQD) - return EAI_NONAME; - -numeric: - switch (afd->a_af) { -#if INET6 - case AF_INET6: { - int error; - - if ((error = ip6_parsenumeric(sa, addr, host, - hostlen, - flags)) != 0) - return(error); - break; - } -#endif - default: - if (!inet_ntop(afd->a_af, addr, host, hostlen)) - return EAI_SYSTEM; - break; - } - } - } - return(0); -} - -#if INET6 -static int -ip6_parsenumeric(sa, addr, host, hostlen, flags) -const struct sockaddr *sa; -const char *addr; -char *host; -size_t hostlen; -int flags; -{ - int numaddrlen; - char numaddr[512]; - - if (!inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr))) - return EAI_SYSTEM; - - numaddrlen = strlen(numaddr); - if (numaddrlen + 1 > hostlen) /* don't forget terminator */ - return EAI_OVERFLOW; - xstrncpy(host, numaddr, hostlen); - - if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) { - char zonebuf[SQUIDHOSTNAMELEN]; - int zonelen; - - zonelen = ip6_sa2str( - (const struct sockaddr_in6 *)(const void *)sa, - zonebuf, sizeof(zonebuf), flags); - if (zonelen < 0) - return EAI_OVERFLOW; - if (zonelen + 1 + numaddrlen + 1 > hostlen) - return EAI_OVERFLOW; - - /* construct */ - memcpy(host + numaddrlen + 1, zonebuf, - (size_t)zonelen); - host[numaddrlen] = SCOPE_DELIMITER; - host[numaddrlen + 1 + zonelen] = '\0'; - } - - return 0; -} - -/* ARGSUSED */ -static int -ip6_sa2str(sa6, buf, bufsiz, flags) -const struct sockaddr_in6 *sa6; -char *buf; -size_t bufsiz; -int flags; -{ - unsigned int ifindex; - const struct in6_addr *a6; - int n; - - ifindex = (unsigned int)sa6->sin6_scope_id; - a6 = &sa6->sin6_addr; - -#if NI_NUMERICSCOPE - if ((flags & NI_NUMERICSCOPE) != 0) { - n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id); - if (n < 0 || n >= bufsiz) - return -1; - else - return n; - } -#endif - - /* if_indextoname() does not take buffer size. not a good api... */ - if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6) || - IN6_IS_ADDR_MC_NODELOCAL(a6)) && bufsiz >= IF_NAMESIZE) { - char *p = if_indextoname(ifindex, buf); - if (p) - return (strlen(p)); - } - - /* last resort */ - n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id); - if (n < 0 || n >= bufsiz) - return -1; - else - return n; -} -#endif /* INET6 */ -#endif /* HAVE_DECL_GETNAMEINFO */ - diff -u -r -N squid-6.10/compat/getnameinfo.h squid-6.11/compat/getnameinfo.h --- squid-6.10/compat/getnameinfo.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/getnameinfo.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -#ifndef SQUID_COMPAT_GETNAMEINFO_H -#define SQUID_COMPAT_GETNAMEINFO_H - -#if !HAVE_DECL_GETNAMEINFO - -// RFC 2553 / Posix resolver -// Reconstructed from KAME getnameinfo.c -SQUIDCEXTERN int xgetnameinfo(const struct sockaddr *sa, - socklen_t salen, - char *host, - size_t hostlen, - char *serv, - size_t servlen, - int flags ); -#define getnameinfo xgetnameinfo - -#endif /* HAVE_DECL_GETNAMEINFO */ -#endif /* SQUID_COMPAT_GETNAMEINFO_H */ - diff -u -r -N squid-6.10/compat/inet_ntop.cc squid-6.11/compat/inet_ntop.cc --- squid-6.10/compat/inet_ntop.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/inet_ntop.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,248 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -/* - * Shamelessly duplicated from the bind9 public sources - * for use by the Squid Project under ISC written permission - * included "as found" below. - * - * Update/Maintenance History: - * - * 24-Sep-2007 : Copied from bind 9.3.3 - * - Added protection around library headers - * - Altered configure checks - * - Un-hacked slightly to use system gethostbyname() - * - * 06-Oct-2007 : Various fixes to allow the build on MinGW - * - * 28-Oct-2007: drop some dead code. now tested working without. - * - * 04-Nov-2010: drop SPRINTF casting macro - * - * 13-Jan-2015 : Various fixed for C++ and MinGW native build - * - * Original License and code follows. - */ - -#include "squid.h" - -#if !HAVE_DECL_INET_NTOP - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "inet_ntop.c,v 1.1.2.1.8.2 2005/11/03 23:08:40 marka Exp"; -#endif /* LIBC_SCCS and not lint */ - -#if HAVE_SYS_PARAM_H -#include -#endif -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif - -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_ARPA_NAMESER_H -#include -#endif - -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_STRING_H -#include -#endif - -#if ! defined(NS_INADDRSZ) -#define NS_INADDRSZ 4 -#endif -#if ! defined(NS_IN6ADDRSZ) -#define NS_IN6ADDRSZ 16 -#endif -#if ! defined(NS_INT16SZ) -#define NS_INT16SZ 2 -#endif - -/* - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -static const char *inet_ntop4 (const u_char *src, char *dst, size_t size); -static const char *inet_ntop6 (const u_char *src, char *dst, size_t size); - -/* char * - * inet_ntop(af, src, dst, size) - * convert a network format address to presentation format. - * return: - * pointer to presentation format address (`dst'), or nullptr (see errno). - * author: - * Paul Vixie, 1996. - */ -const char * -xinet_ntop(int af, const void *src, char *dst, size_t size) -{ - switch (af) { - case AF_INET: - return (inet_ntop4((const u_char*)src, dst, size)); - case AF_INET6: - return (inet_ntop6((const u_char*)src, dst, size)); - default: - errno = EAFNOSUPPORT; - return nullptr; - } - /* NOTREACHED */ -} - -/* const char * - * inet_ntop4(src, dst, size) - * format an IPv4 address - * return: - * `dst' (as a const) - * notes: - * (1) uses no statics - * (2) takes a u_char* not an in_addr as input - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop4(const u_char *src, char *dst, size_t size) -{ - static const char fmt[] = "%u.%u.%u.%u"; - char tmp[sizeof("255.255.255.255")+1]; - - if ((size_t)snprintf(tmp, min(sizeof(tmp),size), fmt, src[0], src[1], src[2], src[3]) >= size) { - errno = ENOSPC; - return nullptr; - } - strcpy(dst, tmp); - return (dst); -} - -/* const char * - * inet_ntop6(src, dst, size) - * convert IPv6 binary address into presentation (printable) format - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop6(const u_char *src, char *dst, size_t size) -{ - /* - * Note that int32_t and int16_t need only be "at least" large enough - * to contain a value of the specified size. On some systems, like - * Crays, there is no such thing as an integer variable with 16 bits. - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ - char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; - struct { int base, len; } best, cur; - u_int words[NS_IN6ADDRSZ / NS_INT16SZ]; - int i; - - /* - * Preprocess: - * Copy the input (bytewise) array into a wordwise array. - * Find the longest run of 0x00's in src[] for :: shorthanding. - */ - memset(words, '\0', sizeof words); - for (i = 0; i < NS_IN6ADDRSZ; i++) - words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); - best.base = -1; - best.len = 0; - cur.base = -1; - cur.len = 0; - for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { - if (words[i] == 0) { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else - cur.len++; - } else { - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - cur.base = -1; - } - } - } - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - } - if (best.base != -1 && best.len < 2) - best.base = -1; - - /* - * Format the result. - */ - tp = tmp; - for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { - /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && - i < (best.base + best.len)) { - if (i == best.base) - *tp++ = ':'; - continue; - } - /* Are we following an initial run of 0x00s or any real hex? */ - if (i != 0) - *tp++ = ':'; - /* Is this address an encapsulated IPv4? */ - if (i == 6 && best.base == 0 && (best.len == 6 || - (best.len == 7 && words[7] != 0x0001) || - (best.len == 5 && words[5] == 0xffff))) { - if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) - return nullptr; - tp += strlen(tp); - break; - } - tp += snprintf(tp, (tmp + sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") - tp), "%x", words[i]); - } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == - (NS_IN6ADDRSZ / NS_INT16SZ)) - *tp++ = ':'; - *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - if ((size_t)(tp - tmp) > size) { - errno = ENOSPC; - return nullptr; - } - strcpy(dst, tmp); - return (dst); -} - -#endif /* HAVE_DECL_INET_NTOP */ - diff -u -r -N squid-6.10/compat/inet_ntop.h squid-6.11/compat/inet_ntop.h --- squid-6.10/compat/inet_ntop.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/inet_ntop.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -#ifndef SQUID_COMPAT_INET_NTOP_H -#define SQUID_COMPAT_INET_NTOP_H - -/* Use the system provided version where possible */ -#if !HAVE_DECL_INET_NTOP - -/* char * -* inet_ntop(af, src, dst, size) -* convert a network format address to presentation format. -* return: -* pointer to presentation format address (`dst'), or NULL (see errno). -* author: -* Paul Vixie, 1996. -*/ -SQUIDCEXTERN const char * xinet_ntop(int af, const void *src, char *dst, size_t size); -#ifndef inet_ntop -#define inet_ntop xinet_ntop -#endif - -#endif /* HAVE_DECL_INET_NTOP */ -#endif /* SQUID_COMPAT_INET_NTOP_H */ - diff -u -r -N squid-6.10/compat/inet_pton.cc squid-6.11/compat/inet_pton.cc --- squid-6.10/compat/inet_pton.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/inet_pton.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,273 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -/* - * Shamelessly duplicated from the bind9 public sources - * for use by the Squid Project under ISC written permission - * included "as found" below. - * - * Update/Maintenance History: - * - * 24-Sep-2007 : Copied from bind 9.3.3 - * - Added protection around library headers - * - Altered configure checks to import - * - * 06-Oct-2007 : Various fixes to allow the build on MinGW - * - * 28-Oct-2007: drop some dead code. now tested working without. - * - * 13-Jan-2015 : Various fixed for C++ and MinGW native build - * - * Original License and code follows. - */ - -#include "squid.h" - -#if !HAVE_DECL_INET_PTON - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "inet_pton.c,v 1.2.206.2 2005/07/28 07:43:18 marka Exp"; -#endif /* LIBC_SCCS and not lint */ - -#if HAVE_SYS_PARAM_H -#include -#endif -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_ARPA_NAMESER_H -#include -#endif -#if HAVE_STRING_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif - -#if ! defined(NS_INADDRSZ) -#define NS_INADDRSZ 4 -#endif -#if ! defined(NS_IN6ADDRSZ) -#define NS_IN6ADDRSZ 16 -#endif -#if ! defined(NS_INT16SZ) -#define NS_INT16SZ 2 -#endif - -/* - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -static int inet_pton4 (const char *src, u_char *dst); -static int inet_pton6 (const char *src, u_char *dst); - -/* int - * inet_pton(af, src, dst) - * convert from presentation format (which usually means ASCII printable) - * to network format (which is usually some kind of binary format). - * return: - * 1 if the address was valid for the specified address family - * 0 if the address wasn't valid (`dst' is untouched in this case) - * -1 if some other error occurred (`dst' is untouched in this case, too) - * author: - * Paul Vixie, 1996. - */ -int -xinet_pton(int af, const char *src, void *dst) -{ - switch (af) { - case AF_INET: - return (inet_pton4(src, (u_char*)dst)); - case AF_INET6: - return (inet_pton6(src, (u_char*)dst)); - default: - errno = EAFNOSUPPORT; - return (-1); - } - /* NOTREACHED */ -} - -/* int - * inet_pton4(src, dst) - * like inet_aton() but without all the hexadecimal and shorthand. - * return: - * 1 if `src' is a valid dotted quad, else 0. - * notice: - * does not touch `dst' unless it's returning 1. - * author: - * Paul Vixie, 1996. - */ -static int -inet_pton4(const char *src, u_char *dst) -{ - static const char digits[] = "0123456789"; - int saw_digit, octets, ch; - u_char tmp[NS_INADDRSZ], *tp; - - saw_digit = 0; - octets = 0; - *(tp = tmp) = 0; - while ((ch = *src++) != '\0') { - const char *pch; - - if ((pch = strchr(digits, ch))) { - u_int nw = *tp * 10 + (pch - digits); - - if (saw_digit && *tp == 0) - return (0); - if (nw > 255) - return (0); - *tp = nw; - if (!saw_digit) { - if (++octets > 4) - return (0); - saw_digit = 1; - } - } else if (ch == '.' && saw_digit) { - if (octets == 4) - return (0); - *++tp = 0; - saw_digit = 0; - } else - return (0); - } - if (octets < 4) - return (0); - memcpy(dst, tmp, NS_INADDRSZ); - return (1); -} - -/* int - * inet_pton6(src, dst) - * convert presentation level address to network order binary form. - * return: - * 1 if `src' is a valid [RFC1884 2.2] address, else 0. - * notice: - * (1) does not touch `dst' unless it's returning 1. - * (2) :: in a full address is silently ignored. - * credit: - * inspired by Mark Andrews. - * author: - * Paul Vixie, 1996. - */ -static int -inet_pton6(const char *src, u_char *dst) -{ - static const char xdigits_l[] = "0123456789abcdef", - xdigits_u[] = "0123456789ABCDEF"; - u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp; - const char *xdigits, *curtok; - int ch, seen_xdigits; - u_int val; - - memset((tp = tmp), '\0', NS_IN6ADDRSZ); - endp = tp + NS_IN6ADDRSZ; - colonp = nullptr; - /* Leading :: requires some special handling. */ - if (*src == ':') - if (*++src != ':') - return (0); - curtok = src; - seen_xdigits = 0; - val = 0; - while ((ch = *src++) != '\0') { - const char *pch; - - if (!(pch = strchr((xdigits = xdigits_l), ch))) - pch = strchr((xdigits = xdigits_u), ch); - if (pch) { - val <<= 4; - val |= (pch - xdigits); - if (++seen_xdigits > 4) - return (0); - continue; - } - if (ch == ':') { - curtok = src; - if (!seen_xdigits) { - if (colonp) - return (0); - colonp = tp; - continue; - } else if (*src == '\0') { - return (0); - } - if (tp + NS_INT16SZ > endp) - return (0); - *tp++ = (u_char) (val >> 8) & 0xff; - *tp++ = (u_char) val & 0xff; - seen_xdigits = 0; - val = 0; - continue; - } - if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) && - inet_pton4(curtok, tp) > 0) { - tp += NS_INADDRSZ; - seen_xdigits = 0; - break; /* '\0' was seen by inet_pton4(). */ - } - return (0); - } - if (seen_xdigits) { - if (tp + NS_INT16SZ > endp) - return (0); - *tp++ = (u_char) (val >> 8) & 0xff; - *tp++ = (u_char) val & 0xff; - } - if (colonp) { - /* - * Since some memmove()'s erroneously fail to handle - * overlapping regions, we'll do the shift by hand. - */ - const int n = tp - colonp; - int i; - - if (tp == endp) - return (0); - for (i = 1; i <= n; i++) { - endp[- i] = colonp[n - i]; - colonp[n - i] = 0; - } - tp = endp; - } - if (tp != endp) - return (0); - memcpy(dst, tmp, NS_IN6ADDRSZ); - return (1); -} - -#endif /* HAVE_DECL_INET_PTON */ - diff -u -r -N squid-6.10/compat/inet_pton.h squid-6.11/compat/inet_pton.h --- squid-6.10/compat/inet_pton.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/inet_pton.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -#ifndef SQUID_COMPAT_INET_PTON_H -#define SQUID_COMPAT_INET_PTON_H - -/* Use the system provided version where possible */ -#if !HAVE_DECL_INET_PTON - -/* int -* inet_pton(af, src, dst) -* convert from presentation format (which usually means ASCII printable) -* to network format (which is usually some kind of binary format). -* return: -* 1 if the address was valid for the specified address family -* 0 if the address wasn't valid (`dst' is untouched in this case) -* -1 if some other error occurred (`dst' is untouched in this case, too) -* author: -* Paul Vixie, 1996. -*/ -SQUIDCEXTERN int xinet_pton(int af, const char *src, void *dst); -#ifndef inet_pton -#define inet_pton xinet_pton -#endif - -#endif /* HAVE_DECL_INET_PTON */ -#endif /* SQUID_COMPAT_INET_PTON_H */ - diff -u -r -N squid-6.10/compat/initgroups.c squid-6.11/compat/initgroups.c --- squid-6.10/compat/initgroups.c 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/initgroups.c 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/initgroups.h squid-6.11/compat/initgroups.h --- squid-6.10/compat/initgroups.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/initgroups.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/krb5.h squid-6.11/compat/krb5.h --- squid-6.10/compat/krb5.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/krb5.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/Makefile.am squid-6.11/compat/Makefile.am --- squid-6.10/compat/Makefile.am 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/Makefile.am 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -29,14 +29,6 @@ eui64_aton.c \ eui64_aton.h \ fdsetsize.h \ - getaddrinfo.cc \ - getaddrinfo.h \ - getnameinfo.cc \ - getnameinfo.h \ - inet_ntop.cc \ - inet_ntop.h \ - inet_pton.cc \ - inet_pton.h \ initgroups.h \ krb5.h \ memrchr.cc \ @@ -53,7 +45,6 @@ os/mswindows.h \ os/netbsd.h \ os/openbsd.h \ - os/opensolaris_10_netdb.h \ os/os2.h \ os/qnx.h \ os/sgi.h \ diff -u -r -N squid-6.10/compat/Makefile.in squid-6.11/compat/Makefile.in --- squid-6.10/compat/Makefile.in 2024-06-08 14:46:35.000000000 +0000 +++ squid-6.11/compat/Makefile.in 2024-09-15 21:03:53.000000000 +0000 @@ -172,8 +172,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libcompatsquid_la_DEPENDENCIES = $(LTLIBOBJS) am_libcompatsquid_la_OBJECTS = assert.lo compat.lo debug.lo \ - eui64_aton.lo getaddrinfo.lo getnameinfo.lo inet_ntop.lo \ - inet_pton.lo memrchr.lo mswindows.lo shm.lo statvfs.lo \ + eui64_aton.lo memrchr.lo mswindows.lo shm.lo statvfs.lo \ strnrchr.lo strnstr.lo xalloc.lo xstrerror.lo xstring.lo \ xstrto.lo libcompatsquid_la_OBJECTS = $(am_libcompatsquid_la_OBJECTS) @@ -208,9 +207,7 @@ $(DEPDIR)/strerror.Plo $(DEPDIR)/strtoll.Plo \ $(DEPDIR)/tempnam.Plo ./$(DEPDIR)/assert.Plo \ ./$(DEPDIR)/compat.Plo ./$(DEPDIR)/debug.Plo \ - ./$(DEPDIR)/eui64_aton.Plo ./$(DEPDIR)/getaddrinfo.Plo \ - ./$(DEPDIR)/getnameinfo.Plo ./$(DEPDIR)/inet_ntop.Plo \ - ./$(DEPDIR)/inet_pton.Plo ./$(DEPDIR)/memrchr.Plo \ + ./$(DEPDIR)/eui64_aton.Plo ./$(DEPDIR)/memrchr.Plo \ ./$(DEPDIR)/mswindows.Plo ./$(DEPDIR)/shm.Plo \ ./$(DEPDIR)/statvfs.Plo ./$(DEPDIR)/strnrchr.Plo \ ./$(DEPDIR)/strnstr.Plo ./$(DEPDIR)/testPreCompiler.Po \ @@ -778,14 +775,6 @@ eui64_aton.c \ eui64_aton.h \ fdsetsize.h \ - getaddrinfo.cc \ - getaddrinfo.h \ - getnameinfo.cc \ - getnameinfo.h \ - inet_ntop.cc \ - inet_ntop.h \ - inet_pton.cc \ - inet_pton.h \ initgroups.h \ krb5.h \ memrchr.cc \ @@ -802,7 +791,6 @@ os/mswindows.h \ os/netbsd.h \ os/openbsd.h \ - os/opensolaris_10_netdb.h \ os/os2.h \ os/qnx.h \ os/sgi.h \ @@ -917,10 +905,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eui64_aton.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getnameinfo.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_pton.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mswindows.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shm.Plo@am__quote@ # am--include-marker @@ -1302,10 +1286,6 @@ -rm -f ./$(DEPDIR)/compat.Plo -rm -f ./$(DEPDIR)/debug.Plo -rm -f ./$(DEPDIR)/eui64_aton.Plo - -rm -f ./$(DEPDIR)/getaddrinfo.Plo - -rm -f ./$(DEPDIR)/getnameinfo.Plo - -rm -f ./$(DEPDIR)/inet_ntop.Plo - -rm -f ./$(DEPDIR)/inet_pton.Plo -rm -f ./$(DEPDIR)/memrchr.Plo -rm -f ./$(DEPDIR)/mswindows.Plo -rm -f ./$(DEPDIR)/shm.Plo @@ -1371,10 +1351,6 @@ -rm -f ./$(DEPDIR)/compat.Plo -rm -f ./$(DEPDIR)/debug.Plo -rm -f ./$(DEPDIR)/eui64_aton.Plo - -rm -f ./$(DEPDIR)/getaddrinfo.Plo - -rm -f ./$(DEPDIR)/getnameinfo.Plo - -rm -f ./$(DEPDIR)/inet_ntop.Plo - -rm -f ./$(DEPDIR)/inet_pton.Plo -rm -f ./$(DEPDIR)/memrchr.Plo -rm -f ./$(DEPDIR)/mswindows.Plo -rm -f ./$(DEPDIR)/shm.Plo diff -u -r -N squid-6.10/compat/memrchr.cc squid-6.11/compat/memrchr.cc --- squid-6.10/compat/memrchr.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/memrchr.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/memrchr.h squid-6.11/compat/memrchr.h --- squid-6.10/compat/memrchr.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/memrchr.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/mswindows.cc squid-6.11/compat/mswindows.cc --- squid-6.10/compat/mswindows.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/mswindows.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/openssl.h squid-6.11/compat/openssl.h --- squid-6.10/compat/openssl.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/openssl.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/aix.h squid-6.11/compat/os/aix.h --- squid-6.10/compat/os/aix.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/aix.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/android.h squid-6.11/compat/os/android.h --- squid-6.10/compat/os/android.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/android.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/dragonfly.h squid-6.11/compat/os/dragonfly.h --- squid-6.10/compat/os/dragonfly.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/dragonfly.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/freebsd.h squid-6.11/compat/os/freebsd.h --- squid-6.10/compat/os/freebsd.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/freebsd.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/hpux.h squid-6.11/compat/os/hpux.h --- squid-6.10/compat/os/hpux.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/hpux.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/linux.h squid-6.11/compat/os/linux.h --- squid-6.10/compat/os/linux.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/linux.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/macosx.h squid-6.11/compat/os/macosx.h --- squid-6.10/compat/os/macosx.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/macosx.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/mswindows.h squid-6.11/compat/os/mswindows.h --- squid-6.10/compat/os/mswindows.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/mswindows.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -616,32 +616,6 @@ } #define getsockopt(s,l,o,v,n) Squid::getsockopt(s,l,o,v,n) -#if HAVE_DECL_INETNTOPA || HAVE_DECL_INET_NTOP -inline char * -inet_ntop(int af, const void *src, char *dst, size_t size) -{ -#if HAVE_DECL_INETNTOPA - return (char*)InetNtopA(af, const_cast(src), dst, size); -#else // HAVE_DECL_INET_NTOP - return ::inet_ntop(af, src, dst, size); -#endif -} -#define inet_ntop(a,s,d,l) Squid::inet_ntop(a,s,d,l) -#endif // let compat/inet_ntop.h deal with it - -#if HAVE_DECL_INETPTONA || HAVE_DECL_INET_PTON -inline char * -inet_pton(int af, const void *src, char *dst) -{ -#if HAVE_DECL_INETPTONA - return (char*)InetPtonA(af, const_cast(src), dst); -#else // HAVE_DECL_INET_PTON - return ::inet_pton(af, src, dst); -#endif -} -#define inet_pton(a,s,d) Squid::inet_pton(a,s,d) -#endif // let compat/inet_pton.h deal with it - /* Simple ioctl() emulation */ inline int ioctl(int s, int c, void * a) diff -u -r -N squid-6.10/compat/os/netbsd.h squid-6.11/compat/os/netbsd.h --- squid-6.10/compat/os/netbsd.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/netbsd.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/openbsd.h squid-6.11/compat/os/openbsd.h --- squid-6.10/compat/os/openbsd.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/openbsd.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/opensolaris_10_netdb.h squid-6.11/compat/os/opensolaris_10_netdb.h --- squid-6.10/compat/os/opensolaris_10_netdb.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/opensolaris_10_netdb.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,488 +0,0 @@ -/* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -/* - * Copied from OpenSolaris 10 public sources - * http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/head/netdb.h - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -/* - * BIND 4.9.3: - * - * Copyright (c) 1980, 1983, 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * --Copyright-- - * - * End BIND 4.9.3 - */ - -/* - * Structures returned by network data base library. - * All addresses are supplied in host order, and - * returned in network order (suitable for use in system calls). - */ - -#ifndef SQUID_COMPAT_OS_OPENSOLARIS_10_NETDB_H -#define SQUID_COMPAT_OS_OPENSOLARIS_10_NETDB_H - -#include -#include -#if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) -#include -#endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */ -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#define _PATH_HEQUIV "/etc/hosts.equiv" -#define _PATH_HOSTS "/etc/hosts" -#define _PATH_IPNODES "/etc/inet/ipnodes" -#define _PATH_IPSECALGS "/etc/inet/ipsecalgs" -#define _PATH_NETMASKS "/etc/netmasks" -#define _PATH_NETWORKS "/etc/networks" -#define _PATH_PROTOCOLS "/etc/protocols" -#define _PATH_SERVICES "/etc/services" - -struct hostent { - char *h_name; /* official name of host */ - char **h_aliases; /* alias list */ - int h_addrtype; /* host address type */ - int h_length; /* length of address */ - char **h_addr_list; /* list of addresses from name server */ -#define h_addr h_addr_list[0] /* address, for backward compatibility */ -}; - -/* - * addrinfo introduced with IPv6 for Protocol-Independent Hostname - * and Service Name Translation. - */ - -#if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME, ... */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ -#ifdef __sparcv9 - int _ai_pad; /* for backwards compat with old size_t */ -#endif /* __sparcv9 */ - socklen_t ai_addrlen; - char *ai_canonname; /* canonical name for hostname */ - struct sockaddr *ai_addr; /* binary address */ - struct addrinfo *ai_next; /* next structure in linked list */ -}; - -/* addrinfo flags */ -#define AI_PASSIVE 0x0008 /* intended for bind() + listen() */ -#define AI_CANONNAME 0x0010 /* return canonical version of host */ -#define AI_NUMERICHOST 0x0020 /* use numeric node address string */ -#define AI_NUMERICSERV 0x0040 /* servname is assumed numeric */ - -/* getipnodebyname() flags */ -#define AI_V4MAPPED 0x0001 /* IPv4 mapped addresses if no IPv6 */ -#define AI_ALL 0x0002 /* IPv6 and IPv4 mapped addresses */ -#define AI_ADDRCONFIG 0x0004 /* AAAA or A records only if IPv6/IPv4 cnfg'd */ - -/* - * These were defined in RFC 2553 but not SUSv3 - * or RFC 3493 which obsoleted 2553. - */ -#if !defined(_XPG6) || defined(__EXTENSIONS__) -#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) - -/* addrinfo errors */ -#define EAI_ADDRFAMILY 1 /* address family not supported */ -#define EAI_NODATA 7 /* no address */ -#endif /* !defined(_XPG6) || defined(__EXTENSIONS__) */ -#define EAI_AGAIN 2 /* DNS temporary failure */ -#define EAI_BADFLAGS 3 /* invalid ai_flags */ -#define EAI_FAIL 4 /* DNS non-recoverable failure */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NONAME 8 /* host/servname not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error in errno */ -#define EAI_OVERFLOW 12 /* argument buffer overflow */ -#define EAI_PROTOCOL 13 -#define EAI_MAX 14 - -/* getnameinfo flags */ -#define NI_NOFQDN 0x0001 -#define NI_NUMERICHOST 0x0002 /* return numeric form of address */ -#define NI_NAMEREQD 0x0004 /* request DNS name */ -#define NI_NUMERICSERV 0x0008 -#define NI_DGRAM 0x0010 - -#if !defined(_XPG6) || defined(__EXTENSIONS__) -/* Not listed in any standards document */ -#define NI_WITHSCOPEID 0x0020 -#define NI_NUMERICSCOPE 0x0040 - -/* getnameinfo max sizes as defined in RFC 2553 obsoleted in RFC 3493 */ -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 -#endif /* !defined(_XPG6) || defined(__EXTENSIONS__) */ -#endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */ - -/* - * Scope delimit character - */ -#define SCOPE_DELIMITER '%' - -/* - * Algorithm entry for /etc/inet/ipsecalgs which defines IPsec protocols - * and algorithms. - */ -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) -typedef struct ipsecalgent { - char **a_names; /* algorithm names */ - int a_proto_num; /* protocol number */ - int a_alg_num; /* algorithm number */ - char *a_mech_name; /* encryption framework mechanism name */ - int *a_block_sizes; /* supported block sizes */ - int *a_key_sizes; /* supported key sizes */ - int a_key_increment; /* key size increment */ - int *a_mech_params; /* mechanism specific parameters */ - int a_alg_flags; /* algorithm flags */ -} ipsecalgent_t; - -/* well-known IPsec protocol numbers */ - -#define IPSEC_PROTO_AH 2 -#define IPSEC_PROTO_ESP 3 -#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ - -/* - * Assumption here is that a network number - * fits in 32 bits -- probably a poor one. - */ -struct netent { - char *n_name; /* official name of net */ - char **n_aliases; /* alias list */ - int n_addrtype; /* net address type */ - in_addr_t n_net; /* network # */ -}; - -struct protoent { - char *p_name; /* official protocol name */ - char **p_aliases; /* alias list */ - int p_proto; /* protocol # */ -}; - -struct servent { - char *s_name; /* official service name */ - char **s_aliases; /* alias list */ - int s_port; /* port # */ - char *s_proto; /* protocol to use */ -}; - -#ifdef __STDC__ -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) -struct hostent *gethostbyname_r -(const char *, struct hostent *, char *, int, int *h_errnop); -struct hostent *gethostbyaddr_r -(const char *, int, int, struct hostent *, char *, int, int *h_errnop); -struct hostent *getipnodebyname(const char *, int, int, int *); -struct hostent *getipnodebyaddr(const void *, size_t, int, int *); -void freehostent(struct hostent *); -struct hostent *gethostent_r(struct hostent *, char *, int, int *h_errnop); - -struct servent *getservbyname_r -(const char *name, const char *, struct servent *, char *, int); -struct servent *getservbyport_r -(int port, const char *, struct servent *, char *, int); -struct servent *getservent_r(struct servent *, char *, int); - -struct netent *getnetbyname_r -(const char *, struct netent *, char *, int); -struct netent *getnetbyaddr_r(long, int, struct netent *, char *, int); -struct netent *getnetent_r(struct netent *, char *, int); - -struct protoent *getprotobyname_r -(const char *, struct protoent *, char *, int); -struct protoent *getprotobynumber_r -(int, struct protoent *, char *, int); -struct protoent *getprotoent_r(struct protoent *, char *, int); - -int getnetgrent_r(char **, char **, char **, char *, int); -int innetgr(const char *, const char *, const char *, const char *); -#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ - -/* Old interfaces that return a pointer to a static area; MT-unsafe */ -struct hostent *gethostbyname(const char *); -struct hostent *gethostent(void); -struct netent *getnetbyaddr(in_addr_t, int); -struct netent *getnetbyname(const char *); -struct netent *getnetent(void); -struct protoent *getprotobyname(const char *); -struct protoent *getprotobynumber(int); -struct protoent *getprotoent(void); -struct servent *getservbyname(const char *, const char *); -struct servent *getservbyport(int, const char *); -struct servent *getservent(void); - -/* gethostbyaddr() second argument is a size_t only in unix95/unix98 */ -#if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) -struct hostent *gethostbyaddr(const void *, socklen_t, int); -#else -struct hostent *gethostbyaddr(const void *, size_t, int); -#endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */ - -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) -int endhostent(void); -int endnetent(void); -int endprotoent(void); -int endservent(void); -int sethostent(int); -int setnetent(int); -int setprotoent(int); -int setservent(int); -#else -void endhostent(void); -void endnetent(void); -void endprotoent(void); -void endservent(void); -void sethostent(int); -void setnetent(int); -void setprotoent(int); -void setservent(int); -#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ - -#if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) - -#ifdef _XPG6 -#ifdef __PRAGMA_REDEFINE_EXTNAME -#pragma redefine_extname getaddrinfo __xnet_getaddrinfo -#else /* __PRAGMA_REDEFINE_EXTNAME */ -#define getaddrinfo __xnet_getaddrinfo -#endif /* __PRAGMA_REDEFINE_EXTNAME */ -#endif /* _XPG6 */ - -int getaddrinfo(const char *_RESTRICT_KYWD1, - const char *_RESTRICT_KYWD2, - const struct addrinfo *_RESTRICT_KYWD3, - struct addrinfo **_RESTRICT_KYWD4); -void freeaddrinfo(struct addrinfo *); -const char *gai_strerror(int); -int getnameinfo(const struct sockaddr *_RESTRICT_KYWD1, - socklen_t, char *_RESTRICT_KYWD2, socklen_t, - char *_RESTRICT_KYWD3, socklen_t, int); -#endif /* !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) */ - -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) -int getnetgrent(char **, char **, char **); -int setnetgrent(const char *); -int endnetgrent(void); -int rcmd(char **, unsigned short, - const char *, const char *, const char *, int *); -int rcmd_af(char **, unsigned short, - const char *, const char *, const char *, int *, int); -int rresvport_af(int *, int); -int rresvport_addr(int *, struct sockaddr_storage *); -int rexec(char **, unsigned short, - const char *, const char *, const char *, int *); -int rexec_af(char **, unsigned short, - const char *, const char *, const char *, int *, int); -int rresvport(int *); -int ruserok(const char *, int, const char *, const char *); -/* BIND */ -struct hostent *gethostbyname2(const char *, int); -void herror(const char *); -const char *hstrerror(int); -/* End BIND */ - -/* IPsec algorithm prototype definitions */ -struct ipsecalgent *getipsecalgbyname(const char *, int, int *); -struct ipsecalgent *getipsecalgbynum(int, int, int *); -int getipsecprotobyname(const char *doi_name); -char *getipsecprotobynum(int doi_domain); -void freeipsecalgent(struct ipsecalgent *ptr); -/* END IPsec algorithm prototype definitions */ - -#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ -#else /* __STDC__ */ -struct hostent *gethostbyname_r(); -struct hostent *gethostbyaddr_r(); -struct hostent *getipnodebyname(); -struct hostent *getipnodebyaddr(); -void freehostent(); -struct hostent *gethostent_r(); -struct servent *getservbyname_r(); -struct servent *getservbyport_r(); -struct servent *getservent_r(); -struct netent *getnetbyname_r(); -struct netent *getnetbyaddr_r(); -struct netent *getnetent_r(); -struct protoent *getprotobyname_r(); -struct protoent *getprotobynumber_r(); -struct protoent *getprotoent_r(); -int getnetgrent_r(); -int innetgr(); - -/* Old interfaces that return a pointer to a static area; MT-unsafe */ -struct hostent *gethostbyname(); -struct hostent *gethostbyaddr(); -struct hostent *gethostent(); -struct netent *getnetbyname(); -struct netent *getnetbyaddr(); -struct netent *getnetent(); -struct servent *getservbyname(); -struct servent *getservbyport(); -struct servent *getservent(); -struct protoent *getprotobyname(); -struct protoent *getprotobynumber(); -struct protoent *getprotoent(); -int getnetgrent(); - -int sethostent(); -int endhostent(); -int setnetent(); -int endnetent(); -int setservent(); -int endservent(); -int setprotoent(); -int endprotoent(); -int setnetgrent(); -int endnetgrent(); -int rcmd(); -int rcmd_af(); -int rexec(); -int rexec_af(); -int rresvport(); -int rresvport_af(); -int rresvport_addr(); -int ruserok(); -/* BIND */ -struct hostent *gethostbyname2(); -void herror(); -char *hstrerror(); -/* IPv6 prototype definitions */ -int getaddrinfo(); -void freeaddrinfo(); -const char *gai_strerror(); -int getnameinfo(); -/* END IPv6 prototype definitions */ -/* End BIND */ - -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) -/* IPsec algorithm prototype definitions */ -struct ipsecalgent *getalgbyname(); -struct ipsecalgent *getalgbydoi(); -int getdoidomainbyname(); -const char *getdoidomainbynum(); -void freealgent(); -/* END IPsec algorithm prototype definitions */ -#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ - -#endif /* __STDC__ */ - -/* - * Error return codes from gethostbyname() and gethostbyaddr() - * (when using the resolver) - */ - -extern int h_errno; - -#ifdef _REENTRANT -#ifdef __STDC__ -extern int *__h_errno(void); -#else -extern int *__h_errno(); -#endif /* __STDC__ */ - -/* Only #define h_errno if there is no conflict with other use */ -#ifdef H_ERRNO_IS_FUNCTION -#define h_errno (*__h_errno()) -#endif /* NO_H_ERRNO_DEFINE */ -#endif /* _REENTRANT */ - -/* - * Error return codes from gethostbyname() and gethostbyaddr() - * (left in extern int h_errno). - */ -#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ -#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ -#define NO_DATA 4 /* Valid name, no data record of requested type */ - -#if !defined(_XPG4_2) || defined(__EXTENSIONS__) -#define NO_ADDRESS NO_DATA /* no address, look for MX record */ - -/* BIND */ -#define NETDB_INTERNAL -1 /* see errno */ -#define NETDB_SUCCESS 0 /* no problem */ -/* End BIND */ - -#define MAXHOSTNAMELEN 256 - -#define MAXALIASES 35 -#define MAXADDRS 35 -#endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */ - -#ifdef __cplusplus -} -#endif - -#endif /* SQUID_COMPAT_OS_OPENSOLARIS_10_NETDB_H */ - diff -u -r -N squid-6.10/compat/os/os2.h squid-6.11/compat/os/os2.h --- squid-6.10/compat/os/os2.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/os2.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/qnx.h squid-6.11/compat/os/qnx.h --- squid-6.10/compat/os/qnx.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/qnx.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/sgi.h squid-6.11/compat/os/sgi.h --- squid-6.10/compat/os/sgi.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/sgi.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/os/solaris.h squid-6.11/compat/os/solaris.h --- squid-6.10/compat/os/solaris.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/solaris.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -77,14 +77,6 @@ //#define s6_addr16 _S6_un._S6_u16 #define s6_addr32 _S6_un._S6_u32 -/* Bug 3057: Solaris 9 defines struct addrinfo with size_t instead of socklen_t - * this causes binary incompatibility on 64-bit systems. - * Fix this by bundling a copy of the OpenSolaris 10 netdb.h to use instead. - */ -#if defined(__sparcv9) -#include "compat/os/opensolaris_10_netdb.h" -#endif - /* Solaris 10 lacks SUN_LEN */ #if !defined(SUN_LEN) #define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) diff -u -r -N squid-6.10/compat/os/sunos.h squid-6.11/compat/os/sunos.h --- squid-6.10/compat/os/sunos.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/os/sunos.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/osdetect.h squid-6.11/compat/osdetect.h --- squid-6.10/compat/osdetect.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/osdetect.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/psignal.c squid-6.11/compat/psignal.c --- squid-6.10/compat/psignal.c 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/psignal.c 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/psignal.h squid-6.11/compat/psignal.h --- squid-6.10/compat/psignal.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/psignal.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/shm.cc squid-6.11/compat/shm.cc --- squid-6.10/compat/shm.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/shm.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/shm.h squid-6.11/compat/shm.h --- squid-6.10/compat/shm.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/shm.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/statvfs.cc squid-6.11/compat/statvfs.cc --- squid-6.10/compat/statvfs.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/statvfs.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/statvfs.h squid-6.11/compat/statvfs.h --- squid-6.10/compat/statvfs.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/statvfs.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/stdio.h squid-6.11/compat/stdio.h --- squid-6.10/compat/stdio.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/stdio.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/stdvarargs.h squid-6.11/compat/stdvarargs.h --- squid-6.10/compat/stdvarargs.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/stdvarargs.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/strerror.c squid-6.11/compat/strerror.c --- squid-6.10/compat/strerror.c 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/strerror.c 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/strnrchr.c squid-6.11/compat/strnrchr.c --- squid-6.10/compat/strnrchr.c 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/strnrchr.c 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/strnrchr.h squid-6.11/compat/strnrchr.h --- squid-6.10/compat/strnrchr.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/strnrchr.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/strnstr.cc squid-6.11/compat/strnstr.cc --- squid-6.10/compat/strnstr.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/strnstr.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/strtoll.c squid-6.11/compat/strtoll.c --- squid-6.10/compat/strtoll.c 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/strtoll.c 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/strtoll.h squid-6.11/compat/strtoll.h --- squid-6.10/compat/strtoll.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/strtoll.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/tempnam.c squid-6.11/compat/tempnam.c --- squid-6.10/compat/tempnam.c 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/tempnam.c 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/tempnam.h squid-6.11/compat/tempnam.h --- squid-6.10/compat/tempnam.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/tempnam.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/testPreCompiler.cc squid-6.11/compat/testPreCompiler.cc --- squid-6.10/compat/testPreCompiler.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/testPreCompiler.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/testPreCompiler.h squid-6.11/compat/testPreCompiler.h --- squid-6.10/compat/testPreCompiler.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/testPreCompiler.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/types.h squid-6.11/compat/types.h --- squid-6.10/compat/types.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/types.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/valgrind.h squid-6.11/compat/valgrind.h --- squid-6.10/compat/valgrind.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/valgrind.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xalloc.cc squid-6.11/compat/xalloc.cc --- squid-6.10/compat/xalloc.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xalloc.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xalloc.h squid-6.11/compat/xalloc.h --- squid-6.10/compat/xalloc.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xalloc.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xis.h squid-6.11/compat/xis.h --- squid-6.10/compat/xis.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xis.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xstrerror.cc squid-6.11/compat/xstrerror.cc --- squid-6.10/compat/xstrerror.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xstrerror.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xstrerror.h squid-6.11/compat/xstrerror.h --- squid-6.10/compat/xstrerror.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xstrerror.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xstring.cc squid-6.11/compat/xstring.cc --- squid-6.10/compat/xstring.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xstring.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xstring.h squid-6.11/compat/xstring.h --- squid-6.10/compat/xstring.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xstring.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xstrto.cc squid-6.11/compat/xstrto.cc --- squid-6.10/compat/xstrto.cc 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xstrto.cc 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/compat/xstrto.h squid-6.11/compat/xstrto.h --- squid-6.10/compat/xstrto.h 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/compat/xstrto.h 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/configure squid-6.11/configure --- squid-6.10/configure 2024-06-08 14:46:42.000000000 +0000 +++ squid-6.11/configure 2024-09-15 21:03:59.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.10. +# Generated by GNU Autoconf 2.71 for Squid Web Proxy 6.11. # # Report bugs to . # @@ -626,8 +626,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='6.10' -PACKAGE_STRING='Squid Web Proxy 6.10' +PACKAGE_VERSION='6.11' +PACKAGE_STRING='Squid Web Proxy 6.11' PACKAGE_BUGREPORT='https://bugs.squid-cache.org/' PACKAGE_URL='' @@ -1696,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.10 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 6.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1767,7 +1767,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 6.10:";; + short | recursive ) echo "Configuration of Squid Web Proxy 6.11:";; esac cat <<\_ACEOF @@ -2189,7 +2189,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 6.10 +Squid Web Proxy configure 6.11 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -3202,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.10, which was +It was created by Squid Web Proxy $as_me 6.11, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4694,7 +4694,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='6.10' + VERSION='6.11' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -4940,7 +4940,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -4949,7 +4949,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -4960,7 +4960,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5001,7 +5001,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5051,7 +5051,7 @@ # -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5134,7 +5134,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5162,7 +5162,7 @@ -# Copyright (C) 1996-2023 The Squid Software Foundation and contributors +# Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5177,7 +5177,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5186,7 +5186,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5197,7 +5197,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5265,7 +5265,7 @@ # -------------------------------------------------------------- # PKG_CHECK_MODULES -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5274,7 +5274,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -5303,7 +5303,7 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -34651,11 +34651,7 @@ printf %s "(cached) " >&6 else $as_nop - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if USE_HEIMDAL_KRB5 @@ -34696,16 +34692,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_gssapi=yes else $as_nop squid_cv_working_gssapi=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_gssapi" >&5 printf "%s\n" "$squid_cv_working_gssapi" >&6; } @@ -34852,11 +34846,7 @@ done CPPFLAGS="-I${srcdir:-.} $CPPFLAGS" - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "compat/krb5.h" @@ -34871,16 +34861,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_krb5=yes else $as_nop squid_cv_working_krb5=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_krb5" >&5 printf "%s\n" "$squid_cv_working_krb5" >&6; } @@ -36410,11 +36398,7 @@ printf %s "(cached) " >&6 else $as_nop - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if USE_HEIMDAL_KRB5 @@ -36455,16 +36439,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_gssapi=yes else $as_nop squid_cv_working_gssapi=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_gssapi" >&5 printf "%s\n" "$squid_cv_working_gssapi" >&6; } @@ -36611,11 +36593,7 @@ done CPPFLAGS="-I${srcdir:-.} $CPPFLAGS" - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "compat/krb5.h" @@ -36630,16 +36608,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_krb5=yes else $as_nop squid_cv_working_krb5=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_krb5" >&5 printf "%s\n" "$squid_cv_working_krb5" >&6; } @@ -38423,14 +38399,7 @@ done CPPFLAGS="-I${srcdir:-.} $CPPFLAGS" - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -38445,19 +38414,12 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_broken_heimdal_krb5_h=no else $as_nop - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define HAVE_BROKEN_HEIMDAL_KRB5_H 1 @@ -38473,22 +38435,18 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_broken_heimdal_krb5_h=yes else $as_nop squid_cv_broken_heimdal_krb5_h=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext # rollback state, key is squid_krb5_heimdal_test CFLAGS="${squid_krb5_heimdal_test_CFLAGS}" @@ -39536,11 +39494,7 @@ printf %s "(cached) " >&6 else $as_nop - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if USE_HEIMDAL_KRB5 @@ -39581,16 +39535,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_gssapi=yes else $as_nop squid_cv_working_gssapi=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_gssapi" >&5 printf "%s\n" "$squid_cv_working_gssapi" >&6; } @@ -39737,11 +39689,7 @@ done CPPFLAGS="-I${srcdir:-.} $CPPFLAGS" - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "compat/krb5.h" @@ -39756,16 +39704,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_krb5=yes else $as_nop squid_cv_working_krb5=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_krb5" >&5 printf "%s\n" "$squid_cv_working_krb5" >&6; } @@ -40134,11 +40080,7 @@ printf %s "(cached) " >&6 else $as_nop - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if USE_HEIMDAL_KRB5 @@ -40179,16 +40121,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_gssapi=yes else $as_nop squid_cv_working_gssapi=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_gssapi" >&5 printf "%s\n" "$squid_cv_working_gssapi" >&6; } @@ -40335,11 +40275,7 @@ done CPPFLAGS="-I${srcdir:-.} $CPPFLAGS" - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "compat/krb5.h" @@ -40354,16 +40290,14 @@ } _ACEOF -if ac_fn_cxx_try_run "$LINENO" +if ac_fn_cxx_try_link "$LINENO" then : squid_cv_working_krb5=yes else $as_nop squid_cv_working_krb5=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $squid_cv_working_krb5" >&5 printf "%s\n" "$squid_cv_working_krb5" >&6; } @@ -43783,7 +43717,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -43879,7 +43813,7 @@ if test -d "$srcdir/src/auth/basic/DB" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -43933,7 +43867,7 @@ if test -d "$srcdir/src/auth/basic/LDAP" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -43988,7 +43922,7 @@ if test -d "$srcdir/src/auth/basic/NCSA" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44086,7 +44020,7 @@ if test -d "$srcdir/src/auth/basic/NIS" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44154,7 +44088,7 @@ if test -d "$srcdir/src/auth/basic/PAM" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44284,7 +44218,7 @@ if test -d "$srcdir/src/auth/basic/POP3" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44338,7 +44272,7 @@ if test -d "$srcdir/src/auth/basic/RADIUS" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44381,7 +44315,7 @@ if test -d "$srcdir/src/auth/basic/SASL" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44560,7 +44494,7 @@ if test -d "$srcdir/src/auth/basic/SMB" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44659,7 +44593,7 @@ if test -d "$srcdir/src/auth/basic/SMB_LM" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44726,7 +44660,7 @@ if test -d "$srcdir/src/auth/basic/SSPI" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44782,7 +44716,7 @@ if test -d "$srcdir/src/auth/basic/fake" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44825,7 +44759,7 @@ if test -d "$srcdir/src/auth/basic/getpwnam" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -44987,7 +44921,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45083,7 +45017,7 @@ if test -d "$srcdir/src/auth/digest/eDirectory" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45138,7 +45072,7 @@ if test -d "$srcdir/src/auth/digest/file" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45181,7 +45115,7 @@ if test -d "$srcdir/src/auth/digest/LDAP" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45263,7 +45197,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45359,7 +45293,7 @@ if test -d "$srcdir/src/auth/negotiate/SSPI" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45417,7 +45351,7 @@ if test -d "$srcdir/src/auth/negotiate/kerberos" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45463,7 +45397,7 @@ if test -d "$srcdir/src/auth/negotiate/wrapper" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45532,7 +45466,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45627,7 +45561,7 @@ if test -d "$srcdir/src/auth/ntlm/fake" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45670,7 +45604,7 @@ if test -d "$srcdir/src/auth/ntlm/SMB_LM" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45740,7 +45674,7 @@ if test -d "$srcdir/src/auth/ntlm/SSPI" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -45945,7 +45879,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46038,7 +45972,7 @@ if test -d "$srcdir/src/log/DB" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46092,7 +46026,7 @@ if test -d "$srcdir/src/log/file" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46148,7 +46082,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46241,7 +46175,7 @@ if test -d "$srcdir/src/acl/external/AD_group" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46306,7 +46240,7 @@ if test -d "$srcdir/src/acl/external/LDAP_group" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46361,7 +46295,7 @@ if test -d "$srcdir/src/acl/external/LM_group" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46416,7 +46350,7 @@ if test -d "$srcdir/src/acl/external/delayer" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46466,7 +46400,7 @@ if test -d "$srcdir/src/acl/external/SQL_session" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46516,7 +46450,7 @@ if test -d "$srcdir/src/acl/external/eDirectory_userip" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46571,7 +46505,7 @@ if test -d "$srcdir/src/acl/external/file_userip" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46623,7 +46557,7 @@ if test -d "$srcdir/src/acl/external/kerberos_ldap_group" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46846,7 +46780,7 @@ if test -d "$srcdir/src/acl/external/kerberos_sid_group" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -46947,7 +46881,7 @@ if test -d "$srcdir/src/acl/external/session" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47224,7 +47158,7 @@ if test -d "$srcdir/src/acl/external/time_quota" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47459,7 +47393,7 @@ if test -d "$srcdir/src/acl/external/unix_group" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47511,7 +47445,7 @@ if test -d "$srcdir/src/acl/external/wbinfo_group" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47628,7 +47562,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47721,7 +47655,7 @@ if test -d "$srcdir/src/http/url_rewriters/fake" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47764,7 +47698,7 @@ if test -d "$srcdir/src/http/url_rewriters/LFS" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47826,7 +47760,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47919,7 +47853,7 @@ if test -d "$srcdir/src/security/cert_validators/fake" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -47985,7 +47919,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -48078,7 +48012,7 @@ if test -d "$srcdir/src/security/cert_generators/file" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -48173,7 +48107,7 @@ fi -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -48266,7 +48200,7 @@ if test -d "$srcdir/src/store/id_rewriters/file" then : - ## Copyright (C) 1996-2023 The Squid Software Foundation and contributors + ## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -53528,224 +53462,6 @@ fi -ac_fn_check_decl "$LINENO" "getaddrinfo" "ac_cv_have_decl_getaddrinfo" " -/* - * BSD requires sys/types.h, sys/socket.h, netinet/in.h, netdb.h, arpa/inet.h - * Linux requires sys/types.h, sys/socket.h, arpa/inet.h - * Windows requires sys/socket.h, winsock2.h, ws2tcpip.h - */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#endif -#if HAVE_WS2TCPIP_H -#include -#endif - -" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS" -if test "x$ac_cv_have_decl_getaddrinfo" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_GETADDRINFO $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "getnameinfo" "ac_cv_have_decl_getnameinfo" " -/* - * BSD requires sys/types.h, sys/socket.h, netinet/in.h, netdb.h, arpa/inet.h - * Linux requires sys/types.h, sys/socket.h, arpa/inet.h - * Windows requires sys/socket.h, winsock2.h, ws2tcpip.h - */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#endif -#if HAVE_WS2TCPIP_H -#include -#endif - -" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS" -if test "x$ac_cv_have_decl_getnameinfo" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_GETNAMEINFO $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "inet_ntop" "ac_cv_have_decl_inet_ntop" " -/* - * BSD requires sys/types.h, sys/socket.h, netinet/in.h, netdb.h, arpa/inet.h - * Linux requires sys/types.h, sys/socket.h, arpa/inet.h - * Windows requires sys/socket.h, winsock2.h, ws2tcpip.h - */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#endif -#if HAVE_WS2TCPIP_H -#include -#endif - -" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS" -if test "x$ac_cv_have_decl_inet_ntop" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_INET_NTOP $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "inet_pton" "ac_cv_have_decl_inet_pton" " -/* - * BSD requires sys/types.h, sys/socket.h, netinet/in.h, netdb.h, arpa/inet.h - * Linux requires sys/types.h, sys/socket.h, arpa/inet.h - * Windows requires sys/socket.h, winsock2.h, ws2tcpip.h - */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#endif -#if HAVE_WS2TCPIP_H -#include -#endif - -" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS" -if test "x$ac_cv_have_decl_inet_pton" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_INET_PTON $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "InetNtopA" "ac_cv_have_decl_InetNtopA" " -/* - * BSD requires sys/types.h, sys/socket.h, netinet/in.h, netdb.h, arpa/inet.h - * Linux requires sys/types.h, sys/socket.h, arpa/inet.h - * Windows requires sys/socket.h, winsock2.h, ws2tcpip.h - */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#endif -#if HAVE_WS2TCPIP_H -#include -#endif - -" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS" -if test "x$ac_cv_have_decl_InetNtopA" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_INETNTOPA $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "InetPtonA" "ac_cv_have_decl_InetPtonA" " -/* - * BSD requires sys/types.h, sys/socket.h, netinet/in.h, netdb.h, arpa/inet.h - * Linux requires sys/types.h, sys/socket.h, arpa/inet.h - * Windows requires sys/socket.h, winsock2.h, ws2tcpip.h - */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#endif -#if HAVE_WS2TCPIP_H -#include -#endif - -" "$ac_cxx_undeclared_builtin_options" "CXXFLAGS" -if test "x$ac_cv_have_decl_InetPtonA" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_INETPTONA $ac_have_decl" >>confdefs.h - - # Magic which checks whether we are forcing a type of comm loop we # are actually going to (ab)use. # Mostly ripped from squid-commloops, thanks to adrian and benno @@ -56837,7 +56553,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.10, which was +This file was extended by Squid Web Proxy $as_me 6.11, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -56905,7 +56621,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.10 +Squid Web Proxy config.status 6.11 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -u -r -N squid-6.10/configure.ac squid-6.11/configure.ac --- squid-6.10/configure.ac 2024-06-08 14:46:42.000000000 +0000 +++ squid-6.11/configure.ac 2024-09-15 21:03:59.000000000 +0000 @@ -1,11 +1,11 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. ## Please see the COPYING and CONTRIBUTORS files for details. ## -AC_INIT([Squid Web Proxy],[6.10],[https://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[6.11],[https://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) @@ -2714,35 +2714,6 @@ tempnam \ ) -AC_CHECK_DECLS([getaddrinfo,getnameinfo,inet_ntop,inet_pton,InetNtopA,InetPtonA],,,[ -/* - * BSD requires sys/types.h, sys/socket.h, netinet/in.h, netdb.h, arpa/inet.h - * Linux requires sys/types.h, sys/socket.h, arpa/inet.h - * Windows requires sys/socket.h, winsock2.h, ws2tcpip.h - */ -#if HAVE_SYS_TYPES_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#endif -#if HAVE_WS2TCPIP_H -#include -#endif -]) - # Magic which checks whether we are forcing a type of comm loop we # are actually going to (ab)use. # Mostly ripped from squid-commloops, thanks to adrian and benno diff -u -r -N squid-6.10/contrib/Makefile.am squid-6.11/contrib/Makefile.am --- squid-6.10/contrib/Makefile.am 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/contrib/Makefile.am 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/contrib/solaris/solaris-krb5-include.patch squid-6.11/contrib/solaris/solaris-krb5-include.patch --- squid-6.10/contrib/solaris/solaris-krb5-include.patch 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/contrib/solaris/solaris-krb5-include.patch 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/contrib/url-normalizer.pl squid-6.11/contrib/url-normalizer.pl --- squid-6.10/contrib/url-normalizer.pl 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/contrib/url-normalizer.pl 2024-09-15 20:54:35.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/local/bin/perl -Tw # -# * Copyright (C) 1996-2023 The Squid Software Foundation and contributors +# * Copyright (C) 1996-2024 The Squid Software Foundation and contributors # * # * Squid software is distributed under GPLv2+ license and includes # * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/contrib/user-agents.pl squid-6.11/contrib/user-agents.pl --- squid-6.10/contrib/user-agents.pl 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/contrib/user-agents.pl 2024-09-15 20:54:35.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# * Copyright (C) 1996-2023 The Squid Software Foundation and contributors +# * Copyright (C) 1996-2024 The Squid Software Foundation and contributors # * # * Squid software is distributed under GPLv2+ license and includes # * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/CONTRIBUTORS squid-6.11/CONTRIBUTORS --- squid-6.10/CONTRIBUTORS 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/CONTRIBUTORS 2024-09-15 20:54:35.000000000 +0000 @@ -23,6 +23,7 @@ Alexander Lukyanov Alexandre Chappaz Alexandre SIMON + Alexey Alexey Veselovsky Alexis Robert Alin Nastac @@ -76,6 +77,7 @@ Bernard Bertrand Jacquin Bill Welliver + bkuhls Bojan Smojver Brad Smith Bratislav @@ -214,6 +216,7 @@ Hasso Tepper Heinrich Schuchardt helix84 + Helmut Grohne Henrik Nordstrom Henrik Nordstrom Hide Nagaoka @@ -370,6 +373,7 @@ Niall Doherty Nick Rogers Nick Wellnhofer + Nicolai Moore Nikita <32056979+Roo4L@users.noreply.github.com> Nikolai Gorchilov noloader @@ -494,6 +498,7 @@ The Squid Software Foundation Thomas De Schampheleire Thomas Hozza + Thomas Leroy <32497783+p4zuu@users.noreply.github.com> Thomas Ristic Thomas Weber Thomas Zajic diff -u -r -N squid-6.10/CREDITS squid-6.11/CREDITS --- squid-6.10/CREDITS 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/CREDITS 2024-09-15 20:54:35.000000000 +0000 @@ -134,74 +134,6 @@ ============================================================================== -compat/os/opensolaris_10_netdb.h: - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -/* - * BIND 4.9.3: - * - * Copyright (c) 1980, 1983, 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * --Copyright-- - * - * End BIND 4.9.3 - */ - -============================================================================== - compat/eui64_aton.h: /* $NetBSD: eui64.h,v 1.1 2005/07/11 15:35:25 kiyohara Exp $ */ diff -u -r -N squid-6.10/doc/debug-messages.dox squid-6.11/doc/debug-messages.dox --- squid-6.10/doc/debug-messages.dox 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/doc/debug-messages.dox 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/doc/debug-sections.txt squid-6.11/doc/debug-sections.txt --- squid-6.10/doc/debug-sections.txt 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/doc/debug-sections.txt 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2023 The Squid Software Foundation and contributors + * Copyright (C) 1996-2024 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/doc/Makefile.am squid-6.11/doc/Makefile.am --- squid-6.10/doc/Makefile.am 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/doc/Makefile.am 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/doc/manuals/language.am squid-6.11/doc/manuals/language.am --- squid-6.10/doc/manuals/language.am 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/doc/manuals/language.am 2024-09-15 20:54:35.000000000 +0000 @@ -1,5 +1,5 @@ ## -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/doc/manuals/Makefile.am squid-6.11/doc/manuals/Makefile.am --- squid-6.10/doc/manuals/Makefile.am 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/doc/manuals/Makefile.am 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/doc/manuals/Substitute.am squid-6.11/doc/manuals/Substitute.am --- squid-6.10/doc/manuals/Substitute.am 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/doc/manuals/Substitute.am 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/doc/release-notes/Makefile.am squid-6.11/doc/release-notes/Makefile.am --- squid-6.10/doc/release-notes/Makefile.am 2024-06-08 13:28:58.000000000 +0000 +++ squid-6.11/doc/release-notes/Makefile.am 2024-09-15 20:54:35.000000000 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors +## Copyright (C) 1996-2024 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -u -r -N squid-6.10/doc/release-notes/release-6.html squid-6.11/doc/release-notes/release-6.html --- squid-6.10/doc/release-notes/release-6.html 2024-06-08 14:51:53.000000000 +0000 +++ squid-6.11/doc/release-notes/release-6.html 2024-09-15 21:09:09.000000000 +0000 @@ -3,10 +3,10 @@ - Squid 6.10 release notes + Squid 6.11 release notes -

Squid 6.10 release notes

+

Squid 6.11 release notes

Squid Developers

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

1. Notice

-

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

+

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

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

@@ -516,7 +516,7 @@

6. Copyright

-

Copyright (C) 1996-2023 The Squid Software Foundation and contributors

+

Copyright (C) 1996-2024 The Squid Software Foundation and contributors

Squid software is distributed under GPLv2+ license and includes contributions from numerous individuals and organizations. Please see the COPYING and CONTRIBUTORS files for details.

diff -u -r -N squid-6.10/errors/af/ERR_ACCESS_DENIED squid-6.11/errors/af/ERR_ACCESS_DENIED --- squid-6.10/errors/af/ERR_ACCESS_DENIED 2024-06-08 14:47:32.000000000 +0000 +++ squid-6.11/errors/af/ERR_ACCESS_DENIED 2024-09-15 21:04:51.000000000 +0000 @@ -1,6 +1,6 @@ - + FOUT: Die aangevraagde URL kon nie verkry word nie