Remove -Werror from CFLAGS (#260931).

Append negotiate to the --enable-auth list (#259463).
(Portage version: 2.1.6.7/cvs/Linux x86_64)

10 files changed, 121 insertions, 998 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 78e7a9160bd9..b569ec59e17b 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.230 2009/02/25 20:39:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.231 2009/03/06 22:42:09 mrness Exp $
+
+*squid-2.7.6-r1 (06 Mar 2009)
+
+  06 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  -files/squid-2.7.5-gentoo.patch, -files/squid-2.7.5-heimdal.patch,
+  files/squid-2.7.6-gentoo.patch, -files/squid-3.0.11-adapted-zph.patch,
+  -files/squid-3.0.11-gentoo.patch, -files/squid-3.0.11-heimdal.patch,
+  files/squid-3.0.13-gentoo.patch, -squid-2.7.5-r1.ebuild,
+  +squid-2.7.6-r1.ebuild, -squid-3.0.11.ebuild:
+  Remove -Werror from CFLAGS (#260931). Append negotiate to the --enable-auth
+  list (#259463).
 
   25 Feb 2009; Markus Meier <maekke@gentoo.org> squid-2.7.6.ebuild:
   amd64 stable, bug #257585
diff --git a/net-proxy/squid/files/squid-2.7.5-gentoo.patch b/net-proxy/squid/files/squid-2.7.5-gentoo.patch
deleted file mode 100644
index 23086059841d..000000000000
--- a/net-proxy/squid/files/squid-2.7.5-gentoo.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-diff -Nru squid-2.7.STABLE5.orig/configure.in squid-2.7.STABLE5/configure.in
---- squid-2.7.STABLE5.orig/configure.in	2008-10-17 19:01:04.000000000 +0000
-+++ squid-2.7.STABLE5/configure.in	2008-10-19 09:48:02.000000000 +0000
-@@ -18,9 +18,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-2.7.STABLE5.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE5/helpers/basic_auth/MSNT/confload.c
---- squid-2.7.STABLE5.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 19:09:48.000000000 +0000
-+++ squid-2.7.STABLE5/helpers/basic_auth/MSNT/confload.c	2008-10-19 09:48:02.000000000 +0000
-@@ -24,7 +24,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-2.7.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-2.7.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 18:44:28.000000000 +0000
-+++ squid-2.7.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default	2008-10-19 09:48:02.000000000 +0000
-@@ -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-2.7.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE5/helpers/basic_auth/SMB/Makefile.am
---- squid-2.7.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 16:56:26.000000000 +0000
-+++ squid-2.7.STABLE5/helpers/basic_auth/SMB/Makefile.am	2008-10-19 09:48:02.000000000 +0000
-@@ -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-2.7.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE5/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.7.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-07 23:36:46.000000000 +0000
-+++ squid-2.7.STABLE5/helpers/basic_auth/SMB/smb_auth.sh	2008-10-19 09:48:02.000000000 +0000
-@@ -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-2.7.STABLE5.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE5/helpers/external_acl/session/squid_session.8
---- squid-2.7.STABLE5.orig/helpers/external_acl/session/squid_session.8	2007-01-06 17:28:35.000000000 +0000
-+++ squid-2.7.STABLE5/helpers/external_acl/session/squid_session.8	2008-10-19 09:48:02.000000000 +0000
-@@ -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-2.7.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-2.7.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 15:07:24.000000000 +0000
-+++ squid-2.7.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8	2008-10-19 09:48:02.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
- .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-2.7.STABLE5.orig/src/access_log.c squid-2.7.STABLE5/src/access_log.c
---- squid-2.7.STABLE5.orig/src/access_log.c	2008-03-18 02:48:43.000000000 +0000
-+++ squid-2.7.STABLE5/src/access_log.c	2008-10-19 09:48:02.000000000 +0000
-@@ -1261,7 +1261,7 @@
- 	LogfileStatus = LOG_ENABLE;
-     }
- #if HEADERS_LOG
--    headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0);
-+    headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0);
-     assert(NULL != headerslog);
- #endif
- #if FORW_VIA_DB
-diff -Nru squid-2.7.STABLE5.orig/src/cf.data.pre squid-2.7.STABLE5/src/cf.data.pre
---- squid-2.7.STABLE5.orig/src/cf.data.pre	2008-09-25 02:33:37.000000000 +0000
-+++ squid-2.7.STABLE5/src/cf.data.pre	2008-10-19 09:48:02.000000000 +0000
-@@ -676,6 +676,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
-@@ -709,6 +711,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
-@@ -726,6 +731,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
-@@ -3745,11 +3753,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
-@@ -3778,12 +3786,12 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: squid
- LOC: Config.effectiveUser
- DOC_START
- 	If you start Squid as root, it will change its effective/real
- 	UID/GID to the user specified below.  The default is to change
--	to UID to nobody.  If you define cache_effective_user, but not
-+	to UID to squid.  If you define cache_effective_user, but not
- 	cache_effective_group, Squid sets the GID to the effective
- 	user's default group ID (taken from the password file) and
- 	supplementary group list from the from groups membership of
-@@ -4420,12 +4428,12 @@
- NAME: snmp_port
- TYPE: ushort
- LOC: Config.Port.snmp
--DEFAULT: 3401
-+DEFAULT: 0
- IFDEF: SQUID_SNMP
- DOC_START
- 	Squid can now serve statistics and status information via SNMP.
--	By default it listens to port 3401 on the machine. If you don't
--	wish to use SNMP, set this to "0".
-+	By default snmp_port is disabled. If you wish to use SNMP, 
-+	set this to "3401" (or any other number you like).
- DOC_END
- 
- NAME: snmp_access
-@@ -4496,12 +4504,12 @@
- NAME: htcp_port
- IFDEF: USE_HTCP
- TYPE: ushort
--DEFAULT: 4827
-+DEFAULT: 0
- LOC: Config.Port.htcp
- DOC_START
- 	The port number where Squid sends and receives HTCP queries to
--	and from neighbor caches.  Default is 4827.  To disable use
--	"0".
-+	and from neighbor caches.  To turn it on you want to set it to
-+	4827.  By default it is set to "0" (disabled).
- DOC_END
- 
- NAME: log_icp_queries
-@@ -5398,6 +5406,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-2.7.STABLE5.orig/src/client_side.c squid-2.7.STABLE5/src/client_side.c
---- squid-2.7.STABLE5.orig/src/client_side.c	2008-10-06 21:27:44.000000000 +0000
-+++ squid-2.7.STABLE5/src/client_side.c	2008-10-19 09:48:02.000000000 +0000
-@@ -4706,14 +4706,7 @@
- 	debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
-     } else {
- 	if (do_debug(83, 4)) {
--	    /* Write out the SSL session details.. actually the call below, but
--	     * OpenSSL headers do strange typecasts confusing GCC.. */
--	    /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L
--	    PEM_ASN1_write((i2d_of_void *) i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
--#else
- 	    PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
--#endif
- 	    /* Note: This does not automatically fflush the log file.. */
- 	}
- 	debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
-diff -Nru squid-2.7.STABLE5.orig/src/defines.h squid-2.7.STABLE5/src/defines.h
---- squid-2.7.STABLE5.orig/src/defines.h	2007-09-24 13:31:19.000000000 +0000
-+++ squid-2.7.STABLE5/src/defines.h	2008-10-19 09:48:02.000000000 +0000
-@@ -259,7 +259,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
- 
- /* gb_type operations */
-diff -Nru squid-2.7.STABLE5.orig/src/main.c squid-2.7.STABLE5/src/main.c
---- squid-2.7.STABLE5.orig/src/main.c	2008-09-25 02:21:52.000000000 +0000
-+++ squid-2.7.STABLE5/src/main.c	2008-10-19 09:48:02.000000000 +0000
-@@ -376,6 +376,22 @@
-     asnFreeMemory();
- }
- 
-+#if USE_UNLINKD
-+static int
-+needUnlinkd(void)
-+{
-+    int i;
-+    int r = 0;
-+    for (i = 0; i < Config.cacheSwap.n_configured; i++) {
-+       if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 ||
-+           strcmp(Config.cacheSwap.swapDirs[i].type, "aufs") == 0 ||
-+           strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0)
-+          r++;
-+    }
-+    return r;
-+}
-+#endif
-+
- static void
- mainReconfigure(void)
- {
-@@ -614,7 +630,7 @@
- 
-     if (!configured_once) {
- #if USE_UNLINKD
--	unlinkdInit();
-+	if (needUnlinkd()) unlinkdInit();
- #endif
- 	urlInitialize();
- 	cachemgrInit();
-@@ -637,6 +653,9 @@
- #if USE_WCCPv2
-     wccp2Init();
- #endif
-+#if USE_UNLINKD
-+    if (needUnlinkd()) unlinkdInit();
-+#endif
-     serverConnectionsOpen();
-     neighbors_init();
-     if (Config.chroot_dir)
-diff -Nru squid-2.7.STABLE5.orig/src/Makefile.am squid-2.7.STABLE5/src/Makefile.am
---- squid-2.7.STABLE5.orig/src/Makefile.am	2008-01-02 15:50:39.000000000 +0000
-+++ squid-2.7.STABLE5/src/Makefile.am	2008-10-19 09:48:02.000000000 +0000
-@@ -340,13 +340,13 @@
- 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_PID_FILE        = $(localstatedir)/run/squid.pid
- DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-+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-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-2.7.5-heimdal.patch b/net-proxy/squid/files/squid-2.7.5-heimdal.patch
deleted file mode 100644
index 6ea700ef8fbb..000000000000
--- a/net-proxy/squid/files/squid-2.7.5-heimdal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nru squid-2.7.STABLE5.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE5/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-2.7.STABLE5.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2007-05-14 23:36:29.000000000 +0000
-+++ squid-2.7.STABLE5/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-19 09:50:22.000000000 +0000
-@@ -18,10 +18,10 @@
- #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
- 
- # HEIMDAL
--#KERBINC = -DHEIMDAL -I/usr/include/heimdal
--#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
-+KERBINC = -DHEIMDAL -I/usr/include/heimdal
-+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
- 
- # MIT
--KERBINC = 
--KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
-+#KERBINC = 
-+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
- 
diff --git a/net-proxy/squid/files/squid-2.7.6-gentoo.patch b/net-proxy/squid/files/squid-2.7.6-gentoo.patch
index 2b6127a6656b..e15a12b7fde4 100644
--- a/net-proxy/squid/files/squid-2.7.6-gentoo.patch
+++ b/net-proxy/squid/files/squid-2.7.6-gentoo.patch
@@ -1,6 +1,6 @@
 diff -Nru squid-2.7.STABLE6.orig/configure.in squid-2.7.STABLE6/configure.in
 --- squid-2.7.STABLE6.orig/configure.in	2009-02-04 00:44:06.000000000 +0000
-+++ squid-2.7.STABLE6/configure.in	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/configure.in	2009-03-06 22:10:42.000000000 +0000
 @@ -18,9 +18,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
@@ -16,7 +16,7 @@ diff -Nru squid-2.7.STABLE6.orig/configure.in squid-2.7.STABLE6/configure.in
  AC_PROG_CC
 diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE6/helpers/basic_auth/MSNT/confload.c
 --- squid-2.7.STABLE6.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 19:09:48.000000000 +0000
-+++ squid-2.7.STABLE6/helpers/basic_auth/MSNT/confload.c	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/helpers/basic_auth/MSNT/confload.c	2009-03-06 22:10:42.000000000 +0000
 @@ -24,7 +24,7 @@
  
  /* Path to configuration file */
@@ -28,7 +28,7 @@ diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.ST
  
 diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default
 --- squid-2.7.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 18:44:28.000000000 +0000
-+++ squid-2.7.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default	2009-03-06 22:10:42.000000000 +0000
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -40,7 +40,7 @@ diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default s
  
 diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE6/helpers/basic_auth/SMB/Makefile.am
 --- squid-2.7.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 16:56:26.000000000 +0000
-+++ squid-2.7.STABLE6/helpers/basic_auth/SMB/Makefile.am	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/helpers/basic_auth/SMB/Makefile.am	2009-03-06 22:10:42.000000000 +0000
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -52,7 +52,7 @@ diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.ST
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
 diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE6/helpers/basic_auth/SMB/smb_auth.sh
 --- squid-2.7.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-07 23:36:46.000000000 +0000
-+++ squid-2.7.STABLE6/helpers/basic_auth/SMB/smb_auth.sh	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/helpers/basic_auth/SMB/smb_auth.sh	2009-03-06 22:10:42.000000000 +0000
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -73,7 +73,7 @@ diff -Nru squid-2.7.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.ST
  
 diff -Nru squid-2.7.STABLE6.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE6/helpers/external_acl/session/squid_session.8
 --- squid-2.7.STABLE6.orig/helpers/external_acl/session/squid_session.8	2007-01-06 17:28:35.000000000 +0000
-+++ squid-2.7.STABLE6/helpers/external_acl/session/squid_session.8	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/helpers/external_acl/session/squid_session.8	2009-03-06 22:10:42.000000000 +0000
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -85,7 +85,7 @@ diff -Nru squid-2.7.STABLE6.orig/helpers/external_acl/session/squid_session.8 sq
  .IP
 diff -Nru squid-2.7.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8
 --- squid-2.7.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 15:07:24.000000000 +0000
-+++ squid-2.7.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8	2009-03-06 22:10:42.000000000 +0000
 @@ -27,7 +27,7 @@
  This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
  matches users in group2 or group3
@@ -95,9 +95,21 @@ diff -Nru squid-2.7.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_grou
  .IP
  acl usergroup1 external unix_group group1
  .IP
+diff -Nru squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/do.sh
+--- squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2007-06-24 22:23:18.000000000 +0000
++++ squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-03-06 22:12:00.000000000 +0000
+@@ -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-2.7.STABLE6.orig/src/access_log.c squid-2.7.STABLE6/src/access_log.c
 --- squid-2.7.STABLE6.orig/src/access_log.c	2008-03-18 02:48:43.000000000 +0000
-+++ squid-2.7.STABLE6/src/access_log.c	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/src/access_log.c	2009-03-06 22:10:42.000000000 +0000
 @@ -1261,7 +1261,7 @@
  	LogfileStatus = LOG_ENABLE;
      }
@@ -109,7 +121,7 @@ diff -Nru squid-2.7.STABLE6.orig/src/access_log.c squid-2.7.STABLE6/src/access_l
  #if FORW_VIA_DB
 diff -Nru squid-2.7.STABLE6.orig/src/cf.data.pre squid-2.7.STABLE6/src/cf.data.pre
 --- squid-2.7.STABLE6.orig/src/cf.data.pre	2009-02-02 11:28:55.000000000 +0000
-+++ squid-2.7.STABLE6/src/cf.data.pre	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/src/cf.data.pre	2009-03-06 22:10:42.000000000 +0000
 @@ -678,6 +678,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
@@ -212,7 +224,7 @@ diff -Nru squid-2.7.STABLE6.orig/src/cf.data.pre squid-2.7.STABLE6/src/cf.data.p
  NAME: cachemgr_passwd
 diff -Nru squid-2.7.STABLE6.orig/src/client_side.c squid-2.7.STABLE6/src/client_side.c
 --- squid-2.7.STABLE6.orig/src/client_side.c	2008-10-06 21:27:44.000000000 +0000
-+++ squid-2.7.STABLE6/src/client_side.c	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/src/client_side.c	2009-03-06 22:10:42.000000000 +0000
 @@ -4706,14 +4706,7 @@
  	debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
      } else {
@@ -230,7 +242,7 @@ diff -Nru squid-2.7.STABLE6.orig/src/client_side.c squid-2.7.STABLE6/src/client_
  	debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
 diff -Nru squid-2.7.STABLE6.orig/src/defines.h squid-2.7.STABLE6/src/defines.h
 --- squid-2.7.STABLE6.orig/src/defines.h	2007-09-24 13:31:19.000000000 +0000
-+++ squid-2.7.STABLE6/src/defines.h	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/src/defines.h	2009-03-06 22:10:42.000000000 +0000
 @@ -259,7 +259,7 @@
  
  /* were to look for errors if config path fails */
@@ -242,7 +254,7 @@ diff -Nru squid-2.7.STABLE6.orig/src/defines.h squid-2.7.STABLE6/src/defines.h
  /* gb_type operations */
 diff -Nru squid-2.7.STABLE6.orig/src/main.c squid-2.7.STABLE6/src/main.c
 --- squid-2.7.STABLE6.orig/src/main.c	2008-09-25 02:21:52.000000000 +0000
-+++ squid-2.7.STABLE6/src/main.c	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/src/main.c	2009-03-06 22:10:42.000000000 +0000
 @@ -376,6 +376,22 @@
      asnFreeMemory();
  }
