From owner-svn-ports-all@freebsd.org Sat May 7 11:20:13 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 563F6B2FB64; Sat, 7 May 2016 11:20:13 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 258281A76; Sat, 7 May 2016 11:20:13 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u47BKCIX073030; Sat, 7 May 2016 11:20:12 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u47BKB9x073022; Sat, 7 May 2016 11:20:11 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201605071120.u47BKB9x073022@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 7 May 2016 11:20:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414771 - in head/www/squid-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 May 2016 11:20:13 -0000 Author: matthew Date: Sat May 7 11:20:11 2016 New Revision: 414771 URL: https://svnweb.freebsd.org/changeset/ports/414771 Log: Reinstate www/squid-devel port after repo-copy of www/squid -> www/squid-devel Reported by: danfe Added: head/www/squid-devel/ - copied from r414769, head/www/squid/ head/www/squid-devel/files/patch-src_adaptation_ecap_ServiceRep.cc (contents, props changed) Modified: head/www/squid-devel/Makefile head/www/squid-devel/distinfo head/www/squid-devel/files/extra-patch-build-8-9 head/www/squid-devel/files/patch-src_tools.cc head/www/squid-devel/files/squid.in head/www/squid-devel/pkg-plist Modified: head/www/squid-devel/Makefile ============================================================================== --- head/www/squid/Makefile Sat May 7 10:54:23 2016 (r414769) +++ head/www/squid-devel/Makefile Sat May 7 11:20:11 2016 (r414771) @@ -1,14 +1,14 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.17 -PORTREVISION= 1 +PORTVERSION= 4.0.9 CATEGORIES= www ipv6 -MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www1.at.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www.eu.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www1.jp.squid-cache.org/Versions/v3/${PORTVERSION:R}/ +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/ +PKGNAMESUFFIX= -devel DIST_SUBDIR= squid${PORTVERSION:R} PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ @@ -17,7 +17,7 @@ PATCH_SITES= http://www.squid-cache.org/ 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/v3/${PORTVERSION:R}/changesets +PATCH_SITE_SUBDIR= Versions/v4/changesets #PATCHFILES= MAINTAINER= timp87@gmail.com @@ -26,14 +26,11 @@ COMMENT= HTTP Caching Proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= squid*-4.* +CONFLICTS= squid*-3.* -BROKEN_powerpc64= Does not build - -USES= compiler cpe perl5 shebangfix tar:xz +USES= compiler:c++11-lang cpe perl5 shebangfix tar:xz CPE_VENDOR= squid-cache -SHEBANG_FILES= scripts/*.pl contrib/*.pl src/*.pl tools/*.pl \ - helpers/ssl/cert_valid.pl +SHEBANG_FILES= scripts/*.pl contrib/*.pl tools/*.pl GNU_CONFIGURE= yes USE_RC_SUBR= squid @@ -47,9 +44,8 @@ SUB_FILES+= pkg-install pkg-message OPTIONS_SUB= yes OPTIONS_GROUP= AUTH -OPTIONS_RADIO= SMB FW -OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SQL -OPTIONS_RADIO_SMB=AUTH_SMB3 AUTH_SMB4 +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 CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \ FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \ @@ -71,8 +67,7 @@ AUTH_SASL_CFLAGS= -I${LOCALBASE}/includ AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -AUTH_SMB3_RUN_DEPENDS= smbclient:net/samba36 -AUTH_SMB4_RUN_DEPENDS= smbclient:net/samba42 +AUTH_SMB_RUN_DEPENDS= smbclient:net/samba42 AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests DELAY_POOLS_CONFIGURE_ENABLE= delay-pools @@ -137,8 +132,7 @@ GSSAPI_MIT_DESC= Build with Kerberos sup AUTH_LDAP_DESC= Install LDAP authentication helpers AUTH_NIS_DESC= Install NIS/YP authentication helpers AUTH_SASL_DESC= Install SASL authentication helpers -AUTH_SMB3_DESC= Install SMB3 auth. helpers (req. net/samba36) -AUTH_SMB4_DESC= Install SMB4 auth. helpers (req. net/samba42) +AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba) AUTH_SQL_DESC= Install SQL based auth CACHE_DIGESTS_DESC= Use cache digests DEBUG_DESC= Build with extended debugging support @@ -156,7 +150,6 @@ IDENT_DESC= Ident lookups (RFC 931) KQUEUE_DESC= Kqueue(2) support LARGEFILE_DESC= Support large (>2GB) cache and log files NETTLE_DESC= Nettle MD5 algorithm support -SMB_DESC= Samba authentication helpers SNMP_DESC= SNMP support SSL_CRTD_DESC= Use ssl_crtd to handle SSL cert requests SSL_DESC= SSL gatewaying support @@ -174,7 +167,7 @@ change_files= ChangeLog \ contrib/nextstep/post_install \ errors/Makefile.am \ errors/Makefile.in \ - helpers/basic_auth/SMB_LM/README.html \ + src/auth/basic/SMB_LM/README.html \ src/Makefile.am \ src/Makefile.in \ src/cf_gen.cc \ @@ -215,10 +208,10 @@ CONFIGURE_ARGS= --with-default-user=squi # Authentication methods and modules: -basic_auth= DB SMB_LM MSNT-multi-domain NCSA PAM POP3 RADIUS fake getpwnam +basic_auth= DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam digest_auth= file external_acl= file_userip time_quota unix_group -ntlm_auth= fake smb_lm +ntlm_auth= fake SMB_LM .if ${PORT_OPTIONS:MAUTH_LDAP} basic_auth+= LDAP @@ -229,12 +222,9 @@ external_acl+= LDAP_group basic_auth+= SASL .endif -.if ${PORT_OPTIONS:MAUTH_SMB3} || ${PORT_OPTIONS:MAUTH_SMB4} -PLIST_SUB+= AUTH_SMB="" +.if ${PORT_OPTIONS:MAUTH_SMB} basic_auth+= SMB external_acl+= wbinfo_group -.else -PLIST_SUB+= AUTH_SMB="@comment " .endif .if ${PORT_OPTIONS:MAUTH_SQL} @@ -308,6 +298,10 @@ CONFIGURE_ARGS+= --enable-url-rewrite-he storeid_rewrite_helpers= file CONFIGURE_ARGS+= --enable-storeid-rewrite-helpers="${storeid_rewrite_helpers}" +# Security certificate validator helpers: +security_cert_validators= fake +CONFIGURE_ARGS+= --enable-security-cert-validators="${security_cert_validators}" + # Other options set via 'make config': .if ${PORT_OPTIONS:MSSL} @@ -321,6 +315,10 @@ CONFIGURE_ARGS+= --enable-storeid-rewrit CONFIGURE_ARGS+= --with-openssl="${OPENSSLBASE}" CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} + +# Security certificate generator helpers: +security_cert_generators= file +CONFIGURE_ARGS+= --enable-security-cert-generators="${security_cert_generators}" .endif .if ${PORT_OPTIONS:MSSL_CRTD} && !${PORT_OPTIONS:MSSL} @@ -363,7 +361,7 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql \ + ${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \ ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) Modified: head/www/squid-devel/distinfo ============================================================================== --- head/www/squid/distinfo Sat May 7 10:54:23 2016 (r414769) +++ head/www/squid-devel/distinfo Sat May 7 11:20:11 2016 (r414771) @@ -1,2 +1,2 @@ -SHA256 (squid3.5/squid-3.5.17.tar.xz) = cb04e34f6ec80a5ae6caaef042703c841d3803c4c280e75eff12a5a6c84951a2 -SIZE (squid3.5/squid-3.5.17.tar.xz) = 2318216 +SHA256 (squid4.0/squid-4.0.9.tar.xz) = cfc42dcd3a50096f25a4514ef8ad16290098e6d150cd56d171bb481f115b95d9 +SIZE (squid4.0/squid-4.0.9.tar.xz) = 2382228 Modified: head/www/squid-devel/files/extra-patch-build-8-9 ============================================================================== --- head/www/squid/files/extra-patch-build-8-9 Sat May 7 10:54:23 2016 (r414769) +++ head/www/squid-devel/files/extra-patch-build-8-9 Sat May 7 11:20:11 2016 (r414771) @@ -1,5 +1,5 @@ ---- helpers/negotiate_auth/kerberos/negotiate_kerberos.h.orig 2015-08-01 06:08:17 UTC -+++ helpers/negotiate_auth/kerberos/negotiate_kerberos.h +--- src/auth/negotiate/kerberos/negotiate_kerberos.h.orig 2015-08-01 06:08:17 UTC ++++ src/auth/negotiate/kerberos/negotiate_kerberos.h @@ -140,7 +140,7 @@ int check_gss_err(OM_uint32 major_status char *gethost_name(void); Added: head/www/squid-devel/files/patch-src_adaptation_ecap_ServiceRep.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid-devel/files/patch-src_adaptation_ecap_ServiceRep.cc Sat May 7 11:20:11 2016 (r414771) @@ -0,0 +1,11 @@ +--- src/adaptation/ecap/ServiceRep.cc.orig 2016-04-20 13:19:59 UTC ++++ src/adaptation/ecap/ServiceRep.cc +@@ -236,7 +236,7 @@ bool Adaptation::Ecap::ServiceRep::probe + + bool Adaptation::Ecap::ServiceRep::up() const + { +- return theService; ++ return theService != NULL; + } + + bool Adaptation::Ecap::ServiceRep::wantsUrl(const SBuf &urlPath) const Modified: head/www/squid-devel/files/patch-src_tools.cc ============================================================================== --- head/www/squid/files/patch-src_tools.cc Sat May 7 10:54:23 2016 (r414769) +++ head/www/squid-devel/files/patch-src_tools.cc Sat May 7 11:20:11 2016 (r414771) @@ -1,11 +1,11 @@ --- src/tools.cc.orig 2015-11-01 10:44:25 UTC +++ src/tools.cc -@@ -635,7 +635,7 @@ no_suid(void) +@@ -603,7 +603,7 @@ no_suid(void) uid = geteuid(); debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever"); -- if (setuid(0) < 0) -+ if (setuid(0) < 0 && TheProcessKind != pkHelper) - debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerror()); - - if (setuid(uid) < 0) +- if (setuid(0) < 0) { ++ if (setuid(0) < 0 && TheProcessKind != pkHelper) { + int xerrno = errno; + debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerr(xerrno)); + } Modified: head/www/squid-devel/files/squid.in ============================================================================== --- head/www/squid/files/squid.in Sat May 7 10:54:23 2016 (r414769) +++ head/www/squid-devel/files/squid.in Sat May 7 11:20:11 2016 (r414771) @@ -77,7 +77,8 @@ squid_load_rc_config() required_dirs=$chdir required_files=$squid_conf command_args="${required_args} ${squid_flags}" - procname="?squid-*" +# We used to need it in squid3 to match pid and proc name +# procname="?squid-*" pidfile=$squid_pidfile } Modified: head/www/squid-devel/pkg-plist ============================================================================== --- head/www/squid/pkg-plist Sat May 7 10:54:23 2016 (r414769) +++ head/www/squid-devel/pkg-plist Sat May 7 11:20:11 2016 (r414771) @@ -34,6 +34,7 @@ %%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 @@ -92,6 +93,7 @@ %%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 @@ -135,6 +137,7 @@ %%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 @@ -178,6 +181,7 @@ %%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 @@ -220,6 +224,7 @@ %%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 @@ -263,6 +268,7 @@ %%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 @@ -306,6 +312,7 @@ %%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 @@ -353,6 +360,7 @@ %%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 @@ -396,6 +404,7 @@ %%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 @@ -453,6 +462,7 @@ %%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 @@ -515,6 +525,7 @@ %%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 @@ -558,6 +569,7 @@ %%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 @@ -602,6 +614,7 @@ %%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 @@ -645,6 +658,7 @@ %%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 @@ -693,6 +707,7 @@ %%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 @@ -736,6 +751,7 @@ %%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 @@ -779,6 +795,7 @@ %%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 @@ -823,6 +840,7 @@ %%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 @@ -866,6 +884,7 @@ %%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 @@ -910,6 +929,7 @@ %%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 @@ -953,6 +973,7 @@ %%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 @@ -996,6 +1017,7 @@ %%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 @@ -1040,6 +1062,7 @@ %%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 @@ -1083,6 +1106,7 @@ %%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 @@ -1126,6 +1150,7 @@ %%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 @@ -1169,6 +1194,7 @@ %%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 @@ -1212,6 +1238,7 @@ %%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 @@ -1254,6 +1281,7 @@ %%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 @@ -1297,6 +1325,7 @@ %%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 @@ -1339,6 +1368,7 @@ %%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 @@ -1383,6 +1413,7 @@ %%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 @@ -1427,6 +1458,7 @@ %%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 @@ -1470,6 +1502,7 @@ %%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 @@ -1513,6 +1546,7 @@ %%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 @@ -1556,6 +1590,7 @@ %%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 @@ -1602,6 +1637,7 @@ %%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 @@ -1647,6 +1683,7 @@ %%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 @@ -1693,6 +1730,7 @@ %%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 @@ -1735,6 +1773,7 @@ %%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 @@ -1778,6 +1817,7 @@ %%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 @@ -1821,6 +1861,7 @@ %%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 @@ -1864,6 +1905,7 @@ %%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 @@ -1906,6 +1948,7 @@ %%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 @@ -1949,6 +1992,7 @@ %%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 @@ -1994,6 +2038,7 @@ %%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 @@ -2039,6 +2084,7 @@ %%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 @@ -2112,7 +2158,6 @@ libexec/squid/basic_db_auth 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 @@ -2124,7 +2169,6 @@ libexec/squid/basic_radius_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 @@ -2134,7 +2178,8 @@ libexec/squid/ext_file_userip_acl libexec/squid/ext_time_quota_acl libexec/squid/ext_unix_group_acl %%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl -libexec/squid/helper-mux.pl +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 @@ -2146,7 +2191,9 @@ libexec/squid/ntlm_smb_lm_auth %%ICMP%%libexec/squid/pinger %%ICMP%%@group %%ICMP%%@mode -%%SSL_CRTD%%libexec/squid/ssl_crtd +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 @@ -2155,7 +2202,6 @@ man/man1/squidclient.1.gz 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 @@ -2170,10 +2216,11 @@ 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