Version bump (#242646).

Package-Manager: portage-2.1.4.4

5 files changed, 364 insertions, 7 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 600b1d587565..0483c6a832e3 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.207 2008/10/18 17:01:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.208 2008/10/19 10:00:35 mrness Exp $
+
+*squid-2.7.5 (19 Oct 2008)
+
+  19 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  +files/squid-2.7.5-gentoo.patch, +files/squid-2.7.5-heimdal.patch,
+  -squid-2.7.4-r1.ebuild, +squid-2.7.5.ebuild:
+  Version bump (#242646).
 
   18 Oct 2008; nixnut <nixnut@gentoo.org> squid-2.7.4-r2.ebuild:
   Stable on ppc wrt bug 242386
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 529d42647115..b59b79f2590b 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,7 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2.7.3-gentoo.patch 12128 RMD160 5cf6e9b709863c324128b49a9660e76fb22f94f6 SHA1 4778c6f8efa8e043300b59c29286b81bf020818d SHA256 a6f20ea317a7e4b4968aabeddcff0937e0372b2ed45a094284ec56b0563f7874
 AUX squid-2.7.4-charset.patch 806 RMD160 05148c248221d0c8994e23721f12c736d9581e11 SHA1 d052513093c8642d282863dc6a5180ff1af8bd41 SHA256 0ff6787182e61fed7438b300f9ac82432eb771d8808413a14b5aecc899841895
 AUX squid-2.7.4-gentoo.patch 12115 RMD160 bba9ad08596da94386d6096e85edbdd18179a2e8 SHA1 e3b9443b9bce5f62100c2e3b207c9eae2debfebb SHA256 cc739e81ebb8c3c28261048f19679a9d6616914718ed59e138dc954ec84d926b
 AUX squid-2.7.4-heimdal.patch 775 RMD160 0b77d87fe33cbb37eade0e4f3936bf86c1ad1287 SHA1 628a8d2dcdf2dac5bd91cae24ceff7d83ddb066c SHA256 74552d40f0b5002c76507795d278b7e2b453e46c2d3b4ef91370f2d28b92a2e9
+AUX squid-2.7.5-gentoo.patch 12128 RMD160 a8e6f9994b77d6079c188c801600462fe2977782 SHA1 15d3d215ce161b765e90dcba4677ac2893db91ea SHA256 6952fe7501b79c8ac72cc3b9c0b7541b2d296b489097becc7fd485cfae757ca2
+AUX squid-2.7.5-heimdal.patch 776 RMD160 9770c48d6e1a4ac7416bfb016d081faa7de538ab SHA1 1760e340b36c90260b748590170d8f6a6396b503 SHA256 8fe3e1b665d2a3f4f86fde78dbb95a9267823320c670cf51182e25d8ed967281
 AUX squid-3.0.8-adapted-zph.patch 7704 RMD160 b0ef47037917f4528d27dbd09c06d51ba55b4d54 SHA1 89b81e01436cc99f2cea2def54f0c3beeae71918 SHA256 b942519ffec52aacdea6529c7e982f12db174b84128cb427dc82032ee77eccee
 AUX squid-3.0.8-gentoo.patch 9376 RMD160 e6d2ccdcbe9cf0906eb32c737b3d7746be9fb163 SHA1 8f552948e0549c7ed50a55934767e043cfe35a6a SHA256 fa172277cab5acf5c34a058dedcb89ab7a8c55d0c61c2829ba8c5a6269420b9a
 AUX squid-3.0.9-gentoo.patch 9376 RMD160 59e279e3aaabd9fa0b5639c47ba3b19a2399f6c3 SHA1 8e4a4b836611b5eb4453a1767cd7eaa1e471e2ad SHA256 cc033d7e5c6dbed210788b7c5a59950b94da1c24d97b1aeb256be4e9da371cdf
@@ -15,12 +20,20 @@ AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
 DIST squid-2.7.STABLE3.tar.gz 1782040 RMD160 80410ce27f3abd0601e10ab5d69099d9f3caaf28 SHA1 0c99054d5fd6537da467acbf299ffe5f1a542ae3 SHA256 d987578c6ca26ca8c8d6fad920580cc39b6ebe95c8ff727b1b6d3c5625fe428d
 DIST squid-2.7.STABLE4.tar.gz 1783318 RMD160 dcd76cf798a205ffa2c403eaadfa1dafd263ae3b SHA1 79a4b41a965985cfd5b50fc90a437c5919d4b4ed SHA256 e4d679dcb7ea56a75d57e88e64c4cd654ddb44e1fcea92af4ff02fad4cec915a
+DIST squid-2.7.STABLE5.tar.gz 1785004 RMD160 eb3375bea52ae75fbe87132abece1a5ddf76fabb SHA1 2be7b8ebeefa912d9f69889424249ae7bedd1971 SHA256 30431b9377aa99ee2fe2c7aa4160c73f680613e213ebf8c692483873ef735a18
 DIST squid-3.0.STABLE8.tar.gz 2443502 RMD160 107ce7b8c21f697019120baddca5926a01abbece SHA1 6eeafd97c83a346d94f4aca8a4407fd45f5abc37 SHA256 f8512f4741b6a0bc041669f36cb28e660861f7b19a68a86de1502fd8f4fccaf2
 DIST squid-3.0.STABLE9.tar.gz 2449207 RMD160 70b3952979c7abf42f179a85d324709e789f5a26 SHA1 ba9656b9ffd219877238e94abc7d0dca31cc1db9 SHA256 e5f13fc00c1980f9063ebe197740beb84f6f624a191268d888672be0ef066dd4
 EBUILD squid-2.7.3.ebuild 5766 RMD160 c0327edeef69e4ac2521d56a5f51df181cc772c6 SHA1 af1824c17a22d83ed7af17ac51cd801b95eaa020 SHA256 10e32bcc84e53ca8d08a3d358b93506959bcf53ab6bc955d59e05e3a3245b5f1
-EBUILD squid-2.7.4-r1.ebuild 5824 RMD160 f189692a4b1e6c3a0753d760a1cfbeba287d8826 SHA1 a9e0b1ca37682d8c9c7df7da77868147e7f8652a SHA256 9d90a3832c6d6158bd230e574432b8633f2d651ff6baf496aeb84a835ad7ecef
 EBUILD squid-2.7.4-r2.ebuild 6321 RMD160 bedf745abf360e1d856b4b1dae40d53c71a6614c SHA1 6b1710d69b9f7d893e416dcff5489e652d2c80ac SHA256 9841db11ff69731f63f38abe7e1053716040a89798cd46c45b5e32b7d3a78356
+EBUILD squid-2.7.5.ebuild 6280 RMD160 bf020c70a3010fe908aa443e927d89447d537efb SHA1 cf970f417f14af4d3689454eb00ced16f8c4fd2e SHA256 3e5f05c950a0e1e605a1781483cc33e33687f2f620acbae2e9fbf62e9fb202b0
 EBUILD squid-3.0.8.ebuild 5743 RMD160 d1f8daae5b314192156bfd782a03a23879b10d02 SHA1 0beda6ca3ffd96127c51e099cea3196109812bec SHA256 7f43bf3449998f9531c51fdce781c19e768632964bde2a150658957fe5da7b38
 EBUILD squid-3.0.9.ebuild 6617 RMD160 9b159dbfed33582e3acb102ceaa3b1e9fecfcfed SHA1 a8c042cecfe2ebda35a24543a579de330a9af44e SHA256 b77087fede33571bbac8259e7f3e45a4a5e1981ad93198141f8d9d609a98d56d
-MISC ChangeLog 47352 RMD160 3ea6df038fbc6950560aedcaf8b904bc57287ca0 SHA1 f77e1e8e331fe818575621ffb86d99050051fbcb SHA256 29c9e910c48de3ab39d6f4cbfb7358833eff5fb13f601b80a32f8cdcf64ce4d1
+MISC ChangeLog 47571 RMD160 12b728ec4845d97049d93e764c82c91e7daffff2 SHA1 c1543373d244b105a22bb4e8c4972f8ab0c0645b SHA256 e2b673de721fd573714102dc990b0827d484a12d5a9f6dd07ae4c2b28d1b3de2
 MISC metadata.xml 785 RMD160 e8e82152b25f16ac930d8f93a3563d6a58fdfef9 SHA1 5e343b5a7a0cc6472052190b8bdbd42539987868 SHA256 1d0379a1b9995ac6d0141a675a852f9318b3956d5c1bb19a1358fc0b08a9eeff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj7BVIACgkQPrHvTlXvhtt6/QCcD5JVnAE4i0HemJ8ijZa39YRq
+ORUAnjebDYttrtoI92iZa0KRfTbMCQCl
+=z7mN
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2.7.5-gentoo.patch b/net-proxy/squid/files/squid-2.7.5-gentoo.patch
new file mode 100644
index 000000000000..23086059841d
--- /dev/null
+++ b/net-proxy/squid/files/squid-2.7.5-gentoo.patch
@@ -0,0 +1,307 @@
+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
new file mode 100644
index 000000000000..6ea700ef8fbb
--- /dev/null
+++ b/net-proxy/squid/files/squid-2.7.5-heimdal.patch
@@ -0,0 +1,18 @@
+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/squid-2.7.4-r1.ebuild b/net-proxy/squid/squid-2.7.5.ebuild
index 39f3ad1f2625..01f66c60d521 100644
--- a/net-proxy/squid/squid-2.7.4-r1.ebuild
+++ b/net-proxy/squid/squid-2.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.4-r1.ebuild,v 1.2 2008/09/12 16:38:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.5.ebuild,v 1.1 2008/10/19 10:00:35 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -21,13 +21,15 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate \
+IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
+	mysql postgres sqlite \
 	qos zero-penalty-hit \
 	pf-transparent ipf-transparent \
 	elibc_uclibc kernel_linux"
 
 DEPEND="pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
+	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 	ssl? ( dev-libs/openssl )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sec-policy/selinux-squid )
@@ -35,7 +37,10 @@ DEPEND="pam? ( virtual/pam )
 	>=sys-libs/db-4
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	samba? ( net-fs/samba )"
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
 
 S="${WORKDIR}/${S_PP}"
 
@@ -59,7 +64,7 @@ src_unpack() {
 
 	cd "${S}" || die "source dir not found"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-charset.patch
+	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
 	eautoreconf
 }
 
@@ -70,6 +75,9 @@ src_compile() {
 	use pam && basic_modules="PAM,${basic_modules}"
 	use sasl && basic_modules="SASL,${basic_modules}"
 	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules="DB,${basic_modules}"
+	fi
 
 	local ext_helpers="ip_user,session,unix_group"
 	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
@@ -78,6 +86,9 @@ src_compile() {
 	local ntlm_helpers="fakeauth"
 	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
 
+	local negotiate_helpers=
+	use kerberos && local negotiate_helpers="squid_kerb_auth"
+
 	local myconf=""
 
 	# Support for uclibc #61175
@@ -116,6 +127,7 @@ src_compile() {
 		--enable-basic-auth-helpers="${basic_modules}" \
 		--enable-external-acl-helpers="${ext_helpers}" \
 		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
 		--enable-ident-lookups \
 		--enable-useragent-log \
 		--enable-cache-digests \