@@ -287,7 +299,7 @@ diff -Nru squid-2.7.STABLE6.orig/src/main.c squid-2.7.STABLE6/src/main.c
      if (Config.chroot_dir)
 diff -Nru squid-2.7.STABLE6.orig/src/Makefile.am squid-2.7.STABLE6/src/Makefile.am
 --- squid-2.7.STABLE6.orig/src/Makefile.am	2008-01-02 15:50:39.000000000 +0000
-+++ squid-2.7.STABLE6/src/Makefile.am	2009-02-16 23:25:36.000000000 +0000
++++ squid-2.7.STABLE6/src/Makefile.am	2009-03-06 22:10:42.000000000 +0000
 @@ -340,13 +340,13 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
diff --git a/net-proxy/squid/files/squid-3.0.11-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.11-adapted-zph.patch
deleted file mode 100644
index e5a025cab30f..000000000000
--- a/net-proxy/squid/files/squid-3.0.11-adapted-zph.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -Nru squid-3.0.STABLE11.orig/src/cf.data.pre squid-3.0.STABLE11/src/cf.data.pre
---- squid-3.0.STABLE11.orig/src/cf.data.pre	2009-01-10 11:50:23.000000000 +0000
-+++ squid-3.0.STABLE11/src/cf.data.pre	2009-01-10 11:51:24.000000000 +0000
-@@ -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.STABLE11.orig/src/client_side_reply.cc squid-3.0.STABLE11/src/client_side_reply.cc
---- squid-3.0.STABLE11.orig/src/client_side_reply.cc	2008-12-23 04:19:32.000000000 +0000
-+++ squid-3.0.STABLE11/src/client_side_reply.cc	2009-01-10 11:51:24.000000000 +0000
-@@ -48,6 +48,7 @@
- #include "ESI.h"
- #endif
- #include "MemObject.h"
-+#include "fde.h"
- #include "ACLChecklist.h"
- #include "ACL.h"
- #if DELAY_POOLS
-@@ -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)
-+      	{
-+			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;
-@@ -1827,6 +1833,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.STABLE11.orig/src/fde.h squid-3.0.STABLE11/src/fde.h
---- squid-3.0.STABLE11.orig/src/fde.h	2008-12-23 04:19:32.000000000 +0000
-+++ squid-3.0.STABLE11/src/fde.h	2009-01-10 11:51:24.000000000 +0000
-@@ -106,7 +106,7 @@
-         long handle;
-     } win32;
- #endif
--
-+    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
- };
- 
- #endif /* SQUID_FDE_H */
-diff -Nru squid-3.0.STABLE11.orig/src/forward.cc squid-3.0.STABLE11/src/forward.cc
---- squid-3.0.STABLE11.orig/src/forward.cc	2008-12-23 04:19:32.000000000 +0000
-+++ squid-3.0.STABLE11/src/forward.cc	2009-01-10 11:51:24.000000000 +0000
-@@ -964,6 +964,52 @@
- 
-     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)
-+	              {
-+	            	  clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
-+	            	  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.STABLE11.orig/src/structs.h squid-3.0.STABLE11/src/structs.h
---- squid-3.0.STABLE11.orig/src/structs.h	2008-12-23 04:19:33.000000000 +0000
-+++ squid-3.0.STABLE11/src/structs.h	2009-01-10 11:51:24.000000000 +0000
-@@ -553,6 +553,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;
-     }
-@@ -721,6 +723,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.11-gentoo.patch b/net-proxy/squid/files/squid-3.0.11-gentoo.patch
deleted file mode 100644
index a19b7be662a3..000000000000
--- a/net-proxy/squid/files/squid-3.0.11-gentoo.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -Nru squid-3.0.STABLE11.orig/configure.in squid-3.0.STABLE11/configure.in
---- squid-3.0.STABLE11.orig/configure.in	2008-12-23 04:19:33.000000000 +0000
-+++ squid-3.0.STABLE11/configure.in	2009-01-10 11:48:27.000000000 +0000
-@@ -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.0.STABLE11.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE11/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE11.orig/helpers/basic_auth/MSNT/confload.c	2008-12-23 04:19:25.000000000 +0000
-+++ squid-3.0.STABLE11/helpers/basic_auth/MSNT/confload.c	2009-01-10 11:48:27.000000000 +0000
-@@ -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.STABLE11.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE11/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE11.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-12-23 04:19:25.000000000 +0000
-+++ squid-3.0.STABLE11/helpers/basic_auth/MSNT/msntauth.conf.default	2009-01-10 11:48:27.000000000 +0000
-@@ -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.STABLE11.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE11/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE11.orig/helpers/basic_auth/SMB/Makefile.am	2008-12-23 04:19:25.000000000 +0000
-+++ squid-3.0.STABLE11/helpers/basic_auth/SMB/Makefile.am	2009-01-10 11:48:27.000000000 +0000
-@@ -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.STABLE11.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE11/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE11.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-12-23 04:19:25.000000000 +0000
-+++ squid-3.0.STABLE11/helpers/basic_auth/SMB/smb_auth.sh	2009-01-10 11:48:27.000000000 +0000
-@@ -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.STABLE11.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE11/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE11.orig/helpers/external_acl/session/squid_session.8	2008-12-23 04:19:26.000000000 +0000
-+++ squid-3.0.STABLE11/helpers/external_acl/session/squid_session.8	2009-01-10 11:48:27.000000000 +0000
-@@ -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.STABLE11.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE11/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE11.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-12-23 04:19:26.000000000 +0000
-+++ squid-3.0.STABLE11/helpers/external_acl/unix_group/squid_unix_group.8	2009-01-10 11:48:27.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
- .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.STABLE11.orig/src/cf.data.pre squid-3.0.STABLE11/src/cf.data.pre
---- squid-3.0.STABLE11.orig/src/cf.data.pre	2008-12-23 04:19:32.000000000 +0000
-+++ squid-3.0.STABLE11/src/cf.data.pre	2009-01-10 11:48:27.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
-+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
-@@ -3259,11 +3267,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
-@@ -5213,6 +5221,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.STABLE11.orig/src/debug.cc squid-3.0.STABLE11/src/debug.cc
---- squid-3.0.STABLE11.orig/src/debug.cc	2008-12-23 04:19:32.000000000 +0000
-+++ squid-3.0.STABLE11/src/debug.cc	2009-01-10 11:48:27.000000000 +0000
-@@ -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.STABLE11.orig/src/defines.h squid-3.0.STABLE11/src/defines.h
---- squid-3.0.STABLE11.orig/src/defines.h	2008-12-23 04:19:32.000000000 +0000
-+++ squid-3.0.STABLE11/src/defines.h	2009-01-10 11:48:27.000000000 +0000
-@@ -219,7 +219,7 @@
- 
- /* were to look for errors if config path fails */
- #ifndef DEFAULT_SQUID_ERROR_DIR
--#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
-+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
- #endif
- 
- /* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE11.orig/src/main.cc squid-3.0.STABLE11/src/main.cc
---- squid-3.0.STABLE11.orig/src/main.cc	2008-12-23 04:19:33.000000000 +0000
-+++ squid-3.0.STABLE11/src/main.cc	2009-01-10 11:48:27.000000000 +0000
-@@ -1486,7 +1486,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());
-@@ -1530,7 +1530,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);
-@@ -1538,7 +1538,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.STABLE11.orig/src/Makefile.am squid-3.0.STABLE11/src/Makefile.am
---- squid-3.0.STABLE11.orig/src/Makefile.am	2008-12-23 04:19:32.000000000 +0000
-+++ squid-3.0.STABLE11/src/Makefile.am	2009-01-10 11:48:27.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)/'`
--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.11-heimdal.patch b/net-proxy/squid/files/squid-3.0.11-heimdal.patch
deleted file mode 100644
index 33c22baa6f73..000000000000
--- a/net-proxy/squid/files/squid-3.0.11-heimdal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nru squid-3.0.STABLE11.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE11/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-3.0.STABLE11.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-12-23 04:19:26.000000000 +0000
-+++ squid-3.0.STABLE11/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-01-10 11:49:46.000000000 +0000
-@@ -18,10 +18,10 @@
- #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
- 
- # HEIMDAL
--#KERBINC = -DHEIMDAL -I/usr/include/heimdal
--#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
-+KERBINC = -DHEIMDAL -I/usr/include/heimdal
-+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
- 
- # MIT
--KERBINC = 
--KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
-+#KERBINC = 
-+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
- 
diff --git a/net-proxy/squid/files/squid-3.0.13-gentoo.patch b/net-proxy/squid/files/squid-3.0.13-gentoo.patch
index d92210db61e7..c6ee8420f543 100644
--- a/net-proxy/squid/files/squid-3.0.13-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.13-gentoo.patch
@@ -1,6 +1,18 @@
+diff -Nru squid-3.0.STABLE13.orig/acinclude.m4 squid-3.0.STABLE13/acinclude.m4
+--- squid-3.0.STABLE13.orig/acinclude.m4	2009-02-03 01:36:11.000000000 +0000
++++ squid-3.0.STABLE13/acinclude.m4	2009-03-06 22:34:34.000000000 +0000
+@@ -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.STABLE13.orig/configure.in squid-3.0.STABLE13/configure.in
 --- squid-3.0.STABLE13.orig/configure.in	2009-02-03 01:36:23.000000000 +0000
-+++ squid-3.0.STABLE13/configure.in	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/configure.in	2009-03-06 22:33:50.000000000 +0000
 @@ -16,9 +16,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
@@ -14,9 +26,26 @@ diff -Nru squid-3.0.STABLE13.orig/configure.in squid-3.0.STABLE13/configure.in
  
  dnl Check for GNU cc
  AC_PROG_CC
+@@ -178,13 +178,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.STABLE13.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE13/helpers/basic_auth/MSNT/confload.c
 --- squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/confload.c	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/confload.c	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/confload.c	2009-03-06 22:33:50.000000000 +0000
 @@ -27,7 +27,7 @@
  
  /* Path to configuration file */
