Version bump wrt security bug #334263.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

13 files changed, 394 insertions, 1313 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 2f741a818dae..13097feb194b 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.306 2010/09/06 20:26:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.307 2010/09/23 22:29:28 mrness Exp $
+
+*squid-3.1.8 (23 Sep 2010)
+
+  23 Sep 2010; Alin Năstac <mrness@gentoo.org> -squid-3.0.19.ebuild,
+  -files/squid-3.0.19-adapted-zph.patch,
+  -files/squid-3.0.19-cross-compile.patch, -files/squid-3.0.19-gentoo.patch,
+  -squid-3.0.20-r1.ebuild, -files/squid-3.0.20-adapted-zph.patch,
+  -files/squid-3.0.20-cross-compile.patch, -files/squid-3.0.20-gentoo.patch,
+  -files/squid-3.0.20-libmd5.patch, +squid-3.1.8.ebuild,
+  +files/squid-3.1.8-gentoo.patch, +files/squid-3.1.8-libmd5.patch,
+  +files/squid-3.1.8-qafixes.patch:
+  Version bump wrt security bug #334263.
 
   06 Sep 2010; Brent Baude <ranger@gentoo.org> squid-3.1.6-r1.ebuild:
   Marking squid-3.1.6-r1 ppc64 for bug 301828
