Version bumps wrt security bug #255962.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64

9 files changed, 606 insertions, 74 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 249d4e1616cd..d95764209e7d 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.221 2009/01/10 12:43:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.222 2009/02/16 23:35:21 mrness Exp $
+
+*squid-3.0.13 (16 Feb 2009)
+*squid-2.7.6 (16 Feb 2009)
+
+  16 Feb 2009; Alin Năstac <mrness@gentoo.org>
+  +files/squid-2.7.6-gentoo.patch, +files/squid-2.7.6-heimdal.patch,
+  -files/squid-3.0.10-adapted-zph.patch, -files/squid-3.0.10-gentoo.patch,
+  -files/squid-3.0.10-heimdal.patch, +files/squid-3.0.13-adapted-zph.patch,
+  +files/squid-3.0.13-gentoo.patch, +files/squid-3.0.13-heimdal.patch,
+  +squid-2.7.6.ebuild, -squid-3.0.10-r1.ebuild, +squid-3.0.13.ebuild:
+  Version bumps wrt security bug #255962.
 
 *squid-3.0.11 (10 Jan 2009)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index c7b4f97bd15c..3c300a006357 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -3,12 +3,14 @@ Hash: SHA1
 
 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.10-adapted-zph.patch 6838 RMD160 8e9b44c4bc0bdbe2ddfa3a6cd9ec8e42390c6b61 SHA1 32dcfe93b5d6313e70c01a5a7c8b455702ac79f9 SHA256 ce4d8f2e1211a5bfde5939e3fa696c672df565003d48a87ded37ce229f9704fb
-AUX squid-3.0.10-gentoo.patch 9436 RMD160 3fe79145673156bedd0e931403d9cdf1556f3f02 SHA1 240e4f784a9f8d25c7ee1263ff9017529982f6b0 SHA256 11d3ba89dbb293a650b33ddc7de0b57bede7266a25bf6ed30c557380b6372067
-AUX squid-3.0.10-heimdal.patch 780 RMD160 15712e266739437c132c281fa148e97694f78bc1 SHA1 d48af0a27a1f279332d5e75004d67e90ccc22eac SHA256 c9ebdf5ba1cd36d133adc15dfe1688955ae4d1cd5abfaccd4d4780340d05e0d7
+AUX squid-2.7.6-gentoo.patch 12128 RMD160 9b8bba9ba05f845e66e30780b0c6415a35b8626c SHA1 ff41e44ef9b4f86c9a83fc4dbad454101c5cdcf9 SHA256 9b6430740f8926650e3dde3098042202ea22caaa746df95a0c8f92e35f3949b3
+AUX squid-2.7.6-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25
 AUX squid-3.0.11-adapted-zph.patch 6838 RMD160 7eee5e581cd68c3024573d4457c5ecd04d0a80f7 SHA1 add8ae094a1774465295ae50114e5420f1b864f6 SHA256 1d46bafda89b450edd1f77f0932e5eb8f839b1f869dcaad0545481e1f65e3e6c
 AUX squid-3.0.11-gentoo.patch 9436 RMD160 456e158eacca5dd0f1fb8be4f77cc723b4f842d2 SHA1 582e32cfc94b36158c3263fa6a556bba72491afc SHA256 899ebab1aae5fa89c8be4cbbce9901573ccd23b0cee04e6a6342f42289aa03d1
 AUX squid-3.0.11-heimdal.patch 780 RMD160 82f05dba4427c00852a8b54889898657fafe95ba SHA1 5c6597318bfea762bf7a9dab9030620a394134dc SHA256 311071eaebb59113796d07e46394d45613da3a7ed0edc42468101e4e6459af17
