From nobody Thu Oct 26 12:55:31 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGQkr15Lfz4xn4s; Thu, 26 Oct 2023 12:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGQkr0g8mz3cvN; Thu, 26 Oct 2023 12:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698324932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYMIDKRu4nTF2Wx5drnv2eHwD4zmLU+PHBCQW2L6Yek=; b=ty8TfXXiA05SUHjSi/KCXCqLGX6VvOLDGj69l0Ups/OmV2SbaRgviL3KAchH6HHK+GJ1BI BCPBX+S47ccowqENYqsXxLRvP7t2ZRJS8ODPC6h0m8Naii0GwvjTteIc/Mqk10V04dPwyA pyo2Uy/m5/NNQ0MV4ynnX9DGBEDERQtov1meOgGIfbLLq8nvPag3lfGYhObT6UL6Uphdz+ bgVGU+0pk5uMftDV3z3lFeBLrz50oTakypo1A4Xeich0V2fX3sbpR9lzKeBvF38uw8vJf8 gj4yfBsOws5/ng8nAnfHzBLSfKz0JRJw+SIjW3lSSqCYslCX2+OssjJ/p7EkRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698324932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYMIDKRu4nTF2Wx5drnv2eHwD4zmLU+PHBCQW2L6Yek=; b=yzVn24cv4NSFr8+IV1CF8xAQC5rjRTAEJ8Evslyky77GPpQfxFZ/wEiSzv38xRhUYRrA/L eHvkPSS/q1yC2GJYVrSA0z6REXarpuvLYc3SmCFhKLjToi3eZb+J6PzBLWhAfg798BBzvm vfMzII755NyZa6ov4UUvd426pGZwdZhn76eww/j/EbzUgXrpGIpWxFCilONGLS3kzZ5xlG 1IW9a8RfX9hfrCGd2AL4CE8tDVVw4gRs1sVb1xr7o4ieppuzQvXKqT2PoUxvnVVX0lAZ7e 676P51BGbk0EykhG5yFlHap0JLiU5tFIf2gN7ovVpRAw7pkWEk7+5UY/tpzj0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698324932; a=rsa-sha256; cv=none; b=VG0SXn87PFhPHFcPC81rKKClGSqFlXGgmnG7Tmv5So+zgVEI/J7Lwg+dhXxfiMfAkFkpZX YOJQXgSzjBo50lLYYORW/zg24T72x0E+R2k3CAAbM6W0NCTKLj3K0/0t6plzv+4XNKlRSN Ftoy1yqi0EoZkbQbVakioV3FlBtlnmboOJIl43yMTJJBUZdIz3SE7zFtnSuxzqzy22zoUC ZrD3sSa2sa3p1xhb5HuTkvh327bGvKnhL5dGczfr/b2kvU/qBEW6aFc7SHB/vKHjrTchoV uAg4P1XNB6hPN6XfA+WH48DWMAot2Mu3b3hL4uWKEMJeONy2ocbH1MRu8ALyTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGQkq6qsSzXtG; Thu, 26 Oct 2023 12:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39QCtVkD020987; Thu, 26 Oct 2023 12:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QCtVVO020984; Thu, 26 Oct 2023 12:55:31 GMT (envelope-from git) Date: Thu, 26 Oct 2023 12:55:31 GMT Message-Id: <202310261255.39QCtVVO020984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Joel Bodenmann Subject: git: 88b1e50105ab - 2023Q4 - www/squid: update to 6.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 88b1e50105abae8c3b0cedec0edc3b0d55e99991 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by jbo: URL: https://cgit.FreeBSD.org/ports/commit/?id=88b1e50105abae8c3b0cedec0edc3b0d55e99991 commit 88b1e50105abae8c3b0cedec0edc3b0d55e99991 Author: Pavel Timofeev AuthorDate: 2023-10-09 17:05:14 +0000 Commit: Joel Bodenmann CommitDate: 2023-10-26 12:43:10 +0000 www/squid: update to 6.3 Error message translation files are now part of www/squid-langpack. Changelog: http://www.squid-cache.org/Versions/v6/squid-6.3-RELEASENOTES.html PR: 272524 (cherry picked from commit 53134607143382ef9029f30acd586d53183efc39) --- www/squid/Makefile | 53 +- www/squid/distinfo | 6 +- www/squid/files/patch-compat_shm.cc | 4 +- www/squid/files/patch-configure | 15 +- www/squid/files/patch-include_squid.h | 4 +- www/squid/files/patch-src-cf.data.pre | 4 +- .../files/patch-src_DiskIO_Mmapped_MmappedFile.cc | 6 +- www/squid/files/patch-src_base_RandomUuid.cc | 10 + www/squid/files/patch-src_ip_Intercept.cc | 6 +- www/squid/files/patch-src_ipc_mem_Segment.cc | 9 +- www/squid/files/patch-src_tools.cc | 4 +- www/squid/files/pkg-message.in | 3 + www/squid/pkg-plist | 2121 +------------------- 13 files changed, 76 insertions(+), 2169 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index 5fb52fa5ce30..ef776b412e28 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,12 +1,12 @@ PORTNAME= squid -DISTVERSION= 5.9 +DISTVERSION= 6.3 CATEGORIES= www -MASTER_SITES= http://www2.pl.squid-cache.org/Versions/v5/ \ - http://www1.il.squid-cache.org/Versions/v5/ \ - http://www1.jp.squid-cache.org/Versions/v5/ \ - http://www2.gr.squid-cache.org/Versions/v5/ \ - http://ca2.squid-cache.org/Versions/v5/ \ - http://www.squid-cache.org/Versions/v5/ +MASTER_SITES= http://www2.pl.squid-cache.org/Versions/v6/ \ + http://www1.il.squid-cache.org/Versions/v6/ \ + http://www1.jp.squid-cache.org/Versions/v6/ \ + http://www2.gr.squid-cache.org/Versions/v6/ \ + http://ca2.squid-cache.org/Versions/v6/ \ + http://www.squid-cache.org/Versions/v6/ PATCH_SITES= http://www2.pl.squid-cache.org/%SUBDIR%/ \ http://www1.il.squid-cache.org/%SUBDIR%/ \ @@ -14,7 +14,7 @@ PATCH_SITES= http://www2.pl.squid-cache.org/%SUBDIR%/ \ http://www2.gr.squid-cache.org/%SUBDIR%/ \ http://ca2.squid-cache.org/%SUBDIR%/ \ http://www.squid-cache.org/%SUBDIR%/ -PATCH_SITE_SUBDIR= Versions/v5/changesets +PATCH_SITE_SUBDIR= Versions/v6/changesets MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy @@ -58,6 +58,7 @@ OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \ WCCPV2 ARP_ACL_CONFIGURE_ENABLE= eui +AUTH_LDAP_CONFIGURE_WITH= ldap AUTH_LDAP_USES= ldap AUTH_LDAP_VARS= BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip" AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -66,7 +67,7 @@ AUTH_SMB_USES= samba:run AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session -TDB_CONFIGURE_ENABLE= tdb +TDB_CONFIGURE_WITH= tdb TDB_LIB_DEPENDS= libtdb.so:databases/tdb TDB_VARS= EXTERNAL_ACL+="time_quota session" CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests @@ -75,6 +76,7 @@ ECAP_CONFIGURE_ENABLE= ecap ECAP_LIB_DEPENDS= libecap.so:www/libecap ECAP_USES= pkgconfig:build ESI_CONFIGURE_ENABLE= esi +ESI_CONFIGURE_WITH= expat xml2 ESI_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libxml2.so:textproc/libxml2 FOLLOW_XFF_CONFIGURE_ENABLE= follow-x-forwarded-for @@ -90,14 +92,14 @@ FS_AUFS_VARS= STORAGE_SCHEMES+=aufs DISKIO_MODULES+=DiskThreads # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS, # e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N FS_AUFS_LDFLAGS= -pthread -FS_AUFS_CONFIGURE_OFF= --without-pthreads +FS_AUFS_CONFIGURE_WITH= pthreads FS_DISKD_VARS= STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon FS_ROCK_VARS= STORAGE_SCHEMES+=rock NETTLE_LIB_DEPENDS= libnettle.so:security/nettle -NETTLE_CONFIGURE_OFF= --without-nettle +NETTLE_CONFIGURE_WITH= nettle SNMP_CONFIGURE_ENABLE= snmp SSL_CONFIGURE_ENABLE= ssl -SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} \ +SSL_CONFIGURE_ON= --with-openssl \ --enable-security-cert-generators="file" \ LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \ LIBOPENSSL_LIBS="-lcrypto -lssl" @@ -120,7 +122,7 @@ WCCP_CONFIGURE_ENABLE= wccp GSSAPI_NONE_CONFIGURE_ON= --without-heimdal-krb5 \ --without-mit-krb5 \ - --without-gss + --without-gnugss GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} \ @@ -177,8 +179,6 @@ WCCPV2_DESC= Web Cache Coordination Protocol v2 WCCP_DESC= Web Cache Coordination Protocol change_files= ChangeLog \ - contrib/nextstep/makepkg \ - contrib/nextstep/post_install \ errors/Makefile.am \ errors/Makefile.in \ src/auth/basic/SMB_LM/README.html \ @@ -209,23 +209,20 @@ CONFIGURE_ARGS= --with-default-user=squid \ --with-swapdir=/var/squid/cache \ --without-gnutls \ --with-included-ltdl \ - --enable-auth \ - --enable-zph-qos \ --enable-build-info \ - --enable-loadable-modules \ --enable-removal-policies="lru heap" \ --disable-epoll \ - --disable-linux-netfilter \ - --disable-linux-tproxy \ - --disable-translation \ --disable-arch-native \ - --disable-strict-error-checking + --disable-strict-error-checking \ + --without-systemd \ + --without-netfilter-conntrack \ + --without-cap .include # Authentication methods and modules: -BASIC_AUTH+= DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam +BASIC_AUTH+= DB NCSA PAM POP3 RADIUS SMB_LM fake getpwnam DIGEST_AUTH+= file EXTERNAL_ACL+= file_userip unix_group delayer @@ -253,20 +250,20 @@ DISKIO_MODULES+= AIO Blocking IpcIo Mmapped CONFIGURE_ARGS+= --enable-auth-basic="${BASIC_AUTH}" \ --enable-auth-digest="${DIGEST_AUTH}" \ - --enable-external-acl-helpers="${EXTERNAL_ACL}" \ --enable-auth-negotiate="${NEGOTIATE_AUTH}" \ --enable-auth-ntlm="fake SMB_LM" \ - --enable-storeio="${STORAGE_SCHEMES}" \ - --enable-disk-io="${DISKIO_MODULES}" \ --enable-log-daemon-helpers="file DB" \ + --enable-external-acl-helpers="${EXTERNAL_ACL}" \ --enable-url-rewrite-helpers="fake LFS" \ + --enable-security-cert-validators="fake" \ --enable-storeid-rewrite-helpers="file" \ - --enable-security-cert-validators="fake" + --enable-storeio="${STORAGE_SCHEMES}" \ + --enable-disk-io="${DISKIO_MODULES}" \ # Other options set via 'make config': .if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) -CONFIGURE_ARGS+= --disable-optimizations --enable-debug-cbdata +CONFIGURE_ARGS+= --disable-optimizations WITH_DEBUG?= yes .endif diff --git a/www/squid/distinfo b/www/squid/distinfo index f1473ce953c9..dbde633e8775 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685219517 -SHA256 (squid-5.9.tar.xz) = 3fe5c2007da2757446af91b6ef974f154b208120a9a39396ea681e5c4abb04b5 -SIZE (squid-5.9.tar.xz) = 2569204 +TIMESTAMP = 1696273281 +SHA256 (squid-6.3.tar.xz) = 74a0f5586a7a5d89573d502708d5e1d66ddf0430cf4802cc7261b765653248fa +SIZE (squid-6.3.tar.xz) = 2547264 diff --git a/www/squid/files/patch-compat_shm.cc b/www/squid/files/patch-compat_shm.cc index c220f4deacc6..f028effdc800 100644 --- a/www/squid/files/patch-compat_shm.cc +++ b/www/squid/files/patch-compat_shm.cc @@ -1,8 +1,8 @@ ---- compat/shm.cc.orig 2016-12-16 10:06:20 UTC +--- compat/shm.cc.orig 2023-02-28 09:10:25 UTC +++ compat/shm.cc @@ -29,6 +29,8 @@ shm_portable_segment_name_is_path() size_t len = sizeof(jailed); - ::sysctlbyname("security.jail.jailed", &jailed, &len, NULL, 0); + ::sysctlbyname("security.jail.jailed", &jailed, &len, nullptr, 0); return !jailed; +#elif defined (__DragonFly__) + return true; diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure index 6fe4b5b2547c..a5f7ac84549b 100644 --- a/www/squid/files/patch-configure +++ b/www/squid/files/patch-configure @@ -1,19 +1,18 @@ ---- configure.orig 2021-12-07 14:11:12 UTC +--- configure.orig 2023-02-28 09:24:52 UTC +++ configure -@@ -36683,8 +36683,10 @@ then : - #define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF +@@ -44124,7 +44124,10 @@ _ACEOF + + else $as_nop --else $as_nop - BUILD_HELPER="" +# XXX: On FreeBSD we have to do this to make NIS work +# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247 +# is resolved. + BUILD_HELPER="NIS" + fi - done -@@ -42604,6 +42606,7 @@ fi +@@ -50983,6 +50986,7 @@ fi ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" " #if HAVE_SCHED_H @@ -21,7 +20,7 @@ #include #endif -@@ -45611,6 +45614,7 @@ else $as_nop +@@ -54169,6 +54173,7 @@ else $as_nop # include # include #undef minor_t diff --git a/www/squid/files/patch-include_squid.h b/www/squid/files/patch-include_squid.h index d08de0ff2998..a12c1a52aad6 100644 --- a/www/squid/files/patch-include_squid.h +++ b/www/squid/files/patch-include_squid.h @@ -1,4 +1,4 @@ ---- include/squid.h.orig 2021-12-07 14:15:52 UTC +--- include/squid.h.orig 2023-02-28 09:10:25 UTC +++ include/squid.h @@ -9,6 +9,7 @@ #ifndef SQUID_CONFIG_H @@ -6,5 +6,5 @@ +#define _WITH_CPU_SET_T #include "autoconf.h" /* For GNU autoconf variables */ + #include "version.h" - #if !defined(HAVE_SQUID) diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src-cf.data.pre index d9f7d1394d23..f6acb5d213c7 100644 --- a/www/squid/files/patch-src-cf.data.pre +++ b/www/squid/files/patch-src-cf.data.pre @@ -1,6 +1,6 @@ ---- src/cf.data.pre.orig 2021-12-07 14:15:52 UTC +--- src/cf.data.pre.orig 2023-02-28 09:10:25 UTC +++ src/cf.data.pre -@@ -5354,6 +5354,10 @@ DEFAULT: @DEFAULT_PID_FILE@ +@@ -5507,6 +5507,10 @@ DEFAULT: @DEFAULT_PID_FILE@ LOC: Config.pidFilename DOC_START A filename to write the process-id to. To disable, enter "none". diff --git a/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc b/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc index 9005a0912f7b..4a7a2ab3d1ce 100644 --- a/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc +++ b/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc @@ -1,11 +1,11 @@ ---- src/DiskIO/Mmapped/MmappedFile.cc.orig 2016-12-16 10:06:20 UTC +--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2023-02-28 09:10:25 UTC +++ src/DiskIO/Mmapped/MmappedFile.cc @@ -236,7 +236,7 @@ Mmapping::map() static const int pageSize = getpagesize(); delta = offset % pageSize; -- buf = mmap(NULL, length + delta, prot, flags, fd, offset - delta); -+ buf = mmap(NULL, length + delta, prot, flags | MAP_NOSYNC, fd, offset - delta); +- buf = mmap(nullptr, length + delta, prot, flags, fd, offset - delta); ++ buf = mmap(nullptr, length + delta, prot, flags | MAP_NOSYNC, fd, offset - delta); if (buf == MAP_FAILED) { const int errNo = errno; diff --git a/www/squid/files/patch-src_base_RandomUuid.cc b/www/squid/files/patch-src_base_RandomUuid.cc new file mode 100644 index 000000000000..eba0bfa8ad42 --- /dev/null +++ b/www/squid/files/patch-src_base_RandomUuid.cc @@ -0,0 +1,10 @@ +--- src/base/RandomUuid.cc.orig 2023-02-28 09:10:25 UTC ++++ src/base/RandomUuid.cc +@@ -13,6 +13,7 @@ + #include "base/TextException.h" + #include "defines.h" + ++#include + #include + + static_assert(sizeof(RandomUuid) == 128/8, "RandomUuid has RFC 4122-prescribed 128-bit size"); diff --git a/www/squid/files/patch-src_ip_Intercept.cc b/www/squid/files/patch-src_ip_Intercept.cc index bf8d9ad50899..3ca029e6b8ea 100644 --- a/www/squid/files/patch-src_ip_Intercept.cc +++ b/www/squid/files/patch-src_ip_Intercept.cc @@ -1,9 +1,9 @@ ---- src/ip/Intercept.cc.orig 2021-12-07 14:15:52 UTC +--- src/ip/Intercept.cc.orig 2023-02-28 09:10:25 UTC +++ src/ip/Intercept.cc -@@ -211,10 +211,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP +@@ -217,10 +217,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP newConn->remote.getInAddr(natLookup.nl_outipaddr.in4); } - #else + #else /* HAVE_STRUCT_NATLOOKUP_NL_INIPADDR_IN6 */ - // warn once every 10 at critical level, then push down a level each repeated event + // warn once every million at critical level, then push down a level each repeated event static int warningLevel = DBG_CRITICAL; diff --git a/www/squid/files/patch-src_ipc_mem_Segment.cc b/www/squid/files/patch-src_ipc_mem_Segment.cc index 88431a56aaee..199808b45b69 100644 --- a/www/squid/files/patch-src_ipc_mem_Segment.cc +++ b/www/squid/files/patch-src_ipc_mem_Segment.cc @@ -1,11 +1,12 @@ ---- src/ipc/mem/Segment.cc.orig 2016-12-16 10:06:20 UTC +-- src/ipc/mem/Segment.cc.orig 2023-03-08 18:21:44.707065000 -0700 +--- src/ipc/mem/Segment.cc.orig 2023-02-28 09:10:25 UTC +++ src/ipc/mem/Segment.cc -@@ -173,7 +173,7 @@ Ipc::Mem::Segment::attach() +@@ -174,7 +174,7 @@ Ipc::Mem::Segment::attach() assert(theSize == static_cast(static_cast(theSize))); void *const p = -- mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED, theFD, 0); -+ mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NOSYNC, theFD, 0); +- mmap(nullptr, theSize, PROT_READ | PROT_WRITE, MAP_SHARED, theFD, 0); ++ mmap(nullptr, theSize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NOSYNC, theFD, 0); if (p == MAP_FAILED) { int xerrno = errno; debugs(54, 5, "mmap " << theName << ": " << xstrerr(xerrno)); diff --git a/www/squid/files/patch-src_tools.cc b/www/squid/files/patch-src_tools.cc index 155d8d84dcaf..ad2a99c6df01 100644 --- a/www/squid/files/patch-src_tools.cc +++ b/www/squid/files/patch-src_tools.cc @@ -1,6 +1,6 @@ ---- src/tools.cc.orig 2021-12-07 14:15:52 UTC +--- src/tools.cc.orig 2023-02-28 09:10:25 UTC +++ src/tools.cc -@@ -608,7 +608,7 @@ no_suid(void) +@@ -650,7 +650,7 @@ no_suid(void) uid = geteuid(); debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever"); diff --git a/www/squid/files/pkg-message.in b/www/squid/files/pkg-message.in index 739ae1433c57..4b78eb8e599d 100644 --- a/www/squid/files/pkg-message.in +++ b/www/squid/files/pkg-message.in @@ -22,6 +22,9 @@ kern.ipc.msgssz=64 kern.ipc.msgtql=2048 + o The pre-translated error pages are no longer included into the port. + If you need them install www/squid-langpack port as well. + o The default configuration will deny everyone but the local host and local networks as defined in RFC 1918 for IPv4 and RFCs 4193 and 4291 for IPv6 access to the proxy service. Edit the "http_access diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist index 7e4a4520cc5e..ac9fe8393a0c 100644 --- a/www/squid/pkg-plist +++ b/www/squid/pkg-plist @@ -54,16 +54,14 @@ libexec/squid/basic_db_auth %%FS_DISKD%%libexec/squid/diskd %%ETCDIR%%/squid.conf.documented %%ETCDIR%%/mib.txt -%%ETCDIR%%/icons/SN.png -%%ETCDIR%%/icons/silk/script.png %%ETCDIR%%/icons/silk/script_palette.png %%ETCDIR%%/icons/silk/script_gear.png -%%ETCDIR%%/icons/silk/plugin.png +%%ETCDIR%%/icons/silk/script.png %%ETCDIR%%/icons/silk/plugin_add.png +%%ETCDIR%%/icons/silk/plugin.png %%ETCDIR%%/icons/silk/picture.png %%ETCDIR%%/icons/silk/photo.png %%ETCDIR%%/icons/silk/page_world.png -%%ETCDIR%%/icons/silk/page_white.png %%ETCDIR%%/icons/silk/page_white_zip.png %%ETCDIR%%/icons/silk/page_white_word.png %%ETCDIR%%/icons/silk/page_white_text.png @@ -75,24 +73,25 @@ libexec/squid/basic_db_auth %%ETCDIR%%/icons/silk/page_white_cplusplus.png %%ETCDIR%%/icons/silk/page_white_c.png %%ETCDIR%%/icons/silk/page_white_acrobat.png +%%ETCDIR%%/icons/silk/page_white.png %%ETCDIR%%/icons/silk/page_green.png %%ETCDIR%%/icons/silk/page_excel.png %%ETCDIR%%/icons/silk/page_code.png -%%ETCDIR%%/icons/silk/package.png %%ETCDIR%%/icons/silk/package_go.png +%%ETCDIR%%/icons/silk/package.png %%ETCDIR%%/icons/silk/music.png %%ETCDIR%%/icons/silk/link.png %%ETCDIR%%/icons/silk/layout.png %%ETCDIR%%/icons/silk/layers.png %%ETCDIR%%/icons/silk/information.png %%ETCDIR%%/icons/silk/image.png -%%ETCDIR%%/icons/silk/folder.png %%ETCDIR%%/icons/silk/folder_table.png -%%ETCDIR%%/icons/silk/film.png +%%ETCDIR%%/icons/silk/folder.png %%ETCDIR%%/icons/silk/film_key.png +%%ETCDIR%%/icons/silk/film.png %%ETCDIR%%/icons/silk/drive_disk.png -%%ETCDIR%%/icons/silk/database.png %%ETCDIR%%/icons/silk/database_table.png +%%ETCDIR%%/icons/silk/database.png %%ETCDIR%%/icons/silk/cup.png %%ETCDIR%%/icons/silk/css.png %%ETCDIR%%/icons/silk/computer_link.png @@ -105,322 +104,7 @@ libexec/squid/basic_db_auth %%ETCDIR%%/icons/silk/bomb.png %%ETCDIR%%/icons/silk/arrow_up.png %%ETCDIR%%/icons/silk/application.png -%%ETCDIR%%/errors/zh-tw -%%ETCDIR%%/errors/zh-sg -%%ETCDIR%%/errors/zh-mo -%%ETCDIR%%/errors/zh-hk -%%ETCDIR%%/errors/zh-hant/error-details.txt -%%ETCDIR%%/errors/zh-hant/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/zh-hant/ERR_WRITE_ERROR -%%ETCDIR%%/errors/zh-hant/ERR_URN_RESOLVE -%%ETCDIR%%/errors/zh-hant/ERR_UNSUP_REQ -%%ETCDIR%%/errors/zh-hant/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/zh-hant/ERR_TOO_BIG -%%ETCDIR%%/errors/zh-hant/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/zh-hant/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/zh-hant/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/zh-hant/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/zh-hant/ERR_READ_ERROR -%%ETCDIR%%/errors/zh-hant/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/zh-hant/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/zh-hant/ERR_NO_RELAY -%%ETCDIR%%/errors/zh-hant/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/zh-hant/ERR_INVALID_URL -%%ETCDIR%%/errors/zh-hant/ERR_INVALID_RESP -%%ETCDIR%%/errors/zh-hant/ERR_INVALID_REQ -%%ETCDIR%%/errors/zh-hant/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/zh-hant/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/zh-hant/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/zh-hant/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/zh-hant/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/zh-hant/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/zh-hant/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/zh-hant/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/zh-hant/ERR_FTP_FAILURE -%%ETCDIR%%/errors/zh-hant/ERR_FTP_DISABLED -%%ETCDIR%%/errors/zh-hant/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/zh-hant/ERR_ESI -%%ETCDIR%%/errors/zh-hant/ERR_DNS_FAIL -%%ETCDIR%%/errors/zh-hant/ERR_DIR_LISTING -%%ETCDIR%%/errors/zh-hant/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/zh-hant/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/zh-hant/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/zh-hant/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/zh-hant/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/zh-hant/ERR_AGENT_WPAD -%%ETCDIR%%/errors/zh-hant/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/zh-hant/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/zh-hant/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/zh-hant-tw -%%ETCDIR%%/errors/zh-hant-mo -%%ETCDIR%%/errors/zh-hant-hk -%%ETCDIR%%/errors/zh-hans/error-details.txt -%%ETCDIR%%/errors/zh-hans/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/zh-hans/ERR_WRITE_ERROR -%%ETCDIR%%/errors/zh-hans/ERR_URN_RESOLVE -%%ETCDIR%%/errors/zh-hans/ERR_UNSUP_REQ -%%ETCDIR%%/errors/zh-hans/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/zh-hans/ERR_TOO_BIG -%%ETCDIR%%/errors/zh-hans/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/zh-hans/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/zh-hans/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/zh-hans/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/zh-hans/ERR_READ_ERROR -%%ETCDIR%%/errors/zh-hans/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/zh-hans/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/zh-hans/ERR_NO_RELAY -%%ETCDIR%%/errors/zh-hans/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/zh-hans/ERR_INVALID_URL -%%ETCDIR%%/errors/zh-hans/ERR_INVALID_RESP -%%ETCDIR%%/errors/zh-hans/ERR_INVALID_REQ -%%ETCDIR%%/errors/zh-hans/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/zh-hans/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/zh-hans/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/zh-hans/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/zh-hans/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/zh-hans/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/zh-hans/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/zh-hans/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/zh-hans/ERR_FTP_FAILURE -%%ETCDIR%%/errors/zh-hans/ERR_FTP_DISABLED -%%ETCDIR%%/errors/zh-hans/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/zh-hans/ERR_ESI -%%ETCDIR%%/errors/zh-hans/ERR_DNS_FAIL -%%ETCDIR%%/errors/zh-hans/ERR_DIR_LISTING -%%ETCDIR%%/errors/zh-hans/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/zh-hans/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/zh-hans/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/zh-hans/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/zh-hans/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/zh-hans/ERR_AGENT_WPAD -%%ETCDIR%%/errors/zh-hans/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/zh-hans/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/zh-hans/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/zh-hans-sg -%%ETCDIR%%/errors/zh-hans-cn -%%ETCDIR%%/errors/zh-cn -%%ETCDIR%%/errors/vi/error-details.txt -%%ETCDIR%%/errors/vi/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/vi/ERR_WRITE_ERROR -%%ETCDIR%%/errors/vi/ERR_URN_RESOLVE -%%ETCDIR%%/errors/vi/ERR_UNSUP_REQ -%%ETCDIR%%/errors/vi/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/vi/ERR_TOO_BIG -%%ETCDIR%%/errors/vi/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/vi/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/vi/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/vi/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/vi/ERR_READ_ERROR -%%ETCDIR%%/errors/vi/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/vi/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/vi/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/vi/ERR_NO_RELAY -%%ETCDIR%%/errors/vi/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/vi/ERR_INVALID_URL -%%ETCDIR%%/errors/vi/ERR_INVALID_RESP -%%ETCDIR%%/errors/vi/ERR_INVALID_REQ -%%ETCDIR%%/errors/vi/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/vi/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/vi/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/vi/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/vi/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/vi/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/vi/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/vi/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/vi/ERR_FTP_FAILURE -%%ETCDIR%%/errors/vi/ERR_FTP_DISABLED -%%ETCDIR%%/errors/vi/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/vi/ERR_ESI -%%ETCDIR%%/errors/vi/ERR_DNS_FAIL -%%ETCDIR%%/errors/vi/ERR_DIR_LISTING -%%ETCDIR%%/errors/vi/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/vi/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/vi/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/vi/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/vi/ERR_AGENT_WPAD -%%ETCDIR%%/errors/vi/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/vi/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/vi-vn -%%ETCDIR%%/errors/uz/error-details.txt -%%ETCDIR%%/errors/uz/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/uz/ERR_WRITE_ERROR -%%ETCDIR%%/errors/uz/ERR_URN_RESOLVE -%%ETCDIR%%/errors/uz/ERR_UNSUP_REQ -%%ETCDIR%%/errors/uz/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/uz/ERR_TOO_BIG -%%ETCDIR%%/errors/uz/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/uz/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/uz/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/uz/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/uz/ERR_READ_ERROR -%%ETCDIR%%/errors/uz/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/uz/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/uz/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/uz/ERR_NO_RELAY -%%ETCDIR%%/errors/uz/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/uz/ERR_INVALID_URL -%%ETCDIR%%/errors/uz/ERR_INVALID_RESP -%%ETCDIR%%/errors/uz/ERR_INVALID_REQ -%%ETCDIR%%/errors/uz/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/uz/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/uz/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/uz/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/uz/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/uz/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/uz/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/uz/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/uz/ERR_FTP_FAILURE -%%ETCDIR%%/errors/uz/ERR_FTP_DISABLED -%%ETCDIR%%/errors/uz/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/uz/ERR_ESI -%%ETCDIR%%/errors/uz/ERR_DNS_FAIL -%%ETCDIR%%/errors/uz/ERR_DIR_LISTING -%%ETCDIR%%/errors/uz/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/uz/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/uz/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/uz/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/uz/ERR_AGENT_WPAD -%%ETCDIR%%/errors/uz/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/uz/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/uk/error-details.txt -%%ETCDIR%%/errors/uk/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/uk/ERR_WRITE_ERROR -%%ETCDIR%%/errors/uk/ERR_URN_RESOLVE -%%ETCDIR%%/errors/uk/ERR_UNSUP_REQ -%%ETCDIR%%/errors/uk/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/uk/ERR_TOO_BIG -%%ETCDIR%%/errors/uk/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/uk/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/uk/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/uk/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/uk/ERR_READ_ERROR -%%ETCDIR%%/errors/uk/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/uk/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/uk/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/uk/ERR_NO_RELAY -%%ETCDIR%%/errors/uk/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/uk/ERR_INVALID_URL -%%ETCDIR%%/errors/uk/ERR_INVALID_RESP -%%ETCDIR%%/errors/uk/ERR_INVALID_REQ -%%ETCDIR%%/errors/uk/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/uk/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/uk/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/uk/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/uk/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/uk/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/uk/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/uk/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/uk/ERR_FTP_FAILURE -%%ETCDIR%%/errors/uk/ERR_FTP_DISABLED -%%ETCDIR%%/errors/uk/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/uk/ERR_ESI -%%ETCDIR%%/errors/uk/ERR_DNS_FAIL -%%ETCDIR%%/errors/uk/ERR_DIR_LISTING -%%ETCDIR%%/errors/uk/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/uk/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/uk/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/uk/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/uk/ERR_AGENT_WPAD -%%ETCDIR%%/errors/uk/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/uk/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/uk-ua -%%ETCDIR%%/errors/TRANSLATORS -%%ETCDIR%%/errors/tr/error-details.txt -%%ETCDIR%%/errors/tr/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/tr/ERR_WRITE_ERROR -%%ETCDIR%%/errors/tr/ERR_URN_RESOLVE -%%ETCDIR%%/errors/tr/ERR_UNSUP_REQ -%%ETCDIR%%/errors/tr/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/tr/ERR_TOO_BIG -%%ETCDIR%%/errors/tr/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/tr/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/tr/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/tr/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/tr/ERR_READ_ERROR -%%ETCDIR%%/errors/tr/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/tr/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/tr/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/tr/ERR_NO_RELAY -%%ETCDIR%%/errors/tr/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/tr/ERR_INVALID_URL -%%ETCDIR%%/errors/tr/ERR_INVALID_RESP -%%ETCDIR%%/errors/tr/ERR_INVALID_REQ -%%ETCDIR%%/errors/tr/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/tr/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/tr/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/tr/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/tr/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/tr/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/tr/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/tr/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/tr/ERR_FTP_FAILURE -%%ETCDIR%%/errors/tr/ERR_FTP_DISABLED -%%ETCDIR%%/errors/tr/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/tr/ERR_ESI -%%ETCDIR%%/errors/tr/ERR_DNS_FAIL -%%ETCDIR%%/errors/tr/ERR_DIR_LISTING -%%ETCDIR%%/errors/tr/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/tr/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/tr/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/tr/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/tr/ERR_AGENT_WPAD -%%ETCDIR%%/errors/tr/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/tr/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/tr-tr -%%ETCDIR%%/errors/th/error-details.txt -%%ETCDIR%%/errors/th/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/th/ERR_WRITE_ERROR -%%ETCDIR%%/errors/th/ERR_URN_RESOLVE -%%ETCDIR%%/errors/th/ERR_UNSUP_REQ -%%ETCDIR%%/errors/th/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/th/ERR_TOO_BIG -%%ETCDIR%%/errors/th/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/th/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/th/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/th/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/th/ERR_READ_ERROR -%%ETCDIR%%/errors/th/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/th/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/th/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/th/ERR_NO_RELAY -%%ETCDIR%%/errors/th/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/th/ERR_INVALID_URL -%%ETCDIR%%/errors/th/ERR_INVALID_RESP -%%ETCDIR%%/errors/th/ERR_INVALID_REQ -%%ETCDIR%%/errors/th/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/th/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/th/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/th/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/th/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/th/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/th/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/th/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/th/ERR_FTP_FAILURE -%%ETCDIR%%/errors/th/ERR_FTP_DISABLED -%%ETCDIR%%/errors/th/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/th/ERR_ESI -%%ETCDIR%%/errors/th/ERR_DNS_FAIL -%%ETCDIR%%/errors/th/ERR_DIR_LISTING -%%ETCDIR%%/errors/th/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/th/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/th/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/th/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/th/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/th/ERR_AGENT_WPAD -%%ETCDIR%%/errors/th/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/th/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/th-th +%%ETCDIR%%/icons/SN.png %%ETCDIR%%/errors/templates/error-details.txt %%ETCDIR%%/errors/templates/ERR_ZERO_SIZE_OBJECT %%ETCDIR%%/errors/templates/ERR_WRITE_ERROR @@ -464,1795 +148,8 @@ libexec/squid/basic_db_auth %%ETCDIR%%/errors/templates/ERR_AGENT_CONFIGURE %%ETCDIR%%/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED %%ETCDIR%%/errors/templates/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/sv/error-details.txt -%%ETCDIR%%/errors/sv/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/sv/ERR_WRITE_ERROR -%%ETCDIR%%/errors/sv/ERR_URN_RESOLVE -%%ETCDIR%%/errors/sv/ERR_UNSUP_REQ -%%ETCDIR%%/errors/sv/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/sv/ERR_TOO_BIG -%%ETCDIR%%/errors/sv/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/sv/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/sv/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/sv/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/sv/ERR_READ_ERROR -%%ETCDIR%%/errors/sv/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/sv/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/sv/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/sv/ERR_NO_RELAY -%%ETCDIR%%/errors/sv/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/sv/ERR_INVALID_URL -%%ETCDIR%%/errors/sv/ERR_INVALID_RESP -%%ETCDIR%%/errors/sv/ERR_INVALID_REQ -%%ETCDIR%%/errors/sv/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/sv/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/sv/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/sv/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/sv/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/sv/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/sv/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/sv/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/sv/ERR_FTP_FAILURE -%%ETCDIR%%/errors/sv/ERR_FTP_DISABLED -%%ETCDIR%%/errors/sv/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/sv/ERR_ESI -%%ETCDIR%%/errors/sv/ERR_DNS_FAIL -%%ETCDIR%%/errors/sv/ERR_DIR_LISTING -%%ETCDIR%%/errors/sv/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/sv/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/sv/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/sv/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/sv/ERR_AGENT_WPAD -%%ETCDIR%%/errors/sv/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/sv/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/sv-se -%%ETCDIR%%/errors/sv-fi -%%ETCDIR%%/errors/sr-sp -%%ETCDIR%%/errors/sr-rs -%%ETCDIR%%/errors/sr-latn/error-details.txt -%%ETCDIR%%/errors/sr-latn/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/sr-latn/ERR_WRITE_ERROR -%%ETCDIR%%/errors/sr-latn/ERR_URN_RESOLVE -%%ETCDIR%%/errors/sr-latn/ERR_UNSUP_REQ -%%ETCDIR%%/errors/sr-latn/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/sr-latn/ERR_TOO_BIG -%%ETCDIR%%/errors/sr-latn/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/sr-latn/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/sr-latn/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/sr-latn/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/sr-latn/ERR_READ_ERROR -%%ETCDIR%%/errors/sr-latn/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/sr-latn/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/sr-latn/ERR_NO_RELAY -%%ETCDIR%%/errors/sr-latn/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/sr-latn/ERR_INVALID_URL -%%ETCDIR%%/errors/sr-latn/ERR_INVALID_RESP -%%ETCDIR%%/errors/sr-latn/ERR_INVALID_REQ -%%ETCDIR%%/errors/sr-latn/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/sr-latn/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/sr-latn/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/sr-latn/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/sr-latn/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/sr-latn/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/sr-latn/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/sr-latn/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/sr-latn/ERR_FTP_FAILURE -%%ETCDIR%%/errors/sr-latn/ERR_FTP_DISABLED -%%ETCDIR%%/errors/sr-latn/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/sr-latn/ERR_ESI -%%ETCDIR%%/errors/sr-latn/ERR_DNS_FAIL -%%ETCDIR%%/errors/sr-latn/ERR_DIR_LISTING -%%ETCDIR%%/errors/sr-latn/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/sr-latn/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/sr-latn/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/sr-latn/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/sr-latn/ERR_AGENT_WPAD -%%ETCDIR%%/errors/sr-latn/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/sr-latn/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/sr-latn-rs -%%ETCDIR%%/errors/sr-latn-me -%%ETCDIR%%/errors/sr-latn-cs -%%ETCDIR%%/errors/sr-cyrl/error-details.txt -%%ETCDIR%%/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/sr-cyrl/ERR_WRITE_ERROR -%%ETCDIR%%/errors/sr-cyrl/ERR_URN_RESOLVE -%%ETCDIR%%/errors/sr-cyrl/ERR_UNSUP_REQ -%%ETCDIR%%/errors/sr-cyrl/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/sr-cyrl/ERR_TOO_BIG -%%ETCDIR%%/errors/sr-cyrl/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/sr-cyrl/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/sr-cyrl/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/sr-cyrl/ERR_READ_ERROR -%%ETCDIR%%/errors/sr-cyrl/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/sr-cyrl/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/sr-cyrl/ERR_NO_RELAY -%%ETCDIR%%/errors/sr-cyrl/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/sr-cyrl/ERR_INVALID_URL -%%ETCDIR%%/errors/sr-cyrl/ERR_INVALID_RESP -%%ETCDIR%%/errors/sr-cyrl/ERR_INVALID_REQ -%%ETCDIR%%/errors/sr-cyrl/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/sr-cyrl/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_FAILURE -%%ETCDIR%%/errors/sr-cyrl/ERR_FTP_DISABLED -%%ETCDIR%%/errors/sr-cyrl/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/sr-cyrl/ERR_ESI -%%ETCDIR%%/errors/sr-cyrl/ERR_DNS_FAIL -%%ETCDIR%%/errors/sr-cyrl/ERR_DIR_LISTING -%%ETCDIR%%/errors/sr-cyrl/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/sr-cyrl/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/sr-cyrl/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/sr-cyrl/ERR_AGENT_WPAD -%%ETCDIR%%/errors/sr-cyrl/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/sr-cyrl/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/sr-cyrl-rs -%%ETCDIR%%/errors/sr-cyrl-me -%%ETCDIR%%/errors/sr-cyrl-cs -%%ETCDIR%%/errors/sr -%%ETCDIR%%/errors/spq -%%ETCDIR%%/errors/sl/error-details.txt -%%ETCDIR%%/errors/sl/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/sl/ERR_WRITE_ERROR -%%ETCDIR%%/errors/sl/ERR_URN_RESOLVE -%%ETCDIR%%/errors/sl/ERR_UNSUP_REQ -%%ETCDIR%%/errors/sl/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/sl/ERR_TOO_BIG -%%ETCDIR%%/errors/sl/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/sl/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/sl/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/sl/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/sl/ERR_READ_ERROR -%%ETCDIR%%/errors/sl/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/sl/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/sl/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/sl/ERR_NO_RELAY -%%ETCDIR%%/errors/sl/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/sl/ERR_INVALID_URL -%%ETCDIR%%/errors/sl/ERR_INVALID_RESP -%%ETCDIR%%/errors/sl/ERR_INVALID_REQ -%%ETCDIR%%/errors/sl/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/sl/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/sl/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/sl/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/sl/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/sl/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/sl/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/sl/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/sl/ERR_FTP_FAILURE -%%ETCDIR%%/errors/sl/ERR_FTP_DISABLED -%%ETCDIR%%/errors/sl/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/sl/ERR_ESI -%%ETCDIR%%/errors/sl/ERR_DNS_FAIL -%%ETCDIR%%/errors/sl/ERR_DIR_LISTING -%%ETCDIR%%/errors/sl/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/sl/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/sl/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/sl/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/sl/ERR_AGENT_WPAD -%%ETCDIR%%/errors/sl/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/sl/ERR_ACCESS_DENIED -%%ETCDIR%%/errors/sl-si -%%ETCDIR%%/errors/sk/error-details.txt -%%ETCDIR%%/errors/sk/ERR_ZERO_SIZE_OBJECT -%%ETCDIR%%/errors/sk/ERR_WRITE_ERROR -%%ETCDIR%%/errors/sk/ERR_URN_RESOLVE -%%ETCDIR%%/errors/sk/ERR_UNSUP_REQ -%%ETCDIR%%/errors/sk/ERR_UNSUP_HTTPVERSION -%%ETCDIR%%/errors/sk/ERR_TOO_BIG -%%ETCDIR%%/errors/sk/ERR_SOCKET_FAILURE -%%ETCDIR%%/errors/sk/ERR_SHUTTING_DOWN -%%ETCDIR%%/errors/sk/ERR_SECURE_CONNECT_FAIL -%%ETCDIR%%/errors/sk/ERR_READ_TIMEOUT -%%ETCDIR%%/errors/sk/ERR_READ_ERROR -%%ETCDIR%%/errors/sk/ERR_PROTOCOL_UNKNOWN -%%ETCDIR%%/errors/sk/ERR_PRECONDITION_FAILED -%%ETCDIR%%/errors/sk/ERR_ONLY_IF_CACHED_MISS -%%ETCDIR%%/errors/sk/ERR_NO_RELAY -%%ETCDIR%%/errors/sk/ERR_LIFETIME_EXP -%%ETCDIR%%/errors/sk/ERR_INVALID_URL -%%ETCDIR%%/errors/sk/ERR_INVALID_RESP -%%ETCDIR%%/errors/sk/ERR_INVALID_REQ -%%ETCDIR%%/errors/sk/ERR_ICAP_FAILURE -%%ETCDIR%%/errors/sk/ERR_GATEWAY_FAILURE -%%ETCDIR%%/errors/sk/ERR_FTP_UNAVAILABLE -%%ETCDIR%%/errors/sk/ERR_FTP_PUT_MODIFIED -%%ETCDIR%%/errors/sk/ERR_FTP_PUT_ERROR -%%ETCDIR%%/errors/sk/ERR_FTP_PUT_CREATED -%%ETCDIR%%/errors/sk/ERR_FTP_NOT_FOUND -%%ETCDIR%%/errors/sk/ERR_FTP_FORBIDDEN -%%ETCDIR%%/errors/sk/ERR_FTP_FAILURE -%%ETCDIR%%/errors/sk/ERR_FTP_DISABLED -%%ETCDIR%%/errors/sk/ERR_FORWARDING_DENIED -%%ETCDIR%%/errors/sk/ERR_ESI -%%ETCDIR%%/errors/sk/ERR_DNS_FAIL -%%ETCDIR%%/errors/sk/ERR_DIR_LISTING -%%ETCDIR%%/errors/sk/ERR_CONNECT_FAIL -%%ETCDIR%%/errors/sk/ERR_CONFLICT_HOST -%%ETCDIR%%/errors/sk/ERR_CANNOT_FORWARD -%%ETCDIR%%/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED -%%ETCDIR%%/errors/sk/ERR_CACHE_ACCESS_DENIED -%%ETCDIR%%/errors/sk/ERR_AGENT_WPAD -%%ETCDIR%%/errors/sk/ERR_AGENT_CONFIGURE -%%ETCDIR%%/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED -%%ETCDIR%%/errors/sk/ERR_ACCESS_DENIED *** 1565 LINES SKIPPED ***