diff --git a/net-proxy/squid/files/squid-3.0.19-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.19-adapted-zph.patch
deleted file mode 100644
index 0bd256e9f3bc..000000000000
--- a/net-proxy/squid/files/squid-3.0.19-adapted-zph.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -Nru squid-3.0.STABLE19.orig/src/cf.data.pre squid-3.0.STABLE19/src/cf.data.pre
---- squid-3.0.STABLE19.orig/src/cf.data.pre	2009-09-12 07:25:41.000000000 +0200
-+++ squid-3.0.STABLE19/src/cf.data.pre	2009-09-12 07:26:48.000000000 +0200
-@@ -1133,6 +1133,60 @@
- 	making the request.
- DOC_END
- 
-+NAME: zph_tos_local
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_local
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark local hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_peer
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_peer
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark peer hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_parent
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_tos_parent
-+DEFAULT: on
-+DOC_START
-+       Set this to off if you want only sibling hits to be marked.
-+       If set to on (default), parent hits are being marked too.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_preserve_miss_tos
-+DEFAULT: on
-+DOC_START
-+       If set to on (default), any HTTP response towards clients will
-+       have the TOS value of the response comming from the remote
-+       server masked with the value of zph_preserve_miss_tos_mask.
-+       For this to work correctly, you will need to patch your linux
-+       kernel with the TOS preserving ZPH patch.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos_mask
-+TYPE: int
-+DEFAULT: 255
-+LOC: Config.zph_preserve_miss_tos_mask
-+DOC_START
-+       Allows you to mask certain bits in the TOS received from the
-+       remote server, before copying the value to the TOS send towards
-+       clients.
-+       Default: 255 (TOS from server is not changed).
-+DOC_END
-+
- NAME: tcp_outgoing_address
- TYPE: acl_address
- DEFAULT: none
-diff -Nru squid-3.0.STABLE19.orig/src/client_side_reply.cc squid-3.0.STABLE19/src/client_side_reply.cc
---- squid-3.0.STABLE19.orig/src/client_side_reply.cc	2009-09-06 13:29:37.000000000 +0200
-+++ squid-3.0.STABLE19/src/client_side_reply.cc	2009-09-12 07:26:48.000000000 +0200
-@@ -48,6 +48,7 @@
- #include "ESI.h"
- #endif
- #include "MemObject.h"
-+#include "fde.h"
- #include "ACLChecklist.h"
- #include "ACL.h"
- #if DELAY_POOLS
-@@ -1549,6 +1550,11 @@
-         /* guarantee nothing has been sent yet! */
-         assert(http->out.size == 0);
-         assert(http->out.offset == 0);
-+        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;
-@@ -1829,6 +1835,24 @@
-     char *buf = next()->readBuffer.data;
- 
-     char *body_buf = buf;
-+    
-+    if (reqofs==0 && !logTypeIsATcpHit(http->logType))
-+    {
-+		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 */
-diff -Nru squid-3.0.STABLE19.orig/src/fde.h squid-3.0.STABLE19/src/fde.h
---- squid-3.0.STABLE19.orig/src/fde.h	2009-09-06 13:29:38.000000000 +0200
-+++ squid-3.0.STABLE19/src/fde.h	2009-09-12 07:26:48.000000000 +0200
-@@ -106,7 +106,7 @@
-         long handle;
-     } win32;
- #endif
--
-+    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
- };
- 
- #endif /* SQUID_FDE_H */
-diff -Nru squid-3.0.STABLE19.orig/src/forward.cc squid-3.0.STABLE19/src/forward.cc
---- squid-3.0.STABLE19.orig/src/forward.cc	2009-09-06 13:29:38.000000000 +0200
-+++ squid-3.0.STABLE19/src/forward.cc	2009-09-12 07:26:48.000000000 +0200
-@@ -965,6 +965,57 @@
- 
-     netdbPingSite(request->host);
- 
-+    /* Retrieves remote server TOS value, and stores it as part of the
-+     * original client request FD object. It is later used to forward
-+     * remote server's TOS in the response to the client in case of a MISS.
-+     */
-+	fde * clientFde = &fd_table[client_fd];
-+	if (clientFde)
-+	{
-+		int tos = 1;
-+		int tos_len = sizeof(tos);
-+		clientFde->upstreamTOS = 0;
-+	    if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0)
-+	    {
-+	       unsigned char buf[512];
-+	       int len = 512;
-+	       if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0)
-+	       {
-+	           /* Parse the PKTOPTIONS structure to locate the TOS data message
-+	            * prepared in the kernel by the ZPH incoming TCP TOS preserving
-+	            * patch.
-+	            */
-+	    	   unsigned char * p = buf;
-+	           while (p-buf < len)
-+	           {
-+	              struct cmsghdr *o = (struct cmsghdr*)p;
-+	              if (o->cmsg_len<=0)
-+	                 break;
-+	
-+	              if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
-+	              {
-+	            	  union {
-+			     unsigned char *pchar;
-+			     int  *pint;
-+			  } data;
-+			  data.pchar = CMSG_DATA(o);
-+	            	  clientFde->upstreamTOS = (unsigned char)*data.pint;
-+	            	  break;
-+	              }
-+	              p += CMSG_LEN(o->cmsg_len);
-+	           }
-+	       }
-+	       else
-+	       {
-+	           debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror());
-+	       }
-+	    }
-+	    else
-+	    {
-+	    	debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror());
-+	    }
-+	}    
-+
-     if (servers && (p = servers->_peer)) {
-         p->stats.fetches++;
-         request->peer_login = p->login;
-diff -Nru squid-3.0.STABLE19.orig/src/structs.h squid-3.0.STABLE19/src/structs.h
---- squid-3.0.STABLE19.orig/src/structs.h	2009-09-06 13:29:38.000000000 +0200
-+++ squid-3.0.STABLE19/src/structs.h	2009-09-12 07:26:48.000000000 +0200
-@@ -554,6 +554,8 @@
-         int emailErrData;
-         int httpd_suppress_version_string;
-         int global_internal_static;
-+        int zph_tos_parent;
-+        int zph_preserve_miss_tos;
-         int debug_override_X;
-         int WIN32_IpAddrChangeMonitor;
-     }
-@@ -722,6 +724,9 @@
-     int sleep_after_fork;	/* microseconds */
-     time_t minimum_expiry_time;	/* seconds */
-     external_acl *externalAclHelperList;
-+    int zph_tos_local;
-+    int zph_tos_peer;
-+    int zph_preserve_miss_tos_mask;
- #if USE_SSL
- 
-     struct
diff --git a/net-proxy/squid/files/squid-3.0.19-cross-compile.patch b/net-proxy/squid/files/squid-3.0.19-cross-compile.patch
deleted file mode 100644
index ba0d8d9e4fe5..000000000000
--- a/net-proxy/squid/files/squid-3.0.19-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Nru squid-3.0.STABLE19.orig/configure.in squid-3.0.STABLE19/configure.in
---- squid-3.0.STABLE19.orig/configure.in	2009-09-12 07:25:41.000000000 +0200
-+++ squid-3.0.STABLE19/configure.in	2009-09-12 07:25:57.000000000 +0200
-@@ -1895,6 +1895,10 @@
- 	;;
- esac
- 
-+dnl Define HOSTCXX
-+HOSTCXX="$build-g++"
-+AC_SUBST(HOSTCXX)
-+
- dnl Check for programs
- AC_PROG_CPP
- AC_PROG_INSTALL
-diff -Nru squid-3.0.STABLE19.orig/src/Makefile.am squid-3.0.STABLE19/src/Makefile.am
---- squid-3.0.STABLE19.orig/src/Makefile.am	2009-09-12 07:25:41.000000000 +0200
-+++ squid-3.0.STABLE19/src/Makefile.am	2009-09-12 07:25:57.000000000 +0200
-@@ -1011,6 +1011,8 @@
- 
- DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
-+HOSTCXX ?= @HOSTCXX@
-+
- $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
- 
- snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
-@@ -1034,6 +1036,11 @@
- squid.conf.default: cf_parser.h
- 	true
- 
-+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
-+	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \
-+		$(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
-+		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
-+
- cf_parser.h: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
- 
diff --git a/net-proxy/squid/files/squid-3.0.19-gentoo.patch b/net-proxy/squid/files/squid-3.0.19-gentoo.patch
deleted file mode 100644
index 98cf2ed14d09..000000000000
--- a/net-proxy/squid/files/squid-3.0.19-gentoo.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -Nru squid-3.0.STABLE19.orig/acinclude.m4 squid-3.0.STABLE19/acinclude.m4
---- squid-3.0.STABLE19.orig/acinclude.m4	2009-09-06 13:29:24.000000000 +0200
-+++ squid-3.0.STABLE19/acinclude.m4	2009-09-12 07:25:05.000000000 +0200
-@@ -73,7 +73,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.0.STABLE19.orig/configure.in squid-3.0.STABLE19/configure.in
---- squid-3.0.STABLE19.orig/configure.in	2009-09-12 07:20:17.000000000 +0200
-+++ squid-3.0.STABLE19/configure.in	2009-09-12 07:25:05.000000000 +0200
-@@ -15,9 +15,9 @@
- PRESET_LDFLAGS="$LDFLAGS"
- 
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
--        LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl         LDFLAGS="-g"
-+dnl fi
- 
- dnl Check for GNU cc
- AC_PROG_CC
-@@ -177,13 +177,13 @@
- dnl TODO: check if the problem will be present in any other newer MinGW release.
-     case "$host_os" in
-     mingw|mingw32)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- 	;;
-     *)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
- 	;;
-     esac
--    SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-     SQUID_CFLAGS=
-     SQUID_CXXFLAGS=
-diff -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE19/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/confload.c	2009-09-06 13:29:29.000000000 +0200
-+++ squid-3.0.STABLE19/helpers/basic_auth/MSNT/confload.c	2009-09-12 07:25:05.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
- 
-diff -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE19/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE19.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-09-06 13:29:29.000000000 +0200
-+++ squid-3.0.STABLE19/helpers/basic_auth/MSNT/msntauth.conf.default	2009-09-12 07:25:05.000000000 +0200
-@@ -8,6 +8,6 @@
- server other_PDC	other_BDC	otherdomain
- 
- # Denied and allowed users. Comment these if not needed.
--#denyusers	/usr/local/squid/etc/msntauth.denyusers
--#allowusers	/usr/local/squid/etc/msntauth.allowusers
-+#denyusers	/etc/squid/msntauth.denyusers
-+#allowusers	/etc/squid/msntauth.allowusers
- 
-diff -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE19/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/Makefile.am	2009-09-06 13:29:30.000000000 +0200
-+++ squid-3.0.STABLE19/helpers/basic_auth/SMB/Makefile.am	2009-09-12 07:25:05.000000000 +0200
-@@ -14,7 +14,7 @@
- ## FIXME: autoconf should test for the samba path.
- 
- 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 -Nru squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE19/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE19.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-09-06 13:29:30.000000000 +0200
-+++ squid-3.0.STABLE19/helpers/basic_auth/SMB/smb_auth.sh	2009-09-12 07:25:06.000000000 +0200
-@@ -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 -Nru squid-3.0.STABLE19.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE19/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE19.orig/helpers/external_acl/session/squid_session.8	2009-09-06 13:29:30.000000000 +0200
-+++ squid-3.0.STABLE19/helpers/external_acl/session/squid_session.8	2009-09-12 07:25:06.000000000 +0200
-@@ -35,7 +35,7 @@
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff -Nru squid-3.0.STABLE19.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE19/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE19.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-09-06 13:29:30.000000000 +0200
-+++ squid-3.0.STABLE19/helpers/external_acl/unix_group/squid_unix_group.8	2009-09-12 07:25:06.000000000 +0200
-@@ -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
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff -Nru squid-3.0.STABLE19.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE19/helpers/negotiate_auth/squid_kerb_auth/do.sh
---- squid-3.0.STABLE19.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-09-06 13:29:33.000000000 +0200
-+++ squid-3.0.STABLE19/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-09-12 07:25:06.000000000 +0200
-@@ -7,7 +7,7 @@
- #
- CC=gcc
- #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
--CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
-+CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
- if [ "$1" = "HEIMDAL" ]; then
-   DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
-   INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
-diff -Nru squid-3.0.STABLE19.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE19/lib/libTrie/acinclude.m4
---- squid-3.0.STABLE19.orig/lib/libTrie/acinclude.m4	2009-09-06 13:29:34.000000000 +0200
-+++ squid-3.0.STABLE19/lib/libTrie/acinclude.m4	2009-09-12 07:25:06.000000000 +0200
-@@ -9,7 +9,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.0.STABLE19.orig/lib/libTrie/configure.in squid-3.0.STABLE19/lib/libTrie/configure.in
---- squid-3.0.STABLE19.orig/lib/libTrie/configure.in	2009-09-06 13:29:35.000000000 +0200
-+++ squid-3.0.STABLE19/lib/libTrie/configure.in	2009-09-12 07:25:06.000000000 +0200
-@@ -58,8 +58,8 @@
- 
- dnl set useful flags
- if test "$GCC" = "yes"; then
--   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
--   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
-+   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-    TRIE_CFLAGS=
-    TRIE_CXXFLAGS=
-diff -Nru squid-3.0.STABLE19.orig/src/cf.data.pre squid-3.0.STABLE19/src/cf.data.pre
---- squid-3.0.STABLE19.orig/src/cf.data.pre	2009-09-06 13:29:37.000000000 +0200
-+++ squid-3.0.STABLE19/src/cf.data.pre	2009-09-12 07:25:06.000000000 +0200
-@@ -652,6 +652,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
-@@ -685,6 +687,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
-@@ -702,6 +707,9 @@
- # from where browsing should be allowed
- http_access allow localnet
- 
-+# 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
-@@ -3296,11 +3304,11 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
--	mail if the cache dies.  The default is "webmaster."
-+	mail if the cache dies.  The default is "root".
- DOC_END
- 
- NAME: mail_from
-@@ -5250,6 +5258,9 @@
- 	If you disable this, it will appear as
- 
- 		X-Forwarded-For: unknown
-+NOCOMMENT_START
-+forwarded_for off
-+NOCOMMENT_END
- DOC_END
- 
- NAME: cachemgr_passwd
-diff -Nru squid-3.0.STABLE19.orig/src/debug.cc squid-3.0.STABLE19/src/debug.cc
---- squid-3.0.STABLE19.orig/src/debug.cc	2009-09-06 13:29:37.000000000 +0200
-+++ squid-3.0.STABLE19/src/debug.cc	2009-09-12 07:25:06.000000000 +0200
-@@ -465,7 +465,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (opt_syslog_enable)
--        openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+        openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility);
- 
- #endif /* HAVE_SYSLOG */
- 
-diff -Nru squid-3.0.STABLE19.orig/src/defines.h squid-3.0.STABLE19/src/defines.h
---- squid-3.0.STABLE19.orig/src/defines.h	2009-09-06 13:29:37.000000000 +0200
-+++ squid-3.0.STABLE19/src/defines.h	2009-09-12 07:25:06.000000000 +0200
-@@ -218,7 +218,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/share/squid/errors/English"
- #endif
- 
- /* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE19.orig/src/main.cc squid-3.0.STABLE19/src/main.cc
---- squid-3.0.STABLE19.orig/src/main.cc	2009-09-06 13:29:38.000000000 +0200
-+++ squid-3.0.STABLE19/src/main.cc	2009-09-12 07:25:06.000000000 +0200
-@@ -1490,7 +1490,7 @@
-     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());
-@@ -1534,7 +1534,7 @@
- 
-         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);
-@@ -1542,7 +1542,7 @@
-         }
- 
-         /* 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);
- 
-diff -Nru squid-3.0.STABLE19.orig/src/Makefile.am squid-3.0.STABLE19/src/Makefile.am
---- squid-3.0.STABLE19.orig/src/Makefile.am	2009-09-06 13:29:36.000000000 +0200
-+++ squid-3.0.STABLE19/src/Makefile.am	2009-09-12 07:25:06.000000000 +0200
-@@ -995,12 +995,12 @@
- DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
--DEFAULT_LOG_PREFIX	= $(localstatedir)/logs
-+DEFAULT_LOG_PREFIX	= $(localstatedir)/log/squid
- 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_PID_FILE        = $(localstatedir)/run/squid.pid
-+DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
- DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch
deleted file mode 100644
index cab36cf494e8..000000000000
--- a/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -Nru squid-3.0.STABLE20.orig/src/cf.data.pre squid-3.0.STABLE20/src/cf.data.pre
---- squid-3.0.STABLE20.orig/src/cf.data.pre	2009-11-28 10:11:48.000000000 +0100
-+++ squid-3.0.STABLE20/src/cf.data.pre	2009-11-28 10:13:15.000000000 +0100
-@@ -1133,6 +1133,60 @@
- 	making the request.
- DOC_END
- 
-+NAME: zph_tos_local
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_local
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark local hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_peer
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_peer
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark peer hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_parent
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_tos_parent
-+DEFAULT: on
-+DOC_START
-+       Set this to off if you want only sibling hits to be marked.
-+       If set to on (default), parent hits are being marked too.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_preserve_miss_tos
-+DEFAULT: on
-+DOC_START
-+       If set to on (default), any HTTP response towards clients will
-+       have the TOS value of the response comming from the remote
-+       server masked with the value of zph_preserve_miss_tos_mask.
-+       For this to work correctly, you will need to patch your linux
-+       kernel with the TOS preserving ZPH patch.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos_mask
-+TYPE: int
-+DEFAULT: 255
-+LOC: Config.zph_preserve_miss_tos_mask
-+DOC_START
-+       Allows you to mask certain bits in the TOS received from the
-+       remote server, before copying the value to the TOS send towards
-+       clients.
-+       Default: 255 (TOS from server is not changed).
-+DOC_END
-+
- NAME: tcp_outgoing_address
- TYPE: acl_address
- DEFAULT: none
-diff -Nru squid-3.0.STABLE20.orig/src/client_side_reply.cc squid-3.0.STABLE20/src/client_side_reply.cc
---- squid-3.0.STABLE20.orig/src/client_side_reply.cc	2009-10-29 11:05:47.000000000 +0100
-+++ squid-3.0.STABLE20/src/client_side_reply.cc	2009-11-28 10:13:15.000000000 +0100
-@@ -48,6 +48,7 @@
- #include "ESI.h"
- #endif
- #include "MemObject.h"
-+#include "fde.h"
- #include "ACLChecklist.h"
- #include "ACL.h"
- #if DELAY_POOLS
-@@ -1549,6 +1550,11 @@
-         /* guarantee nothing has been sent yet! */
-         assert(http->out.size == 0);
-         assert(http->out.offset == 0);
-+        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;
-@@ -1829,6 +1835,24 @@
-     char *buf = next()->readBuffer.data;
- 
-     char *body_buf = buf;
-+    
-+    if (reqofs==0 && !logTypeIsATcpHit(http->logType))
-+    {
-+		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 */
-diff -Nru squid-3.0.STABLE20.orig/src/fde.h squid-3.0.STABLE20/src/fde.h
---- squid-3.0.STABLE20.orig/src/fde.h	2009-10-29 11:05:47.000000000 +0100
-+++ squid-3.0.STABLE20/src/fde.h	2009-11-28 10:13:15.000000000 +0100
-@@ -106,7 +106,7 @@
-         long handle;
-     } win32;
- #endif
--
-+    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
- };
- 
- #endif /* SQUID_FDE_H */
-diff -Nru squid-3.0.STABLE20.orig/src/forward.cc squid-3.0.STABLE20/src/forward.cc
---- squid-3.0.STABLE20.orig/src/forward.cc	2009-10-29 11:05:47.000000000 +0100
-+++ squid-3.0.STABLE20/src/forward.cc	2009-11-28 10:13:15.000000000 +0100
-@@ -965,6 +965,57 @@
- 
-     netdbPingSite(request->host);
- 
-+    /* Retrieves remote server TOS value, and stores it as part of the
-+     * original client request FD object. It is later used to forward
-+     * remote server's TOS in the response to the client in case of a MISS.
-+     */
-+	fde * clientFde = &fd_table[client_fd];
-+	if (clientFde)
-+	{
-+		int tos = 1;
-+		int tos_len = sizeof(tos);
-+		clientFde->upstreamTOS = 0;
-+	    if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0)
-+	    {
-+	       unsigned char buf[512];
-+	       int len = 512;
-+	       if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0)
-+	       {
-+	           /* Parse the PKTOPTIONS structure to locate the TOS data message
-+	            * prepared in the kernel by the ZPH incoming TCP TOS preserving
-+	            * patch.
-+	            */
-+	    	   unsigned char * p = buf;
-+	           while (p-buf < len)
-+	           {
-+	              struct cmsghdr *o = (struct cmsghdr*)p;
-+	              if (o->cmsg_len<=0)
-+	                 break;
-+	
-+	              if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
-+	              {
-+	            	  union {
-+			     unsigned char *pchar;
-+			     int  *pint;
-+			  } data;
-+			  data.pchar = CMSG_DATA(o);
-+	            	  clientFde->upstreamTOS = (unsigned char)*data.pint;
-+	            	  break;
-+	              }
-+	              p += CMSG_LEN(o->cmsg_len);
-+	           }
-+	       }
-+	       else
-+	       {
-+	           debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror());
-+	       }
-+	    }
-+	    else
-+	    {
-+	    	debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror());
-+	    }
-+	}    
-+
-     if (servers && (p = servers->_peer)) {
-         p->stats.fetches++;
-         request->peer_login = p->login;
-diff -Nru squid-3.0.STABLE20.orig/src/structs.h squid-3.0.STABLE20/src/structs.h
---- squid-3.0.STABLE20.orig/src/structs.h	2009-10-29 11:05:48.000000000 +0100
-+++ squid-3.0.STABLE20/src/structs.h	2009-11-28 10:13:15.000000000 +0100
-@@ -554,6 +554,8 @@
-         int emailErrData;
-         int httpd_suppress_version_string;
-         int global_internal_static;
-+        int zph_tos_parent;
-+        int zph_preserve_miss_tos;
-         int debug_override_X;
-         int WIN32_IpAddrChangeMonitor;
-     }
-@@ -722,6 +724,9 @@
-     int sleep_after_fork;	/* microseconds */
-     time_t minimum_expiry_time;	/* seconds */
-     external_acl *externalAclHelperList;
-+    int zph_tos_local;
-+    int zph_tos_peer;
-+    int zph_preserve_miss_tos_mask;
- #if USE_SSL
- 
-     struct
diff --git a/net-proxy/squid/files/squid-3.0.20-cross-compile.patch b/net-proxy/squid/files/squid-3.0.20-cross-compile.patch
deleted file mode 100644
index f48419bbf7c9..000000000000
--- a/net-proxy/squid/files/squid-3.0.20-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
---- squid-3.0.STABLE20.orig/configure.in	2009-11-28 10:11:48.000000000 +0100
-+++ squid-3.0.STABLE20/configure.in	2009-11-28 10:12:23.000000000 +0100
-@@ -1895,6 +1895,10 @@
- 	;;
- esac
- 
-+dnl Define HOSTCXX
-+HOSTCXX="$build-g++"
-+AC_SUBST(HOSTCXX)
-+
- dnl Check for programs
- AC_PROG_CPP
- AC_PROG_INSTALL
-diff -Nru squid-3.0.STABLE20.orig/src/Makefile.am squid-3.0.STABLE20/src/Makefile.am
---- squid-3.0.STABLE20.orig/src/Makefile.am	2009-11-28 10:11:48.000000000 +0100
-+++ squid-3.0.STABLE20/src/Makefile.am	2009-11-28 10:12:23.000000000 +0100
-@@ -1011,6 +1011,8 @@
- 
- DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
-+HOSTCXX ?= @HOSTCXX@
-+
- $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
- 
- snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
-@@ -1034,6 +1036,11 @@
- squid.conf.default: cf_parser.h
- 	true
- 
-+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
-+	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \
-+		$(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
-+		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
-+
- cf_parser.h: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
- 
diff --git a/net-proxy/squid/files/squid-3.0.20-gentoo.patch b/net-proxy/squid/files/squid-3.0.20-gentoo.patch
deleted file mode 100644
index f76e6e90829f..000000000000
--- a/net-proxy/squid/files/squid-3.0.20-gentoo.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -Nru squid-3.0.STABLE20.orig/acinclude.m4 squid-3.0.STABLE20/acinclude.m4
---- squid-3.0.STABLE20.orig/acinclude.m4	2009-10-29 11:05:32.000000000 +0100
-+++ squid-3.0.STABLE20/acinclude.m4	2009-11-28 10:10:44.000000000 +0100
-@@ -73,7 +73,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
--${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
---- squid-3.0.STABLE20.orig/configure.in	2009-10-29 11:05:49.000000000 +0100
-+++ squid-3.0.STABLE20/configure.in	2009-11-28 10:10:01.000000000 +0100
-@@ -15,9 +15,9 @@
- PRESET_LDFLAGS="$LDFLAGS"
- 
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
--        LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl         LDFLAGS="-g"
-+dnl fi
- 
- dnl Check for GNU cc
- AC_PROG_CC
-@@ -177,13 +177,13 @@
- dnl TODO: check if the problem will be present in any other newer MinGW release.
-     case "$host_os" in
-     mingw|mingw32)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- 	;;
-     *)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
- 	;;
-     esac
--    SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-     SQUID_CFLAGS=
-     SQUID_CXXFLAGS=
-diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE20/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/confload.c	2009-10-29 11:05:38.000000000 +0100
-+++ squid-3.0.STABLE20/helpers/basic_auth/MSNT/confload.c	2009-11-28 10:10:01.000000000 +0100
-@@ -27,7 +27,7 @@
- 
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
- 
-diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-10-29 11:05:38.000000000 +0100
-+++ squid-3.0.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default	2009-11-28 10:10:01.000000000 +0100
-@@ -8,6 +8,6 @@
- server other_PDC	other_BDC	otherdomain
- 
- # Denied and allowed users. Comment these if not needed.
--#denyusers	/usr/local/squid/etc/msntauth.denyusers
--#allowusers	/usr/local/squid/etc/msntauth.allowusers
-+#denyusers	/etc/squid/msntauth.denyusers
-+#allowusers	/etc/squid/msntauth.allowusers
- 
-diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE20/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am	2009-10-29 11:05:38.000000000 +0100
-+++ squid-3.0.STABLE20/helpers/basic_auth/SMB/Makefile.am	2009-11-28 10:10:01.000000000 +0100
-@@ -14,7 +14,7 @@
- ## FIXME: autoconf should test for the samba path.
- 
- 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 -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE20/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-10-29 11:05:38.000000000 +0100
-+++ squid-3.0.STABLE20/helpers/basic_auth/SMB/smb_auth.sh	2009-11-28 10:10:01.000000000 +0100
-@@ -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 -Nru squid-3.0.STABLE20.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE20/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE20.orig/helpers/external_acl/session/squid_session.8	2009-10-29 11:05:39.000000000 +0100
-+++ squid-3.0.STABLE20/helpers/external_acl/session/squid_session.8	2009-11-28 10:10:01.000000000 +0100
-@@ -35,7 +35,7 @@
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff -Nru squid-3.0.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-10-29 11:05:39.000000000 +0100
-+++ squid-3.0.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8	2009-11-28 10:10:01.000000000 +0100
-@@ -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
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff -Nru squid-3.0.STABLE20.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE20/helpers/negotiate_auth/squid_kerb_auth/do.sh
---- squid-3.0.STABLE20.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-10-29 11:05:42.000000000 +0100
-+++ squid-3.0.STABLE20/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-11-28 10:10:01.000000000 +0100
-@@ -7,7 +7,7 @@
- #
- CC=gcc
- #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
--CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
-+CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
- if [ "$1" = "HEIMDAL" ]; then
-   DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
-   INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
-diff -Nru squid-3.0.STABLE20.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE20/lib/libTrie/acinclude.m4
---- squid-3.0.STABLE20.orig/lib/libTrie/acinclude.m4	2009-10-29 11:05:44.000000000 +0100
-+++ squid-3.0.STABLE20/lib/libTrie/acinclude.m4	2009-11-28 10:10:01.000000000 +0100
-@@ -9,7 +9,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.0.STABLE20.orig/lib/libTrie/configure.in squid-3.0.STABLE20/lib/libTrie/configure.in
---- squid-3.0.STABLE20.orig/lib/libTrie/configure.in	2009-10-29 11:05:44.000000000 +0100
-+++ squid-3.0.STABLE20/lib/libTrie/configure.in	2009-11-28 10:10:01.000000000 +0100
-@@ -58,8 +58,8 @@
- 
- dnl set useful flags
- if test "$GCC" = "yes"; then
--   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
--   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
-+   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-    TRIE_CFLAGS=
-    TRIE_CXXFLAGS=
-diff -Nru squid-3.0.STABLE20.orig/src/cf.data.pre squid-3.0.STABLE20/src/cf.data.pre
---- squid-3.0.STABLE20.orig/src/cf.data.pre	2009-10-29 11:05:47.000000000 +0100
-+++ squid-3.0.STABLE20/src/cf.data.pre	2009-11-28 10:10:01.000000000 +0100
-@@ -652,6 +652,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
-@@ -685,6 +687,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
-@@ -702,6 +707,9 @@
- # from where browsing should be allowed
- http_access allow localnet
- 
-+# 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
-@@ -3296,11 +3304,11 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
--	mail if the cache dies.  The default is "webmaster."
-+	mail if the cache dies.  The default is "root".
- DOC_END
- 
- NAME: mail_from
-@@ -5250,6 +5258,9 @@
- 	If you disable this, it will appear as
- 
- 		X-Forwarded-For: unknown
-+NOCOMMENT_START
-+forwarded_for off
-+NOCOMMENT_END
- DOC_END
- 
- NAME: cachemgr_passwd
-diff -Nru squid-3.0.STABLE20.orig/src/debug.cc squid-3.0.STABLE20/src/debug.cc
---- squid-3.0.STABLE20.orig/src/debug.cc	2009-10-29 11:05:47.000000000 +0100
-+++ squid-3.0.STABLE20/src/debug.cc	2009-11-28 10:10:01.000000000 +0100
-@@ -465,7 +465,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (opt_syslog_enable)
--        openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+        openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility);
- 
- #endif /* HAVE_SYSLOG */
- 
-diff -Nru squid-3.0.STABLE20.orig/src/defines.h squid-3.0.STABLE20/src/defines.h
---- squid-3.0.STABLE20.orig/src/defines.h	2009-10-29 11:05:47.000000000 +0100
-+++ squid-3.0.STABLE20/src/defines.h	2009-11-28 10:10:01.000000000 +0100
-@@ -218,7 +218,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/share/squid/errors/English"
- #endif
- 
- /* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE20.orig/src/main.cc squid-3.0.STABLE20/src/main.cc
---- squid-3.0.STABLE20.orig/src/main.cc	2009-10-29 11:05:48.000000000 +0100
-+++ squid-3.0.STABLE20/src/main.cc	2009-11-28 10:10:01.000000000 +0100
-@@ -1490,7 +1490,7 @@
-     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());
-@@ -1534,7 +1534,7 @@
- 
-         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);
-@@ -1542,7 +1542,7 @@
-         }
- 
-         /* 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);
- 
-diff -Nru squid-3.0.STABLE20.orig/src/Makefile.am squid-3.0.STABLE20/src/Makefile.am
---- squid-3.0.STABLE20.orig/src/Makefile.am	2009-10-29 11:05:46.000000000 +0100
-+++ squid-3.0.STABLE20/src/Makefile.am	2009-11-28 10:10:01.000000000 +0100
-@@ -995,12 +995,12 @@
- DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
--DEFAULT_LOG_PREFIX	= $(localstatedir)/logs
-+DEFAULT_LOG_PREFIX	= $(localstatedir)/log/squid
- 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_PID_FILE        = $(localstatedir)/run/squid.pid
-+DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
- DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-3.0.20-libmd5.patch b/net-proxy/squid/files/squid-3.0.20-libmd5.patch
deleted file mode 100644
index 4ecfaa06b1ba..000000000000
--- a/net-proxy/squid/files/squid-3.0.20-libmd5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
---- squid-3.0.STABLE20.orig/configure.in	2009-11-28 10:29:42.000000000 +0100
-+++ squid-3.0.STABLE20/configure.in	2009-11-29 09:36:03.000000000 +0100
-@@ -2426,7 +2426,11 @@
- AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
- 
- dnl Solaris10 provides MD5 natively through libmd5
--AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
-+case "$host" in
-+	*-solaris*)
-+	    AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
-+	    ;;
-+esac
- 
- AC_SUBST(CRYPTLIB)
- 
diff --git a/net-proxy/squid/files/squid-3.1.8-gentoo.patch b/net-proxy/squid/files/squid-3.1.8-gentoo.patch
new file mode 100644
index 000000000000..d48eedfed0f4
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.1.8-gentoo.patch
@@ -0,0 +1,281 @@
+diff -Nru squid-3.1.8.orig/acinclude.m4 squid-3.1.8/acinclude.m4
+--- squid-3.1.8.orig/acinclude.m4	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/acinclude.m4	2010-09-23 23:34:10.000000000 +0200
+@@ -75,7 +75,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
+-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.1.8.orig/configure.in squid-3.1.8/configure.in
+--- squid-3.1.8.orig/configure.in	2010-09-04 05:26:52.000000000 +0200
++++ squid-3.1.8/configure.in	2010-09-23 23:34:10.000000000 +0200
+@@ -16,9 +16,9 @@
+ PRESET_LDFLAGS="$LDFLAGS"
+ 
+ dnl Set default LDFLAGS
+-if test -z "$LDFLAGS"; then
+-        LDFLAGS="-g"
+-fi
++dnl if test -z "$LDFLAGS"; then
++dnl         LDFLAGS="-g"
++dnl fi
+ 
+ dnl Check for GNU cc
+ AC_PROG_CC
+diff -Nru squid-3.1.8.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.8/helpers/basic_auth/MSNT/confload.c
+--- squid-3.1.8.orig/helpers/basic_auth/MSNT/confload.c	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/MSNT/confload.c	2010-09-23 23:34:10.000000000 +0200
+@@ -27,7 +27,7 @@
+ 
+ /* Path to configuration file */
+ #ifndef SYSCONFDIR
+-#define SYSCONFDIR "/usr/local/squid/etc"
++#define SYSCONFDIR "/etc/squid"
+ #endif
+ #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
+ 
+diff -Nru squid-3.1.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.8/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.1.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/MSNT/msntauth.conf.default	2010-09-23 23:34:10.000000000 +0200
+@@ -8,6 +8,6 @@
+ server other_PDC	other_BDC	otherdomain
+ 
+ # Denied and allowed users. Comment these if not needed.
+-#denyusers	/usr/local/squid/etc/msntauth.denyusers
+-#allowusers	/usr/local/squid/etc/msntauth.allowusers
++#denyusers	/etc/squid/msntauth.denyusers
++#allowusers	/etc/squid/msntauth.allowusers
+ 
+diff -Nru squid-3.1.8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.8/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.1.8.orig/helpers/basic_auth/SMB/Makefile.am	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.am	2010-09-23 23:34:10.000000000 +0200
+@@ -16,7 +16,7 @@
+ ## FIXME: autoconf should test for the samba path.
+ 
+ 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 -Nru squid-3.1.8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.8/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.1.8.orig/helpers/basic_auth/SMB/smb_auth.sh	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/SMB/smb_auth.sh	2010-09-23 23:34:10.000000000 +0200
+@@ -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 -Nru squid-3.1.8.orig/helpers/external_acl/session/squid_session.8 squid-3.1.8/helpers/external_acl/session/squid_session.8
+--- squid-3.1.8.orig/helpers/external_acl/session/squid_session.8	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/helpers/external_acl/session/squid_session.8	2010-09-23 23:34:10.000000000 +0200
+@@ -35,7 +35,7 @@
+ .P
+ Configuration example using the default automatic mode
+ .IP
+-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
++external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
+ .IP
+ acl session external session
+ .IP
+diff -Nru squid-3.1.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.8/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.1.8.orig/helpers/external_acl/unix_group/squid_unix_group.8	2010-09-04 05:25:58.000000000 +0200
++++ squid-3.1.8/helpers/external_acl/unix_group/squid_unix_group.8	2010-09-23 23:34:10.000000000 +0200
+@@ -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
+ .IP
+-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
++external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
+ .IP
+ acl usergroup1 external unix_group group1
+ .IP
+diff -Nru squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-09-04 05:25:58.000000000 +0200
++++ squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-09-23 23:34:10.000000000 +0200
+@@ -17,6 +17,7 @@
+ 
+ AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
+ AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
++AM_MAINTAINER_MODE
+ AC_CONFIG_SRCDIR([squid_kerb_auth.c])
+ 
+ AC_PROG_CC
+@@ -467,7 +468,7 @@
+ echo "configure: ##"
+ echo "configure: ## -----------------------------##"
+ 
+-MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
++MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
+ for ac_cv_my_cflag in $MY_CFLAGS; do
+ echo "int main()
+   {
+diff -Nru squid-3.1.8.orig/lib/libTrie/acinclude.m4 squid-3.1.8/lib/libTrie/acinclude.m4
+--- squid-3.1.8.orig/lib/libTrie/acinclude.m4	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/lib/libTrie/acinclude.m4	2010-09-23 23:34:10.000000000 +0200
+@@ -11,7 +11,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
+-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.1.8.orig/lib/libTrie/configure.in squid-3.1.8/lib/libTrie/configure.in
+--- squid-3.1.8.orig/lib/libTrie/configure.in	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/lib/libTrie/configure.in	2010-09-23 23:34:10.000000000 +0200
+@@ -59,8 +59,8 @@
+ 
+ dnl set useful flags
+ if test "$GCC" = "yes"; then
+-   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
+-   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
++   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ else
+    TRIE_CFLAGS=
+    TRIE_CXXFLAGS=
+diff -Nru squid-3.1.8.orig/src/cf.data.pre squid-3.1.8/src/cf.data.pre
+--- squid-3.1.8.orig/src/cf.data.pre	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/src/cf.data.pre	2010-09-23 23:34:10.000000000 +0200
+@@ -716,6 +716,7 @@
+ 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 CONNECT method CONNECT
+ NOCOMMENT_END
+ DOC_END
+@@ -864,6 +865,9 @@
+ http_access allow localnet
+ http_access allow localhost
+ 
++# 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
+@@ -4036,11 +4040,11 @@
+ 
+ NAME: cache_mgr
+ TYPE: string
+-DEFAULT: webmaster
++DEFAULT: root
+ LOC: Config.adminEmail
+ DOC_START
+ 	Email-address of local cache manager who will receive
+-	mail if the cache dies.  The default is "webmaster."
++	mail if the cache dies.  The default is "root".
+ DOC_END
+ 
+ NAME: mail_from
+@@ -6357,7 +6361,7 @@
+ NAME: forwarded_for
+ COMMENT: on|off|transparent|truncate|delete
+ TYPE: string
+-DEFAULT: on
++DEFAULT: delete
+ LOC: opt_forwarded_for
+ DOC_START
+ 	If set to "on", Squid will append your client's IP address
+diff -Nru squid-3.1.8.orig/src/debug.cc squid-3.1.8/src/debug.cc
+--- squid-3.1.8.orig/src/debug.cc	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/src/debug.cc	2010-09-23 23:34:10.000000000 +0200
+@@ -452,7 +452,7 @@
+ #if HAVE_SYSLOG && defined(LOG_LOCAL4)
+ 
+     if (Debug::log_syslog)
+-        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
++        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
+ 
+ #endif /* HAVE_SYSLOG */
+ 
+diff -Nru squid-3.1.8.orig/src/main.cc squid-3.1.8/src/main.cc
+--- squid-3.1.8.orig/src/main.cc	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/src/main.cc	2010-09-23 23:34:10.000000000 +0200
+@@ -1556,7 +1556,7 @@
+     if (*(argv[0]) == '(')
+         return;
+ 
+-    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+ 
+     if ((pid = fork()) < 0)
+         syslog(LOG_ALERT, "fork failed: %s", xstrerror());
+@@ -1600,7 +1600,7 @@
+ 
+         if ((pid = fork()) == 0) {
+             /* child */
+-            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+             prog = xstrdup(argv[0]);
+             argv[0] = xstrdup("(squid)");
+             execvp(prog, argv);
+@@ -1608,7 +1608,7 @@
+         }
+ 
+         /* parent */
+-        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
++        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+ 
+         syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
+ 
+diff -Nru squid-3.1.8.orig/src/Makefile.am squid-3.1.8/src/Makefile.am
+--- squid-3.1.8.orig/src/Makefile.am	2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/src/Makefile.am	2010-09-23 23:34:10.000000000 +0200
+@@ -638,7 +638,6 @@
+ 
+ sysconf_DATA = \
+ 	squid.conf.default \
+-	squid.conf.documented \
+ 	mime.conf.default
+ 
+ data_DATA = \
+@@ -719,8 +718,8 @@
+ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
+ DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
+ DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
+-DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
+-DEFAULT_SWAP_DIR        = $(localstatedir)/cache
++DEFAULT_NETDB_FILE      = $(localstatedir)/run/netdb.state
++DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
+ DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+@@ -797,13 +796,11 @@
+ 	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+ 	else \
+-	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+-	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
++	        echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
++	        $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
+ 	fi
+-	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
+-	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
+-	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
+-	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
++	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
++	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
+ 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
+ 	$(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
+ 
diff --git a/net-proxy/squid/files/squid-3.1.8-libmd5.patch b/net-proxy/squid/files/squid-3.1.8-libmd5.patch
new file mode 100644
index 000000000000..1e28b843503a
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.1.8-libmd5.patch
@@ -0,0 +1,16 @@
+diff -Nru squid-3.1.8.orig/configure.in squid-3.1.8/configure.in
+--- squid-3.1.8.orig/configure.in	2010-09-23 23:34:49.000000000 +0200
++++ squid-3.1.8/configure.in	2010-09-23 23:36:41.000000000 +0200
+@@ -2730,7 +2730,11 @@
+ dnl libcrypt (eg FreeBSD)
+ AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
+ dnl Solaris10 provides MD5 natively through libmd5
+-AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++case "$host" in
++	*-solaris*)
++	    AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++	    ;;
++esac
+ AC_SUBST(CRYPTLIB)
+ 
+ dnl Check for libdl, used by auth_modules/PAM
diff --git a/net-proxy/squid/files/squid-3.1.8-qafixes.patch b/net-proxy/squid/files/squid-3.1.8-qafixes.patch
new file mode 100644
index 000000000000..630068978867
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.1.8-qafixes.patch
@@ -0,0 +1,39 @@
+diff -Nru squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-09-23 23:34:49.000000000 +0200
++++ squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-09-23 23:35:45.000000000 +0200
+@@ -94,7 +94,7 @@
+                        else
+                          ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
+                          if test "x$ac_gssapi_libs" != "x" ; then
+-                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                           LIBS="$LIBS $ac_gssapi_libs"
+                          else
+                            for lib in $ac_gss_libs; do
+                              AC_CHECK_LIB($lib,main)
+@@ -118,7 +118,7 @@
+                      fi
+                      ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
+                      if test "x$ac_gssapi_libs" != "x" ; then
+-                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                         LIBS="$LIBS $ac_gssapi_libs"
+                      else
+                          for lib in $ac_gss_libs; do
+                             AC_CHECK_LIB($lib,main)
+@@ -172,7 +172,7 @@
+                              ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
+                              LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
+                            fi
+-                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                           LIBS="$LIBS $ac_gssapi_libs"
+                          else
+                            for lib in $ac_gss_libs; do
+                              AC_CHECK_LIB($lib,main)
+@@ -201,7 +201,7 @@
+                            ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
+                            LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
+                          fi
+-                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                         LIBS="$LIBS $ac_gssapi_libs"
+                      else
+                          for lib in $ac_gss_libs; do
+                             AC_CHECK_LIB($lib,main)
diff --git a/net-proxy/squid/squid-3.0.19.ebuild b/net-proxy/squid/squid-3.0.19.ebuild
deleted file mode 100644
index 742fcf53b7f2..000000000000
--- a/net-proxy/squid/squid-3.0.19.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.19.ebuild,v 1.7 2010/03/21 15:04:47 ranger Exp $
-
-EAPI="2"
-
-inherit eutils pam toolchain-funcs autotools
-
-# lame archive versioning scheme..
-S_PMV="${PV%%.*}"
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-
-RESTRICT="test" # check if test works in next bump
-
-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="caps pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
-	mysql postgres sqlite \
-	zero-penalty-hit \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux +epoll"
-
-DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-	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 )
-	!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 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
-
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3-capability.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	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}"
-	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}"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local ntlm_helpers="fakeauth"
-	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
-
-	local negotiate_helpers=
-	use kerberos && local negotiate_helpers="squid_kerb_auth"
-
-	local myconf=""
-
-	# 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
-			$(use_enable epoll)"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} $(use_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 \
-		--with-default-user=squid \
-		--enable-auth="basic,digest,negotiate,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-negotiate-auth-helpers="${negotiate_helpers}" \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-large-files \
-		--with-filedescriptors=8192 \
-		$(use_enable caps) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable icap-client) \
-		${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake 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}"
-	if use zero-penalty-hit; then
-		echo
-		ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel"
-		ewarn "with the patch that can be found on http://zph.bratcheda.org site."
-	fi
-}
diff --git a/net-proxy/squid/squid-3.0.20-r1.ebuild b/net-proxy/squid/squid-3.1.8.ebuild
index ce1754144da7..f121d4b34e17 100644
--- a/net-proxy/squid/squid-3.0.20-r1.ebuild
+++ b/net-proxy/squid/squid-3.1.8.ebuild
@@ -1,50 +1,49 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.20-r1.ebuild,v 1.2 2010/09/04 14:45:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.8.ebuild,v 1.1 2010/09/23 22:29:28 mrness Exp $
 
 EAPI="2"
 
