Attachment #194947 for bug #229601




# $FreeBSD:

PORTNAME=	squid
PORTVERSION=	4.1
PORTREVISION=	3
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
		http://www2.us.squid-cache.org/Versions/v4/ \
		http://www1.at.squid-cache.org/Versions/v4/ \
		http://www.eu.squid-cache.org/Versions/v4/ \
		http://www1.jp.squid-cache.org/Versions/v4/
#DIST_SUBDIR=	squid${PORTVERSION:R}
DIST_SUBDIR=	squid${PORTVERSION}

PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
		http://www2.us.squid-cache.org/%SUBDIR%/ \

		http://www.eu.squid-cache.org/%SUBDIR%/ \
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
		http://master.squid-cache.org/~amosjeffries/patches/:nosid
PATCH_SITE_SUBDIR=	Versions/v4/changesets

MAINTAINER=	timp87@gmail.com
COMMENT=	HTTP Caching Proxy

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN_powerpc64=	fails to link: ext_time_quota_acl.cc: undefined reference to std::ctype

CONFLICTS=	squid*-3.*

USES=		compiler:c++11-lib cpe perl5 shebangfix tar:xz
CPE_VENDOR=	squid-cache
SHEBANG_FILES=	scripts/*.pl contrib/*.pl tools/*.pl
		helpers/ssl/cert_valid.pl
GNU_CONFIGURE=	yes
USE_RC_SUBR=	squid


OPTIONS_RADIO=	FW
OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
OPTIONS_DEFINE=	ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
		KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \
		STACKTRACES VIA_DB WCCP WCCPV2

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
BDB_USES=			bdb
CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
ECAP_CFLAGS=			-I${LOCALBASE}/include

LARGEFILE_CONFIGURE_WITH=	large-files
LAX_HTTP_CONFIGURE_ENABLE=	http-violations
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_DISKD_VARS=			STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon

SNMP_CONFIGURE_ENABLE=		snmp
SSL_CONFIGURE_ENABLE=		ssl
SSL_CONFIGURE_ON=		--with-openssl=${OPENSSLBASE} \
				--enable-security-cert-generators="file" \
				LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \
				LIBOPENSSL_LIBS="-lcrypto -lssl"
SSL_USES=			ssl
SSL_VARS=			BROKEN_SSL=openssl-devel
SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
SSL_CRTD_IMPLIES=		SSL
STACKTRACES_CONFIGURE_ENABLE=	stacktraces
STACKTRACES_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gen-stacktrace
STACKTRACES_LIB_DEPENDS=	libunwind.so:devel/libunwind
STACKTRACES_CONFIGURE_ON=	--disable-strict-error-checking
STACKTRACES_CFLAGS=		-g
STACKTRACES_LDFLAGS=		-lunwind -L${LOCALBASE}/lib
STACKTRACES_VARS=		STRIP=""
TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
TP_PF_CONFIGURE_ENABLE=		pf-transparent

GSSAPI_MIT_CONFIGURE_ON=	--with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_MIT_PLIST_SUB=		AUTH_KERB=""

# TODO:
# add an option for external_acl/session (requires some kind of external
# Berkeley DB support, unsure which one)
ARP_ACL_DESC=		ARP/MAC/EUI based authentification
AUTH_DESC=		Authentication helpers
AUTH_LDAP_DESC=		Install LDAP authentication helpers
AUTH_NIS_DESC=		Install NIS/YP authentication helpers
AUTH_SASL_DESC=		Install SASL authentication helpers
AUTH_SMB_DESC=		Install SMB auth. helpers (req. Samba)
AUTH_SQL_DESC=		Install SQL based auth
BDB_DESC=		Berkeley DB support required for session and time quota external helpers
CACHE_DIGESTS_DESC=	Use cache digests
DEBUG_DESC=		Build with extended debugging support
DELAY_POOLS_DESC=	Delay pools (bandwidth limiting)

		contrib/nextstep/post_install \
		errors/Makefile.am \
		errors/Makefile.in \
		src/auth/basic/SMB_LM/README.html \
		src/Makefile.am \
		src/Makefile.in \
		src/cf_gen.cc \


# Authentication methods and modules:

BASIC_AUTH+=	DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam
EXTERNAL_ACL+=	file_userip unix_group

# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)

NEGOTIATE_AUTH=	none
PLIST_SUB+=	AUTH_KERB="@comment "
.else

# The kerberos_ldap_group external helper also depends on LDAP and SASL:
. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
EXTERNAL_ACL+=	kerberos_ldap_group

NEGOTIATE_AUTH=	kerberos wrapper
.endif

# The session and time_quota external helpers require Berkeley DB support:
.if ${PORT_OPTIONS:MBDB}
CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
LDFLAGS+=	-L${BDB_LIB_DIR}
EXTERNAL_ACL+=	time_quota session
.endif

# Storage schemes:
STORAGE_SCHEMES+=	ufs
DISKIO_MODULES+=	AIO Blocking IpcIo Mmapped


			--enable-auth-digest="file" \
			--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" \
			--enable-url-rewrite-helpers="fake" \
			--enable-storeid-rewrite-helpers="file" \
			--enable-security-cert-validators="fake"

# Other options set via 'make config':



post-install:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \
		${STAGEDIR}${EXAMPLESDIR}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})

.include <bsd.port.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+=	-Wno-unknown-warning-option
CXXFLAGS+=	-Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)squid/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1479930399	1	TIMESTAMP = 1522445865
2	SHA256 (squid3.5/squid-3.5.27.tar.xz) = 5ddb4367f2dc635921f9ca7a59d8b87edb0412fa203d1543393ac3c7f9fef0ec	2	SHA256 (squid4.1/squid-4.1.tar.xz) = b61e486fe1ba1f5c918a48d5ae3929d3f604e347c3c7dceb1105a9f0e5ee9eb5
3	SIZE (squid3.5/squid-3.5.27.tar.xz) = 2303468	3	SIZE (squid4.1/squid-4.1.tar.xz) = 2425892

Lines 1-8 Link Here

(-)squid/files/patch-compat_compat.h (-4 / +4 lines)
1	--- compat/compat.h.orig 2015-11-01 10:44:25 UTC	1	--- compat/compat.h.orig 2016-12-16 10:06:20 UTC
2	+++ compat/compat.h	2	+++ compat/compat.h
3	@@ -42,17 +42,6 @@	3	@@ -29,17 +29,6 @@
4	#endif	4	/******************************************************/
5	#endif	5	#include "compat/osdetect.h"
6		6
7	-/* Solaris 10 has a broken definition for minor_t in IPFilter compat.	7	-/* Solaris 10 has a broken definition for minor_t in IPFilter compat.
8	- * We must pre-define before doing anything with OS headers so the OS	8	- * We must pre-define before doing anything with OS headers so the OS

Lines 1-4 Link Here

(-)squid/files/patch-compat_shm.cc (-1 / +1 lines)
1	--- compat/shm.cc.orig 2015-11-01 10:44:25 UTC	1	--- compat/shm.cc.orig 2016-12-16 10:06:20 UTC
2	+++ compat/shm.cc	2	+++ compat/shm.cc
3	@@ -29,6 +29,8 @@ shm_portable_segment_name_is_path()	3	@@ -29,6 +29,8 @@ shm_portable_segment_name_is_path()
4	size_t len = sizeof(jailed);	4	size_t len = sizeof(jailed);




--- configure.orig	2018-06-11 09:48:04.000000000 -0700
+++ configure	2018-06-22 20:34:58.827873000 -0700
@@ -34345,7 +34345,7 @@
 ##
 
 BUILD_HELPER="NIS"

 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
@@ -34360,8 +34360,10 @@
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 

 fi
 
 done
@@ -34834,7 +34836,7 @@
 
   # unconditionally requires crypt(3), for now
   if test "x$ac_cv_func_crypt" != "x"; then

 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -37226,7 +37228,7 @@
   arpa/nameser.h \
   assert.h \
   bstring.h \

   ctype.h \
   direct.h \
   errno.h \
@@ -37434,6 +37436,7 @@
 #include <netinet/ip.h>
 #endif
 #if HAVE_NETINET_IP_COMPAT_H

 #include <netinet/ip_compat.h>
 #endif
 #if HAVE_NETINET_IP_FIL_H
@@ -41450,6 +41453,7 @@
 #     include <sys/ioccom.h>
 #     include <netinet/in.h>
 

 #     include <netinet/ip_compat.h>
 #     include <netinet/ip_fil.h>
 #     include <netinet/ip_nat.h>
@@ -41480,6 +41484,7 @@
 #       include <sys/ioccom.h>
 #       include <netinet/in.h>
 #undef minor_t

 #       include <netinet/ip_compat.h>
 #       include <netinet/ip_fil.h>
 #       include <netinet/ip_nat.h>
@@ -41524,6 +41529,7 @@
 	ip_fil_compat.h \
 	ip_fil.h \
 	ip_nat.h \

 	netinet/ip_compat.h \
 	netinet/ip_fil_compat.h \
 	netinet/ip_fil.h \
@@ -41553,6 +41559,7 @@
 #if HAVE_IP_COMPAT_H
 #include <ip_compat.h>
 #elif HAVE_NETINET_IP_COMPAT_H

 #include <netinet/ip_compat.h>
 #endif
 #if HAVE_IP_FIL_H
@@ -41616,8 +41623,7 @@
 
 
 fi
-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"
-   "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
 #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
 #define minor_t fubar
 #endif

Lines 1-6 Link Here

(-)squid/files/patch-src-cf.data.pre (-2 / +2 lines)
1	--- src/cf.data.pre.orig 2015-11-01 10:44:25 UTC	1	--- src/cf.data.pre.orig 2018-06-11 16:30:57 UTC
2	+++ src/cf.data.pre	2	+++ src/cf.data.pre
3	@@ -4558,6 +4558,10 @@ DEFAULT: @DEFAULT_PID_FILE@	3	@@ -4947,6 +4947,10 @@ DEFAULT: @DEFAULT_PID_FILE@
4	LOC: Config.pidFilename	4	LOC: Config.pidFilename
5	DOC_START	5	DOC_START
6	A filename to write the process-id to. To disable, enter "none".	6	A filename to write the process-id to. To disable, enter "none".

Lines 1-6 Link Here

(-)squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc (-2 / +2 lines)
1	--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-11-01 10:44:25 UTC	1	--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2016-12-16 10:06:20 UTC
2	+++ src/DiskIO/Mmapped/MmappedFile.cc	2	+++ src/DiskIO/Mmapped/MmappedFile.cc
3	@@ -235,7 +235,7 @@ Mmapping::map()	3	@@ -236,7 +236,7 @@ Mmapping::map()
4	static const int pageSize = getpagesize();	4	static const int pageSize = getpagesize();
5	delta = offset % pageSize;	5	delta = offset % pageSize;
6		6




--- src/ip/Intercept.cc.orig	2015-11-01 10:44:25 UTC
+++ src/ip/Intercept.cc
@@ -202,10 +202,10 @@ Ip::Intercept::IpfInterception(const Com
     // for NAT lookup set local and remote IP:port's
     if (newConn->remote.isIPv6()) {
 #if IPFILTER_VERSION < 5000003
-        // 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;
         debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1");
-        warningLevel = (warningLevel + 1) % 10;
+        warningLevel = (warningLevel + 1) % 1048576;
         return false;
 #else
         natLookup.nl_v = 6;




http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch

commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5)
Author: squidadm <squidadm@users.noreply.github.com>
Date:   2018-01-21 08:07:08 +1300

    Fix indirect IP logging for transactions without a client connection (#129) (#136)

--- src/client_side_request.cc.orig	2018-02-23 13:39:32 UTC
+++ src/client_side_request.cc
@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *d
         * Ensure that the access log shows the indirect client
         * instead of the direct client.
         */