@@ -28,7 +57,7 @@ diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.S
  
 diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default
 --- squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default	2009-03-06 22:33:50.000000000 +0000
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -40,7 +69,7 @@ diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default
  
 diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE13/helpers/basic_auth/SMB/Makefile.am
 --- squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/SMB/Makefile.am	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/helpers/basic_auth/SMB/Makefile.am	2009-03-06 22:33:50.000000000 +0000
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -52,7 +81,7 @@ diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.S
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
 diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE13/helpers/basic_auth/SMB/smb_auth.sh
 --- squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/SMB/smb_auth.sh	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/helpers/basic_auth/SMB/smb_auth.sh	2009-03-06 22:33:50.000000000 +0000
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -73,7 +102,7 @@ diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.S
  
 diff -Nru squid-3.0.STABLE13.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE13/helpers/external_acl/session/squid_session.8
 --- squid-3.0.STABLE13.orig/helpers/external_acl/session/squid_session.8	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/external_acl/session/squid_session.8	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/helpers/external_acl/session/squid_session.8	2009-03-06 22:33:50.000000000 +0000
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -85,7 +114,7 @@ diff -Nru squid-3.0.STABLE13.orig/helpers/external_acl/session/squid_session.8 s
  .IP
 diff -Nru squid-3.0.STABLE13.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE13/helpers/external_acl/unix_group/squid_unix_group.8
 --- squid-3.0.STABLE13.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/external_acl/unix_group/squid_unix_group.8	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/helpers/external_acl/unix_group/squid_unix_group.8	2009-03-06 22:33:50.000000000 +0000
 @@ -27,7 +27,7 @@
  This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
  matches users in group2 or group3