-inherit eutils pam toolchain-funcs autotools
-
-# lame archive versioning scheme..
-S_PMV="${PV%%.*}"
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-
-RESTRICT="test" # check if test works in next bump
+inherit eutils pam toolchain-funcs
 
 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"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
-IUSE="caps pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux +epoll"
+	elibc_uclibc kernel_linux +epoll tproxy"
+RESTRICT=test
 
-DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
-	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
+	kerberos? ( virtual/krb5 )
 	ssl? ( dev-libs/openssl )
 	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap )
 	selinux? ( sec-policy/selinux-squid )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4
 	dev-lang/perl"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/automake
+	sys-devel/autoconf
+	sys-devel/libtool
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_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 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!"
@@ -54,20 +53,29 @@ pkg_setup() {
 		die "/etc/squid/squid.conf: cache_dir use a disabled store type"
 	fi
 
+	if use tproxy && ! use caps; then
+		eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!"
+		eerror "Please enable caps USE flag and try again."
+
+		die "invalid combination of USE flags"
+	fi
+
 	enewgroup squid 31
 	enewuser squid 31 -1 /var/cache/squid squid
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	epatch "${FILESDIR}"/${P}-qafixes.patch
 	epatch "${FILESDIR}"/${P}-libmd5.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
 
-	eautoreconf
+	# eautoreconf breaks lib/libLtdl/libtool script
+	./bootstrap.sh || die "autoreconf failed"
 }
 
 src_configure() {
+	local myconf=""
+
 	local basic_modules="getpwnam,NCSA,MSNT"
 	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
 	use ldap && basic_modules="LDAP,${basic_modules}"
@@ -87,19 +95,23 @@ src_configure() {
 	use ldap && ext_helpers="ldap_group,${ext_helpers}"
 
 	local ntlm_helpers="fakeauth"
-	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
+	use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
 
 	local negotiate_helpers=
-	use kerberos && local negotiate_helpers="squid_kerb_auth"
-
-	local myconf=""
+	if use kerberos; then
+		negotiate_helpers="squid_kerb_auth"
+		has_version app-crypt/mit-krb5 \
+			&& myconf="--enable-mit --disable-heimdal" \
+			|| myconf="--disable-mit --enable-heimdal"
+	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"
+	myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
 
 	if use kernel_linux; then
 		myconf="${myconf} --enable-linux-netfilter
+			$(use_enable tproxy linux-tproxy)
 			$(use_enable epoll)"
 	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
 		myconf="${myconf} $(use_enable kqueue)"
@@ -116,7 +128,9 @@ src_configure() {
 		--sysconfdir=/etc/squid \
 		--libexecdir=/usr/libexec/squid \
 		--localstatedir=/var \
+		--with-pidfile=/var/run/squid.pid \
 		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
 		--with-default-user=squid \
 		--enable-auth="basic,digest,negotiate,ntlm" \
 		--enable-removal-policies="lru,heap" \
@@ -132,10 +146,14 @@ src_configure() {
 		--enable-arp-acl \
 		--with-large-files \
 		--with-filedescriptors=8192 \
+		--disable-strict-error-checking \
 		$(use_enable caps) \
+		$(use_enable ipv6) \
 		$(use_enable snmp) \
 		$(use_enable ssl) \
 		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		$(use_enable zero-penalty-hit zph-qos) \
 		${myconf} || die "econf failed"
 }