Version bump (#237560).

Update zph patch (#236329).
Add database backend support(#234798).
(Portage version: 2.1.4.4)

5 files changed, 316 insertions, 137 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 1a7bc4d0a65b..1b5a8d85bbf4 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,16 @@
 # 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.202 2008/09/12 16:38:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.203 2008/09/14 09:14:16 mrness Exp $
+
+*squid-3.0.9 (14 Sep 2008)
+*squid-2.7.4-r2 (14 Sep 2008)
+
+  14 Sep 2008; Alin Năstac <mrness@gentoo.org>
+  -files/squid-3.0.7-adapted-zph.patch, -files/squid-3.0.7-gentoo.patch,
+  +files/squid-3.0.9-gentoo.patch, +files/squid-3.0.9-zph.patch,
+  +squid-2.7.4-r2.ebuild, -squid-3.0.7.ebuild, +squid-3.0.9.ebuild:
+  Version bump (#237560). Update zph patch (#236329). Add database backend
+  support(#234798).
 
   12 Sep 2008; Raúl Porcel <armin76@gentoo.org> squid-2.7.4-r1.ebuild,
   squid-3.0.8.ebuild:
diff --git a/net-proxy/squid/files/squid-3.0.7-gentoo.patch b/net-proxy/squid/files/squid-3.0.9-gentoo.patch
index d2bb52e5c985..9ee2886268e5 100644
--- a/net-proxy/squid/files/squid-3.0.7-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.9-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-3.0.STABLE7.orig/configure.in squid-3.0.STABLE7/configure.in
---- squid-3.0.STABLE7.orig/configure.in	2008-06-22 05:35:54.000000000 +0200
-+++ squid-3.0.STABLE7/configure.in	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/configure.in squid-3.0.STABLE9/configure.in
+--- squid-3.0.STABLE9.orig/configure.in	2008-09-09 16:06:45.000000000 +0000
++++ squid-3.0.STABLE9/configure.in	2008-09-14 07:35:54.000000000 +0000
 @@ -19,9 +19,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
@@ -14,10 +14,10 @@ diff -Nru squid-3.0.STABLE7.orig/configure.in squid-3.0.STABLE7/configure.in
  
  dnl Check for GNU cc
  AC_PROG_CC
-diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE7/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE7.orig/helpers/basic_auth/MSNT/confload.c	2008-06-22 05:35:48.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/basic_auth/MSNT/confload.c	2008-06-26 20:51:22.000000000 +0200
-@@ -24,7 +24,7 @@
+diff -ru squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE9/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/confload.c	2008-09-09 16:06:40.000000000 +0000
++++ squid-3.0.STABLE9/helpers/basic_auth/MSNT/confload.c	2008-09-14 07:35:54.000000000 +0000
+@@ -27,7 +27,7 @@
  
  /* Path to configuration file */
  #ifndef SYSCONFDIR
@@ -26,9 +26,9 @@ diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.ST
  #endif
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
-diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE7/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-06-22 05:35:48.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/basic_auth/MSNT/msntauth.conf.default	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-09-09 16:06:40.000000000 +0000
++++ squid-3.0.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default	2008-09-14 07:35:54.000000000 +0000
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -38,9 +38,9 @@ diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/MSNT/msntauth.conf.default s
 +#denyusers	/etc/squid/msntauth.denyusers
 +#allowusers	/etc/squid/msntauth.allowusers
  
-diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE7/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE7.orig/helpers/basic_auth/SMB/Makefile.am	2008-06-22 05:35:49.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/basic_auth/SMB/Makefile.am	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE9/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am	2008-09-09 16:06:40.000000000 +0000
++++ squid-3.0.STABLE9/helpers/basic_auth/SMB/Makefile.am	2008-09-14 07:35:54.000000000 +0000
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -50,9 +50,9 @@ diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.ST
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE7/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE7.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-06-22 05:35:49.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/basic_auth/SMB/smb_auth.sh	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE9/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-09-09 16:06:40.000000000 +0000
++++ squid-3.0.STABLE9/helpers/basic_auth/SMB/smb_auth.sh	2008-09-14 07:35:54.000000000 +0000
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -71,9 +71,9 @@ diff -Nru squid-3.0.STABLE7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.ST
  echo "Domain controller IP address: $dcip"
  [ -n "$dcip" ] || exit 1
  
-diff -Nru squid-3.0.STABLE7.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE7/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE7.orig/helpers/external_acl/session/squid_session.8	2008-06-22 05:35:49.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/external_acl/session/squid_session.8	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE9/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE9.orig/helpers/external_acl/session/squid_session.8	2008-09-09 16:06:41.000000000 +0000
++++ squid-3.0.STABLE9/helpers/external_acl/session/squid_session.8	2008-09-14 07:35:54.000000000 +0000
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -83,9 +83,9 @@ diff -Nru squid-3.0.STABLE7.orig/helpers/external_acl/session/squid_session.8 sq
  .IP
  acl session external session
  .IP
-diff -Nru squid-3.0.STABLE7.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE7/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE7.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-06-22 05:35:49.000000000 +0200
-+++ squid-3.0.STABLE7/helpers/external_acl/unix_group/squid_unix_group.8	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-09-09 16:06:41.000000000 +0000
++++ squid-3.0.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8	2008-09-14 07:35:54.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,10 +95,10 @@ diff -Nru squid-3.0.STABLE7.orig/helpers/external_acl/unix_group/squid_unix_grou
  .IP
  acl usergroup1 external unix_group group1
  .IP
-diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.pre
---- squid-3.0.STABLE7.orig/src/cf.data.pre	2008-06-22 05:35:53.000000000 +0200
-+++ squid-3.0.STABLE7/src/cf.data.pre	2008-06-26 20:51:22.000000000 +0200
-@@ -650,6 +650,8 @@
+diff -ru squid-3.0.STABLE9.orig/src/cf.data.pre squid-3.0.STABLE9/src/cf.data.pre
+--- squid-3.0.STABLE9.orig/src/cf.data.pre	2008-09-09 16:06:44.000000000 +0000
++++ squid-3.0.STABLE9/src/cf.data.pre	2008-09-14 07:35:54.000000000 +0000
+@@ -652,6 +652,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
  acl Safe_ports port 777		# multiling http
@@ -107,7 +107,7 @@ diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.p
  acl CONNECT method CONNECT
  NOCOMMENT_END
  DOC_END
-@@ -683,6 +685,9 @@
+@@ -685,6 +687,9 @@
  # Only allow cachemgr access from localhost
  http_access allow manager localhost
  http_access deny manager
@@ -117,7 +117,7 @@ diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.p
  # Deny requests to unknown ports
  http_access deny !Safe_ports
  # Deny CONNECT to other than SSL ports
-@@ -700,6 +705,9 @@
+@@ -702,6 +707,9 @@
  # from where browsing should be allowed
  http_access allow localnet
  
@@ -127,7 +127,7 @@ diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.p
  # And finally deny all other access to this proxy
  http_access deny all
  NOCOMMENT_END
-@@ -3237,11 +3245,11 @@
+@@ -3254,11 +3262,11 @@
  
  NAME: cache_mgr
  TYPE: string
@@ -141,7 +141,7 @@ diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.p
  DOC_END
  
  NAME: mail_from
-@@ -5189,6 +5197,9 @@
+@@ -5208,6 +5216,9 @@
  	If you disable this, it will appear as
  
  		X-Forwarded-For: unknown
@@ -151,9 +151,9 @@ diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.p
  DOC_END
  
  NAME: cachemgr_passwd
-diff -Nru squid-3.0.STABLE7.orig/src/debug.cc squid-3.0.STABLE7/src/debug.cc
---- squid-3.0.STABLE7.orig/src/debug.cc	2008-06-22 05:35:53.000000000 +0200
-+++ squid-3.0.STABLE7/src/debug.cc	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/src/debug.cc squid-3.0.STABLE9/src/debug.cc
+--- squid-3.0.STABLE9.orig/src/debug.cc	2008-09-09 16:06:44.000000000 +0000
++++ squid-3.0.STABLE9/src/debug.cc	2008-09-14 07:35:54.000000000 +0000
 @@ -465,7 +465,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
@@ -163,9 +163,9 @@ diff -Nru squid-3.0.STABLE7.orig/src/debug.cc squid-3.0.STABLE7/src/debug.cc
  
  #endif /* HAVE_SYSLOG */
  
-diff -Nru squid-3.0.STABLE7.orig/src/defines.h squid-3.0.STABLE7/src/defines.h
---- squid-3.0.STABLE7.orig/src/defines.h	2008-06-22 05:35:53.000000000 +0200
-+++ squid-3.0.STABLE7/src/defines.h	2008-06-26 20:51:22.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/src/defines.h squid-3.0.STABLE9/src/defines.h
+--- squid-3.0.STABLE9.orig/src/defines.h	2008-09-09 16:06:44.000000000 +0000
++++ squid-3.0.STABLE9/src/defines.h	2008-09-14 07:35:54.000000000 +0000
 @@ -219,7 +219,7 @@
  
  /* were to look for errors if config path fails */
@@ -175,10 +175,10 @@ diff -Nru squid-3.0.STABLE7.orig/src/defines.h squid-3.0.STABLE7/src/defines.h
  #endif
  
  /* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE7.orig/src/main.cc squid-3.0.STABLE7/src/main.cc
---- squid-3.0.STABLE7.orig/src/main.cc	2008-06-22 05:35:53.000000000 +0200
-+++ squid-3.0.STABLE7/src/main.cc	2008-06-26 20:51:22.000000000 +0200
-@@ -1482,7 +1482,7 @@
+diff -ru squid-3.0.STABLE9.orig/src/main.cc squid-3.0.STABLE9/src/main.cc
+--- squid-3.0.STABLE9.orig/src/main.cc	2008-09-09 16:06:44.000000000 +0000
++++ squid-3.0.STABLE9/src/main.cc	2008-09-14 07:35:54.000000000 +0000
+@@ -1486,7 +1486,7 @@
      if (*(argv[0]) == '(')
          return;
  
@@ -187,7 +187,7 @@ diff -Nru squid-3.0.STABLE7.orig/src/main.cc squid-3.0.STABLE7/src/main.cc
  
      if ((pid = fork()) < 0)
          syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1526,7 +1526,7 @@
+@@ -1530,7 +1530,7 @@
  
          if ((pid = fork()) == 0) {
              /* child */
@@ -196,7 +196,7 @@ diff -Nru squid-3.0.STABLE7.orig/src/main.cc squid-3.0.STABLE7/src/main.cc
              prog = xstrdup(argv[0]);
              argv[0] = xstrdup("(squid)");
              execvp(prog, argv);
-@@ -1534,7 +1534,7 @@
+@@ -1538,7 +1538,7 @@
          }
  
          /* parent */
@@ -205,10 +205,10 @@ diff -Nru squid-3.0.STABLE7.orig/src/main.cc squid-3.0.STABLE7/src/main.cc
  
          syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  
-diff -Nru squid-3.0.STABLE7.orig/src/Makefile.am squid-3.0.STABLE7/src/Makefile.am
---- squid-3.0.STABLE7.orig/src/Makefile.am	2008-06-22 05:35:52.000000000 +0200
-+++ squid-3.0.STABLE7/src/Makefile.am	2008-06-26 20:51:22.000000000 +0200
-@@ -988,12 +988,12 @@
+diff -ru squid-3.0.STABLE9.orig/src/Makefile.am squid-3.0.STABLE9/src/Makefile.am
+--- squid-3.0.STABLE9.orig/src/Makefile.am	2008-09-09 16:06:43.000000000 +0000
++++ squid-3.0.STABLE9/src/Makefile.am	2008-09-14 07:35:54.000000000 +0000
+@@ -992,12 +992,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
  DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-3.0.7-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.9-zph.patch
index 4ca6d15b15bd..5a1ea96ca198 100644
--- a/net-proxy/squid/files/squid-3.0.7-adapted-zph.patch
+++ b/net-proxy/squid/files/squid-3.0.9-zph.patch
@@ -1,7 +1,7 @@
-diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.pre
---- squid-3.0.STABLE7.orig/src/cf.data.pre	2008-06-26 20:52:15.000000000 +0200
-+++ squid-3.0.STABLE7/src/cf.data.pre	2008-06-26 20:53:03.000000000 +0200
-@@ -1125,6 +1125,60 @@
+diff -ru squid-3.0.STABLE9.orig/src/cf.data.pre squid-3.0.STABLE9/src/cf.data.pre
+--- squid-3.0.STABLE9.orig/src/cf.data.pre	2008-09-14 07:38:23.000000000 +0000
++++ squid-3.0.STABLE9/src/cf.data.pre	2008-09-14 07:44:46.000000000 +0000
+@@ -1127,6 +1127,60 @@
  	making the request.
  DOC_END
  
@@ -62,9 +62,9 @@ diff -Nru squid-3.0.STABLE7.orig/src/cf.data.pre squid-3.0.STABLE7/src/cf.data.p
  NAME: tcp_outgoing_address
  TYPE: acl_address
  DEFAULT: none
-diff -Nru squid-3.0.STABLE7.orig/src/client_side_reply.cc squid-3.0.STABLE7/src/client_side_reply.cc
---- squid-3.0.STABLE7.orig/src/client_side_reply.cc	2008-06-22 05:35:53.000000000 +0200
-+++ squid-3.0.STABLE7/src/client_side_reply.cc	2008-06-26 20:53:03.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/src/client_side_reply.cc squid-3.0.STABLE9/src/client_side_reply.cc
+--- squid-3.0.STABLE9.orig/src/client_side_reply.cc	2008-09-09 16:06:44.000000000 +0000
++++ squid-3.0.STABLE9/src/client_side_reply.cc	2008-09-14 07:44:46.000000000 +0000
 @@ -48,6 +48,7 @@
  #include "ESI.h"
  #endif
@@ -73,83 +73,46 @@ diff -Nru squid-3.0.STABLE7.orig/src/client_side_reply.cc squid-3.0.STABLE7/src/
  #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 -Nru squid-3.0.STABLE7.orig/src/fde.h squid-3.0.STABLE7/src/fde.h
---- squid-3.0.STABLE7.orig/src/fde.h	2008-06-22 05:35:53.000000000 +0200
-+++ squid-3.0.STABLE7/src/fde.h	2008-06-26 20:53:03.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/src/fde.h squid-3.0.STABLE9/src/fde.h
+--- squid-3.0.STABLE9.orig/src/fde.h	2008-09-09 16:06:44.000000000 +0000
++++ squid-3.0.STABLE9/src/fde.h	2008-09-14 07:44:46.000000000 +0000
 @@ -106,7 +106,7 @@
          long handle;
      } win32;
@@ -159,9 +122,9 @@ diff -Nru squid-3.0.STABLE7.orig/src/fde.h squid-3.0.STABLE7/src/fde.h
  };
  
  #endif /* SQUID_FDE_H */
-diff -Nru squid-3.0.STABLE7.orig/src/forward.cc squid-3.0.STABLE7/src/forward.cc
---- squid-3.0.STABLE7.orig/src/forward.cc	2008-06-22 05:35:53.000000000 +0200
-+++ squid-3.0.STABLE7/src/forward.cc	2008-06-26 20:53:03.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/src/forward.cc squid-3.0.STABLE9/src/forward.cc
+--- squid-3.0.STABLE9.orig/src/forward.cc	2008-09-09 16:06:44.000000000 +0000
++++ squid-3.0.STABLE9/src/forward.cc	2008-09-14 07:44:46.000000000 +0000
 @@ -964,6 +964,52 @@
  
      netdbPingSite(request->host);
@@ -215,9 +178,9 @@ diff -Nru squid-3.0.STABLE7.orig/src/forward.cc squid-3.0.STABLE7/src/forward.cc
      if (servers && (p = servers->_peer)) {
          p->stats.fetches++;
          request->peer_login = p->login;
-diff -Nru squid-3.0.STABLE7.orig/src/structs.h squid-3.0.STABLE7/src/structs.h
---- squid-3.0.STABLE7.orig/src/structs.h	2008-06-22 05:35:54.000000000 +0200
-+++ squid-3.0.STABLE7/src/structs.h	2008-06-26 20:53:03.000000000 +0200
+diff -ru squid-3.0.STABLE9.orig/src/structs.h squid-3.0.STABLE9/src/structs.h
+--- squid-3.0.STABLE9.orig/src/structs.h	2008-09-09 16:06:45.000000000 +0000
++++ squid-3.0.STABLE9/src/structs.h	2008-09-14 07:44:46.000000000 +0000
 @@ -553,6 +553,8 @@
          int emailErrData;
          int httpd_suppress_version_string;
@@ -225,9 +188,9 @@ diff -Nru squid-3.0.STABLE7.orig/src/structs.h squid-3.0.STABLE7/src/structs.h
 +        int zph_tos_parent;
 +        int zph_preserve_miss_tos;
          int debug_override_X;
+         int WIN32_IpAddrChangeMonitor;
      }
- 
-@@ -720,6 +722,9 @@
+@@ -721,6 +723,9 @@
      int sleep_after_fork;	/* microseconds */
      time_t minimum_expiry_time;	/* seconds */
      external_acl *externalAclHelperList;
diff --git a/net-proxy/squid/squid-2.7.4-r2.ebuild b/net-proxy/squid/squid-2.7.4-r2.ebuild
new file mode 100644
index 000000000000..b3b5f0c8ae8f
--- /dev/null
+++ b/net-proxy/squid/squid-2.7.4-r2.ebuild
@@ -0,0 +1,194 @@
+# 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-2.7.4-r2.ebuild,v 1.1 2008/09/14 09:14:16 mrness Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils pam toolchain-funcs autotools linux-info
+
+#lame archive versioning scheme..
+S_PMV="${PV%%.*}"
+S_PV="${PV%.*}"
+S_PL="${PV##*.}"
+S_PL="${S_PL/_rc/-RC}"
+S_PP="${PN}-${S_PV}.STABLE${S_PL}"
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+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 ssl snmp selinux logrotate \
+	mysql postgres sqlite \
+	qos zero-penalty-hit \
+	pf-transparent ipf-transparent \
+	elibc_uclibc kernel_linux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	dev-lang/perl"
+RDEPEND="${DEPEND}
+	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 use qos; then
+		eerror "qos patch is no longer supported!"
+		eerror "Please remove qos USE flag and use zph* config options instead."
+		die "unsupported USE flags detected"
+	fi
+	if use zero-penalty-hit; then
+		ewarn "This version supports natively IP TOS/Priority mangling,"
+		ewarn "but it does not support zph_preserve_miss_tos."
+		ewarn "If you need that, please use squid-3.0.6-r2 or higher."
+	fi
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+
+	cd "${S}" || die "source dir not found"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-charset.patch
+	eautoreconf
+}
+
+src_compile() {
+	local basic_modules="getpwnam,NCSA,MSNT"
+	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
+	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}"
+	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}"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local ntlm_helpers="fakeauth"
+	use samba && ntlm_helpers="SMB,${ntlm_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 && linux_chkconfig_present EPOLL ; 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)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--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="${ntlm_helpers}" \
+		--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 \
+		--with-maxfd=8192 \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/ncsa_auth
+	fowners root:squid /usr/libexec/squid/pam_auth
+	fperms 4750 /usr/libexec/squid/ncsa_auth
+	fperms 4750 /usr/libexec/squid/pam_auth
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	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_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}"
+}
diff --git a/net-proxy/squid/squid-3.0.7.ebuild b/net-proxy/squid/squid-3.0.9.ebuild
index 017c2eabb813..30b1475504e8 100644
--- a/net-proxy/squid/squid-3.0.7.ebuild
+++ b/net-proxy/squid/squid-3.0.9.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.7.ebuild,v 1.1 2008/06/26 19:32:15 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.9.ebuild,v 1.1 2008/09/14 09:14:16 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -21,8 +21,9 @@ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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 \
+	mysql postgres sqlite \
 	qos zero-penalty-hit \
 	pf-transparent ipf-transparent \
 	elibc_uclibc kernel_linux"
@@ -36,11 +37,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 +67,7 @@ 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
 
 	eautoreconf
 }
@@ -68,6 +80,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}"
@@ -78,12 +93,9 @@ src_compile() {
 
 	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"