-        ConnStateData *conn = http->getConn();
-        conn->log_addr = request->indirect_client_addr;
-        http->al->cache.caddr = conn->log_addr;
+        http->al->cache.caddr = request->indirect_client_addr;
+        if (ConnStateData *conn = http->getConn())
+            conn->log_addr = request->indirect_client_addr;
     }
     request->x_forwarded_for_iterator.clean();
     request->flags.done_follow_x_forwarded_for = true;




http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch

commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5)
Author: Amos Jeffries <yadij@users.noreply.github.com>
Date:   2018-01-19 13:54:14 +1300

    ESI: make sure endofName never exceeds tagEnd (#130)

--- src/esi/CustomParser.cc.orig	2018-02-23 13:37:52 UTC
+++ src/esi/CustomParser.cc
@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t
 
             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
 
-            if (endofName > tagEnd)
+            if (!endofName || endofName > tagEnd)
                 endofName = const_cast<char *>(tagEnd);
 
             *endofName = '\0';
@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t
 
             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
 
-            if (endofName > tagEnd)
+            if (!endofName || endofName > tagEnd)
                 endofName = const_cast<char *>(tagEnd);
 
             *endofName = '\0';




--- src/ip/Intercept.cc.orig	2018-06-20 11:02:30 UTC
+++ src/ip/Intercept.cc
@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Com
         newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
     }
 #else