+AUX squid-3.0.13-adapted-zph.patch 6838 RMD160 5a8728e93498ce03fdcbc1926c63271d562b9671 SHA1 1f6453eb8d00e3ac84b4000aeb14cdf3da54f9d4 SHA256 13f4c3cd42ce662cf0e13fb4ca27b0e50562d22af69aabc373a1ff299c694a29
+AUX squid-3.0.13-gentoo.patch 9436 RMD160 bd8a11e3f39e8f70bd50274ada21978478fdb398 SHA1 cc8130cd991b7b13759851930e93125f5864abf5 SHA256 a94aa8771fbb10c72b0333ccdd092b33ddd4e6e8e32ad47c61931e71e680268a
+AUX squid-3.0.13-heimdal.patch 780 RMD160 4cf5b9494a0537bdd0f886b46e7f0685d0e428be SHA1 71b99ceed606c3e41db9f0f78a8d993d8e35a407 SHA256 a51da87baf57bf251c0c401a29b296a89ffa391f5da6e821bbe15a309dd76537
 AUX squid.confd 541 RMD160 e248f8fdc3ce732267614652f17bd88472e62b76 SHA1 995df246caffb2a74be2df3072d7ff5fbd024a9d SHA256 982d829f3862c5543af82acd4f7bb123ebe3e9d1c5eff0911f5345262811f2e1
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
 AUX squid.initd 2202 RMD160 bdfe34d7d4f0ab5270d2773914d6eb254b030505 SHA1 0092d4259b22c29871b78b0656f836784ec7c09d SHA256 627f30e789949a6881da1b8227cc57ff782159cf5d6c99b1ec4163cfa38636eb
@@ -16,17 +18,19 @@ AUX squid.initd-logrotate 2095 RMD160 bdbbee1246cc59bcedcf569cfe95ff729f593120 S
 AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8b3c43c0d327150069a65aa473302ae6c423ff SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
 DIST squid-2.7.STABLE5.tar.gz 1785004 RMD160 eb3375bea52ae75fbe87132abece1a5ddf76fabb SHA1 2be7b8ebeefa912d9f69889424249ae7bedd1971 SHA256 30431b9377aa99ee2fe2c7aa4160c73f680613e213ebf8c692483873ef735a18
-DIST squid-3.0.STABLE10.tar.gz 2449969 RMD160 d8d4e57365f8bab05e69805e866ab52a21c885a1 SHA1 21d2ab3f7615e9bae9190818fef65a0135fe4c7b SHA256 9538af9cd96e9aee42d33f4ceba86d7b2de3d6281b5c5a152ea8f872ed2fb6d7
+DIST squid-2.7.STABLE6.tar.gz 1786189 RMD160 ca59583e9d938c3184a306984f034553f768e942 SHA1 0f66afca85444f7d4f49a527470ef14741904db0 SHA256 0aeb0dd601822711cf8e131d82de8bc64e918adbcfea7e834c4529895759331a
 DIST squid-3.0.STABLE11.tar.gz 2453126 RMD160 24deeaa0b5638aafbd0c211551627d2336acbe7f SHA1 ee157ab6a10c88ae8cf6bf09e72df7bf05fbcfac SHA256 b7c95dee132c21338760d734ec9ac7c65d378fb90af3e271d3d938432cd60378
+DIST squid-3.0.STABLE13.tar.gz 2454967 RMD160 8da76671013bf4100cbc4c2976e228f81323344e SHA1 6f0f1079a027c64a9f95b7b6c9bdd943af28a42e SHA256 8764fe16c8873bcc5c0c7e5f97b22e70dec186d1182ca4803ec94761bac750e1
 EBUILD squid-2.7.5-r1.ebuild 6028 RMD160 beba0dd2eee220986be8f1617fd830a8cf953dd8 SHA1 f3f95bbf2c5ee1f1158f68c667f0ee26ad7dee62 SHA256 2fa3274454548385170f36ccfc63579ed60612b9a15df8d58b9b5492fa9f070e
