Bump.

5 files changed, 500 insertions, 3 deletions

diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog
index e5dc7a0ec47d..15cd232c634c 100644
--- a/net-www/squid/ChangeLog
+++ b/net-www/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/squid
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.16 2003/03/30 20:03:26 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.17 2003/06/04 18:59:35 woodchip Exp $
+
+*squid-2.5.3 (04 Jun 2003)
+
+  04 Jun 2003; <woodchip@gentoo.org> Manifest, squid-2.5.3.ebuild,
+  files/squid-2.5.3-gentoo.diff:
+  Version bump.  Re-diff patch.
 
 *squid-2.5.2 (27 Mar 2003)
 
diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest
index e4a215e1149d..2fe1ead43780 100644
--- a/net-www/squid/Manifest
+++ b/net-www/squid/Manifest
@@ -1,10 +1,10 @@
-MD5 7505fdfce767b6b08d34b71316f24302 ChangeLog 3251
+MD5 38f8960c9df066a28d1a975438ee0cb6 ChangeLog 3254
 MD5 f240c792a67d4e93a1bfb17f25d2e94e squid-2.4.7.ebuild 3493
 MD5 58c09e4ec1eee391fcd053f36eef9cc6 squid-2.5.1-r1.ebuild 4157
 MD5 ae5e19926f9dac8a34e0253ad44a55e6 squid-2.5.1-r2.ebuild 4645
 MD5 e20f21a8c737a144f17cead12ebf22ab squid-2.5.1.ebuild 3916
 MD5 5c1a2db0192935fb9320d9f8efea4416 squid-2.5.2.ebuild 4719
-MD5 5c1a2db0192935fb9320d9f8efea4416 squid-2.5.3.ebuild 4719
+MD5 c03e9accb1e133d4842dfe26e42a252b squid-2.5.3.ebuild 4719
 MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74
 MD5 1b3cc2650e3dd133917d8b34801df988 files/digest-squid-2.5.1 71
 MD5 1b3cc2650e3dd133917d8b34801df988 files/digest-squid-2.5.1-r1 71