@@ -95,9 +124,47 @@ diff -Nru squid-3.0.STABLE13.orig/helpers/external_acl/unix_group/squid_unix_gro
  .IP
  acl usergroup1 external unix_group group1
  .IP
+diff -Nru squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/do.sh
+--- squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-02-03 01:36:16.000000000 +0000
++++ squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-03-06 22:33:50.000000000 +0000
+@@ -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.STABLE13.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE13/lib/libTrie/acinclude.m4
+--- squid-3.0.STABLE13.orig/lib/libTrie/acinclude.m4	2009-02-03 01:36:20.000000000 +0000
++++ squid-3.0.STABLE13/lib/libTrie/acinclude.m4	2009-03-06 22:34:13.000000000 +0000
+@@ -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.STABLE13.orig/lib/libTrie/configure.in squid-3.0.STABLE13/lib/libTrie/configure.in
+--- squid-3.0.STABLE13.orig/lib/libTrie/configure.in	2009-02-03 01:36:20.000000000 +0000
++++ squid-3.0.STABLE13/lib/libTrie/configure.in	2009-03-06 22:33:50.000000000 +0000
+@@ -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.STABLE13.orig/src/cf.data.pre squid-3.0.STABLE13/src/cf.data.pre
 --- squid-3.0.STABLE13.orig/src/cf.data.pre	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/cf.data.pre	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/src/cf.data.pre	2009-03-06 22:33:50.000000000 +0000
 @@ -652,6 +652,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
