Version bump (#244958).

(Portage version: 2.1.4.4)

5 files changed, 134 insertions, 127 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 53d014e679d7..cd06ce46f70c 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.210 2008/10/27 05:13:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.211 2008/11/02 10:10:10 mrness Exp $
+
+*squid-3.0.10 (02 Nov 2008)
+
+  02 Nov 2008; Alin Năstac <mrness@gentoo.org>
+  -files/squid-3.0.8-adapted-zph.patch, -files/squid-3.0.8-gentoo.patch,
+  +files/squid-3.0.10-gentoo.patch, +files/squid-3.0.10-heimdal.patch,
+  +files/squid-3.0.10-zph.patch, -squid-3.0.8.ebuild, +squid-3.0.10.ebuild:
+  Version bump (#244958).
 
   27 Oct 2008; Jeroen Roovers <jer@gentoo.org> squid-2.7.4-r2.ebuild:
   Stable for HPPA (bug #242386).
diff --git a/net-proxy/squid/files/squid-3.0.8-gentoo.patch b/net-proxy/squid/files/squid-3.0.10-gentoo.patch
index 950ced858709..b6b12ec92418 100644
--- a/net-proxy/squid/files/squid-3.0.8-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.10-gentoo.patch
@@ -1,6 +1,6 @@
-diff -ur squid-3.0.STABLE8.orig/configure.in squid-3.0.STABLE8/configure.in
---- squid-3.0.STABLE8.orig/configure.in	2008-07-18 10:02:55.000000000 +0000
-+++ squid-3.0.STABLE8/configure.in	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/configure.in squid-3.0.STABLE10/configure.in
+--- squid-3.0.STABLE10.orig/configure.in	2008-10-14 11:22:33.000000000 +0000
++++ squid-3.0.STABLE10/configure.in	2008-11-02 09:54:55.000000000 +0000
 @@ -19,9 +19,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
@@ -14,9 +14,9 @@ diff -ur squid-3.0.STABLE8.orig/configure.in squid-3.0.STABLE8/configure.in
  
  dnl Check for GNU cc
  AC_PROG_CC
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c	2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE10/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/confload.c	2008-10-14 11:22:26.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/MSNT/confload.c	2008-11-02 09:54:55.000000000 +0000
 @@ -27,7 +27,7 @@
  
  /* Path to configuration file */
@@ -26,9 +26,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STA
  #endif
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE10/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-10-14 11:22:26.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/MSNT/msntauth.conf.default	2008-11-02 09:54:55.000000000 +0000
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -38,9 +38,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default sq
 +#denyusers	/etc/squid/msntauth.denyusers
 +#allowusers	/etc/squid/msntauth.allowusers
  
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am	2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE10/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am	2008-10-14 11:22:28.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/SMB/Makefile.am	2008-11-02 09:54:55.000000000 +0000
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -50,9 +50,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STA
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE10/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-10-14 11:22:28.000000000 +0000
++++ squid-3.0.STABLE10/helpers/basic_auth/SMB/smb_auth.sh	2008-11-02 09:54:55.000000000 +0000
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -71,9 +71,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STA
  echo "Domain controller IP address: $dcip"
  [ -n "$dcip" ] || exit 1
  
-diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8	2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE10/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE10.orig/helpers/external_acl/session/squid_session.8	2008-10-14 11:22:29.000000000 +0000
++++ squid-3.0.STABLE10/helpers/external_acl/session/squid_session.8	2008-11-02 09:54:55.000000000 +0000
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -83,9 +83,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 squ
  .IP
  acl session external session
  .IP
-diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-07-18 10:02:50.000000000 +0000
-+++ squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE10/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE10.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-10-14 11:22:29.000000000 +0000
++++ squid-3.0.STABLE10/helpers/external_acl/unix_group/squid_unix_group.8	2008-11-02 09:54:55.000000000 +0000
 @@ -27,7 +27,7 @@
  This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
  matches users in group2 or group3
@@ -95,9 +95,9 @@ diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group
  .IP
  acl usergroup1 external unix_group group1
  .IP
-diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre
---- squid-3.0.STABLE8.orig/src/cf.data.pre	2008-07-18 10:02:53.000000000 +0000
-+++ squid-3.0.STABLE8/src/cf.data.pre	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data.pre
+--- squid-3.0.STABLE10.orig/src/cf.data.pre	2008-10-14 11:22:31.000000000 +0000
++++ squid-3.0.STABLE10/src/cf.data.pre	2008-11-02 09:54:55.000000000 +0000
 @@ -652,6 +652,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
@@ -127,7 +127,7 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
  # And finally deny all other access to this proxy
  http_access deny all
  NOCOMMENT_END
-@@ -3249,11 +3257,11 @@
+@@ -3260,11 +3268,11 @@
  
  NAME: cache_mgr
  TYPE: string
@@ -141,7 +141,7 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
  DOC_END
  
  NAME: mail_from
-@@ -5200,6 +5208,9 @@
+@@ -5214,6 +5222,9 @@
  	If you disable this, it will appear as
  
  		X-Forwarded-For: unknown
@@ -151,9 +151,9 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
  DOC_END
  
  NAME: cachemgr_passwd
-diff -ur squid-3.0.STABLE8.orig/src/debug.cc squid-3.0.STABLE8/src/debug.cc
---- squid-3.0.STABLE8.orig/src/debug.cc	2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/debug.cc	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/debug.cc squid-3.0.STABLE10/src/debug.cc
+--- squid-3.0.STABLE10.orig/src/debug.cc	2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/debug.cc	2008-11-02 09:54:55.000000000 +0000
 @@ -465,7 +465,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
@@ -163,9 +163,9 @@ diff -ur squid-3.0.STABLE8.orig/src/debug.cc squid-3.0.STABLE8/src/debug.cc
  
  #endif /* HAVE_SYSLOG */
  
-diff -ur squid-3.0.STABLE8.orig/src/defines.h squid-3.0.STABLE8/src/defines.h
---- squid-3.0.STABLE8.orig/src/defines.h	2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/defines.h	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/defines.h squid-3.0.STABLE10/src/defines.h
+--- squid-3.0.STABLE10.orig/src/defines.h	2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/defines.h	2008-11-02 09:54:55.000000000 +0000
 @@ -219,7 +219,7 @@
  
  /* were to look for errors if config path fails */
@@ -175,9 +175,9 @@ diff -ur squid-3.0.STABLE8.orig/src/defines.h squid-3.0.STABLE8/src/defines.h
  #endif
  
  /* handy to determine the #elements in a static array */
-diff -ur squid-3.0.STABLE8.orig/src/main.cc squid-3.0.STABLE8/src/main.cc
---- squid-3.0.STABLE8.orig/src/main.cc	2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/main.cc	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/main.cc squid-3.0.STABLE10/src/main.cc
+--- squid-3.0.STABLE10.orig/src/main.cc	2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/main.cc	2008-11-02 09:54:55.000000000 +0000
 @@ -1486,7 +1486,7 @@
      if (*(argv[0]) == '(')
          return;
@@ -205,9 +205,9 @@ diff -ur squid-3.0.STABLE8.orig/src/main.cc squid-3.0.STABLE8/src/main.cc
  
          syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  
-diff -ur squid-3.0.STABLE8.orig/src/Makefile.am squid-3.0.STABLE8/src/Makefile.am
---- squid-3.0.STABLE8.orig/src/Makefile.am	2008-07-18 10:02:53.000000000 +0000
-+++ squid-3.0.STABLE8/src/Makefile.am	2008-08-01 21:56:22.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/Makefile.am squid-3.0.STABLE10/src/Makefile.am
+--- squid-3.0.STABLE10.orig/src/Makefile.am	2008-10-14 11:22:31.000000000 +0000
++++ squid-3.0.STABLE10/src/Makefile.am	2008-11-02 09:54:55.000000000 +0000
 @@ -992,12 +992,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
diff --git a/net-proxy/squid/files/squid-3.0.10-heimdal.patch b/net-proxy/squid/files/squid-3.0.10-heimdal.patch
new file mode 100644
index 000000000000..b97ec481441f
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.10-heimdal.patch
@@ -0,0 +1,18 @@
+diff -Nru squid-3.0.STABLE10.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE10/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-3.0.STABLE10.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-14 11:22:29.000000000 +0000
++++ squid-3.0.STABLE10/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-11-02 09:58:27.000000000 +0000
+@@ -18,10 +18,10 @@
+ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+ 
+ # HEIMDAL
+-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
+-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
++KERBINC = -DHEIMDAL -I/usr/include/heimdal
++KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
+ 
+ # MIT
+-KERBINC = 
+-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
++#KERBINC = 
++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+ 
diff --git a/net-proxy/squid/files/squid-3.0.8-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.10-zph.patch
index 955b9189ae93..2c56a85230c6 100644
--- a/net-proxy/squid/files/squid-3.0.8-adapted-zph.patch
+++ b/net-proxy/squid/files/squid-3.0.10-zph.patch
@@ -1,7 +1,7 @@
-diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre
---- squid-3.0.STABLE8.orig/src/cf.data.pre	2008-08-01 21:59:10.000000000 +0000
-+++ squid-3.0.STABLE8/src/cf.data.pre	2008-08-01 22:00:44.000000000 +0000
-@@ -1127,6 +1127,60 @@
+diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data.pre
+--- squid-3.0.STABLE10.orig/src/cf.data.pre	2008-11-02 09:55:43.000000000 +0000
++++ squid-3.0.STABLE10/src/cf.data.pre	2008-11-02 09:57:33.000000000 +0000
+@@ -1133,6 +1133,60 @@
  	making the request.
  DOC_END
  
@@ -62,9 +62,9 @@ diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pr
  NAME: tcp_outgoing_address
  TYPE: acl_address
  DEFAULT: none
-diff -ur squid-3.0.STABLE8.orig/src/client_side_reply.cc squid-3.0.STABLE8/src/client_side_reply.cc
---- squid-3.0.STABLE8.orig/src/client_side_reply.cc	2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/client_side_reply.cc	2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/client_side_reply.cc squid-3.0.STABLE10/src/client_side_reply.cc
+--- squid-3.0.STABLE10.orig/src/client_side_reply.cc	2008-10-14 11:22:31.000000000 +0000
++++ squid-3.0.STABLE10/src/client_side_reply.cc	2008-11-02 09:57:33.000000000 +0000
 @@ -48,6 +48,7 @@
  #include "ESI.h"
  #endif
@@ -73,83 +73,46 @@ diff -ur squid-3.0.STABLE8.orig/src/client_side_reply.cc squid-3.0.STABLE8/src/c
  #include "ACLChecklist.h"
  #include "ACL.h"
  #if DELAY_POOLS
-@@ -1548,6 +1549,58 @@
+@@ -1548,6 +1549,11 @@
          /* guarantee nothing has been sent yet! */
          assert(http->out.size == 0);
          assert(http->out.offset == 0);
-+
-+        if (Config.zph_tos_local ||
-+        	Config.zph_tos_peer ||
-+	        Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
-+		{
-+		   int need_change = 0;
-+		   int hit = 0;
-+		   int tos = 0;
-+		   int tos_old = 0;
-+		   int tos_len = sizeof(tos_old);
-+		   int res;
-+		               
-+		   if (Config.zph_tos_local)
-+		   {
-+			   /* local hit */
-+		       hit = 1;
-+		       tos = Config.zph_tos_local;
-+		   }
-+		   else if (Config.zph_tos_peer && 
-+			    	(http->request->hier.code==SIBLING_HIT ||
-+			    	Config.onoff.zph_tos_parent&&http->request->hier.code==PARENT_HIT))
-+		   {
-+			  /* sibling or parent hit */
-+		       hit = 1;
-+		       tos = Config.zph_tos_peer;
-+		   }
-+		   
-+		   if (http->request->flags.proxy_keepalive)
-+		   {
-+			   res = getsockopt(http->getConn()->fd, IPPROTO_IP, IP_TOS, &tos_old, (socklen_t*)&tos_len);
-+		       if (res < 0)
-+		       {
-+		           debugs(33, 1, "ZPH: error in getsockopt(IP_TOS) on keepalived FD "<< http->getConn()->fd << " " << xstrerror());
-+		       }
-+		       else if (hit && tos_old != tos)
-+		       {
-+		    	   /* HIT: 1-st request, or previous was MISS,
-+		    	    * or local/parent hit change.
-+		    	    */
-+		           need_change = 1;                    
-+		       }
-+		   }
-+		   else if (hit)
-+		   {
-+			   /* no keepalive */
-+		       need_change = 1;
-+		   }
-+		   if (need_change) {
-+			   comm_set_tos(http->getConn()->fd,tos);
-+		   }
-+		}        
-+        
++        if (Config.zph_tos_local)
++      	{
++			debugs(33, 1, "ZPH hit hier.code=" << http->request->hier.code <<" TOS="<<Config.zph_tos_local);
++	    	comm_set_tos(http->getConn()->fd,Config.zph_tos_local);
++      	}             
          tempBuffer.offset = reqofs;
          tempBuffer.length = getNextNode()->readBuffer.length;
          tempBuffer.data = getNextNode()->readBuffer.data;
-@@ -1828,6 +1881,14 @@
+@@ -1827,6 +1833,24 @@
+     char *buf = next()->readBuffer.data;
  
      char *body_buf = buf;
- 
-+    if (reqofs==0 && !logTypeIsATcpHit(http->logType) &&
-+    	Config.onoff.zph_preserve_miss_tos &&
-+    	Config.zph_preserve_miss_tos_mask)
++    
++    if (reqofs==0 && !logTypeIsATcpHit(http->logType))
 +    {
-+		int tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
++		int tos = 0;
++		if (Config.zph_tos_peer && 

++    	 	 (http->request->hier.code==SIBLING_HIT ||

++			 Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT))
++		{
++			tos = Config.zph_tos_peer;
++			debugs(33, 1, "ZPH: Peer hit, TOS="<<tos<<" hier.code="<<http->request->hier.code);
++		}
++		else if (Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
++		{
++			tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
++			debugs(33, 1, "ZPH: Preserving TOS on miss, TOS="<<tos);
++		}
 +		comm_set_tos(fd,tos);
-+    }
-+
++    }     
+ 
      if (buf != result.data) {
          /* we've got to copy some data */
-         assert(result.length <= next()->readBuffer.length);
-diff -ur squid-3.0.STABLE8.orig/src/fde.h squid-3.0.STABLE8/src/fde.h
---- squid-3.0.STABLE8.orig/src/fde.h	2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/fde.h	2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/fde.h squid-3.0.STABLE10/src/fde.h
+--- squid-3.0.STABLE10.orig/src/fde.h	2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/fde.h	2008-11-02 09:57:33.000000000 +0000
 @@ -106,7 +106,7 @@
          long handle;
      } win32;
@@ -159,9 +122,9 @@ diff -ur squid-3.0.STABLE8.orig/src/fde.h squid-3.0.STABLE8/src/fde.h
  };
  
  #endif /* SQUID_FDE_H */
-diff -ur squid-3.0.STABLE8.orig/src/forward.cc squid-3.0.STABLE8/src/forward.cc
---- squid-3.0.STABLE8.orig/src/forward.cc	2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/forward.cc	2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/forward.cc squid-3.0.STABLE10/src/forward.cc
+--- squid-3.0.STABLE10.orig/src/forward.cc	2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/forward.cc	2008-11-02 09:57:33.000000000 +0000
 @@ -964,6 +964,52 @@
  
      netdbPingSite(request->host);
@@ -215,9 +178,9 @@ diff -ur squid-3.0.STABLE8.orig/src/forward.cc squid-3.0.STABLE8/src/forward.cc
      if (servers && (p = servers->_peer)) {
          p->stats.fetches++;
          request->peer_login = p->login;
-diff -ur squid-3.0.STABLE8.orig/src/structs.h squid-3.0.STABLE8/src/structs.h
---- squid-3.0.STABLE8.orig/src/structs.h	2008-07-18 10:02:54.000000000 +0000
-+++ squid-3.0.STABLE8/src/structs.h	2008-08-01 22:00:44.000000000 +0000
+diff -Nru squid-3.0.STABLE10.orig/src/structs.h squid-3.0.STABLE10/src/structs.h
+--- squid-3.0.STABLE10.orig/src/structs.h	2008-10-14 11:22:32.000000000 +0000
++++ squid-3.0.STABLE10/src/structs.h	2008-11-02 09:57:33.000000000 +0000
 @@ -553,6 +553,8 @@
          int emailErrData;
          int httpd_suppress_version_string;
diff --git a/net-proxy/squid/squid-3.0.8.ebuild b/net-proxy/squid/squid-3.0.10.ebuild
index 4573f503dc8b..f220949c2638 100644
--- a/net-proxy/squid/squid-3.0.8.ebuild
+++ b/net-proxy/squid/squid-3.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.8.ebuild,v 1.2 2008/09/12 16:38:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.10.ebuild,v 1.1 2008/11/02 10:10:10 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -22,13 +22,15 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 -arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl nis radius ssl snmp selinux icap-client logrotate \
+IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+	mysql postgres sqlite \
 	qos zero-penalty-hit \
 	pf-transparent ipf-transparent \
 	elibc_uclibc kernel_linux"
 
 DEPEND="pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
+	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 	ssl? ( dev-libs/openssl )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sec-policy/selinux-squid )
@@ -36,11 +38,22 @@ DEPEND="pam? ( virtual/pam )
 	>=sys-libs/db-4
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	samba? ( net-fs/samba )"
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
 
 S="${WORKDIR}/${S_PP}"
 
 pkg_setup() {
+	if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
+		eerror "coss store IO has been disabled by upstream due to stability issues!"
+		eerror "If you want to install this version, switch the store type to something else"
+		eerror "before attempting to install this version again."
+
+		die "/etc/squid/squid.conf: cache_dir use a disabled store type"
+	fi
+
 	if use qos; then
 		eerror "qos patch is no longer supported by us!"
 		eerror "Please remove qos from your USE and select zero-penalty-hit flag instead."
@@ -55,7 +68,8 @@ src_unpack() {
 
 	cd "${S}" || die "source dir not found"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
+	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-zph.patch
+	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
 
 	eautoreconf
 }
@@ -68,6 +82,9 @@ src_compile() {
 	use sasl && basic_modules="SASL,${basic_modules}"
 	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
 	use radius && basic_modules="squid_radius_auth,${basic_modules}"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules="DB,${basic_modules}"
+	fi
 
 	local ext_helpers="ip_user,session,unix_group"
 	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
@@ -76,14 +93,14 @@ src_compile() {
 	local ntlm_helpers="fakeauth"
 	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
 
+	local negotiate_helpers=
+	use kerberos && local negotiate_helpers="squid_kerb_auth"
+
 	local myconf=""
 
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-	fi
+	# coss support has been disabled
+	# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
+	myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
 
 	if use kernel_linux; then
 		myconf="${myconf} --enable-linux-netfilter"
@@ -110,6 +127,7 @@ src_compile() {
 		--enable-basic-auth-helpers="${basic_modules}" \
 		--enable-external-acl-helpers="${ext_helpers}" \
 		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
 		--enable-useragent-log \
 		--enable-cache-digests \
 		--enable-delay-pools \