-EBUILD squid-3.0.10-r1.ebuild 6469 RMD160 56066cf358fadc60f85fe9c3c12ece85458bf831 SHA1 5ce38906ac2abfbb35d85e3b75907dc1df4d63cb SHA256 be8877e49f17212fb8e410008647eb55de1041904a24398baf926dc3623d6eee
+EBUILD squid-2.7.6.ebuild 6032 RMD160 27d6c37149477700f92611a213e94c5c2cec8997 SHA1 3c506f4ebd0bf911cdff94d310661f571c297095 SHA256 7dd7b8763cae997d15b26efdf8ed02cada63472d17819d51c662aee8ac3c86a7
 EBUILD squid-3.0.11.ebuild 6466 RMD160 b3efec155a3e1f35eebd19b5ed993e7eff3309f1 SHA1 243c9c252029483769fd03e22538aebc3a990df5 SHA256 4a8a6d6619498d1cd68df49c1b70684ffc1dbfb161c3615c3861196e783cae8e
-MISC ChangeLog 50059 RMD160 09ca23000a32a2bbd75ded5704b10bae1d1d1b92 SHA1 43536b14f04db179591b04768480254dc0a088df SHA256 3b43c726ba4ca1d1c523a2f4f81e796e37b6791ceb18c535715b86466cf5ab21
+EBUILD squid-3.0.13.ebuild 6466 RMD160 f275d21ca8b84336dc5c27ee9f14e0e299dda4bd SHA1 4ecf4adcbabaa63bd85db52b55f666a050913d04 SHA256 f63c2cfe58cf5716fb04057e65fed266f958ee30fa5a15c1d3a3e825d313af06
+MISC ChangeLog 50567 RMD160 4aef9026d2a29a138558a95eb2b0528443a840d5 SHA1 4af051dfaf41957735e45da9589a9581fb615cbf SHA256 fbee413d19b78edf6c6fcbd3b3a3376912a9b0425a28957086fc9bb152ef8876
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklomAkACgkQts85UDFmaOVMVACePgCyB0WbqosZQMvLru33l/Kx
-RaEAn2a3lcGHCZWqmk79iQhC/3cCbhtV
-=L8Sv
+iEYEARECAAYFAkmZ+NgACgkQts85UDFmaOWekwCdE66hcI1jF2jDqzWz26aeh0W2
+ZGYAn1PGGMH2R62ypPd79Posh4o4tq33
+=VDtW
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2.7.6-gentoo.patch b/net-proxy/squid/files/squid-2.7.6-gentoo.patch
new file mode 100644
index 000000000000..2b6127a6656b
--- /dev/null
+++ b/net-proxy/squid/files/squid-2.7.6-gentoo.patch
@@ -0,0 +1,307 @@
+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
+@@ -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.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
+@@ -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.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
+@@ -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.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
+@@ -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.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
+@@ -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.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
+@@ -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.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
+@@ -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.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
+@@ -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.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
+@@ -678,6 +678,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
+@@ -711,6 +713,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
+@@ -728,6 +733,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
+@@ -3754,11 +3762,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
+@@ -3787,12 +3795,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
+@@ -4429,12 +4437,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
+@@ -4505,12 +4513,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
+@@ -5407,6 +5415,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.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
+@@ -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.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
+@@ -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.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
+@@ -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.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
+@@ -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.6-heimdal.patch b/net-proxy/squid/files/squid-2.7.6-heimdal.patch
new file mode 100644
index 000000000000..67500ae6a85d
--- /dev/null
+++ b/net-proxy/squid/files/squid-2.7.6-heimdal.patch
@@ -0,0 +1,18 @@
+diff -Nru squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2007-05-14 23:36:29.000000000 +0000
++++ squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-16 23:26:28.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.10-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch
index eda4b2f9b817..4f0395976237 100644
--- a/net-proxy/squid/files/squid-3.0.10-adapted-zph.patch
+++ b/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data.pre
---- squid-3.0.STABLE10.orig/src/cf.data.pre	2008-11-02 09:55:43.000000000 +0000
-+++ squid-3.0.STABLE10/src/cf.data.pre	2008-11-02 09:57:33.000000000 +0000
+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-16 23:20:51.000000000 +0000
++++ squid-3.0.STABLE13/src/cf.data.pre	2009-02-16 23:21:13.000000000 +0000
 @@ -1133,6 +1133,60 @@
  	making the request.
  DOC_END
