Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
21305852 update to squid 3.5.5 s11-update
authorStacy Yeh <stacy.yeh@oracle.com>
Wed, 08 Jul 2015 11:41:17 -0700
branchs11-update
changeset 4603 915af16592e4
parent 4601 63c842b82978
child 4608 cb83c5fecabd
21305852 update to squid 3.5.5 19581055 problem in UTILITY/SQUID 19613140 problem in UTILITY/SQUID 19766836 problem in UTILITY/SQUID 18498871 problem in UTILITY/SQUID 21027922 problem in UTILITY/SQUID
components/squid/Makefile file | annotate | diff | comparison | revisions
components/squid/files/squid.conf.default file | annotate | diff | comparison | revisions
components/squid/patches/CVE-2013-4115.patch file | annotate | diff | comparison | revisions
components/squid/patches/Makefile.in.patch file | annotate | diff | comparison | revisions
components/squid/patches/wno-write-strings.patch file | annotate | diff | comparison | revisions
components/squid/squid.p5m file | annotate | diff | comparison | revisions 
--- a/components/squid/Makefile	Tue Jul 07 15:18:10 2015 -0700
+++ b/components/squid/Makefile	Wed Jul 08 11:41:17 2015 -0700
@@ -23,28 +23,31 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-COMPILER = gcc3
+COMPILER =	gcc
 
 include ../../make-rules/shared-macros.mk
 
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin:/usr/perl5/bin
 
 COMPONENT_NAME=         squid
-COMPONENT_VERSION=      3.1.23
+COMPONENT_VERSION=      3.5.5
 COMPONENT_PROJECT_URL=  http://www.squid-cache.org/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:ba5f6a7000a032f2315923c1b8d0b37458d33a7f59d603facecf9e8c12470b34
-COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)Versions/v3/3.1/$(COMPONENT_ARCHIVE)
+    sha256:23793da6b23871765188becae59a6f4b6c3672c256ba9be90743b46a3c7921cf
+COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)Versions/v3/3.5/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/squid
 
-TPNO=			13323
+TPNO=			23264
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+CC += $(CC_BITS)
+CXX += $(CC_BITS)
+
 CFLAGS += -I/usr/include/kerberosv5
 CFLAGS += $(CPP_LARGEFILES)
 
@@ -57,15 +60,15 @@
 CONFIGURE_OPTIONS += --sharedstatedir=/var/squid
 CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)/squid
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_PREFIX)/man
+CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_PREFIX)/sbin
 CONFIGURE_OPTIONS += --enable-arp-acl
-CONFIGURE_OPTIONS += --enable-auth='basic,digest,negotiate,ntlm'
-CONFIGURE_OPTIONS += --enable-basic-auth-helpers='DB,NCSA,YP,LDAP,PAM,getpwnam,MSNT,POP3,multi-domain-NTLM,SMB,SASL'
+CONFIGURE_OPTIONS += --enable-auth-basic='DB,NCSA,LDAP,PAM,getpwnam,MSNT-multi-domain,POP3,SMB,SASL'
 CONFIGURE_OPTIONS += --enable-cache-digests
 CONFIGURE_OPTIONS += --enable-carp
 CONFIGURE_OPTIONS += --enable-coss-aio-ops
 CONFIGURE_OPTIONS += --enable-delay-pools
-CONFIGURE_OPTIONS += --enable-digest-auth-helpers='ldap,password'
-CONFIGURE_OPTIONS += --enable-external-acl-helpers='ip_user,unix_group,ldap_group,wbinfo_group'
+CONFIGURE_OPTIONS += --enable-auth-digest='LDAP'
+CONFIGURE_OPTIONS += --enable-external-acl-helpers='file_userip,unix_group,LDAP_group,wbinfo_group'
 CONFIGURE_OPTIONS += --enable-follow-x-forwarded-for
 CONFIGURE_OPTIONS += --enable-forward-log
 CONFIGURE_OPTIONS += --enable-forw-via-db
@@ -73,15 +76,13 @@
 CONFIGURE_OPTIONS += --enable-icmp
 CONFIGURE_OPTIONS += --enable-large-cache-files
 CONFIGURE_OPTIONS += --enable-multicast-miss
-CONFIGURE_OPTIONS += --enable-negotiate-auth-helpers='squid_kerb_auth'
-CONFIGURE_OPTIONS += --enable-ntlm-auth-helpers='smb_lm,fakeauth,no_check'
+CONFIGURE_OPTIONS += --enable-auth-negotiate='kerberos'
+CONFIGURE_OPTIONS += --enable-auth-ntlm='smb_lm,fake'
 CONFIGURE_OPTIONS += --enable-ntlm-fail-open
-CONFIGURE_OPTIONS += --enable-referer-log
 CONFIGURE_OPTIONS += --enable-removal-policies='heap,lru'
 CONFIGURE_OPTIONS += --enable-snmp
 CONFIGURE_OPTIONS += --enable-ssl
 CONFIGURE_OPTIONS += --enable-storeio='aufs,diskd,ufs'
-CONFIGURE_OPTIONS += --enable-useragent-log
 CONFIGURE_OPTIONS += --enable-x-accelerator-vary
 CONFIGURE_OPTIONS += --with-aio
 CONFIGURE_OPTIONS += --with-aufs-threads=8
@@ -89,9 +90,16 @@
 CONFIGURE_OPTIONS += --with-build-environment=POSIX_V6_ILP32_OFFBIG
 CONFIGURE_OPTIONS += --with-pthreads
 
-COMPONENT_POST_BUILD_ACTION= \
-                (cd $(COMPONENT_DIR) ; \
-                 $(CP) files/squid.conf.default $(@D)/src)
+COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS)"
+
+# Appends the following line to the end of the squid.conf configuration
+# file. This line is necessary for running squid for testing. 
+# This starts up squid as user webservd. 
+COMPONENT_POST_INSTALL_ACTION += \
+	(cd $(PROTO_DIR)/etc/squid ; \
+ 	echo '\ncache_effective_user webservd' >> squid.conf)
+
+ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
 build:		$(BUILD_32) 
@@ -111,6 +119,10 @@
 # acl my_machine src 192.0.2.21 # Replace with your desktop's IP address
 # http_access allow my_machine
 #
+# You will probably need to remove or comment out the following lines or Squid
+# will fail to start:
+#	# acl manager proto cache_object
+#
 # Make sure apache is running.
 #	# svcs apache22
 # Start squid:
@@ -131,11 +143,15 @@
 REQUIRED_PACKAGES += library/libtool/libltdl
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += runtime/perl-516
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/gcc-3-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
 REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/security/crypto
 REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/library/security/libsasl
 REQUIRED_PACKAGES += system/network