diff --git a/net-www/squid/files/digest-squid-2.5.3 b/net-www/squid/files/digest-squid-2.5.3
new file mode 100644
index 000000000000..796e250584e8
--- /dev/null
+++ b/net-www/squid/files/digest-squid-2.5.3
@@ -0,0 +1 @@
+MD5 ed5eb7835d00fdecc7dd7c1837542df2 squid-2.5.STABLE3.tar.bz2 1028081
diff --git a/net-www/squid/files/squid-2.5.3-gentoo.diff b/net-www/squid/files/squid-2.5.3-gentoo.diff
new file mode 100644
index 000000000000..f4ab4c7dbc49
--- /dev/null
+++ b/net-www/squid/files/squid-2.5.3-gentoo.diff
@@ -0,0 +1,336 @@
+diff -uNr squid-2.5.STABLE3.orig/errors/Makefile.in squid-2.5.STABLE3/errors/Makefile.in
+--- squid-2.5.STABLE3.orig/errors/Makefile.in	2003-02-11 21:02:09.000000000 -0500
++++ squid-2.5.STABLE3/errors/Makefile.in	2003-06-03 01:23:51.000000000 -0400
+@@ -116,7 +116,7 @@
+ install_sh = @install_sh@
+ makesnmplib = @makesnmplib@
+ 
+-errordir = $(datadir)/errors
++errordir = $(libexecdir)/errors
+ 
+ DEFAULT_ERROR_DIR = $(errordir)
+ 
+diff -uNr squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE3/helpers/basic_auth/SMB/Makefile.in
+--- squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/Makefile.in	2003-02-11 21:02:25.000000000 -0500
++++ squid-2.5.STABLE3/helpers/basic_auth/SMB/Makefile.in	2003-06-03 01:23:51.000000000 -0400
+@@ -126,7 +126,7 @@
+ makesnmplib = @makesnmplib@
+ 
+ SMB_AUTH_HELPER = smb_auth.sh
+-SAMBAPREFIX = /usr/local/samba
++SAMBAPREFIX = /usr
+ SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
+ 
+ libexec_SCRIPTS = $(SMB_AUTH_HELPER)
+diff -uNr squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.5.STABLE3/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-2.5.STABLE3.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-07 18:36:46.000000000 -0500
++++ squid-2.5.STABLE3/helpers/basic_auth/SMB/smb_auth.sh	2003-06-03 01:23:51.000000000 -0400
+@@ -24,7 +24,7 @@
+ read AUTHSHARE
+ read AUTHFILE
+ read SMBUSER
+-read SMBPASS
++read -r SMBPASS
+ 
+ # Find domain controller
+ echo "Domain name: $DOMAINNAME"
+@@ -47,7 +47,7 @@
+   addropt=""
+ fi
+ echo "Query address options: $addropt"
+-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
++dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
+ echo "Domain controller IP address: $dcip"
+ [ -n "$dcip" ] || exit 1
+ 
+diff -uNr squid-2.5.STABLE3.orig/icons/Makefile.in squid-2.5.STABLE3/icons/Makefile.in
+--- squid-2.5.STABLE3.orig/icons/Makefile.in	2003-05-21 20:15:40.000000000 -0400
++++ squid-2.5.STABLE3/icons/Makefile.in	2003-06-03 01:23:51.000000000 -0400
+@@ -144,7 +144,7 @@
+ 		anthony-xpm.gif
+ 
+ 
+-icondir = $(datadir)/icons
++icondir = $(libexecdir)/icons
+ icon_DATA = $(ICON1) $(ICON2)
+ EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
+ DISTCLEANFILES = 
+diff -uNr squid-2.5.STABLE3.orig/src/Makefile.in squid-2.5.STABLE3/src/Makefile.in
+--- squid-2.5.STABLE3.orig/src/Makefile.in	2003-02-11 21:03:14.000000000 -0500
++++ squid-2.5.STABLE3/src/Makefile.in	2003-06-03 01:23:51.000000000 -0400
+@@ -374,18 +374,18 @@
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
+ DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
+ DEFAULT_DNSSERVER = $(libexecdir)/dnsserver$(EXEEXT)
+-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+-DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+-DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+-DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
+-DEFAULT_SWAP_DIR = $(localstatedir)/cache
++DEFAULT_LOG_PREFIX = $(localstatedir)/log
++DEFAULT_CACHE_LOG = $(localstatedir)/log/squid/cache.log
++DEFAULT_ACCESS_LOG = $(localstatedir)/log/squid/access.log
++DEFAULT_STORE_LOG = $(localstatedir)/log/squid/store.log
++DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
++DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
+ DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT)
+ DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT)
+ DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT)
+-DEFAULT_ICON_DIR = $(datadir)/icons
+-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
+-DEFAULT_MIB_PATH = $(datadir)/mib.txt
++DEFAULT_ICON_DIR = $(libexecdir)/icons
++DEFAULT_ERROR_DIR = $(sysconfdir)/errors
++DEFAULT_MIB_PATH = $(libexecdir)/mib.txt
+ 
+ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
+ 
+@@ -836,12 +836,12 @@
+ uninstall-info-am:
+ install-dataDATA: $(data_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(data_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ uninstall-dataDATA:
+diff -uNr squid-2.5.STABLE3.orig/src/cf.data.pre squid-2.5.STABLE3/src/cf.data.pre
+--- squid-2.5.STABLE3.orig/src/cf.data.pre	2003-05-21 10:34:38.000000000 -0400
++++ squid-2.5.STABLE3/src/cf.data.pre	2003-06-03 01:28:47.000000000 -0400
+@@ -156,12 +156,12 @@
+ NAME: htcp_port
+ IFDEF: USE_HTCP
+ TYPE: ushort
+-DEFAULT: 4827
++DEFAULT: 0
+ LOC: Config.Port.htcp
+ DOC_START
+ 	The port number where Squid sends and receives HTCP queries to
+-	and from neighbor caches.  Default is 4827.  To disable use
+-	"0".
++	and from neighbor caches.  To turn it on you want to set it to
++	4827.  By default it is set to "0" (disabled).
+ DOC_END
+ 
+ 
+@@ -2032,6 +2032,8 @@
+ acl Safe_ports port 488		# gss-http
+ acl Safe_ports port 591		# filemaker
+ acl Safe_ports port 777		# multiling http
++acl Safe_ports port 901		# SWAT
++acl purge method PURGE
+ acl CONNECT method CONNECT
+ NOCOMMENT_END
+ DOC_END
+@@ -2065,6 +2067,9 @@
+ # Only allow cachemgr access from localhost
+ http_access allow manager localhost
+ http_access deny manager
++# Only allow purge requests from localhost
++http_access allow purge localhost
++http_access deny purge
+ # Deny requests to unknown ports
+ http_access deny !Safe_ports
+ # Deny CONNECT to other than SSL ports
+@@ -2083,6 +2088,9 @@
+ #acl our_networks src 192.168.1.0/24 192.168.2.0/24
+ #http_access allow our_networks
+ 
++# Allow the localhost to have access by default
++http_access allow localhost
++
+ # And finally deny all other access to this proxy
+ http_access deny all
+ NOCOMMENT_END
+@@ -2299,7 +2307,7 @@
+ 
+ NAME: cache_mgr
+ TYPE: string
+-DEFAULT: webmaster
++DEFAULT: root
+ LOC: Config.adminEmail
+ DOC_START
+ 	Email-address of local cache manager who will receive
+@@ -2309,20 +2317,20 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: squid
+ LOC: Config.effectiveUser
+ DOC_NONE
+ 
+ NAME: cache_effective_group
+ TYPE: string
+-DEFAULT: none
++DEFAULT: squid
+ LOC: Config.effectiveGroup
+ DOC_START
+ 
+ 	If you start Squid as root, it will change its effective/real
+-	UID/GID to the UID/GID 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 the
++	UID/GID to the ones specified below.  The default is to
++	change to UID squid.  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).
+ 
+@@ -3085,7 +3093,11 @@
+ 	If you wish to create your own versions of the default
+ 	(English) error files, either to customize them to suit your
+ 	language or company copy the template English files to another
+-	directory and point this tag at them.
++	directory where the error files are read from.
++	/usr/lib/squid/errors contains sets of error files
++	in different languages. The default error directory
++	is /etc/squid/errors, which is a link to one of these
++	error sets.
+ DOC_END
+ 
+ NAME: minimum_retry_timeout
+@@ -3127,12 +3139,15 @@
+ NAME: snmp_port
+ TYPE: ushort
+ LOC: Config.Port.snmp
+-DEFAULT: 3401
++DEFAULT: 0
+ IFDEF: SQUID_SNMP
+ DOC_START
+ 	Squid can now serve statistics and status information via SNMP.
+ 	By default it listens to port 3401 on the machine. If you don't
+ 	wish to use SNMP, set this to "0".
++
++	Note: on Gentoo Linux, the default is zero - you need to
++	set it to 3401 to enable it.
+ DOC_END
+ 
+ NAME: snmp_access
+diff -uNr squid-2.5.STABLE3.orig/src/debug.c squid-2.5.STABLE3/src/debug.c
+--- squid-2.5.STABLE3.orig/src/debug.c	2001-12-17 13:01:54.000000000 -0500
++++ squid-2.5.STABLE3/src/debug.c	2003-06-03 01:23:51.000000000 -0400
+@@ -200,9 +200,9 @@
+     }
+     debugOpenLog(logfile);
+ 
+-#if HAVE_SYSLOG && defined(LOG_LOCAL4)
++#if HAVE_SYSLOG
+     if (opt_syslog_enable)
+-	openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++	openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+ #endif /* HAVE_SYSLOG */
+ 
+ }
+diff -uNr squid-2.5.STABLE3.orig/src/defines.h squid-2.5.STABLE3/src/defines.h
+--- squid-2.5.STABLE3.orig/src/defines.h	2002-08-08 16:17:39.000000000 -0400
++++ squid-2.5.STABLE3/src/defines.h	2003-06-03 01:23:51.000000000 -0400
+@@ -219,7 +219,7 @@
+ 
+ /* were to look for errors if config path fails */
+ #ifndef DEFAULT_SQUID_ERROR_DIR
+-#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
++#define DEFAULT_SQUID_ERROR_DIR "/usr/lib/squid/errors/English"
+ #endif
+ 
+ /* gb_type operations */
+diff -uNr squid-2.5.STABLE3.orig/src/main.c squid-2.5.STABLE3/src/main.c
+--- squid-2.5.STABLE3.orig/src/main.c	2003-05-05 20:24:14.000000000 -0400
++++ squid-2.5.STABLE3/src/main.c	2003-06-03 01:23:51.000000000 -0400
+@@ -326,6 +326,21 @@
+     asnFreeMemory();
+ }
+ 
++#if USE_UNLINKD
++static int
++needUnlinkd(void)
++{
++    int i;
++    int r = 0;
++    for (i = 0; i < Config.cacheSwap.n_configured; i++) {
++       if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 ||
++           strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0)
++          r++;
++    }
++    return r;
++}
++#endif
++
+ static void
+ mainReconfigure(void)
+ {
+@@ -351,6 +366,7 @@
+     redirectShutdown();
+     authenticateShutdown();
+     externalAclShutdown();
++    unlinkdClose();
+     storeDirCloseSwapLogs();
+     storeLogClose();
+     accessLogClose();
+@@ -381,6 +397,9 @@
+ #if USE_WCCP
+     wccpInit();
+ #endif
++#if USE_UNLINKD
++    if (needUnlinkd()) unlinkdInit();
++#endif
+     serverConnectionsOpen();
+     if (theOutIcpConnection >= 0) {
+ 	if (!Config2.Accel.on || Config.onoff.accel_with_proxy)
+@@ -524,7 +543,7 @@
+ 
+     if (!configured_once) {
+ #if USE_UNLINKD
+-	unlinkdInit();
++	if (needUnlinkd()) unlinkdInit();
+ #endif
+ 	urlInitialize();
+ 	cachemgrInit();
+@@ -858,7 +877,7 @@
+     int nullfd;
+     if (*(argv[0]) == '(')
+ 	return;
+-    openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++    openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+     if ((pid = fork()) < 0)
+ 	syslog(LOG_ALERT, "fork failed: %s", xstrerror());
+     else if (pid > 0)
+@@ -893,14 +912,14 @@
+ 	mainStartScript(argv[0]);
+ 	if ((pid = fork()) == 0) {
+ 	    /* child */
+-	    openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++	    openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+ 	    prog = xstrdup(argv[0]);
+ 	    argv[0] = xstrdup("(squid)");
+ 	    execvp(prog, argv);
+ 	    syslog(LOG_ALERT, "execvp failed: %s", xstrerror());
+ 	}
+ 	/* parent */
+-	openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++	openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+ 	syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
+ 	time(&start);
+ 	squid_signal(SIGINT, SIG_IGN, SA_RESTART);
+diff -uNr squid-2.5.STABLE3.orig/src/url.c squid-2.5.STABLE3/src/url.c
+--- squid-2.5.STABLE3.orig/src/url.c	2003-01-18 09:16:49.000000000 -0500
++++ squid-2.5.STABLE3/src/url.c	2003-06-03 01:23:51.000000000 -0400
+@@ -312,8 +312,8 @@
+ 	return NULL;
+     }
+ #endif
+-    if (Config.appendDomain && !strchr(host, '.'))
+-	strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN);
++    if (Config.appendDomain && !strchr(host, '.') && strcasecmp(host, "localhost") != 0)
++        strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN);
+     /* remove trailing dots from hostnames */
+     while ((l = strlen(host)) > 0 && host[--l] == '.')
+ 	host[l] = '\0';
diff --git a/net-www/squid/squid-2.5.3.ebuild b/net-www/squid/squid-2.5.3.ebuild
new file mode 100644
index 000000000000..0505cc3ba474
--- /dev/null
+++ b/net-www/squid/squid-2.5.3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.3.ebuild,v 1.1 2003/06/04 18:59:35 woodchip Exp $
+
+IUSE="pam ldap ssl sasl snmp"
+
+#lame archive versioning scheme..
+S_PV=${PV%.*}
+S_PL=${PV##*.}
+S_PP=${PN}-${S_PV}.STABLE${S_PL}
+
+DESCRIPTION="A caching web proxy, with advanced features"
+HOMEPAGE="http://www.squid-cache.org/"
+
+S=${WORKDIR}/${S_PP}
+SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
+
+RDEPEND="virtual/glibc
+	pam? ( >=sys-libs/pam-0.72 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )"
+DEPEND="${RDEPEND} dev-lang/perl"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	#do NOT just remove this patch.  yes, it's here for a reason.
+	#woodchip@gentoo.org (07 Nov 2002)
+	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
+
+	#hmm #10865
+	cd helpers/external_acl/ldap_group
+	cp Makefile.in Makefile.in.orig
+	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
+		Makefile.in.orig > Makefile.in
+
+	if [ -z "$DEBUGBUILD" ]
+	then
+		cd ${S}
+		mv configure.in configure.in.orig
+		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
+		autoconf || die
+	fi
+}
+
+src_compile() {
+	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	use ldap && basic_modules="LDAP,${basic_modules}"
+	use pam && basic_modules="PAM,${basic_modules}"
+	if [ `use sasl` ]; then
+		basic_modules="SASL,${basic_modules}"
+		#support for cyrus-sasl-1.x and 2.x; thanks Raker!
+		if [ -f /usr/include/sasl/sasl.h ]; then
+			cd ${S}/helpers/basic_auth/SASL/
+			cp sasl_auth.c sasl_auth.c.orig
+			sed \
+				-e "s:sasl.h:sasl/sasl.h:" \
+				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
+				-e "s:strlen(password), \&errstr:strlen(password):" \
+				< sasl_auth.c.orig > sasl_auth.c
+			cp Makefile.in Makefile.in.orig
+			sed -e "s:-lsasl:-lsasl2:" \
+				< Makefile.in.orig > Makefile.in
+			cd ${S}
+		fi
+	fi
+
+	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local myconf=""
+	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
+	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
+
+	./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 \
+		\
+		--enable-auth="basic,digest,ntlm" \
+		--enable-removal-policies="lru,heap" \
+		--enable-digest-auth-helpers="password" \
+		--enable-storeio="ufs,diskd,coss,aufs,null" \
+		--enable-basic-auth-helpers=${basic_modules} \
+		--enable-external-acl-helpers=${ext_helpers} \
+		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
+		--enable-linux-netfilter \
+		--disable-ident-lookups \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-async-io \
+		--enable-truncate \
+		--enable-arp-acl \
+		--with-pthreads \
+		--enable-htcp \
+		--enable-carp \
+		--enable-poll \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+		#--enable-icmp
+
+	mv include/autoconf.h include/autoconf.h.orig
+	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
+		include/autoconf.h.orig > include/autoconf.h
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	#--enable-icmp
+	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
+	#chown root.squid ${D}/usr/lib/squid/pinger
+	#chmod 4750 ${D}/usr/lib/squid/pinger
+
+	#some clean ups
+	rm -rf ${D}/var
+	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
+
+	#simply switch this symlink to choose the desired language..
+	dosym /usr/lib/squid/errors/English /etc/squid/errors
+
+	dodoc CONTRIBUTORS COPYING COPYRIGHT 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*
+
+	insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid
+	exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid
+	insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid
+	exeinto /etc/cron.weekly ; doexe ${FILESDIR}/squid.cron
+}
+
+pkg_postinst() {
+	# empty dirs..
+	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
+	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
+}