@@ -62,9 +62,9 @@ diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data
  NAME: tcp_outgoing_address
  TYPE: acl_address
  DEFAULT: none
-diff -Nru squid-3.0.STABLE10.orig/src/client_side_reply.cc squid-3.0.STABLE10/src/client_side_reply.cc
---- squid-3.0.STABLE10.orig/src/client_side_reply.cc	2008-10-14 11:22:31.000000000 +0000
-+++ squid-3.0.STABLE10/src/client_side_reply.cc	2008-11-02 09:57:33.000000000 +0000
+diff -Nru squid-3.0.STABLE13.orig/src/client_side_reply.cc squid-3.0.STABLE13/src/client_side_reply.cc
+--- squid-3.0.STABLE13.orig/src/client_side_reply.cc	2009-02-03 01:36:22.000000000 +0000
++++ squid-3.0.STABLE13/src/client_side_reply.cc	2009-02-16 23:21:13.000000000 +0000
 @@ -48,6 +48,7 @@
  #include "ESI.h"
  #endif
@@ -110,9 +110,9 @@ diff -Nru squid-3.0.STABLE10.orig/src/client_side_reply.cc squid-3.0.STABLE10/sr
  
      if (buf != result.data) {
          /* we've got to copy some data */
-diff -Nru squid-3.0.STABLE10.orig/src/fde.h squid-3.0.STABLE10/src/fde.h
---- squid-3.0.STABLE10.orig/src/fde.h	2008-10-14 11:22:32.000000000 +0000
-+++ squid-3.0.STABLE10/src/fde.h	2008-11-02 09:57:33.000000000 +0000
+diff -Nru squid-3.0.STABLE13.orig/src/fde.h squid-3.0.STABLE13/src/fde.h
+--- squid-3.0.STABLE13.orig/src/fde.h	2009-02-03 01:36:22.000000000 +0000
++++ squid-3.0.STABLE13/src/fde.h	2009-02-16 23:21:13.000000000 +0000
 @@ -106,7 +106,7 @@
          long handle;
      } win32;
@@ -122,9 +122,9 @@ diff -Nru squid-3.0.STABLE10.orig/src/fde.h squid-3.0.STABLE10/src/fde.h
  };
  
  #endif /* SQUID_FDE_H */
-diff -Nru squid-3.0.STABLE10.orig/src/forward.cc squid-3.0.STABLE10/src/forward.cc
---- squid-3.0.STABLE10.orig/src/forward.cc	2008-10-14 11:22:32.000000000 +0000
-+++ squid-3.0.STABLE10/src/forward.cc	2008-11-02 09:57:33.000000000 +0000
+diff -Nru squid-3.0.STABLE13.orig/src/forward.cc squid-3.0.STABLE13/src/forward.cc
+--- squid-3.0.STABLE13.orig/src/forward.cc	2009-02-03 01:36:22.000000000 +0000
++++ squid-3.0.STABLE13/src/forward.cc	2009-02-16 23:21:13.000000000 +0000
 @@ -964,6 +964,52 @@
  
      netdbPingSite(request->host);