-        // 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;
         debugs(89, warningLevel, "Your IPF (IPFilter) NAT does not support IPv6. Please upgrade it.");
-        warningLevel = (warningLevel + 1) % 10;
+        warningLevel = (warningLevel + 1) % 1048576;
         return false;
     }
     newConn->local.getInAddr(natLookup.nl_inip);

Lines 1-11 Link Here

(-)squid/files/patch-src_ipc_mem_Segment.cc (-4 / +4 lines)
1	--- src/ipc/mem/Segment.cc.orig 2015-11-01 10:44:25 UTC	1	--- src/ipc/mem/Segment.cc.orig 2016-12-16 10:06:20 UTC
2	+++ src/ipc/mem/Segment.cc	2	+++ src/ipc/mem/Segment.cc
3	@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach()	3	@@ -173,7 +173,7 @@ Ipc::Mem::Segment::attach()
4	assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));	4	assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));
5		5
6	void *const p =	6	void *const p =
7	- mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED, theFD, 0);	7	- mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED, theFD, 0);
8	+ mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED \| MAP_NOSYNC, theFD, 0);	8	+ mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED \| MAP_NOSYNC, theFD, 0);
9	if (p == MAP_FAILED) {	9	if (p == MAP_FAILED) {
10	debugs(54, 5, HERE << "mmap " << theName << ": " << xstrerror());	10	int xerrno = errno;
11	fatalf("Ipc::Mem::Segment::attach failed to mmap(%s): %s\n",	11	debugs(54, 5, "mmap " << theName << ": " << xstrerr(xerrno));

Lines 1-11 Link Here

(-)squid/files/patch-src_tools.cc (-8 / +8 lines)
1	--- src/tools.cc.orig 2015-11-01 10:44:25 UTC	1	--- src/tools.cc.orig 2018-06-11 16:30:57 UTC
2	+++ src/tools.cc	2	+++ src/tools.cc
3	@@ -635,7 +635,7 @@ no_suid(void)	3	@@ -605,7 +605,7 @@ no_suid(void)
4	uid = geteuid();	4	uid = geteuid();
5	debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever");	5	debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
6		6
7	- if (setuid(0) < 0)	7	- if (setuid(0) < 0) {
8	+ if (setuid(0) < 0 && TheProcessKind != pkHelper)	8	+ if (setuid(0) < 0 && TheProcessKind != pkHelper) {
9	debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerror());	9	int xerrno = errno;
10		10	debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerr(xerrno));
11	if (setuid(uid) < 0)	11	}

Lines 1-6 Link Here

(-)squid/files/pkg-install.in (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $FreeBSD: head/www/squid/files/pkg-install.in 368307 2014-09-16 12:29:19Z marino $	3	# $FreeBSD: head/www/squid-devel/files/pkg-install.in 368307 2014-09-16 12:29:19Z marino $
4	#	4	#
5		5
6	PATH=/bin:/usr/bin:/usr/sbin	6	PATH=/bin:/usr/bin:/usr/sbin




#!/bin/sh
#
# $FreeBSD: head/www/squid-devel/files/squid.in 438126 2017-04-10 06:54:35Z riggs $
#
# PROVIDE: squid
# REQUIRE: LOGIN

# squid_krb5_ktname:
#		Alternative Kerberos 5 Key Table.
#		Default: none
#
# squid_krb5_config:
#		Alternative Kerberos 5 config file
#		Default: none

	required_dirs=$chdir
	required_files=$squid_conf
	command_args="${required_args} ${squid_flags}"
#	We used to need it in squid3 to match pid and proc name
#	procname="?squid-*"
	pidfile=$squid_pidfile
}





%%ETCDIR%%/errors/af/ERR_NO_RELAY
%%ETCDIR%%/errors/af/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/af/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/af/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/af/ERR_READ_ERROR
%%ETCDIR%%/errors/af/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/af/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ar/ERR_NO_RELAY
%%ETCDIR%%/errors/ar/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ar/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ar/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ar/ERR_READ_ERROR
%%ETCDIR%%/errors/ar/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ar/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/az/ERR_NO_RELAY
%%ETCDIR%%/errors/az/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/az/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/az/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/az/ERR_READ_ERROR
%%ETCDIR%%/errors/az/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/az/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/bg/ERR_NO_RELAY
%%ETCDIR%%/errors/bg/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/bg/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/bg/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/bg/ERR_READ_ERROR
%%ETCDIR%%/errors/bg/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/bg/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ca/ERR_NO_RELAY
%%ETCDIR%%/errors/ca/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ca/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ca/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ca/ERR_READ_ERROR
%%ETCDIR%%/errors/ca/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ca/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/cs/ERR_NO_RELAY
%%ETCDIR%%/errors/cs/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/cs/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/cs/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/cs/ERR_READ_ERROR
%%ETCDIR%%/errors/cs/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/cs/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/da/ERR_NO_RELAY
%%ETCDIR%%/errors/da/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/da/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/da/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/da/ERR_READ_ERROR
%%ETCDIR%%/errors/da/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/da/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/de/ERR_NO_RELAY
%%ETCDIR%%/errors/de/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/de/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/de/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/de/ERR_READ_ERROR
%%ETCDIR%%/errors/de/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/de/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/el/ERR_NO_RELAY
%%ETCDIR%%/errors/el/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/el/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/el/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/el/ERR_READ_ERROR
%%ETCDIR%%/errors/el/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/el/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/en/ERR_NO_RELAY
%%ETCDIR%%/errors/en/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/en/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/en/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/en/ERR_READ_ERROR
%%ETCDIR%%/errors/en/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/en/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/es/ERR_NO_RELAY
%%ETCDIR%%/errors/es/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/es/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/es/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/es/ERR_READ_ERROR
%%ETCDIR%%/errors/es/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/es/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/et/ERR_NO_RELAY
%%ETCDIR%%/errors/et/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/et/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/et/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/et/ERR_READ_ERROR
%%ETCDIR%%/errors/et/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/et/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/fa/ERR_NO_RELAY
%%ETCDIR%%/errors/fa/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/fa/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/fa/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/fa/ERR_READ_ERROR
%%ETCDIR%%/errors/fa/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/fa/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/fi/ERR_NO_RELAY
%%ETCDIR%%/errors/fi/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/fi/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/fi/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/fi/ERR_READ_ERROR
%%ETCDIR%%/errors/fi/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/fi/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/fr/ERR_NO_RELAY
%%ETCDIR%%/errors/fr/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/fr/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/fr/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/fr/ERR_READ_ERROR
%%ETCDIR%%/errors/fr/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/fr/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/he/ERR_NO_RELAY
%%ETCDIR%%/errors/he/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/he/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/he/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/he/ERR_READ_ERROR
%%ETCDIR%%/errors/he/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/he/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/hu/ERR_NO_RELAY
%%ETCDIR%%/errors/hu/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/hu/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/hu/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/hu/ERR_READ_ERROR
%%ETCDIR%%/errors/hu/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/hu/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/hy/ERR_NO_RELAY
%%ETCDIR%%/errors/hy/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/hy/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/hy/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/hy/ERR_READ_ERROR
%%ETCDIR%%/errors/hy/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/hy/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/id/ERR_NO_RELAY
%%ETCDIR%%/errors/id/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/id/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/id/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/id/ERR_READ_ERROR
%%ETCDIR%%/errors/id/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/id/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/it/ERR_NO_RELAY
%%ETCDIR%%/errors/it/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/it/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/it/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/it/ERR_READ_ERROR
%%ETCDIR%%/errors/it/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/it/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ja/ERR_NO_RELAY
%%ETCDIR%%/errors/ja/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ja/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ja/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ja/ERR_READ_ERROR
%%ETCDIR%%/errors/ja/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ja/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ka/ERR_NO_RELAY
%%ETCDIR%%/errors/ka/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ka/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ka/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ka/ERR_READ_ERROR
%%ETCDIR%%/errors/ka/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ka/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ko/ERR_NO_RELAY
%%ETCDIR%%/errors/ko/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ko/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ko/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ko/ERR_READ_ERROR
%%ETCDIR%%/errors/ko/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ko/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/lt/ERR_NO_RELAY
%%ETCDIR%%/errors/lt/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/lt/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/lt/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/lt/ERR_READ_ERROR
%%ETCDIR%%/errors/lt/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/lt/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/lv/ERR_NO_RELAY
%%ETCDIR%%/errors/lv/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/lv/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/lv/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/lv/ERR_READ_ERROR
%%ETCDIR%%/errors/lv/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/lv/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ms/ERR_NO_RELAY
%%ETCDIR%%/errors/ms/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ms/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ms/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ms/ERR_READ_ERROR
%%ETCDIR%%/errors/ms/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ms/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/nl/ERR_NO_RELAY
%%ETCDIR%%/errors/nl/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/nl/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/nl/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/nl/ERR_READ_ERROR
%%ETCDIR%%/errors/nl/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/nl/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/oc/ERR_NO_RELAY
%%ETCDIR%%/errors/oc/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/oc/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/oc/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/oc/ERR_READ_ERROR
%%ETCDIR%%/errors/oc/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/oc/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/pl/ERR_NO_RELAY
%%ETCDIR%%/errors/pl/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/pl/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/pl/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/pl/ERR_READ_ERROR
%%ETCDIR%%/errors/pl/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/pl/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/pt-br/ERR_NO_RELAY
%%ETCDIR%%/errors/pt-br/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/pt-br/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/pt-br/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/pt-br/ERR_READ_ERROR
%%ETCDIR%%/errors/pt-br/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/pt-br/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/pt/ERR_NO_RELAY
%%ETCDIR%%/errors/pt/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/pt/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/pt/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/pt/ERR_READ_ERROR
%%ETCDIR%%/errors/pt/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/pt/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ro/ERR_NO_RELAY
%%ETCDIR%%/errors/ro/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ro/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ro/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ro/ERR_READ_ERROR
%%ETCDIR%%/errors/ro/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ro/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/ru/ERR_NO_RELAY
%%ETCDIR%%/errors/ru/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/ru/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/ru/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/ru/ERR_READ_ERROR
%%ETCDIR%%/errors/ru/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/ru/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/sk/ERR_NO_RELAY
%%ETCDIR%%/errors/sk/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/sk/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/sk/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/sk/ERR_READ_ERROR
%%ETCDIR%%/errors/sk/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/sk/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/sl/ERR_NO_RELAY
%%ETCDIR%%/errors/sl/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/sl/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/sl/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/sl/ERR_READ_ERROR
%%ETCDIR%%/errors/sl/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/sl/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/sr-cyrl/ERR_NO_RELAY
%%ETCDIR%%/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/sr-cyrl/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/sr-cyrl/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/sr-cyrl/ERR_READ_ERROR
%%ETCDIR%%/errors/sr-cyrl/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/sr-latn/ERR_NO_RELAY
%%ETCDIR%%/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/sr-latn/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/sr-latn/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/sr-latn/ERR_READ_ERROR
%%ETCDIR%%/errors/sr-latn/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/sr-latn/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/sv/ERR_NO_RELAY
%%ETCDIR%%/errors/sv/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/sv/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/sv/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/sv/ERR_READ_ERROR
%%ETCDIR%%/errors/sv/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/sv/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/templates/ERR_NO_RELAY
%%ETCDIR%%/errors/templates/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/templates/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/templates/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/templates/ERR_READ_ERROR
%%ETCDIR%%/errors/templates/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/templates/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/th/ERR_NO_RELAY
%%ETCDIR%%/errors/th/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/th/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/th/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/th/ERR_READ_ERROR
%%ETCDIR%%/errors/th/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/th/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/tr/ERR_NO_RELAY
%%ETCDIR%%/errors/tr/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/tr/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/tr/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/tr/ERR_READ_ERROR
%%ETCDIR%%/errors/tr/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/tr/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/uk/ERR_NO_RELAY
%%ETCDIR%%/errors/uk/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/uk/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/uk/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/uk/ERR_READ_ERROR
%%ETCDIR%%/errors/uk/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/uk/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/uz/ERR_NO_RELAY
%%ETCDIR%%/errors/uz/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/uz/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/uz/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/uz/ERR_READ_ERROR
%%ETCDIR%%/errors/uz/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/uz/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/vi/ERR_NO_RELAY
%%ETCDIR%%/errors/vi/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/vi/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/vi/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/vi/ERR_READ_ERROR
%%ETCDIR%%/errors/vi/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/vi/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/zh-hans/ERR_NO_RELAY
%%ETCDIR%%/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/zh-hans/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/zh-hans/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/zh-hans/ERR_READ_ERROR
%%ETCDIR%%/errors/zh-hans/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/zh-hans/ERR_SECURE_CONNECT_FAIL

%%ETCDIR%%/errors/zh-hant/ERR_NO_RELAY
%%ETCDIR%%/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS
%%ETCDIR%%/errors/zh-hant/ERR_PRECONDITION_FAILED
%%ETCDIR%%/errors/zh-hant/ERR_PROTOCOL_UNKNOWN
%%ETCDIR%%/errors/zh-hant/ERR_READ_ERROR
%%ETCDIR%%/errors/zh-hant/ERR_READ_TIMEOUT
%%ETCDIR%%/errors/zh-hant/ERR_SECURE_CONNECT_FAIL

libexec/squid/basic_fake_auth
libexec/squid/basic_getpwnam_auth
%%AUTH_LDAP%%libexec/squid/basic_ldap_auth
libexec/squid/basic_msnt_multi_domain_auth
libexec/squid/basic_ncsa_auth
%%AUTH_NIS%%libexec/squid/basic_nis_auth
libexec/squid/basic_pam_auth

libexec/squid/basic_smb_lm_auth
libexec/squid/cachemgr.cgi
%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
%%SSL%%libexec/squid/cert_valid.pl
libexec/squid/digest_file_auth
%%FS_DISKD%%libexec/squid/diskd
libexec/squid/ext_file_userip_acl
%%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
%%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
%%BDB%%libexec/squid/ext_session_acl
%%AUTH_SQL%%libexec/squid/ext_sql_session_acl
%%BDB%%libexec/squid/ext_time_quota_acl
libexec/squid/ext_unix_group_acl
%%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl
libexec/squid/helper-mux
man/man8/helper-mux.8.gz
libexec/squid/log_file_daemon
%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth
%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test

%%ICMP%%libexec/squid/pinger
%%ICMP%%@group
%%ICMP%%@mode
libexec/squid/security_fake_certverify
man/man8/security_fake_certverify.8.gz
%%SSL%%libexec/squid/security_file_certgen
libexec/squid/storeid_file_rewrite
%%UNLINKD%%libexec/squid/unlinkd
libexec/squid/url_fake_rewrite

man/man8/basic_db_auth.8.gz
man/man8/basic_getpwnam_auth.8.gz
%%AUTH_LDAP%%man/man8/basic_ldap_auth.8.gz
man/man8/basic_msnt_multi_domain_auth.8.gz
man/man8/basic_ncsa_auth.8.gz
man/man8/basic_pam_auth.8.gz
man/man8/basic_pop3_auth.8.gz

man/man8/digest_file_auth.8.gz
man/man8/ext_file_userip_acl.8.gz
%%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz
%%BDB%%man/man8/ext_session_acl.8.gz
%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz
%%BDB%%man/man8/ext_time_quota_acl.8.gz
man/man8/ext_unix_group_acl.8.gz
%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz
%%SSL%%man/man8/security_file_certgen.8.gz
man/man8/squid.8.gz
%%SSL_CRTD%%man/man8/ssl_crtd.8.gz
man/man8/storeid_file_rewrite.8.gz
sbin/purge
man/man1/purge.1.gz
sbin/squid
sbin/squidclient
@dir(squid,squid,750) /var/log/squid

Return to bug 229601

Lines 1-15 Link Here

(-)squid/Makefile (-39 / +39 lines)
1	# $FreeBSD: head/www/squid/Makefile 462744 2018-02-23 20:35:13Z dbaio $	1	# $FreeBSD:
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 3.5.27	4	PORTVERSION= 4.1
5	PORTREVISION= 3
6	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
7	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
8	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	7	http://www2.us.squid-cache.org/Versions/v4/ \
9	http://www1.at.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	8	http://www1.at.squid-cache.org/Versions/v4/ \
10	http://www.eu.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	9	http://www.eu.squid-cache.org/Versions/v4/ \
11	http://www1.jp.squid-cache.org/Versions/v3/${PORTVERSION:R}/	10	http://www1.jp.squid-cache.org/Versions/v4/
12	DIST_SUBDIR= squid${PORTVERSION:R}	11	#DIST_SUBDIR= squid${PORTVERSION:R}
		12	DIST_SUBDIR= squid${PORTVERSION}
13		13
14	PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \	14	PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
15	http://www2.us.squid-cache.org/%SUBDIR%/ \	15	http://www2.us.squid-cache.org/%SUBDIR%/ \
Lines 17-23 Link Here
17	http://www.eu.squid-cache.org/%SUBDIR%/ \	17	http://www.eu.squid-cache.org/%SUBDIR%/ \
18	http://www1.jp.squid-cache.org/%SUBDIR%/ \	18	http://www1.jp.squid-cache.org/%SUBDIR%/ \
19	http://master.squid-cache.org/~amosjeffries/patches/:nosid	19	http://master.squid-cache.org/~amosjeffries/patches/:nosid
20	PATCH_SITE_SUBDIR= Versions/v3/${PORTVERSION:R}/changesets	20	PATCH_SITE_SUBDIR= Versions/v4/changesets
21		21
22	MAINTAINER= timp87@gmail.com	22	MAINTAINER= timp87@gmail.com
23	COMMENT= HTTP Caching Proxy	23	COMMENT= HTTP Caching Proxy
Lines 25-38 Link Here
25	LICENSE= GPLv2	25	LICENSE= GPLv2
26	LICENSE_FILE= ${WRKSRC}/COPYING	26	LICENSE_FILE= ${WRKSRC}/COPYING
27		27
28	CONFLICTS= squid-4.	28	BROKEN_powerpc64= fails to link: ext_time_quota_acl.cc: undefined reference to std::ctype
29		29
30	BROKEN_powerpc64= Does not build: error: unrecognizable insn	30	CONFLICTS= squid-3.
31		31
32	USES= compiler cpe perl5 shebangfix tar:xz	32	USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz
33	CPE_VENDOR= squid-cache	33	CPE_VENDOR= squid-cache
34	SHEBANG_FILES= scripts/.pl contrib/.pl src/.pl tools/.pl \	34	SHEBANG_FILES= scripts/.pl contrib/.pl tools/*.pl
35	helpers/ssl/cert_valid.pl
36	GNU_CONFIGURE= yes	35	GNU_CONFIGURE= yes
37	USE_RC_SUBR= squid	36	USE_RC_SUBR= squid
38		37
Lines 49-55 Link Here
49	OPTIONS_RADIO= FW	48	OPTIONS_RADIO= FW
50	OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL	49	OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
51	OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF	50	OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF
52	OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \	51	OPTIONS_DEFINE= ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \
53	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \	52	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
54	KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \	53	KQUEUE LARGEFILE LAX_HTTP NETTLE PCRE SNMP SSL SSL_CRTD \
55	STACKTRACES VIA_DB WCCP WCCPV2	54	STACKTRACES VIA_DB WCCP WCCPV2
Lines 76-81 Link Here
76	AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group	75	AUTH_SMB_VARS= BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
77	AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI	76	AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI
78	AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session	77	AUTH_SQL_VARS= EXTERNAL_ACL+=SQL_session
		78	BDB_USES= bdb
79	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests	79	CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests
80	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools	80	DELAY_POOLS_CONFIGURE_ENABLE= delay-pools
81	ECAP_CFLAGS= -I${LOCALBASE}/include	81	ECAP_CFLAGS= -I${LOCALBASE}/include
Lines 98-103 Link Here
98	LARGEFILE_CONFIGURE_WITH= large-files	98	LARGEFILE_CONFIGURE_WITH= large-files
99	LAX_HTTP_CONFIGURE_ENABLE= http-violations	99	LAX_HTTP_CONFIGURE_ENABLE= http-violations
100	FS_AUFS_VARS= STORAGE_SCHEMES+=aufs DISKIO_MODULES+=DiskThreads	100	FS_AUFS_VARS= STORAGE_SCHEMES+=aufs DISKIO_MODULES+=DiskThreads
		101	# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
		102	# e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
101	FS_AUFS_LDFLAGS= -pthread	103	FS_AUFS_LDFLAGS= -pthread
102	FS_AUFS_CONFIGURE_OFF= --without-pthreads	104	FS_AUFS_CONFIGURE_OFF= --without-pthreads
103	FS_DISKD_VARS= STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon	105	FS_DISKD_VARS= STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon
Lines 110-128 Link Here
110	SNMP_CONFIGURE_ENABLE= snmp	112	SNMP_CONFIGURE_ENABLE= snmp
111	SSL_CONFIGURE_ENABLE= ssl	113	SSL_CONFIGURE_ENABLE= ssl
112	SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} \	114	SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} \
		115	--enable-security-cert-generators="file" \
113	LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \	116	LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \
114	LIBOPENSSL_LIBS="-lcrypto -lssl"	117	LIBOPENSSL_LIBS="-lcrypto -lssl"
115	SSL_USES= ssl	118	SSL_USES= ssl
116	SSL_VARS= BROKEN_SSL=openssl-devel
117	SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd	119	SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd
118	SSL_CRTD_IMPLIES= SSL	120	SSL_CRTD_IMPLIES= SSL
119	STACKTRACES_CONFIGURE_ENABLE= stacktraces	121	STACKTRACES_CONFIGURE_ENABLE= stacktraces
120	STACKTRACES_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gen-stacktrace	122	STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace
121	STACKTRACES_LIB_DEPENDS= libunwind.so:devel/libunwind	123	STACKTRACES_LIB_DEPENDS= libunwind.so:devel/libunwind
122	STACKTRACES_CONFIGURE_ON= --disable-strict-error-checking	124	STACKTRACES_CONFIGURE_ON= --disable-strict-error-checking
123	STACKTRACES_CFLAGS= -g	125	STACKTRACES_CFLAGS= -g
124	STACKTRACES_LDFLAGS= -lunwind -L${LOCALBASE}/lib	126	STACKTRACES_LDFLAGS= -lunwind -L${LOCALBASE}/lib
125	STACKTRACES_VARS= strip=""	127	STACKTRACES_VARS= STRIP=""
126	TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent	128	TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent
127	TP_IPF_CONFIGURE_ENABLE= ipf-transparent	129	TP_IPF_CONFIGURE_ENABLE= ipf-transparent
128	TP_PF_CONFIGURE_ENABLE= pf-transparent	130	TP_PF_CONFIGURE_ENABLE= pf-transparent
Lines 147-162 Link Here
147	GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	149	GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
148	GSSAPI_MIT_PLIST_SUB= AUTH_KERB=""	150	GSSAPI_MIT_PLIST_SUB= AUTH_KERB=""
149		151
150	# TODO:
151	# add an option for external_acl/session (requires some kind of external
152	# Berkeley DB support, unsure which one)
153	ARP_ACL_DESC= ARP/MAC/EUI based authentification	152	ARP_ACL_DESC= ARP/MAC/EUI based authentification
154	AUTH_DESC= Authentication helpers	153	AUTH_DESC= Authentication helpers
155	AUTH_LDAP_DESC= Install LDAP authentication helpers	154	AUTH_LDAP_DESC= Install LDAP authentication helpers
156	AUTH_NIS_DESC= Install NIS/YP authentication helpers	155	AUTH_NIS_DESC= Install NIS/YP authentication helpers
157	AUTH_SASL_DESC= Install SASL authentication helpers	156	AUTH_SASL_DESC= Install SASL authentication helpers
158	AUTH_SMB_DESC= Samba authentication helpers	157	AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba)
159	AUTH_SQL_DESC= Install SQL based auth	158	AUTH_SQL_DESC= Install SQL based auth
		159	BDB_DESC= Berkeley DB support required for session and time quota external helpers
160	CACHE_DIGESTS_DESC= Use cache digests	160	CACHE_DIGESTS_DESC= Use cache digests
161	DEBUG_DESC= Build with extended debugging support	161	DEBUG_DESC= Build with extended debugging support
162	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)	162	DELAY_POOLS_DESC= Delay pools (bandwidth limiting)
Lines 190-196 Link Here
190	contrib/nextstep/post_install \	190	contrib/nextstep/post_install \
191	errors/Makefile.am \	191	errors/Makefile.am \
192	errors/Makefile.in \	192	errors/Makefile.in \
193	helpers/basic_auth/SMB_LM/README.html \	193	src/auth/basic/SMB_LM/README.html \
194	src/Makefile.am \	194	src/Makefile.am \
195	src/Makefile.in \	195	src/Makefile.in \
196	src/cf_gen.cc \	196	src/cf_gen.cc \
Lines 232-239 Link Here
232		232
233	# Authentication methods and modules:	233	# Authentication methods and modules:
234		234
235	BASIC_AUTH+= DB SMB_LM MSNT-multi-domain NCSA PAM POP3 RADIUS fake getpwnam	235	BASIC_AUTH+= DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam
236	EXTERNAL_ACL+= file_userip time_quota unix_group	236	EXTERNAL_ACL+= file_userip unix_group
237		237
238	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:	238	# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
239	.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)	239	.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
Lines 245-251 Link Here
245	NEGOTIATE_AUTH= none	245	NEGOTIATE_AUTH= none
246	PLIST_SUB+= AUTH_KERB="@comment "	246	PLIST_SUB+= AUTH_KERB="@comment "
247	.else	247	.else
248
249	# The kerberos_ldap_group external helper also depends on LDAP and SASL:	248	# The kerberos_ldap_group external helper also depends on LDAP and SASL:
250	. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}	249	. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
251	EXTERNAL_ACL+= kerberos_ldap_group	250	EXTERNAL_ACL+= kerberos_ldap_group
Lines 253-259 Link Here
253	NEGOTIATE_AUTH= kerberos wrapper	252	NEGOTIATE_AUTH= kerberos wrapper
254	.endif	253	.endif
255		254
256	# Storage schemes	255	# The session and time_quota external helpers require Berkeley DB support:
		256	.if ${PORT_OPTIONS:MBDB}
		257	CPPFLAGS+= -I${BDB_INCLUDE_DIR}
		258	LDFLAGS+= -L${BDB_LIB_DIR}
		259	EXTERNAL_ACL+= time_quota session
		260	.endif
		261
		262	# Storage schemes:
257	STORAGE_SCHEMES+= ufs	263	STORAGE_SCHEMES+= ufs
258	DISKIO_MODULES+= AIO Blocking IpcIo Mmapped	264	DISKIO_MODULES+= AIO Blocking IpcIo Mmapped
259		265
Lines 261-272 Link Here
261	--enable-auth-digest="file" \	267	--enable-auth-digest="file" \
262	--enable-external-acl-helpers="${EXTERNAL_ACL}" \	268	--enable-external-acl-helpers="${EXTERNAL_ACL}" \
263	--enable-auth-negotiate="${NEGOTIATE_AUTH}" \	269	--enable-auth-negotiate="${NEGOTIATE_AUTH}" \
264	--enable-auth-ntlm="fake smb_lm" \	270	--enable-auth-ntlm="fake SMB_LM" \
265	--enable-storeio="${STORAGE_SCHEMES}" \	271	--enable-storeio="${STORAGE_SCHEMES}" \
266	--enable-disk-io="${DISKIO_MODULES}" \	272	--enable-disk-io="${DISKIO_MODULES}" \
267	--enable-log-daemon-helpers="file" \	273	--enable-log-daemon-helpers="file" \
268	--enable-url-rewrite-helpers="fake" \	274	--enable-url-rewrite-helpers="fake" \
269	--enable-storeid-rewrite-helpers="file"	275	--enable-storeid-rewrite-helpers="file" \
		276	--enable-security-cert-validators="fake"
270		277
271	# Other options set via 'make config':	278	# Other options set via 'make config':
272		279
Lines 298-313 Link Here
298		305
299	post-install:	306	post-install:
300	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	307	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
301	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql \	308	${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \
302	${STAGEDIR}${EXAMPLESDIR}	309	${STAGEDIR}${EXAMPLESDIR}
303	@${MKDIR} ${STAGEDIR}${DOCSDIR}	310	@${MKDIR} ${STAGEDIR}${DOCSDIR}
304	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})	311	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})
305		312
306	.include <bsd.port.pre.mk>	313	.include <bsd.port.mk>
307
308	.if ${CHOSEN_COMPILER_TYPE} == clang
309	CXXFLAGS+= -Wno-unknown-warning-option
310	CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess
311	.endif
312
313	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)squid/files/patch-configure (-11 / +21 lines)
1	--- configure.orig 2015-11-01 10:46:19 UTC	1	--- configure.orig 2018-06-11 09:48:04.000000000 -0700
2	+++ configure	2	+++ configure 2018-06-22 20:34:58.827873000 -0700
3	@@ -32038,7 +32040,7 @@ done	3	@@ -34345,7 +34345,7 @@
4	##	4	##
5		5
6	BUILD_HELPER="NIS"	6	BUILD_HELPER="NIS"
Lines 9-15 Link Here
9	do :	9	do :
10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "	11	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
12	@@ -32053,8 +32055,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"	12	@@ -34360,8 +34360,10 @@
13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1	13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
14	_ACEOF	14	_ACEOF
15		15
Lines 22-28 Link Here
22	fi	22	fi
23		23
24	done	24	done
25	@@ -32519,7 +32523,7 @@ done	25	@@ -34834,7 +34836,7 @@
26		26
27	# unconditionally requires crypt(3), for now	27	# unconditionally requires crypt(3), for now
28	if test "x$ac_cv_func_crypt" != "x"; then	28	if test "x$ac_cv_func_crypt" != "x"; then
Lines 31-37 Link Here
31	do :	31	do :
32	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	32	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
33	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"	33	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
34	@@ -34574,7 +34578,7 @@ for ac_header in \	34	@@ -37226,7 +37228,7 @@
35	arpa/nameser.h \	35	arpa/nameser.h \
36	assert.h \	36	assert.h \
37	bstring.h \	37	bstring.h \
Lines 40-46 Link Here
40	ctype.h \	40	ctype.h \
41	direct.h \	41	direct.h \
42	errno.h \	42	errno.h \
43	@@ -34785,6 +34789,7 @@ ac_fn_cxx_check_header_compile "$LINENO"	43	@@ -37434,6 +37436,7 @@
44	#include <netinet/ip.h>	44	#include <netinet/ip.h>
45	#endif	45	#endif
46	#if HAVE_NETINET_IP_COMPAT_H	46	#if HAVE_NETINET_IP_COMPAT_H
Lines 48-54 Link Here
48	#include <netinet/ip_compat.h>	48	#include <netinet/ip_compat.h>
49	#endif	49	#endif
50	#if HAVE_NETINET_IP_FIL_H	50	#if HAVE_NETINET_IP_FIL_H
51	@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x	51	@@ -41450,6 +41453,7 @@
52	# include <sys/ioccom.h>	52	# include <sys/ioccom.h>
53	# include <netinet/in.h>	53	# include <netinet/in.h>
54		54
Lines 56-62 Link Here
56	# include <netinet/ip_compat.h>	56	# include <netinet/ip_compat.h>
57	# include <netinet/ip_fil.h>	57	# include <netinet/ip_fil.h>
58	# include <netinet/ip_nat.h>	58	# include <netinet/ip_nat.h>
59	@@ -38803,6 +38809,7 @@ else	59	@@ -41480,6 +41484,7 @@
60	# include <sys/ioccom.h>	60	# include <sys/ioccom.h>
61	# include <netinet/in.h>	61	# include <netinet/in.h>
62	#undef minor_t	62	#undef minor_t
Lines 64-70 Link Here
64	# include <netinet/ip_compat.h>	64	# include <netinet/ip_compat.h>
65	# include <netinet/ip_fil.h>	65	# include <netinet/ip_fil.h>
66	# include <netinet/ip_nat.h>	66	# include <netinet/ip_nat.h>
67	@@ -38847,6 +38854,7 @@ _ACEOF	67	@@ -41524,6 +41529,7 @@
68	ip_fil_compat.h \	68	ip_fil_compat.h \
69	ip_fil.h \	69	ip_fil.h \
70	ip_nat.h \	70	ip_nat.h \
Lines 72-78 Link Here
72	netinet/ip_compat.h \	72	netinet/ip_compat.h \
73	netinet/ip_fil_compat.h \	73	netinet/ip_fil_compat.h \
74	netinet/ip_fil.h \	74	netinet/ip_fil.h \
75	@@ -38876,6 +38884,7 @@ ac_fn_cxx_check_header_compile "$LINENO"	75	@@ -41553,6 +41559,7 @@
76	#if HAVE_IP_COMPAT_H	76	#if HAVE_IP_COMPAT_H
77	#include <ip_compat.h>	77	#include <ip_compat.h>
78	#elif HAVE_NETINET_IP_COMPAT_H	78	#elif HAVE_NETINET_IP_COMPAT_H
Lines 80-82 Link Here
80	#include <netinet/ip_compat.h>	80	#include <netinet/ip_compat.h>
81	#endif	81	#endif
82	#if HAVE_IP_FIL_H	82	#if HAVE_IP_FIL_H
		83	@@ -41616,8 +41623,7 @@
		84
		85
		86	fi
		87	-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"
		88	- "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
		89	+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
		90	#if USE_SOLARIS_IPFILTER_MINOR_T_HACK
		91	#define minor_t fubar
		92	#endif

Lines 1-15 Link Here

(-)squid/files/patch-src__ip__Intercept.cc (-15 lines)
1	--- src/ip/Intercept.cc.orig 2015-11-01 10:44:25 UTC
2	+++ src/ip/Intercept.cc
3	@@ -202,10 +202,10 @@ Ip::Intercept::IpfInterception(const Com
4	// for NAT lookup set local and remote IP:port's
5	if (newConn->remote.isIPv6()) {
6	#if IPFILTER_VERSION < 5000003
7	- // warn once every 10 at critical level, then push down a level each repeated event
8	+ // warn once every million at critical level, then push down a level each repeated event
9	static int warningLevel = DBG_CRITICAL;
10	debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1");
11	- warningLevel = (warningLevel + 1) % 10;
12	+ warningLevel = (warningLevel + 1) % 1048576;
13	return false;
14	#else
15	natLookup.nl_v = 6;

Lines 1-23 Link Here

(-)squid/files/patch-src_client__side__request.cc (-23 lines)
1	http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch
2
3	commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5)
4	Author: squidadm <squidadm@users.noreply.github.com>
5	Date: 2018-01-21 08:07:08 +1300
6
7	Fix indirect IP logging for transactions without a client connection (#129) (#136)
8
9	--- src/client_side_request.cc.orig 2018-02-23 13:39:32 UTC
10	+++ src/client_side_request.cc
11	@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *d
12	* Ensure that the access log shows the indirect client
13	* instead of the direct client.
14	*/
15	- ConnStateData *conn = http->getConn();
16	- conn->log_addr = request->indirect_client_addr;
17	- http->al->cache.caddr = conn->log_addr;
18	+ http->al->cache.caddr = request->indirect_client_addr;
19	+ if (ConnStateData *conn = http->getConn())
20	+ conn->log_addr = request->indirect_client_addr;
21	}
22	request->x_forwarded_for_iterator.clean();
23	request->flags.done_follow_x_forwarded_for = true;

Lines 1-28 Link Here

(-)squid/files/patch-src_esi_CustomParser.cc (-28 lines)
1	http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch
2
3	commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5)
4	Author: Amos Jeffries <yadij@users.noreply.github.com>
5	Date: 2018-01-19 13:54:14 +1300
6
7	ESI: make sure endofName never exceeds tagEnd (#130)
8
9	--- src/esi/CustomParser.cc.orig 2018-02-23 13:37:52 UTC
10	+++ src/esi/CustomParser.cc
11	@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t
12
13	char * endofName = strpbrk(const_cast<char *>(tag), w_space);
14
15	- if (endofName > tagEnd)
16	+ if (!endofName \|\| endofName > tagEnd)
17	endofName = const_cast<char *>(tagEnd);
18
19	*endofName = '\0';
20	@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t
21
22	char * endofName = strpbrk(const_cast<char *>(tag), w_space);
23
24	- if (endofName > tagEnd)
25	+ if (!endofName \|\| endofName > tagEnd)
26	endofName = const_cast<char *>(tagEnd);
27
28	*endofName = '\0';

Line 0 Link Here

(-)squid/files/patch-src_ip_Intercept.cc (+15 lines)
	1	--- src/ip/Intercept.cc.orig 2018-06-20 11:02:30 UTC
	2	+++ src/ip/Intercept.cc
	3	@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Com
	4	newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
	5	}
	6	#else
	7	- // warn once every 10 at critical level, then push down a level each repeated event
	8	+ // warn once every million at critical level, then push down a level each repeated event
	9	static int warningLevel = DBG_CRITICAL;
	10	debugs(89, warningLevel, "Your IPF (IPFilter) NAT does not support IPv6. Please upgrade it.");
	11	- warningLevel = (warningLevel + 1) % 10;
	12	+ warningLevel = (warningLevel + 1) % 1048576;
	13	return false;
	14	}
	15	newConn->local.getInAddr(natLookup.nl_inip);

