Remove /etc/squid/errors symlink (#151304).

(Portage version: 2.1.1)
 (Signed Manifest commit)

3 files changed, 15 insertions, 217 deletions

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 8c61ccf89363..641bd70708fb 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -35,7 +35,7 @@ DIST squid-2.5.STABLE14.tar.gz 1399962 RMD160 abe464ab115b3f9541d3890fd413044f52
 DIST squid-2.6.STABLE3-patches-20060819.tar.gz 4832 RMD160 0bab6b6b9d0df4da9e30a1c2e7e0d9fdd63c8057 SHA1 404362d88d2e949827ed14f8941387859d9203dd SHA256 b096aada8aa92502a05ef96b572f00f6f5127907ba5cfe39d5441a396781cde3
 DIST squid-2.6.STABLE3-patches-20061007.tar.gz 7371 RMD160 f50c838e64501aeff6409840a998a6483791cf42 SHA1 de76db7f5d93b9783a879b7039788cbce58e2c44 SHA256 c156f49d3b6b5c4cb263b20308c3fa219780d01b29a4c5f8ef3bfaa611238830
 DIST squid-2.6.STABLE3.tar.gz 1599876 RMD160 7b13a91f0809b94c1dacc11a9fe9366fd4362395 SHA1 59e52b0be9697108b3a581270cf0695119ffa7df SHA256 293c9b8ea4c5fa19e8df92d86e9554081b66454bd97b0acdf0bbb289845614a6
-DIST squid-2.6.STABLE4-patches-20061007.tar.gz 7329 RMD160 a68e568e0f9c58fc3f8819de3a9bfad24873cd1d SHA1 b2ca6d49e43748c913f6bedc7da9d4de61c9b4f2 SHA256 de8bb7a9e1373dd8ddae680c409de92718845c7009aa9be68c9fca19ec4e51d0
+DIST squid-2.6.STABLE4-patches-20061016.tar.gz 7261 RMD160 99571e719c8cffa77552967fdb788aa712a6d59f SHA1 95549601405147d4a64905b17f63741c908df314 SHA256 9493ed808920b89d527c26309a0b94a17ea35ac0da2acf65cc91547cf9a151c6
 DIST squid-2.6.STABLE4.tar.gz 1627562 RMD160 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89 SHA1 82dea18e047c8f1192dde55e51b4537863f44a2c SHA256 ab346a474c73a308a9589be49bae4139c8b158247cefe3ffd27d2301ba86c5d0
 EBUILD squid-2.5.12-r1.ebuild 6753 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 SHA1 6341414a00f644e58786363965ae3363e2747e3c SHA256 03577f1a7be0549a49d1e6e490f5bc4c254a10bf6d9c9e80394477ca76bf0249
 MD5 d016ce3a38feda11279d8b2c1f6dba25 squid-2.5.12-r1.ebuild 6753
@@ -57,14 +57,14 @@ EBUILD squid-2.6.3.ebuild 6315 RMD160 732df4d73f0e4c065915866164906c92f264f6ea S
 MD5 cb335bf8d7bf5b7d84a72230fae8b9a2 squid-2.6.3.ebuild 6315
 RMD160 732df4d73f0e4c065915866164906c92f264f6ea squid-2.6.3.ebuild 6315
 SHA256 055275722f83580fc87141f430a58fc01f899747fba4e8a2be671797134de25b squid-2.6.3.ebuild 6315
-EBUILD squid-2.6.4-r1.ebuild 6407 RMD160 0fc62a0c899be97ad71704bfc191cb578a428dbb SHA1 5f8d179d61fe8b6355e39ea057a0c2d5aa70421c SHA256 b35f2d1e5db63cf18ab6eb50fe64ae459a4b732298d2f4b350eb093be04ba4d1
-MD5 e559be786c9691a2bd9f4afedf7a4810 squid-2.6.4-r1.ebuild 6407
-RMD160 0fc62a0c899be97ad71704bfc191cb578a428dbb squid-2.6.4-r1.ebuild 6407
-SHA256 b35f2d1e5db63cf18ab6eb50fe64ae459a4b732298d2f4b350eb093be04ba4d1 squid-2.6.4-r1.ebuild 6407
-MISC ChangeLog 29319 RMD160 368c63d8b29c37170f468788597207d69928cbb6 SHA1 179a5bc9dc23b6955c5c3cdaba4e7e7c79028009 SHA256 52089e991af36ab6ed969625c6e6289a518682f0c8dd3477869216c0e8db3c97
-MD5 ca4aa8fa9637286ad68580cd38061b87 ChangeLog 29319
-RMD160 368c63d8b29c37170f468788597207d69928cbb6 ChangeLog 29319
-SHA256 52089e991af36ab6ed969625c6e6289a518682f0c8dd3477869216c0e8db3c97 ChangeLog 29319
+EBUILD squid-2.6.4-r2.ebuild 6621 RMD160 f5aee531c86822de9b3408fcd663777b69a7b6cc SHA1 d9857abfd86712f955e6d6279ff9a55b55bf9f93 SHA256 0bd341d62038ffb597a782546cf7745eb187819d9d5c5f1a46f88f8e4fc4e50f
+MD5 2e9b90f249d8e2c0e8488173744d60ee squid-2.6.4-r2.ebuild 6621
+RMD160 f5aee531c86822de9b3408fcd663777b69a7b6cc squid-2.6.4-r2.ebuild 6621
+SHA256 0bd341d62038ffb597a782546cf7745eb187819d9d5c5f1a46f88f8e4fc4e50f squid-2.6.4-r2.ebuild 6621
+MISC ChangeLog 29494 RMD160 866c0d38e0e9d6aeaf4f1e0fee11c8d698fb74cd SHA1 06ee45c2fc9e6424bdba9ca89728920790519035 SHA256 9ef66f86c08a8837266e4dbf72039fde3f64c3b7296e242d606e685c346be237
+MD5 8116b44958d3b3e540715c713a6731a0 ChangeLog 29494
+RMD160 866c0d38e0e9d6aeaf4f1e0fee11c8d698fb74cd ChangeLog 29494
+SHA256 9ef66f86c08a8837266e4dbf72039fde3f64c3b7296e242d606e685c346be237 ChangeLog 29494
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -84,13 +84,13 @@ SHA256 1727923e9880a2d267ed0cc7cbc782c1617aa8b5a9161ad7c6dc255870f1c916 files/di
 MD5 1bf029faae01373cee9f51fd7492fb18 files/digest-squid-2.6.3 852
 RMD160 b534859ed81bdaef649a93f4c9763c1ecb9c21f8 files/digest-squid-2.6.3 852
 SHA256 6de8efdb0f77fcd3fda484e7eff2934837b702d0e442358f4b212243a3f0e4c7 files/digest-squid-2.6.3 852
-MD5 7df5b1b37d4eebbb99ab8154f1cebb3f files/digest-squid-2.6.4-r1 554
-RMD160 a21d45278b3e4cba2294ad0f9a5825fa6354fd7c files/digest-squid-2.6.4-r1 554
-SHA256 b9a5699ad5dd25232a1c37a1a6a736322366f46a254aa87e6c5ac7056034bfc0 files/digest-squid-2.6.4-r1 554
+MD5 0cd0b76791bf2bdd9ac30fd20138393f files/digest-squid-2.6.4-r2 554
+RMD160 f249a74c2deb7fbf3138f8751562febad8016e95 files/digest-squid-2.6.4-r2 554
+SHA256 6194b86ac425ead2f71ea960ef4e4e4b060a69b7af7001166a3955eaebcc4bbe files/digest-squid-2.6.4-r2 554
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJzbQ3sf9c6kjmR8RAiFHAJ9IzI+cZEX8o5iWLP8IoYh2po5EDgCeKu0U
-ZOs1WnBL3oJ+Y75jouF8Xi4=
-=CB1B
+iD8DBQFFM9Qg3sf9c6kjmR8RAoL9AJ9si5T9RKn0WX5ac0yPx1Ga1BXOWACZAQh0
+ufLnqRFkW32HorI4E3+7daM=
+=35c8
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.4-r1 b/net-proxy/squid/files/digest-squid-2.6.4-r1
deleted file mode 100644
index d5ac4e69dc8f..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.4-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 25f67fa2a0e896f1042fa43e1ea0001a squid-2.6.STABLE4-patches-20061007.tar.gz 7329
-RMD160 a68e568e0f9c58fc3f8819de3a9bfad24873cd1d squid-2.6.STABLE4-patches-20061007.tar.gz 7329
-SHA256 de8bb7a9e1373dd8ddae680c409de92718845c7009aa9be68c9fca19ec4e51d0 squid-2.6.STABLE4-patches-20061007.tar.gz 7329
-MD5 b29affd7dd5b57ca4fdcfdb177c4e402 squid-2.6.STABLE4.tar.gz 1627562
-RMD160 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89 squid-2.6.STABLE4.tar.gz 1627562
-SHA256 ab346a474c73a308a9589be49bae4139c8b158247cefe3ffd27d2301ba86c5d0 squid-2.6.STABLE4.tar.gz 1627562
diff --git a/net-proxy/squid/squid-2.6.4-r1.ebuild b/net-proxy/squid/squid-2.6.4-r1.ebuild
deleted file mode 100644
index 982ce641e770..000000000000
--- a/net-proxy/squid/squid-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.4-r1.ebuild,v 1.1 2006/10/07 05:10:25 mrness Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
-
-#lame archive versioning scheme..
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PL="${S_PL/_rc/-RC}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-PATCH_VERSION="20061007"
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap sasl nis ssl snmp selinux logrotate zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux \
-	underscores customlog follow-xff" #Dead flags; should be removed when <squid-2.6.1 versions are removed
-
-RDEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.26 )
-	ssl? ( >=dev-libs/openssl-0.9.7j )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-
-	use underscores && ewarn "underscores USE flag has no effect (the option is available through allow_underscore configuration directive)."
-	use customlog && ewarn "customlog USE flag has no effect (the correspondent patch has been included in the main version)."
-	use follow-xff && ewarn "follow-xff USE flag has no effect (the correspondent patch has been included in the main version)."
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd "${S}" || die "dir ${S} not found"
-
-	# Do bulk patching from squids bug fix list as well as our patches
-	use zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
-	EPATCH_SUFFIX="patch"
-	epatch "${WORKDIR}/patch"
-
-	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \
-		helpers/basic_auth/*/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-
-	local ext_helpers="ip_user,session,unix_group,wbinfo_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-		myconf="${myconf} --disable-async-io"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-		myconf="${myconf} --enable-async-io"
-	fi
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-		if kernel_is ge 2 6 ; then
-			myconf="${myconf} --enable-epoll"
-		fi
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --enable-kqueue"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		--datadir=/usr/share/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="SMB,fakeauth" \
-		--enable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-follow-x-forwarded-for \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#need suid root for looking into /etc/shadow
-	fowners root:squid /usr/lib/squid/ncsa_auth
-	fowners root:squid /usr/lib/squid/pam_auth
-	fperms 4750 /usr/lib/squid/ncsa_auth
-	fperms 4750 /usr/lib/squid/pam_auth
-
-	#some clean ups
-	rm -f "${D}"/usr/bin/Run*
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/share/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_preinst() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root."
-	ewarn "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}