@@ -153,7 +220,7 @@ diff -Nru squid-3.0.STABLE13.orig/src/cf.data.pre squid-3.0.STABLE13/src/cf.data
  NAME: cachemgr_passwd
 diff -Nru squid-3.0.STABLE13.orig/src/debug.cc squid-3.0.STABLE13/src/debug.cc
 --- squid-3.0.STABLE13.orig/src/debug.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/debug.cc	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/src/debug.cc	2009-03-06 22:33:50.000000000 +0000
 @@ -465,7 +465,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
@@ -165,7 +232,7 @@ diff -Nru squid-3.0.STABLE13.orig/src/debug.cc squid-3.0.STABLE13/src/debug.cc
  
 diff -Nru squid-3.0.STABLE13.orig/src/defines.h squid-3.0.STABLE13/src/defines.h
 --- squid-3.0.STABLE13.orig/src/defines.h	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/defines.h	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/src/defines.h	2009-03-06 22:33:50.000000000 +0000
 @@ -218,7 +218,7 @@
  
  /* were to look for errors if config path fails */
@@ -177,7 +244,7 @@ diff -Nru squid-3.0.STABLE13.orig/src/defines.h squid-3.0.STABLE13/src/defines.h
  /* handy to determine the #elements in a static array */
 diff -Nru squid-3.0.STABLE13.orig/src/main.cc squid-3.0.STABLE13/src/main.cc
 --- squid-3.0.STABLE13.orig/src/main.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/main.cc	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/src/main.cc	2009-03-06 22:33:50.000000000 +0000
 @@ -1485,7 +1485,7 @@
      if (*(argv[0]) == '(')
          return;