+REQUIRED_PACKAGES += service/security/kerberos-5 
--- a/components/squid/files/squid.conf.default	Tue Jul 07 15:18:10 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-#
-# Recommended minimum configuration:
-#
-acl manager proto cache_object
-acl localhost src 127.0.0.1/32 ::1
-acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
-
-# Example rule allowing access from your local networks.
-# Adapt to list your (internal) IP networks from where browsing
-# should be allowed
-acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
-acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
-acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
-acl localnet src fc00::/7       # RFC 4193 local private network range
-acl localnet src fe80::/10      # RFC 4291 link-local (directly plugged) machines
-
-acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 70		# gopher
-acl Safe_ports port 210		# wais
-acl Safe_ports port 1025-65535	# unregistered ports
-acl Safe_ports port 280		# http-mgmt
-acl Safe_ports port 488		# gss-http
-acl Safe_ports port 591		# filemaker
-acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
-
-#
-# Recommended minimum Access Permission configuration:
-#
-# Only allow cachemgr access from localhost
-http_access allow manager localhost
-http_access deny manager
-
-# Deny requests to certain unsafe ports
-http_access deny !Safe_ports
-
-# Deny CONNECT to other than secure SSL ports
-http_access deny CONNECT !SSL_ports
-
-# We strongly recommend the following be uncommented to protect innocent
-# web applications running on the proxy server who think the only
-# one who can access services on "localhost" is a local user
-#http_access deny to_localhost
-
-#
-# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-#
-
-# Example rule allowing access from your local networks.
-# Adapt localnet in the ACL section to list your (internal) IP networks
-# from where browsing should be allowed
-http_access allow localnet
-http_access allow localhost
-
-# And finally deny all other access to this proxy
-http_access deny all
-
-# Squid normally listens to port 3128
-http_port 3128
-
-# We recommend you to use at least the following line.
-hierarchy_stoplist cgi-bin ?
-
-# Uncomment and adjust the following to add a disk cache directory.
-#cache_dir ufs /var/squid/cache 100 16 256
-
-# Leave coredumps in the first cache dir
-coredump_dir /var/squid/cache
-
-# Add any of your own refresh_pattern entries above these.
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern ^gopher:	1440	0%	1440
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern .		0	20%	4320
-
-#  TAG: cache_effective_user
-#	If you start Squid as root, it will change its effective/real
-#	UID/GID to the user specified below.  The default is to change
-#	to UID to nobody.  If you define cache_effective_user, but not
-#	cache_effective_group, Squid sets the GID to the effective
-#	user's default group ID (taken from the password file) and
-#	supplementary group list from the from groups membership of
-#	cache_effective_user.
-#
-#Default:
-cache_effective_user webservd
-
-#  TAG: cache_effective_group
-#	If you want Squid to run with a specific GID regardless of
-#	the group memberships of the effective user then set this
-#	to the group (or GID) you want Squid to run as. When set
-#	all other group privileges of the effective user is ignored
-#	and only this GID is effective. If Squid is not started as
-#	root the user starting Squid must be member of the specified
-#	group.
-#
-#Default:
-# none
--- a/components/squid/patches/CVE-2013-4115.patch	Tue Jul 07 15:18:10 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-Fix for CVE-2013-4115
-
-Buffer overflow in the idnsALookup function in dns_internal.cc in Squid
-3.2 through 3.2.11 and 3.3 through 3.3.6 allows remote attackers to
-cause a denial of service (memory corruption and server termination)
-via a long name in a DNS lookup request.
-
-See http://www.squid-cache.org/Advisories/SQUID-2013_2.txt
-
-The patch comes from
-http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10487.patch
-
---- squid-3.1.23-orig/src/dns_internal.cc	2013-01-08 18:15:21.000000000 -0800
-+++ squid-3.1.23/src/dns_internal.cc	2013-12-10 14:09:08.983526000 -0800
-@@ -1532,22 +1532,26 @@
- void
- idnsALookup(const char *name, IDNSCB * callback, void *data)
- {
--    unsigned int i;
--    int nd = 0;
--    idns_query *q;
-+    size_t nameLength = strlen(name);
- 
--    if (idnsCachedLookup(name, callback, data))
-+    // Prevent buffer overflow on q->name
-+    if (nameLength > NS_MAXDNAME) {
-+        debugs(23, DBG_IMPORTANT, "SECURITY ALERT: DNS name too long to perform lookup: '" << name << "'. see access.log for details.");
-+        callback(data, NULL, 0, "Internal error");
-         return;
-+    }
- 
--    q = cbdataAlloc(idns_query);
-+    if (idnsCachedLookup(name, callback, data))
-+        return;
- 
-+    idns_query *q = cbdataAlloc(idns_query);
-     q->id = idnsQueryID();
--
--    for (i = 0; i < strlen(name); i++)
-+    int nd = 0;
-+    for (unsigned int i = 0; i < nameLength; ++i)
-         if (name[i] == '.')
-             nd++;
- 
--    if (Config.onoff.res_defnames && npc > 0 && name[strlen(name)-1] != '.') {
-+    if (Config.onoff.res_defnames && npc > 0 && name[nameLength-1] != '.') {
-         q->do_searchpath = 1;
-     } else {
-         q->do_searchpath = 0;
--- a/components/squid/patches/Makefile.in.patch	Tue Jul 07 15:18:10 2015 -0700
+++ b/components/squid/patches/Makefile.in.patch	Wed Jul 08 11:41:17 2015 -0700
@@ -1,11 +1,14 @@
---- squid-3.1.8/helpers/basic_auth/SASL/Makefile.in.orig	Wed Mar 23 01:33:05 2011
-+++ squid-3.1.8/helpers/basic_auth/SASL/Makefile.in	Wed Mar 23 01:35:04 2011
-@@ -286,7 +286,7 @@
- LDADD = \
- 	$(top_builddir)/compat/libcompat.la \
- 	-L$(top_builddir)/lib -lmiscutil \
+Solaris-specific patch; not suitable for upstream. 
+
+diff -rupN squid-3.5.5-orig/helpers/basic_auth/SASL/Makefile.in squid-3.5.5/helpers/basic_auth/SASL/Makefile.in
+--- squid-3.5.5-orig/helpers/basic_auth/SASL/Makefile.in	2015-06-16 11:02:41.242508702 -0700
++++ squid-3.5.5/helpers/basic_auth/SASL/Makefile.in	2015-06-16 11:03:18.755629692 -0700
+@@ -673,7 +673,7 @@ basic_sasl_auth_SOURCES = basic_sasl_aut
+ basic_sasl_auth_LDADD = \
+ 	$(top_builddir)/lib/libmiscencoding.la \
+ 	$(COMPAT_LIB) \
 -	$(LIBSASL) \
 +	-lsasl \
  	$(XTRA_LIBS)
  
- EXTRA_DIST = squid_sasl_auth squid_sasl_auth.conf config.test
+ EXTRA_DIST = \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/squid/patches/wno-write-strings.patch	Wed Jul 08 11:41:17 2015 -0700
@@ -0,0 +1,44 @@
+Solaris-specific patch, not suitable for upstream. 
+Prevents gcc from throwing an error on warnings for "deprecated conversion 
+from string constant to 'char*'" that arises during building Squid. 
+
+diff -rupN squid-3.5.5-orig/configure squid-3.5.5/configure
+--- squid-3.5.5-orig/configure	2015-06-18 10:43:50.253744903 -0700
++++ squid-3.5.5/configure	2015-06-18 10:44:36.173461352 -0700
+@@ -19975,13 +19975,13 @@ fi
+ if test "$squid_cv_compiler" = "gcc"; then
+   case "$squid_host_os" in
+   mingw)
+-    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow"
++    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow"
+     ;;
+   *)
+-    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow"
++    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow"
+     ;;
+   esac
+-  SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow"
++  SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow"
+ else
+   SQUID_CFLAGS=
+   SQUID_CXXFLAGS=
+diff -rupN squid-3.5.5-orig/configure.ac squid-3.5.5/configure.ac
+--- squid-3.5.5-orig/configure.ac	2015-06-18 10:44:01.422693185 -0700
++++ squid-3.5.5/configure.ac	2015-06-18 10:44:50.759898824 -0700
+@@ -361,13 +361,13 @@ dnl Guido Serassio (serassio@squid-cache
+ dnl Using the latest MinGW (gcc 3.4.5 + mingw-runtime 3.13) cannot build with
+ dnl -Werror -Wmissing-prototypes -Wmissing-declarations
+ dnl TODO: check if the problem will be present in any other newer MinGW release.
+-    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow"
++    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow"
+     ;;
+   *)
+-    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow"
++    SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow"
+     ;;
+   esac
+-  SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow"
++  SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow"
+ else
+   SQUID_CFLAGS=
+   SQUID_CXXFLAGS=
--- a/components/squid/squid.p5m	Tue Jul 07 15:18:10 2015 -0700
+++ b/components/squid/squid.p5m	Wed Jul 08 11:41:17 2015 -0700
@@ -37,22 +37,17 @@
 set name=org.opensolaris.arc-caseid value=LSARC/2009/130
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-# from here on files have no modified attributes
-dir  path=etc
-dir  path=etc/squid
-
 # special attributes
 file path=etc/squid/cachemgr.conf group=webservd mode=0644 \
     original_name=SUNWsquid:etc/squid/cachemgr.conf preserve=renamenew
+
+# from here on files have no modified attributes
 file path=etc/squid/cachemgr.conf.default
 file path=etc/squid/errorpage.css
 file path=etc/squid/errorpage.css.default
 file path=etc/squid/mime.conf group=webservd mode=0644 \
     original_name=SUNWsquid:etc/squid/mime.conf preserve=renamenew
 file path=etc/squid/mime.conf.default
-file path=etc/squid/msntauth.conf group=webservd mode=0644 \
-    original_name=SUNWsquid:etc/squid/msntauth.conf preserve=renamenew
-file path=etc/squid/msntauth.conf.default
 file path=etc/squid/squid.conf group=webservd mode=0644 \
     original_name=SUNWsquid:etc/squid/squid.conf preserve=renamenew
 file path=etc/squid/squid.conf.default
@@ -62,61 +57,58 @@
 # smf stuff to control start/stop of squid
 file files/http-squid path=lib/svc/method/http-squid \
     restart_fmri=svc:/network/http:squid
-dir  path=usr
-dir  path=usr/squid
-dir  path=usr/squid/bin
+file path=usr/squid/bin/purge
 file path=usr/squid/bin/squidclient
-dir  path=usr/squid/include
-dir  path=usr/squid/lib
-dir  path=usr/squid/libexec
+file path=usr/squid/libexec/basic_db_auth
+file path=usr/squid/libexec/basic_getpwnam_auth
+file path=usr/squid/libexec/basic_ldap_auth
+file path=usr/squid/libexec/basic_msnt_multi_domain_auth
+file path=usr/squid/libexec/basic_ncsa_auth
+file path=usr/squid/libexec/basic_pam_auth
+file path=usr/squid/libexec/basic_pop3_auth
+file path=usr/squid/libexec/basic_sasl_auth
+file path=usr/squid/libexec/basic_smb_auth
+file path=usr/squid/libexec/basic_smb_auth.sh
 file path=usr/squid/libexec/cachemgr.cgi
 file path=usr/squid/libexec/digest_ldap_auth
-file path=usr/squid/libexec/digest_pw_auth
 file path=usr/squid/libexec/diskd
-file path=usr/squid/libexec/fakeauth_auth
-file path=usr/squid/libexec/getpwname_auth
-file path=usr/squid/libexec/ip_user_check
-file path=usr/squid/libexec/msnt_auth
-file path=usr/squid/libexec/ncsa_auth
-file path=usr/squid/libexec/negotiate_kerb_auth
-file path=usr/squid/libexec/negotiate_kerb_auth_test
-file path=usr/squid/libexec/no_check.pl
+file path=usr/squid/libexec/ext_file_userip_acl
+file path=usr/squid/libexec/ext_ldap_group_acl
+file path=usr/squid/libexec/ext_unix_group_acl
+file path=usr/squid/libexec/ext_wbinfo_group_acl
+file path=usr/squid/libexec/helper-mux.pl
+file path=usr/squid/libexec/log_db_daemon
+file path=usr/squid/libexec/log_file_daemon
+file path=usr/squid/libexec/negotiate_kerberos_auth
+file path=usr/squid/libexec/negotiate_kerberos_auth_test
+file path=usr/squid/libexec/ntlm_fake_auth
 file path=usr/squid/libexec/ntlm_smb_lm_auth
-file path=usr/squid/libexec/pam_auth
 file path=usr/squid/libexec/pinger
-file path=usr/squid/libexec/pop3.pl
-file path=usr/squid/libexec/sasl_auth
-file path=usr/squid/libexec/smb_auth
-file path=usr/squid/libexec/smb_auth.pl
-file path=usr/squid/libexec/smb_auth.sh
-file path=usr/squid/libexec/squid_db_auth
-file path=usr/squid/libexec/squid_kerb_auth
-file path=usr/squid/libexec/squid_kerb_auth_test
-file path=usr/squid/libexec/squid_ldap_auth
-file path=usr/squid/libexec/squid_ldap_group
-file path=usr/squid/libexec/squid_unix_group
+file path=usr/squid/libexec/storeid_file_rewrite
 file path=usr/squid/libexec/unlinkd
-file path=usr/squid/libexec/wbinfo_group.pl
-file path=usr/squid/libexec/yp_auth
-dir  path=usr/squid/man
-dir  path=usr/squid/man/man1
+file path=usr/squid/libexec/url_fake_rewrite
+file path=usr/squid/libexec/url_fake_rewrite.sh
 file path=usr/squid/man/man1/squidclient.1
-dir  path=usr/squid/man/man8
+file path=usr/squid/man/man8/basic_db_auth.8
+file path=usr/squid/man/man8/basic_getpwnam_auth.8
+file path=usr/squid/man/man8/basic_ldap_auth.8
+file path=usr/squid/man/man8/basic_msnt_multi_domain_auth.8
+file path=usr/squid/man/man8/basic_ncsa_auth.8
+file path=usr/squid/man/man8/basic_pam_auth.8
+file path=usr/squid/man/man8/basic_pop3_auth.8
+file path=usr/squid/man/man8/basic_sasl_auth.8
 file path=usr/squid/man/man8/cachemgr.cgi.8
-file path=usr/squid/man/man8/ncsa_auth.8
-file path=usr/squid/man/man8/pam_auth.8
+file path=usr/squid/man/man8/ext_file_userip_acl.8
+file path=usr/squid/man/man8/ext_ldap_group_acl.8
+file path=usr/squid/man/man8/ext_unix_group_acl.8
+file path=usr/squid/man/man8/ext_wbinfo_group_acl.8
+file path=usr/squid/man/man8/log_db_daemon.8
+file path=usr/squid/man/man8/negotiate_kerberos_auth.8
 file path=usr/squid/man/man8/squid.8
-file path=usr/squid/man/man8/squid_db_auth.8
-file path=usr/squid/man/man8/squid_ldap_auth.8
-file path=usr/squid/man/man8/squid_ldap_group.8
-file path=usr/squid/man/man8/squid_unix_group.8
-dir  path=usr/squid/sbin
+file path=usr/squid/man/man8/storeid_file_rewrite.8
 file path=usr/squid/sbin/squid
-dir  path=usr/squid/share
-dir  path=usr/squid/share/errors
 file path=usr/squid/share/errors/COPYRIGHT
 file path=usr/squid/share/errors/TRANSLATORS
-dir  path=usr/squid/share/errors/af
 file path=usr/squid/share/errors/af/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/af/ERR_AGENT_CONFIGURE
@@ -124,6 +116,7 @@
 file path=usr/squid/share/errors/af/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/af/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/af/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/af/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/af/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/af/ERR_DIR_LISTING
 file path=usr/squid/share/errors/af/ERR_DNS_FAIL
@@ -158,7 +151,6 @@
 file path=usr/squid/share/errors/af/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/af/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/af/error-details.txt
-dir  path=usr/squid/share/errors/ar
 link path=usr/squid/share/errors/ar-ae target=ar
 link path=usr/squid/share/errors/ar-bh target=ar
 link path=usr/squid/share/errors/ar-dz target=ar
@@ -182,6 +174,7 @@
 file path=usr/squid/share/errors/ar/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/ar/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ar/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/ar/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/ar/ERR_DIR_LISTING
 file path=usr/squid/share/errors/ar/ERR_DNS_FAIL
@@ -216,7 +209,6 @@
 file path=usr/squid/share/errors/ar/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/ar/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/ar/error-details.txt
-dir  path=usr/squid/share/errors/az
 link path=usr/squid/share/errors/az-az target=az
 file path=usr/squid/share/errors/az/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -225,6 +217,7 @@
 file path=usr/squid/share/errors/az/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/az/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/az/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/az/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/az/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/az/ERR_DIR_LISTING
 file path=usr/squid/share/errors/az/ERR_DNS_FAIL
@@ -259,7 +252,6 @@
 file path=usr/squid/share/errors/az/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/az/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/az/error-details.txt
-dir  path=usr/squid/share/errors/bg
 link path=usr/squid/share/errors/bg-bg target=bg
 file path=usr/squid/share/errors/bg/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -268,6 +260,7 @@
 file path=usr/squid/share/errors/bg/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/bg/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/bg/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/bg/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/bg/ERR_DIR_LISTING
 file path=usr/squid/share/errors/bg/ERR_DNS_FAIL
@@ -302,7 +295,6 @@
 file path=usr/squid/share/errors/bg/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/bg/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/bg/error-details.txt
-dir  path=usr/squid/share/errors/ca
 file path=usr/squid/share/errors/ca/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/ca/ERR_AGENT_CONFIGURE
@@ -310,6 +302,7 @@
 file path=usr/squid/share/errors/ca/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/ca/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ca/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/ca/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/ca/ERR_DIR_LISTING
 file path=usr/squid/share/errors/ca/ERR_DNS_FAIL
@@ -344,7 +337,6 @@
 file path=usr/squid/share/errors/ca/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/ca/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/ca/error-details.txt
-dir  path=usr/squid/share/errors/cs
 link path=usr/squid/share/errors/cs-cz target=cs
 file path=usr/squid/share/errors/cs/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -353,6 +345,7 @@
 file path=usr/squid/share/errors/cs/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/cs/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/cs/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/cs/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/cs/ERR_DIR_LISTING
 file path=usr/squid/share/errors/cs/ERR_DNS_FAIL
@@ -387,7 +380,6 @@
 file path=usr/squid/share/errors/cs/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/cs/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/cs/error-details.txt
-dir  path=usr/squid/share/errors/da
 link path=usr/squid/share/errors/da-dk target=da
 file path=usr/squid/share/errors/da/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -396,6 +388,7 @@
 file path=usr/squid/share/errors/da/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/da/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/da/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/da/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/da/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/da/ERR_DIR_LISTING
 file path=usr/squid/share/errors/da/ERR_DNS_FAIL
@@ -430,7 +423,6 @@
 file path=usr/squid/share/errors/da/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/da/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/da/error-details.txt
-dir  path=usr/squid/share/errors/de
 link path=usr/squid/share/errors/de-at target=de
 link path=usr/squid/share/errors/de-ch target=de
 link path=usr/squid/share/errors/de-de target=de
@@ -443,6 +435,7 @@
 file path=usr/squid/share/errors/de/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/de/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/de/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/de/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/de/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/de/ERR_DIR_LISTING
 file path=usr/squid/share/errors/de/ERR_DNS_FAIL
@@ -477,7 +470,6 @@
 file path=usr/squid/share/errors/de/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/de/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/de/error-details.txt
-dir  path=usr/squid/share/errors/el
 link path=usr/squid/share/errors/el-gr target=el
 file path=usr/squid/share/errors/el/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -486,6 +478,7 @@
 file path=usr/squid/share/errors/el/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/el/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/el/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/el/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/el/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/el/ERR_DIR_LISTING
 file path=usr/squid/share/errors/el/ERR_DNS_FAIL
@@ -520,7 +513,6 @@
 file path=usr/squid/share/errors/el/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/el/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/el/error-details.txt
-dir  path=usr/squid/share/errors/en
 link path=usr/squid/share/errors/en-au target=en
 link path=usr/squid/share/errors/en-bz target=en
 link path=usr/squid/share/errors/en-ca target=en
@@ -543,6 +535,7 @@
 file path=usr/squid/share/errors/en/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/en/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/en/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/en/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/en/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/en/ERR_DIR_LISTING
 file path=usr/squid/share/errors/en/ERR_DNS_FAIL
@@ -577,7 +570,6 @@
 file path=usr/squid/share/errors/en/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/en/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/en/error-details.txt
-dir  path=usr/squid/share/errors/es
 link path=usr/squid/share/errors/es-ar target=es
 link path=usr/squid/share/errors/es-bo target=es
 link path=usr/squid/share/errors/es-cl target=es
@@ -604,6 +596,7 @@
 file path=usr/squid/share/errors/es/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/es/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/es/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/es/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/es/ERR_DIR_LISTING
 file path=usr/squid/share/errors/es/ERR_DNS_FAIL
@@ -638,7 +631,6 @@
 file path=usr/squid/share/errors/es/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/es/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/es/error-details.txt
-dir  path=usr/squid/share/errors/et
 link path=usr/squid/share/errors/et-ee target=et
 file path=usr/squid/share/errors/et/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -647,6 +639,7 @@
 file path=usr/squid/share/errors/et/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/et/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/et/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/et/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/et/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/et/ERR_DIR_LISTING
 file path=usr/squid/share/errors/et/ERR_DNS_FAIL
@@ -681,7 +674,6 @@
 file path=usr/squid/share/errors/et/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/et/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/et/error-details.txt
-dir  path=usr/squid/share/errors/fa
 link path=usr/squid/share/errors/fa-fa target=fa
 link path=usr/squid/share/errors/fa-ir target=fa
 file path=usr/squid/share/errors/fa/ERR_ACCESS_DENIED
@@ -691,6 +683,7 @@
 file path=usr/squid/share/errors/fa/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/fa/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/fa/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/fa/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/fa/ERR_DIR_LISTING
 file path=usr/squid/share/errors/fa/ERR_DNS_FAIL
@@ -725,7 +718,6 @@
 file path=usr/squid/share/errors/fa/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/fa/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/fa/error-details.txt
-dir  path=usr/squid/share/errors/fi
 link path=usr/squid/share/errors/fi-fi target=fi
 file path=usr/squid/share/errors/fi/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -734,6 +726,7 @@
 file path=usr/squid/share/errors/fi/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/fi/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/fi/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/fi/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/fi/ERR_DIR_LISTING
 file path=usr/squid/share/errors/fi/ERR_DNS_FAIL
@@ -768,7 +761,6 @@
 file path=usr/squid/share/errors/fi/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/fi/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/fi/error-details.txt
-dir  path=usr/squid/share/errors/fr
 link path=usr/squid/share/errors/fr-be target=fr
 link path=usr/squid/share/errors/fr-ca target=fr
 link path=usr/squid/share/errors/fr-ch target=fr
@@ -782,6 +774,7 @@
 file path=usr/squid/share/errors/fr/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/fr/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/fr/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/fr/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/fr/ERR_DIR_LISTING
 file path=usr/squid/share/errors/fr/ERR_DNS_FAIL
@@ -816,7 +809,6 @@
 file path=usr/squid/share/errors/fr/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/fr/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/fr/error-details.txt
-dir  path=usr/squid/share/errors/he
 link path=usr/squid/share/errors/he-il target=he
 file path=usr/squid/share/errors/he/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -825,6 +817,7 @@
 file path=usr/squid/share/errors/he/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/he/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/he/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/he/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/he/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/he/ERR_DIR_LISTING
 file path=usr/squid/share/errors/he/ERR_DNS_FAIL
@@ -859,7 +852,6 @@
 file path=usr/squid/share/errors/he/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/he/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/he/error-details.txt
-dir  path=usr/squid/share/errors/hu
 link path=usr/squid/share/errors/hu-hu target=hu
 file path=usr/squid/share/errors/hu/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -868,6 +860,7 @@
 file path=usr/squid/share/errors/hu/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/hu/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/hu/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/hu/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/hu/ERR_DIR_LISTING
 file path=usr/squid/share/errors/hu/ERR_DNS_FAIL
@@ -902,7 +895,6 @@
 file path=usr/squid/share/errors/hu/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/hu/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/hu/error-details.txt
-dir  path=usr/squid/share/errors/hy
 link path=usr/squid/share/errors/hy-am target=hy
 link path=usr/squid/share/errors/hy-armn target=hy
 file path=usr/squid/share/errors/hy/ERR_ACCESS_DENIED
@@ -912,6 +904,7 @@
 file path=usr/squid/share/errors/hy/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/hy/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/hy/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/hy/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/hy/ERR_DIR_LISTING
 file path=usr/squid/share/errors/hy/ERR_DNS_FAIL
@@ -946,7 +939,6 @@
 file path=usr/squid/share/errors/hy/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/hy/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/hy/error-details.txt
-dir  path=usr/squid/share/errors/id
 link path=usr/squid/share/errors/id-id target=id
 file path=usr/squid/share/errors/id/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -955,6 +947,7 @@
 file path=usr/squid/share/errors/id/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/id/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/id/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/id/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/id/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/id/ERR_DIR_LISTING
 file path=usr/squid/share/errors/id/ERR_DNS_FAIL
@@ -989,7 +982,6 @@
 file path=usr/squid/share/errors/id/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/id/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/id/error-details.txt
-dir  path=usr/squid/share/errors/it
 link path=usr/squid/share/errors/it-ch target=it
 link path=usr/squid/share/errors/it-it target=it
 file path=usr/squid/share/errors/it/ERR_ACCESS_DENIED
@@ -999,6 +991,7 @@
 file path=usr/squid/share/errors/it/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/it/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/it/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/it/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/it/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/it/ERR_DIR_LISTING
 file path=usr/squid/share/errors/it/ERR_DNS_FAIL
@@ -1033,7 +1026,6 @@
 file path=usr/squid/share/errors/it/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/it/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/it/error-details.txt
-dir  path=usr/squid/share/errors/ja
 link path=usr/squid/share/errors/ja-jp target=ja
 file path=usr/squid/share/errors/ja/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1042,6 +1034,7 @@
 file path=usr/squid/share/errors/ja/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/ja/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ja/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/ja/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/ja/ERR_DIR_LISTING
 file path=usr/squid/share/errors/ja/ERR_DNS_FAIL
@@ -1076,7 +1069,49 @@
 file path=usr/squid/share/errors/ja/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/ja/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/ja/error-details.txt
-dir  path=usr/squid/share/errors/ko
+link path=usr/squid/share/errors/ka-ge target=ka
+file path=usr/squid/share/errors/ka/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ka/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ka/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ka/ERR_AGENT_WPAD
+file path=usr/squid/share/errors/ka/ERR_CACHE_ACCESS_DENIED
+file path=usr/squid/share/errors/ka/ERR_CACHE_MGR_ACCESS_DENIED
+file path=usr/squid/share/errors/ka/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ka/ERR_CONFLICT_HOST
+file path=usr/squid/share/errors/ka/ERR_CONNECT_FAIL
+file path=usr/squid/share/errors/ka/ERR_DIR_LISTING
+file path=usr/squid/share/errors/ka/ERR_DNS_FAIL
+file path=usr/squid/share/errors/ka/ERR_ESI
+file path=usr/squid/share/errors/ka/ERR_FORWARDING_DENIED
+file path=usr/squid/share/errors/ka/ERR_FTP_DISABLED
+file path=usr/squid/share/errors/ka/ERR_FTP_FAILURE
+file path=usr/squid/share/errors/ka/ERR_FTP_FORBIDDEN
+file path=usr/squid/share/errors/ka/ERR_FTP_NOT_FOUND
+file path=usr/squid/share/errors/ka/ERR_FTP_PUT_CREATED
+file path=usr/squid/share/errors/ka/ERR_FTP_PUT_ERROR
+file path=usr/squid/share/errors/ka/ERR_FTP_PUT_MODIFIED
+file path=usr/squid/share/errors/ka/ERR_FTP_UNAVAILABLE
+file path=usr/squid/share/errors/ka/ERR_GATEWAY_FAILURE
+file path=usr/squid/share/errors/ka/ERR_ICAP_FAILURE
+file path=usr/squid/share/errors/ka/ERR_INVALID_REQ
+file path=usr/squid/share/errors/ka/ERR_INVALID_RESP
+file path=usr/squid/share/errors/ka/ERR_INVALID_URL
+file path=usr/squid/share/errors/ka/ERR_LIFETIME_EXP
+file path=usr/squid/share/errors/ka/ERR_NO_RELAY
+file path=usr/squid/share/errors/ka/ERR_ONLY_IF_CACHED_MISS
+file path=usr/squid/share/errors/ka/ERR_PRECONDITION_FAILED
+file path=usr/squid/share/errors/ka/ERR_READ_ERROR
+file path=usr/squid/share/errors/ka/ERR_READ_TIMEOUT
+file path=usr/squid/share/errors/ka/ERR_SECURE_CONNECT_FAIL
+file path=usr/squid/share/errors/ka/ERR_SHUTTING_DOWN
+file path=usr/squid/share/errors/ka/ERR_SOCKET_FAILURE
+file path=usr/squid/share/errors/ka/ERR_TOO_BIG
+file path=usr/squid/share/errors/ka/ERR_UNSUP_HTTPVERSION
+file path=usr/squid/share/errors/ka/ERR_UNSUP_REQ
+file path=usr/squid/share/errors/ka/ERR_URN_RESOLVE
+file path=usr/squid/share/errors/ka/ERR_WRITE_ERROR
+file path=usr/squid/share/errors/ka/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ka/error-details.txt
 link path=usr/squid/share/errors/ko-kp target=ko
 link path=usr/squid/share/errors/ko-kr target=ko
 file path=usr/squid/share/errors/ko/ERR_ACCESS_DENIED
@@ -1086,6 +1121,7 @@
 file path=usr/squid/share/errors/ko/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/ko/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ko/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/ko/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/ko/ERR_DIR_LISTING
 file path=usr/squid/share/errors/ko/ERR_DNS_FAIL
@@ -1120,7 +1156,6 @@
 file path=usr/squid/share/errors/ko/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/ko/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/ko/error-details.txt
-dir  path=usr/squid/share/errors/lt
 link path=usr/squid/share/errors/lt-lt target=lt
 file path=usr/squid/share/errors/lt/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1129,6 +1164,7 @@
 file path=usr/squid/share/errors/lt/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/lt/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/lt/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/lt/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/lt/ERR_DIR_LISTING
 file path=usr/squid/share/errors/lt/ERR_DNS_FAIL
@@ -1163,7 +1199,6 @@
 file path=usr/squid/share/errors/lt/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/lt/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/lt/error-details.txt
-dir  path=usr/squid/share/errors/lv
 link path=usr/squid/share/errors/lv-lv target=lv
 file path=usr/squid/share/errors/lv/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1172,6 +1207,7 @@
 file path=usr/squid/share/errors/lv/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/lv/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/lv/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/lv/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/lv/ERR_DIR_LISTING
 file path=usr/squid/share/errors/lv/ERR_DNS_FAIL
@@ -1206,7 +1242,6 @@
 file path=usr/squid/share/errors/lv/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/lv/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/lv/error-details.txt
-dir  path=usr/squid/share/errors/ms
 link path=usr/squid/share/errors/ms-my target=ms
 file path=usr/squid/share/errors/ms/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1215,6 +1250,7 @@
 file path=usr/squid/share/errors/ms/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/ms/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ms/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/ms/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/ms/ERR_DIR_LISTING
 file path=usr/squid/share/errors/ms/ERR_DNS_FAIL
@@ -1249,7 +1285,6 @@
 file path=usr/squid/share/errors/ms/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/ms/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/ms/error-details.txt
-dir  path=usr/squid/share/errors/nl
 link path=usr/squid/share/errors/nl-nl target=nl
 file path=usr/squid/share/errors/nl/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1258,6 +1293,7 @@
 file path=usr/squid/share/errors/nl/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/nl/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/nl/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/nl/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/nl/ERR_DIR_LISTING
 file path=usr/squid/share/errors/nl/ERR_DNS_FAIL
@@ -1292,7 +1328,6 @@
 file path=usr/squid/share/errors/nl/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/nl/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/nl/error-details.txt
-dir  path=usr/squid/share/errors/oc
 file path=usr/squid/share/errors/oc/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/oc/ERR_AGENT_CONFIGURE
@@ -1300,6 +1335,7 @@
 file path=usr/squid/share/errors/oc/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/oc/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/oc/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/oc/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/oc/ERR_DIR_LISTING
 file path=usr/squid/share/errors/oc/ERR_DNS_FAIL
@@ -1334,7 +1370,6 @@
 file path=usr/squid/share/errors/oc/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/oc/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/oc/error-details.txt
-dir  path=usr/squid/share/errors/pl
 link path=usr/squid/share/errors/pl-pl target=pl
 file path=usr/squid/share/errors/pl/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1343,6 +1378,7 @@
 file path=usr/squid/share/errors/pl/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/pl/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/pl/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/pl/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/pl/ERR_DIR_LISTING
 file path=usr/squid/share/errors/pl/ERR_DNS_FAIL
@@ -1377,8 +1413,6 @@
 file path=usr/squid/share/errors/pl/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/pl/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/pl/error-details.txt
-dir  path=usr/squid/share/errors/pt
-dir  path=usr/squid/share/errors/pt-br
 file path=usr/squid/share/errors/pt-br/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/pt-br/ERR_AGENT_CONFIGURE
@@ -1386,6 +1420,7 @@
 file path=usr/squid/share/errors/pt-br/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/pt-br/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/pt-br/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/pt-br/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/pt-br/ERR_DIR_LISTING
 file path=usr/squid/share/errors/pt-br/ERR_DNS_FAIL
@@ -1428,6 +1463,7 @@
 file path=usr/squid/share/errors/pt/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/pt/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/pt/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/pt/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/pt/ERR_DIR_LISTING
 file path=usr/squid/share/errors/pt/ERR_DNS_FAIL
@@ -1462,7 +1498,6 @@
 file path=usr/squid/share/errors/pt/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/pt/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/pt/error-details.txt
-dir  path=usr/squid/share/errors/ro
 link path=usr/squid/share/errors/ro-md target=ro
 link path=usr/squid/share/errors/ro-ro target=ro
 file path=usr/squid/share/errors/ro/ERR_ACCESS_DENIED
@@ -1472,6 +1507,7 @@
 file path=usr/squid/share/errors/ro/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/ro/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ro/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/ro/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/ro/ERR_DIR_LISTING
 file path=usr/squid/share/errors/ro/ERR_DNS_FAIL
@@ -1506,7 +1542,6 @@
 file path=usr/squid/share/errors/ro/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/ro/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/ro/error-details.txt
-dir  path=usr/squid/share/errors/ru
 link path=usr/squid/share/errors/ru-ru target=ru
 file path=usr/squid/share/errors/ru/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1515,6 +1550,7 @@
 file path=usr/squid/share/errors/ru/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/ru/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/ru/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/ru/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/ru/ERR_DIR_LISTING
 file path=usr/squid/share/errors/ru/ERR_DNS_FAIL
@@ -1549,7 +1585,6 @@
 file path=usr/squid/share/errors/ru/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/ru/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/ru/error-details.txt
-dir  path=usr/squid/share/errors/sk
 link path=usr/squid/share/errors/sk-sk target=sk
 file path=usr/squid/share/errors/sk/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1558,6 +1593,7 @@
 file path=usr/squid/share/errors/sk/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/sk/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/sk/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/sk/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/sk/ERR_DIR_LISTING
 file path=usr/squid/share/errors/sk/ERR_DNS_FAIL
@@ -1592,7 +1628,6 @@
 file path=usr/squid/share/errors/sk/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/sk/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/sk/error-details.txt
-dir  path=usr/squid/share/errors/sl
 link path=usr/squid/share/errors/sl-si target=sl
 file path=usr/squid/share/errors/sl/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1601,6 +1636,7 @@
 file path=usr/squid/share/errors/sl/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/sl/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/sl/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/sl/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/sl/ERR_DIR_LISTING
 file path=usr/squid/share/errors/sl/ERR_DNS_FAIL
@@ -1636,7 +1672,9 @@
 file path=usr/squid/share/errors/sl/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/sl/error-details.txt
 link path=usr/squid/share/errors/sr target=sr-latn
-dir  path=usr/squid/share/errors/sr-cyrl
+link path=usr/squid/share/errors/sr-cyrl-cs target=sr-cyrl
+link path=usr/squid/share/errors/sr-cyrl-me target=sr-cyrl
+link path=usr/squid/share/errors/sr-cyrl-rs target=sr-cyrl
 file path=usr/squid/share/errors/sr-cyrl/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/sr-cyrl/ERR_AGENT_CONFIGURE
@@ -1644,6 +1682,7 @@
 file path=usr/squid/share/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/sr-cyrl/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/sr-cyrl/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/sr-cyrl/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/sr-cyrl/ERR_DIR_LISTING
 file path=usr/squid/share/errors/sr-cyrl/ERR_DNS_FAIL
@@ -1678,8 +1717,9 @@
 file path=usr/squid/share/errors/sr-cyrl/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/sr-cyrl/error-details.txt
-dir  path=usr/squid/share/errors/sr-latn
 link path=usr/squid/share/errors/sr-latn-cs target=sr-latn
+link path=usr/squid/share/errors/sr-latn-me target=sr-latn
+link path=usr/squid/share/errors/sr-latn-rs target=sr-latn
 file path=usr/squid/share/errors/sr-latn/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/sr-latn/ERR_AGENT_CONFIGURE
@@ -1687,6 +1727,7 @@
 file path=usr/squid/share/errors/sr-latn/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/sr-latn/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/sr-latn/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/sr-latn/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/sr-latn/ERR_DIR_LISTING
 file path=usr/squid/share/errors/sr-latn/ERR_DNS_FAIL
@@ -1721,8 +1762,8 @@
 file path=usr/squid/share/errors/sr-latn/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/sr-latn/error-details.txt
+link path=usr/squid/share/errors/sr-rs target=sr-cyrl
 link path=usr/squid/share/errors/sr-sp target=sr-latn
-dir  path=usr/squid/share/errors/sv
 link path=usr/squid/share/errors/sv-fi target=sv
 link path=usr/squid/share/errors/sv-se target=sv
 file path=usr/squid/share/errors/sv/ERR_ACCESS_DENIED
@@ -1732,6 +1773,7 @@
 file path=usr/squid/share/errors/sv/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/sv/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/sv/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/sv/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/sv/ERR_DIR_LISTING
 file path=usr/squid/share/errors/sv/ERR_DNS_FAIL
@@ -1766,7 +1808,6 @@
 file path=usr/squid/share/errors/sv/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/sv/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/sv/error-details.txt
-dir  path=usr/squid/share/errors/templates
 file path=usr/squid/share/errors/templates/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/templates/ERR_AGENT_CONFIGURE
@@ -1774,6 +1815,7 @@
 file path=usr/squid/share/errors/templates/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/templates/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/templates/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/templates/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/templates/ERR_DIR_LISTING
 file path=usr/squid/share/errors/templates/ERR_DNS_FAIL
@@ -1808,7 +1850,6 @@
 file path=usr/squid/share/errors/templates/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/templates/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/templates/error-details.txt
-dir  path=usr/squid/share/errors/th
 link path=usr/squid/share/errors/th-th target=th
 file path=usr/squid/share/errors/th/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1817,6 +1858,7 @@
 file path=usr/squid/share/errors/th/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/th/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/th/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/th/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/th/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/th/ERR_DIR_LISTING
 file path=usr/squid/share/errors/th/ERR_DNS_FAIL
@@ -1851,7 +1893,6 @@
 file path=usr/squid/share/errors/th/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/th/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/th/error-details.txt
-dir  path=usr/squid/share/errors/tr
 link path=usr/squid/share/errors/tr-tr target=tr
 file path=usr/squid/share/errors/tr/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1860,6 +1901,7 @@
 file path=usr/squid/share/errors/tr/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/tr/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/tr/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/tr/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/tr/ERR_DIR_LISTING
 file path=usr/squid/share/errors/tr/ERR_DNS_FAIL
@@ -1894,7 +1936,6 @@
 file path=usr/squid/share/errors/tr/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/tr/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/tr/error-details.txt
-dir  path=usr/squid/share/errors/uk
 link path=usr/squid/share/errors/uk-ua target=uk
 file path=usr/squid/share/errors/uk/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1903,6 +1944,7 @@
 file path=usr/squid/share/errors/uk/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/uk/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/uk/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/uk/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/uk/ERR_DIR_LISTING
 file path=usr/squid/share/errors/uk/ERR_DNS_FAIL
@@ -1937,7 +1979,6 @@
 file path=usr/squid/share/errors/uk/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/uk/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/uk/error-details.txt
-dir  path=usr/squid/share/errors/uz
 file path=usr/squid/share/errors/uz/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED
 file path=usr/squid/share/errors/uz/ERR_AGENT_CONFIGURE
@@ -1945,6 +1986,7 @@
 file path=usr/squid/share/errors/uz/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/uz/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/uz/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/uz/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/uz/ERR_DIR_LISTING
 file path=usr/squid/share/errors/uz/ERR_DNS_FAIL
@@ -1979,7 +2021,6 @@
 file path=usr/squid/share/errors/uz/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/uz/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/uz/error-details.txt
-dir  path=usr/squid/share/errors/vi
 link path=usr/squid/share/errors/vi-vn target=vi
 file path=usr/squid/share/errors/vi/ERR_ACCESS_DENIED
 file path=usr/squid/share/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1988,6 +2029,7 @@
 file path=usr/squid/share/errors/vi/ERR_CACHE_ACCESS_DENIED
 file path=usr/squid/share/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED
 file path=usr/squid/share/errors/vi/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/vi/ERR_CONFLICT_HOST
 file path=usr/squid/share/errors/vi/ERR_CONNECT_FAIL
 file path=usr/squid/share/errors/vi/ERR_DIR_LISTING
 file path=usr/squid/share/errors/vi/ERR_DNS_FAIL
@@ -2022,121 +2064,151 @@
 file path=usr/squid/share/errors/vi/ERR_WRITE_ERROR
 file path=usr/squid/share/errors/vi/ERR_ZERO_SIZE_OBJECT
 file path=usr/squid/share/errors/vi/error-details.txt
-dir  path=usr/squid/share/errors/zh-cn
-file path=usr/squid/share/errors/zh-cn/ERR_ACCESS_DENIED
-file path=usr/squid/share/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
-file path=usr/squid/share/errors/zh-cn/ERR_AGENT_CONFIGURE
-file path=usr/squid/share/errors/zh-cn/ERR_AGENT_WPAD
-file path=usr/squid/share/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
-file path=usr/squid/share/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
-file path=usr/squid/share/errors/zh-cn/ERR_CANNOT_FORWARD
-file path=usr/squid/share/errors/zh-cn/ERR_CONNECT_FAIL
-file path=usr/squid/share/errors/zh-cn/ERR_DIR_LISTING
-file path=usr/squid/share/errors/zh-cn/ERR_DNS_FAIL
-file path=usr/squid/share/errors/zh-cn/ERR_ESI
-file path=usr/squid/share/errors/zh-cn/ERR_FORWARDING_DENIED
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_DISABLED
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_FAILURE
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_FORBIDDEN
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_NOT_FOUND
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_PUT_CREATED
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_PUT_ERROR
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_PUT_MODIFIED
-file path=usr/squid/share/errors/zh-cn/ERR_FTP_UNAVAILABLE
-file path=usr/squid/share/errors/zh-cn/ERR_GATEWAY_FAILURE
-file path=usr/squid/share/errors/zh-cn/ERR_ICAP_FAILURE
-file path=usr/squid/share/errors/zh-cn/ERR_INVALID_REQ
-file path=usr/squid/share/errors/zh-cn/ERR_INVALID_RESP
-file path=usr/squid/share/errors/zh-cn/ERR_INVALID_URL
-file path=usr/squid/share/errors/zh-cn/ERR_LIFETIME_EXP
-file path=usr/squid/share/errors/zh-cn/ERR_NO_RELAY
-file path=usr/squid/share/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS
-file path=usr/squid/share/errors/zh-cn/ERR_PRECONDITION_FAILED
-file path=usr/squid/share/errors/zh-cn/ERR_READ_ERROR
-file path=usr/squid/share/errors/zh-cn/ERR_READ_TIMEOUT
-file path=usr/squid/share/errors/zh-cn/ERR_SECURE_CONNECT_FAIL
-file path=usr/squid/share/errors/zh-cn/ERR_SHUTTING_DOWN
-file path=usr/squid/share/errors/zh-cn/ERR_SOCKET_FAILURE
-file path=usr/squid/share/errors/zh-cn/ERR_TOO_BIG
-file path=usr/squid/share/errors/zh-cn/ERR_UNSUP_HTTPVERSION
-file path=usr/squid/share/errors/zh-cn/ERR_UNSUP_REQ
-file path=usr/squid/share/errors/zh-cn/ERR_URN_RESOLVE
-file path=usr/squid/share/errors/zh-cn/ERR_WRITE_ERROR
-file path=usr/squid/share/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
-file path=usr/squid/share/errors/zh-cn/error-details.txt
-link path=usr/squid/share/errors/zh-hk target=zh-tw
-link path=usr/squid/share/errors/zh-mo target=zh-tw
-link path=usr/squid/share/errors/zh-sg target=zh-cn
-dir  path=usr/squid/share/errors/zh-tw
-file path=usr/squid/share/errors/zh-tw/ERR_ACCESS_DENIED
-file path=usr/squid/share/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
-file path=usr/squid/share/errors/zh-tw/ERR_AGENT_CONFIGURE
-file path=usr/squid/share/errors/zh-tw/ERR_AGENT_WPAD
-file path=usr/squid/share/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
-file path=usr/squid/share/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
-file path=usr/squid/share/errors/zh-tw/ERR_CANNOT_FORWARD
-file path=usr/squid/share/errors/zh-tw/ERR_CONNECT_FAIL
-file path=usr/squid/share/errors/zh-tw/ERR_DIR_LISTING
-file path=usr/squid/share/errors/zh-tw/ERR_DNS_FAIL
-file path=usr/squid/share/errors/zh-tw/ERR_ESI
-file path=usr/squid/share/errors/zh-tw/ERR_FORWARDING_DENIED
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_DISABLED
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_FAILURE
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_FORBIDDEN
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_NOT_FOUND
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_PUT_CREATED
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_PUT_ERROR
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_PUT_MODIFIED
-file path=usr/squid/share/errors/zh-tw/ERR_FTP_UNAVAILABLE
-file path=usr/squid/share/errors/zh-tw/ERR_GATEWAY_FAILURE
-file path=usr/squid/share/errors/zh-tw/ERR_ICAP_FAILURE
-file path=usr/squid/share/errors/zh-tw/ERR_INVALID_REQ
-file path=usr/squid/share/errors/zh-tw/ERR_INVALID_RESP
-file path=usr/squid/share/errors/zh-tw/ERR_INVALID_URL
-file path=usr/squid/share/errors/zh-tw/ERR_LIFETIME_EXP
-file path=usr/squid/share/errors/zh-tw/ERR_NO_RELAY
-file path=usr/squid/share/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS
-file path=usr/squid/share/errors/zh-tw/ERR_PRECONDITION_FAILED
-file path=usr/squid/share/errors/zh-tw/ERR_READ_ERROR
-file path=usr/squid/share/errors/zh-tw/ERR_READ_TIMEOUT
-file path=usr/squid/share/errors/zh-tw/ERR_SECURE_CONNECT_FAIL
-file path=usr/squid/share/errors/zh-tw/ERR_SHUTTING_DOWN
-file path=usr/squid/share/errors/zh-tw/ERR_SOCKET_FAILURE
-file path=usr/squid/share/errors/zh-tw/ERR_TOO_BIG
-file path=usr/squid/share/errors/zh-tw/ERR_UNSUP_HTTPVERSION
-file path=usr/squid/share/errors/zh-tw/ERR_UNSUP_REQ
-file path=usr/squid/share/errors/zh-tw/ERR_URN_RESOLVE
-file path=usr/squid/share/errors/zh-tw/ERR_WRITE_ERROR
-file path=usr/squid/share/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
-file path=usr/squid/share/errors/zh-tw/error-details.txt
-dir  path=usr/squid/share/icons
-file path=usr/squid/share/icons/anthony-binhex.gif
-file path=usr/squid/share/icons/anthony-bomb.gif
-file path=usr/squid/share/icons/anthony-box.gif
-file path=usr/squid/share/icons/anthony-box2.gif
-file path=usr/squid/share/icons/anthony-c.gif
-file path=usr/squid/share/icons/anthony-compressed.gif
-file path=usr/squid/share/icons/anthony-dir.gif
-file path=usr/squid/share/icons/anthony-dirup.gif
-file path=usr/squid/share/icons/anthony-dvi.gif
-file path=usr/squid/share/icons/anthony-f.gif
-file path=usr/squid/share/icons/anthony-image.gif
-file path=usr/squid/share/icons/anthony-image2.gif
-file path=usr/squid/share/icons/anthony-layout.gif
-file path=usr/squid/share/icons/anthony-link.gif
-file path=usr/squid/share/icons/anthony-movie.gif
-file path=usr/squid/share/icons/anthony-pdf.gif
-file path=usr/squid/share/icons/anthony-portal.gif
-file path=usr/squid/share/icons/anthony-ps.gif
-file path=usr/squid/share/icons/anthony-quill.gif
-file path=usr/squid/share/icons/anthony-script.gif
-file path=usr/squid/share/icons/anthony-sound.gif
-file path=usr/squid/share/icons/anthony-tar.gif
-file path=usr/squid/share/icons/anthony-tex.gif
-file path=usr/squid/share/icons/anthony-text.gif
-file path=usr/squid/share/icons/anthony-unknown.gif
-file path=usr/squid/share/icons/anthony-xbm.gif
-file path=usr/squid/share/icons/anthony-xpm.gif
+link path=usr/squid/share/errors/zh-cn target=zh-hans
+link path=usr/squid/share/errors/zh-hans-cn target=zh-hans
+link path=usr/squid/share/errors/zh-hans-sg target=zh-hans
+file path=usr/squid/share/errors/zh-hans/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-hans/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/zh-hans/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/zh-hans/ERR_AGENT_WPAD
+file path=usr/squid/share/errors/zh-hans/ERR_CACHE_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-hans/ERR_CACHE_MGR_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-hans/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/zh-hans/ERR_CONFLICT_HOST
+file path=usr/squid/share/errors/zh-hans/ERR_CONNECT_FAIL
+file path=usr/squid/share/errors/zh-hans/ERR_DIR_LISTING
+file path=usr/squid/share/errors/zh-hans/ERR_DNS_FAIL
+file path=usr/squid/share/errors/zh-hans/ERR_ESI
+file path=usr/squid/share/errors/zh-hans/ERR_FORWARDING_DENIED
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_DISABLED
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_FAILURE
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_FORBIDDEN
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_NOT_FOUND
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_PUT_CREATED
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_PUT_ERROR
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_PUT_MODIFIED
+file path=usr/squid/share/errors/zh-hans/ERR_FTP_UNAVAILABLE
+file path=usr/squid/share/errors/zh-hans/ERR_GATEWAY_FAILURE
+file path=usr/squid/share/errors/zh-hans/ERR_ICAP_FAILURE
+file path=usr/squid/share/errors/zh-hans/ERR_INVALID_REQ
+file path=usr/squid/share/errors/zh-hans/ERR_INVALID_RESP
+file path=usr/squid/share/errors/zh-hans/ERR_INVALID_URL
+file path=usr/squid/share/errors/zh-hans/ERR_LIFETIME_EXP
+file path=usr/squid/share/errors/zh-hans/ERR_NO_RELAY
+file path=usr/squid/share/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS
+file path=usr/squid/share/errors/zh-hans/ERR_PRECONDITION_FAILED
+file path=usr/squid/share/errors/zh-hans/ERR_READ_ERROR
+file path=usr/squid/share/errors/zh-hans/ERR_READ_TIMEOUT
+file path=usr/squid/share/errors/zh-hans/ERR_SECURE_CONNECT_FAIL
+file path=usr/squid/share/errors/zh-hans/ERR_SHUTTING_DOWN
+file path=usr/squid/share/errors/zh-hans/ERR_SOCKET_FAILURE
+file path=usr/squid/share/errors/zh-hans/ERR_TOO_BIG
+file path=usr/squid/share/errors/zh-hans/ERR_UNSUP_HTTPVERSION
+file path=usr/squid/share/errors/zh-hans/ERR_UNSUP_REQ
+file path=usr/squid/share/errors/zh-hans/ERR_URN_RESOLVE
+file path=usr/squid/share/errors/zh-hans/ERR_WRITE_ERROR
+file path=usr/squid/share/errors/zh-hans/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/zh-hans/error-details.txt
+link path=usr/squid/share/errors/zh-hant-hk target=zh-hant
+link path=usr/squid/share/errors/zh-hant-mo target=zh-hant
+link path=usr/squid/share/errors/zh-hant-tw target=zh-hant
+file path=usr/squid/share/errors/zh-hant/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-hant/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/zh-hant/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/zh-hant/ERR_AGENT_WPAD
+file path=usr/squid/share/errors/zh-hant/ERR_CACHE_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-hant/ERR_CACHE_MGR_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-hant/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/zh-hant/ERR_CONFLICT_HOST
+file path=usr/squid/share/errors/zh-hant/ERR_CONNECT_FAIL
+file path=usr/squid/share/errors/zh-hant/ERR_DIR_LISTING
+file path=usr/squid/share/errors/zh-hant/ERR_DNS_FAIL
+file path=usr/squid/share/errors/zh-hant/ERR_ESI
+file path=usr/squid/share/errors/zh-hant/ERR_FORWARDING_DENIED
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_DISABLED
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_FAILURE
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_FORBIDDEN
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_NOT_FOUND
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_PUT_CREATED
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_PUT_ERROR
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_PUT_MODIFIED
+file path=usr/squid/share/errors/zh-hant/ERR_FTP_UNAVAILABLE
+file path=usr/squid/share/errors/zh-hant/ERR_GATEWAY_FAILURE
+file path=usr/squid/share/errors/zh-hant/ERR_ICAP_FAILURE
+file path=usr/squid/share/errors/zh-hant/ERR_INVALID_REQ
+file path=usr/squid/share/errors/zh-hant/ERR_INVALID_RESP
+file path=usr/squid/share/errors/zh-hant/ERR_INVALID_URL
+file path=usr/squid/share/errors/zh-hant/ERR_LIFETIME_EXP
+file path=usr/squid/share/errors/zh-hant/ERR_NO_RELAY
+file path=usr/squid/share/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS
+file path=usr/squid/share/errors/zh-hant/ERR_PRECONDITION_FAILED
+file path=usr/squid/share/errors/zh-hant/ERR_READ_ERROR
+file path=usr/squid/share/errors/zh-hant/ERR_READ_TIMEOUT
+file path=usr/squid/share/errors/zh-hant/ERR_SECURE_CONNECT_FAIL
+file path=usr/squid/share/errors/zh-hant/ERR_SHUTTING_DOWN
+file path=usr/squid/share/errors/zh-hant/ERR_SOCKET_FAILURE
+file path=usr/squid/share/errors/zh-hant/ERR_TOO_BIG
+file path=usr/squid/share/errors/zh-hant/ERR_UNSUP_HTTPVERSION
+file path=usr/squid/share/errors/zh-hant/ERR_UNSUP_REQ
+file path=usr/squid/share/errors/zh-hant/ERR_URN_RESOLVE
+file path=usr/squid/share/errors/zh-hant/ERR_WRITE_ERROR
+file path=usr/squid/share/errors/zh-hant/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/zh-hant/error-details.txt
+link path=usr/squid/share/errors/zh-hk target=zh-hant
+link path=usr/squid/share/errors/zh-mo target=zh-hant
+link path=usr/squid/share/errors/zh-sg target=zh-hans
+link path=usr/squid/share/errors/zh-tw target=zh-hant
+file path=usr/squid/share/icons/SN.png
+file path=usr/squid/share/icons/silk/application.png
+file path=usr/squid/share/icons/silk/arrow_up.png
+file path=usr/squid/share/icons/silk/bomb.png
+file path=usr/squid/share/icons/silk/box.png
+file path=usr/squid/share/icons/silk/bricks.png
+file path=usr/squid/share/icons/silk/bullet_red.png
+file path=usr/squid/share/icons/silk/cd.png
+file path=usr/squid/share/icons/silk/chart_line.png
+file path=usr/squid/share/icons/silk/compress.png
+file path=usr/squid/share/icons/silk/computer_link.png
+file path=usr/squid/share/icons/silk/css.png
+file path=usr/squid/share/icons/silk/cup.png
+file path=usr/squid/share/icons/silk/database.png
+file path=usr/squid/share/icons/silk/database_table.png
+file path=usr/squid/share/icons/silk/drive_disk.png
+file path=usr/squid/share/icons/silk/film.png
+file path=usr/squid/share/icons/silk/film_key.png
+file path=usr/squid/share/icons/silk/folder.png
+file path=usr/squid/share/icons/silk/folder_table.png
+file path=usr/squid/share/icons/silk/image.png
+file path=usr/squid/share/icons/silk/information.png
+file path=usr/squid/share/icons/silk/layers.png
+file path=usr/squid/share/icons/silk/layout.png
+file path=usr/squid/share/icons/silk/link.png
+file path=usr/squid/share/icons/silk/music.png
+file path=usr/squid/share/icons/silk/package.png
+file path=usr/squid/share/icons/silk/package_go.png
+file path=usr/squid/share/icons/silk/page_code.png
+file path=usr/squid/share/icons/silk/page_excel.png
+file path=usr/squid/share/icons/silk/page_green.png
+file path=usr/squid/share/icons/silk/page_white.png
+file path=usr/squid/share/icons/silk/page_white_acrobat.png
+file path=usr/squid/share/icons/silk/page_white_c.png
+file path=usr/squid/share/icons/silk/page_white_cplusplus.png
+file path=usr/squid/share/icons/silk/page_white_flash.png
+file path=usr/squid/share/icons/silk/page_white_magnify.png
+file path=usr/squid/share/icons/silk/page_white_picture.png
+file path=usr/squid/share/icons/silk/page_white_powerpoint.png
+file path=usr/squid/share/icons/silk/page_white_stack.png
+file path=usr/squid/share/icons/silk/page_white_text.png
+file path=usr/squid/share/icons/silk/page_white_word.png
+file path=usr/squid/share/icons/silk/page_white_zip.png
+file path=usr/squid/share/icons/silk/page_world.png
+file path=usr/squid/share/icons/silk/photo.png
+file path=usr/squid/share/icons/silk/picture.png
+file path=usr/squid/share/icons/silk/plugin.png
+file path=usr/squid/share/icons/silk/plugin_add.png
+file path=usr/squid/share/icons/silk/script.png
+file path=usr/squid/share/icons/silk/script_gear.png
+file path=usr/squid/share/icons/silk/script_palette.png
 file path=usr/squid/share/mib.txt
 dir  path=var/squid/cache owner=webservd group=webservd mode=0755
 dir  path=var/squid/logs owner=webservd group=webservd mode=0755
upstream/oracle/userland-gate