Changes to give squid up to 8192 descriptors, default 1024

6 files changed, 24 insertions, 30 deletions

diff --git a/www-proxy/squid/ChangeLog b/www-proxy/squid/ChangeLog
index 0c8ef37cb659..59ec0a8a1c96 100644
--- a/www-proxy/squid/ChangeLog
+++ b/www-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-proxy/squid
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.21 2004/12/29 01:54:29 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.22 2004/12/29 15:18:49 cyfred Exp $
+
+  30 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  files/squid-2.5.7-gentoo.diff, files/squid.confd, files/squid.rc6,
+  squid-2.5.7.ebuild:
+  Changes to give squid a max of 8192 descriptors (default 1024).
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/www-proxy/squid/Manifest b/www-proxy/squid/Manifest
index e9e9f3b393b9..59f721c0bc36 100644
--- a/www-proxy/squid/Manifest
+++ b/www-proxy/squid/Manifest
@@ -1,19 +1,19 @@
 MD5 6802044bc30b84224b81aac7ab4029e1 ChangeLog 11787
-MD5 b245a877cfb8c37e0c387241821f7317 squid-2.5.7.ebuild 5814
-MD5 81a38c1c8b9bde45861c616a3d06621a squid-2.5.5-r3.ebuild 5383
+MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
 MD5 e4a8135ed447b72a7271fade6c06e9cc squid-2.4.7.ebuild 4000
+MD5 81a38c1c8b9bde45861c616a3d06621a squid-2.5.5-r3.ebuild 5383
 MD5 96e1e858c2ff6b3549c5c6c8077939e3 squid-2.5.6-r3.ebuild 5805
-MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
-MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
-MD5 c9e417545195eaf76d98acafbb70132a files/digest-squid-2.5.7 155
+MD5 f4884ec37deeb7db84244e4b61caae4f squid-2.5.7.ebuild 5814
+MD5 45bf3c4b37515fe4da4ed6d39904132d files/digest-squid-2.5.5-r3 147
 MD5 c3cb57db464a884a63d0c53ceb38331b files/digest-squid-2.5.6-r3 156
+MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
-MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
-MD5 4995c4c8c3365f121620ea78d6ca8794 files/digest-squid-2.4.7 222
-MD5 45bf3c4b37515fe4da4ed6d39904132d files/digest-squid-2.5.5-r3 147
+MD5 77aec5b95dd4600de8621d925d2997e4 files/squid-2.5.7-gentoo.diff 16834
 MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133
+MD5 152f2a0cd6f78077ee6615a848282a9a files/squid.confd 437
 MD5 bea1d2ef8cb2f1590f89bf37f28b9268 files/squid.pam 505
-MD5 6e5b0d474a4c7d4969bd706b2261a09a files/squid-2.5.7-gentoo.diff 17136
-MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
-MD5 1b391c390c547ef3a249aee590e654d8 files/squid.rc6 1980
-MD5 6e37fe3047234060fc63d5c16a4b7853 files/squid.confd 437
+MD5 94cc3090f104c5823f7c709267eefa9f files/squid.rc6 1980
+MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
+MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
+MD5 4995c4c8c3365f121620ea78d6ca8794 files/digest-squid-2.4.7 222
+MD5 c9e417545195eaf76d98acafbb70132a files/digest-squid-2.5.7 155
diff --git a/www-proxy/squid/files/squid-2.5.7-gentoo.diff b/www-proxy/squid/files/squid-2.5.7-gentoo.diff
index 5c543c858d63..3906a8aec9c5 100644
--- a/www-proxy/squid/files/squid-2.5.7-gentoo.diff
+++ b/www-proxy/squid/files/squid-2.5.7-gentoo.diff
@@ -447,14 +447,3 @@ diff -uNr squid-2.5.STABLE7.orig/src/url.c squid-2.5.STABLE7/src/url.c
   * class is disabled - it's more efficient to just do it than to do all
   * the checks.
   */
---- squid-2.5.STABLE7/configure.in.old	2004-12-04 12:55:24.366583200 +1100
-+++ squid-2.5.STABLE7/configure.in	2004-12-04 12:56:32.863170136 +1100
-@@ -2027,7 +2027,7 @@
- 	exit(0);
- }
- ],
--SQUID_MAXFD=`cat conftestval`,
-+SQUID_MAXFD=8192,
- SQUID_MAXFD=256,
- SQUID_MAXFD=256)
- AC_MSG_RESULT($SQUID_MAXFD)
diff --git a/www-proxy/squid/files/squid.confd b/www-proxy/squid/files/squid.confd
index 0fc36106dfdb..f92f5aa89cf0 100644
--- a/www-proxy/squid/files/squid.confd
+++ b/www-proxy/squid/files/squid.confd
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/files/squid.confd,v 1.1 2004/08/15 19:01:22 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/files/squid.confd,v 1.2 2004/12/29 15:18:49 cyfred Exp $
 
 # Config file for /etc/init.d/squid
 
 SQUID_OPTS="-DYC"
 
 # Max. number of filedescriptors to use. You can increase this on a busy
-# cache to a maximum of (currently) 4096 filedescriptors. Default is 1024.
+# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024.
 SQUID_MAXFD=1024
diff --git a/www-proxy/squid/files/squid.rc6 b/www-proxy/squid/files/squid.rc6
index 8f2f957b136c..faf7fe02f777 100644
--- a/www-proxy/squid/files/squid.rc6
+++ b/www-proxy/squid/files/squid.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/files/squid.rc6,v 1.1 2004/08/15 19:01:22 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/files/squid.rc6,v 1.2 2004/12/29 15:18:49 cyfred Exp $
 
 opts="${opts} reload"
 
@@ -13,7 +13,7 @@ depend() {
 maxfds() {
 	[ -n "$SQUID_MAXFD" ] || return
 	[ -f /proc/sys/fs/file-max ] || return 0
-	[ $SQUID_MAXFD -le 4096 ] || SQUID_MAXFD=4096
+	[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
 	global_file_max=`cat /proc/sys/fs/file-max`
 	minimal_file_max=$(($SQUID_MAXFD + 4096))
 	if [ "$global_file_max" -lt $minimal_file_max ]
diff --git a/www-proxy/squid/squid-2.5.7.ebuild b/www-proxy/squid/squid-2.5.7.ebuild
index 45549771fd69..5d985d41ffb7 100644
--- a/www-proxy/squid/squid-2.5.7.ebuild
+++ b/www-proxy/squid/squid-2.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.7.ebuild,v 1.6 2004/12/11 23:50:11 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.7.ebuild,v 1.7 2004/12/29 15:18:49 cyfred Exp $
 
 inherit eutils
 
@@ -126,7 +126,7 @@ src_compile() {
 		#--enable-icmp
 
 	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
+	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
 		include/autoconf.h.orig > include/autoconf.h
 
 #	if [ "${ARCH}" = "hppa" ]