@@ -207,7 +274,7 @@ diff -Nru squid-3.0.STABLE13.orig/src/main.cc squid-3.0.STABLE13/src/main.cc
  
 diff -Nru squid-3.0.STABLE13.orig/src/Makefile.am squid-3.0.STABLE13/src/Makefile.am
 --- squid-3.0.STABLE13.orig/src/Makefile.am	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/Makefile.am	2009-02-16 23:20:09.000000000 +0000
++++ squid-3.0.STABLE13/src/Makefile.am	2009-03-06 22:33:50.000000000 +0000
 @@ -991,12 +991,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
diff --git a/net-proxy/squid/squid-2.7.5-r1.ebuild b/net-proxy/squid/squid-2.7.6-r1.ebuild
index 0c1c388e26e7..7ff1c0c0b048 100644
--- a/net-proxy/squid/squid-2.7.5-r1.ebuild
+++ b/net-proxy/squid/squid-2.7.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.5-r1.ebuild,v 1.7 2008/12/22 16:57:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6-r1.ebuild,v 1.1 2009/03/06 22:42:09 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \
@@ -48,7 +48,7 @@ pkg_setup() {
 	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."
+		ewarn "If you need that, please use >=${CATEGORY}/${PN}-3 ."
 	fi
 	enewgroup squid 31
 	enewuser squid 31 -1 /var/cache/squid squid
@@ -114,7 +114,7 @@ src_compile() {
 		--libexecdir=/usr/libexec/squid \
 		--localstatedir=/var \
 		--datadir=/usr/share/squid \
-		--enable-auth="basic,digest,ntlm" \
+		--enable-auth="basic,digest,ntlm,negotiate" \
 		--enable-removal-policies="lru,heap" \
 		--enable-digest-auth-helpers="password" \
 		--enable-basic-auth-helpers="${basic_modules}" \
diff --git a/net-proxy/squid/squid-3.0.11.ebuild b/net-proxy/squid/squid-3.0.11.ebuild
deleted file mode 100644
index 8efeb094b9f9..000000000000
--- a/net-proxy/squid/squid-3.0.11.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.11.ebuild,v 1.1 2009/01/10 12:43:41 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_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="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="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_unpack() {
-	unpack ${A} || die "unpack failed"
-
-	cd "${S}" || die "source dir not found"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
-	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.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}"
-	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 snmp) \
-		$(use_enable ssl) \
-		$(use_enable icap-client) \
-		${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}"
-	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
-}