@@ -178,9 +178,9 @@ diff -Nru squid-3.0.STABLE10.orig/src/forward.cc squid-3.0.STABLE10/src/forward.
      if (servers && (p = servers->_peer)) {
          p->stats.fetches++;
          request->peer_login = p->login;
-diff -Nru squid-3.0.STABLE10.orig/src/structs.h squid-3.0.STABLE10/src/structs.h
---- squid-3.0.STABLE10.orig/src/structs.h	2008-10-14 11:22:32.000000000 +0000
-+++ squid-3.0.STABLE10/src/structs.h	2008-11-02 09:57:33.000000000 +0000
+diff -Nru squid-3.0.STABLE13.orig/src/structs.h squid-3.0.STABLE13/src/structs.h
+--- squid-3.0.STABLE13.orig/src/structs.h	2009-02-03 01:36:23.000000000 +0000
++++ squid-3.0.STABLE13/src/structs.h	2009-02-16 23:21:13.000000000 +0000
 @@ -553,6 +553,8 @@
          int emailErrData;
          int httpd_suppress_version_string;
diff --git a/net-proxy/squid/files/squid-3.0.10-gentoo.patch b/net-proxy/squid/files/squid-3.0.13-gentoo.patch
index b6b12ec92418..d92210db61e7 100644
--- a/net-proxy/squid/files/squid-3.0.10-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.13-gentoo.patch
@@ -1,7 +1,7 @@
-diff -Nru squid-3.0.STABLE10.orig/configure.in squid-3.0.STABLE10/configure.in
---- squid-3.0.STABLE10.orig/configure.in	2008-10-14 11:22:33.000000000 +0000
-+++ squid-3.0.STABLE10/configure.in	2008-11-02 09:54:55.000000000 +0000
-@@ -19,9 +19,9 @@
+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
+@@ -16,9 +16,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
  dnl Set default LDFLAGS
@@ -14,9 +14,9 @@ diff -Nru squid-3.0.STABLE10.orig/configure.in squid-3.0.STABLE10/configure.in
  
  dnl Check for GNU cc
  AC_PROG_CC
-diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE10/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/confload.c	2008-10-14 11:22:26.000000000 +0000
-+++ squid-3.0.STABLE10/helpers/basic_auth/MSNT/confload.c	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -27,7 +27,7 @@
  
  /* Path to configuration file */
@@ -26,9 +26,9 @@ diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.S
  #endif
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
-diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE10/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-10-14 11:22:26.000000000 +0000
-+++ squid-3.0.STABLE10/helpers/basic_auth/MSNT/msntauth.conf.default	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -38,9 +38,9 @@ diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/MSNT/msntauth.conf.default
 +#denyusers	/etc/squid/msntauth.denyusers
 +#allowusers	/etc/squid/msntauth.allowusers
  
-diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE10/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am	2008-10-14 11:22:28.000000000 +0000
-+++ squid-3.0.STABLE10/helpers/basic_auth/SMB/Makefile.am	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -50,9 +50,9 @@ diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.S
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE10/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-10-14 11:22:28.000000000 +0000
-+++ squid-3.0.STABLE10/helpers/basic_auth/SMB/smb_auth.sh	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -71,9 +71,9 @@ diff -Nru squid-3.0.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.S
  echo "Domain controller IP address: $dcip"
  [ -n "$dcip" ] || exit 1
  
-diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE10/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE10.orig/helpers/external_acl/session/squid_session.8	2008-10-14 11:22:29.000000000 +0000
-+++ squid-3.0.STABLE10/helpers/external_acl/session/squid_session.8	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -83,9 +83,9 @@ diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/session/squid_session.8 s
  .IP
  acl session external session
  .IP
-diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE10/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE10.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-10-14 11:22:29.000000000 +0000
-+++ squid-3.0.STABLE10/helpers/external_acl/unix_group/squid_unix_group.8	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -27,7 +27,7 @@
  This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
  matches users in group2 or group3
@@ -95,9 +95,9 @@ diff -Nru squid-3.0.STABLE10.orig/helpers/external_acl/unix_group/squid_unix_gro
  .IP
  acl usergroup1 external unix_group group1
  .IP
-diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data.pre
---- squid-3.0.STABLE10.orig/src/cf.data.pre	2008-10-14 11:22:31.000000000 +0000
-+++ squid-3.0.STABLE10/src/cf.data.pre	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -652,6 +652,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
@@ -127,7 +127,7 @@ diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data
  # And finally deny all other access to this proxy
  http_access deny all
  NOCOMMENT_END
-@@ -3260,11 +3268,11 @@
+@@ -3263,11 +3271,11 @@
  
  NAME: cache_mgr
  TYPE: string
@@ -141,7 +141,7 @@ diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data
  DOC_END
  
  NAME: mail_from
-@@ -5214,6 +5222,9 @@
+@@ -5217,6 +5225,9 @@
  	If you disable this, it will appear as
  
  		X-Forwarded-For: unknown
@@ -151,9 +151,9 @@ diff -Nru squid-3.0.STABLE10.orig/src/cf.data.pre squid-3.0.STABLE10/src/cf.data
  DOC_END
  
  NAME: cachemgr_passwd
-diff -Nru squid-3.0.STABLE10.orig/src/debug.cc squid-3.0.STABLE10/src/debug.cc
---- squid-3.0.STABLE10.orig/src/debug.cc	2008-10-14 11:22:32.000000000 +0000
-+++ squid-3.0.STABLE10/src/debug.cc	2008-11-02 09:54:55.000000000 +0000
+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
 @@ -465,7 +465,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
@@ -163,10 +163,10 @@ diff -Nru squid-3.0.STABLE10.orig/src/debug.cc squid-3.0.STABLE10/src/debug.cc
  
  #endif /* HAVE_SYSLOG */
  
-diff -Nru squid-3.0.STABLE10.orig/src/defines.h squid-3.0.STABLE10/src/defines.h
---- squid-3.0.STABLE10.orig/src/defines.h	2008-10-14 11:22:32.000000000 +0000
-+++ squid-3.0.STABLE10/src/defines.h	2008-11-02 09:54:55.000000000 +0000
-@@ -219,7 +219,7 @@
+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
+@@ -218,7 +218,7 @@
  
  /* were to look for errors if config path fails */
  #ifndef DEFAULT_SQUID_ERROR_DIR
@@ -175,10 +175,10 @@ diff -Nru squid-3.0.STABLE10.orig/src/defines.h squid-3.0.STABLE10/src/defines.h
  #endif
  
  /* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE10.orig/src/main.cc squid-3.0.STABLE10/src/main.cc
---- squid-3.0.STABLE10.orig/src/main.cc	2008-10-14 11:22:32.000000000 +0000
-+++ squid-3.0.STABLE10/src/main.cc	2008-11-02 09:54:55.000000000 +0000
-@@ -1486,7 +1486,7 @@
+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
+@@ -1485,7 +1485,7 @@
      if (*(argv[0]) == '(')
          return;
  
@@ -187,7 +187,7 @@ diff -Nru squid-3.0.STABLE10.orig/src/main.cc squid-3.0.STABLE10/src/main.cc
  
      if ((pid = fork()) < 0)
          syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1530,7 +1530,7 @@
+@@ -1529,7 +1529,7 @@
  
          if ((pid = fork()) == 0) {
              /* child */
@@ -196,7 +196,7 @@ diff -Nru squid-3.0.STABLE10.orig/src/main.cc squid-3.0.STABLE10/src/main.cc
              prog = xstrdup(argv[0]);
              argv[0] = xstrdup("(squid)");
              execvp(prog, argv);
-@@ -1538,7 +1538,7 @@
+@@ -1537,7 +1537,7 @@
          }
  
          /* parent */