Lines 1-6 Link Here

(-)squid/files/squid.in (-3 / +3 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $FreeBSD: head/www/squid/files/squid.in 440014 2017-05-03 13:51:58Z miwi $	3	# $FreeBSD: head/www/squid-devel/files/squid.in 438126 2017-04-10 06:54:35Z riggs $
4	#	4	#
5	# PROVIDE: squid	5	# PROVIDE: squid
6	# REQUIRE: LOGIN	6	# REQUIRE: LOGIN
Lines 42-48 Link Here
42	# squid_krb5_ktname:	42	# squid_krb5_ktname:
43	# Alternative Kerberos 5 Key Table.	43	# Alternative Kerberos 5 Key Table.
44	# Default: none	44	# Default: none
45	#
46	# squid_krb5_config:	45	# squid_krb5_config:
47	# Alternative Kerberos 5 config file	46	# Alternative Kerberos 5 config file
48	# Default: none	47	# Default: none
Lines 81-87 Link Here
81	required_dirs=$chdir	80	required_dirs=$chdir
82	required_files=$squid_conf	81	required_files=$squid_conf
83	command_args="${required_args} ${squid_flags}"	82	command_args="${required_args} ${squid_flags}"
84	procname="?squid-*"	83	# We used to need it in squid3 to match pid and proc name
		84	# procname="?squid-*"
85	pidfile=$squid_pidfile	85	pidfile=$squid_pidfile
86	}	86	}
87		87