@@ -205,10 +205,10 @@ diff -Nru squid-3.0.STABLE10.orig/src/main.cc squid-3.0.STABLE10/src/main.cc
  
          syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  
-diff -Nru squid-3.0.STABLE10.orig/src/Makefile.am squid-3.0.STABLE10/src/Makefile.am
---- squid-3.0.STABLE10.orig/src/Makefile.am	2008-10-14 11:22:31.000000000 +0000
-+++ squid-3.0.STABLE10/src/Makefile.am	2008-11-02 09:54:55.000000000 +0000
-@@ -992,12 +992,12 @@
+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
+@@ -991,12 +991,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
  DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-3.0.10-heimdal.patch b/net-proxy/squid/files/squid-3.0.13-heimdal.patch
index b97ec481441f..04cb2671b80a 100644
--- a/net-proxy/squid/files/squid-3.0.10-heimdal.patch
+++ b/net-proxy/squid/files/squid-3.0.13-heimdal.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-3.0.STABLE10.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE10/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-3.0.STABLE10.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-14 11:22:29.000000000 +0000
-+++ squid-3.0.STABLE10/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-11-02 09:58:27.000000000 +0000
+diff -Nru squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-03 01:36:16.000000000 +0000
++++ squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-16 23:22:02.000000000 +0000
 @@ -18,10 +18,10 @@
  #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
  
diff --git a/net-proxy/squid/squid-2.7.6.ebuild b/net-proxy/squid/squid-2.7.6.ebuild
new file mode 100644
index 000000000000..f03c68698e15
--- /dev/null
+++ b/net-proxy/squid/squid-2.7.6.ebuild
@@ -0,0 +1,192 @@
+# 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.6.ebuild,v 1.1 2009/02/16 23:35:21 mrness Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils pam toolchain-funcs autotools linux-info
+
+#lame archive versioning scheme..
+S_PMV="${PV%%.*}"
+S_PV="${PV%.*}"
+S_PL="${PV##*.}"
+S_PL="${S_PL/_rc/-RC}"
+S_PP="${PN}-${S_PV}.STABLE${S_PL}"
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux 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 use zero-penalty-hit; then
+		ewarn "This version supports natively IP TOS/Priority mangling,"
+		ewarn "but it does not support zph_preserve_miss_tos."
+		ewarn "If you need that, please use squid-3.0.6-r2 or higher."
+	fi
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+
+	cd "${S}" || die "source dir not found"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	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}"
+	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=""
+
+	# Support for uclibc #61175
+	if use elibc_uclibc; then
+		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
+		myconf="${myconf} --disable-async-io"
+	else
+		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
+		myconf="${myconf} --enable-async-io"
+	fi
+
+	if use kernel_linux; then
+		myconf="${myconf} --enable-linux-netfilter
+			$(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 \
+		--enable-auth="basic,digest,ntlm" \
+		--enable-removal-policies="lru,heap" \
+		--enable-digest-auth-helpers="password" \
+		--enable-basic-auth-helpers="${basic_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
+		--enable-ident-lookups \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-arp-acl \
+		--with-pthreads \
+		--with-large-files \
+		--enable-htcp \
+		--enable-carp \
+		--enable-follow-x-forwarded-for \
+		--with-maxfd=8192 \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/ncsa_auth
+	fowners root:squid /usr/libexec/squid/pam_auth
+	fperms 4750 /usr/libexec/squid/ncsa_auth
+	fperms 4750 /usr/libexec/squid/pam_auth
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
+		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
+	newdoc helpers/basic_auth/SMB/README README.auth_smb
+	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
+	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
+	doman helpers/basic_auth/LDAP/*.8
+	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	rm -rf "${D}"/var
+	diropts -m0755 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Squid authentication helpers have been installed suid root."
+	ewarn "This allows shadow based authentication (see bug #52977 for more)."
+	echo
+	ewarn "Be careful what type of cache_dir you select!"
+	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
+	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
+	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
+	echo
+	ewarn "Squid can be configured to run in transparent mode like this:"
+	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
+}
diff --git a/net-proxy/squid/squid-3.0.10-r1.ebuild b/net-proxy/squid/squid-3.0.13.ebuild
index ce0214bf1d83..dc04f039bcc4 100644
--- a/net-proxy/squid/squid-3.0.10-r1.ebuild
+++ b/net-proxy/squid/squid-3.0.13.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-3.0.10-r1.ebuild,v 1.2 2008/12/14 13:56:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.13.ebuild,v 1.1 2009/02/16 23:35:21 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"