Version bump (#234282).

Package-Manager: portage-2.1.4.4

4 files changed, 514 insertions, 2 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 3364f47f1351..170227811a3f 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # 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.197 2008/08/05 03:38:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.198 2008/08/09 08:24:44 mrness Exp $
+
+*squid-2.7.4 (09 Aug 2008)
+
+  09 Aug 2008; Alin Năstac <mrness@gentoo.org>
+  +files/squid-2.7.4-gentoo.patch, +squid-2.7.4.ebuild:
+  Version bump (#234282).
 
   05 Aug 2008; Jeroen Roovers <jer@gentoo.org> squid-2.7.3.ebuild:
   Stable for HPPA (bug #233650).
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index b14737a6845a..0a9697e05ad6 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2.6.19-ToS_Hit_ToS_Preserve.patch 7810 RMD160 c76b6d9c51773640252ffd90ca62f1b66e30b450 SHA1 7918d173c1887a867189b598150e518801a60daa SHA256 950cb186b7ed4625504f40d06484f5ce34af6a5d6e61abbce3d75645eb16118e
 AUX squid-2.6.19-gentoo.patch 11898 RMD160 6e1eadfc216568f8a5f374febfc39253fb34e2a6 SHA1 33eb35aecd01f69d8c46536189f7b74aeb4e8aa4 SHA256 81bafaa2304fd0e80fcb7258a02af967576c4163090676b25c5c43021fb89c29
 AUX squid-2.6.19-qos.patch 10046 RMD160 899e9142137282b6861d44655874cbef3f0766c6 SHA1 54318f2fb76a066b82d52ac4d55d495f3ee35b06 SHA256 babd201b4e18b9b59ff05f02f7a2fcb66fc359106f669899dae2f8fb27df89bd
@@ -7,6 +10,7 @@ AUX squid-2.6.20-gentoo.patch 11898 RMD160 661dd41756c6fe579cde485bbf49a1c7d0958
 AUX squid-2.6.20-lincapver.patch 910 RMD160 a7e7d02b377f893c94a558dbbb5745626eb089b9 SHA1 a734499233278dac2d5534f61bba242c3030533b SHA256 82fc1305ed8499aba0fd0ea19cec2eec650b5f064ad755fe004cb7f67103c3d2
 AUX squid-2.6.20-qos.patch 10046 RMD160 d45c12f01f9c71ef6dd026a2e84e364a82a4fe13 SHA1 6e082842a0e09cd016ec9fa67920c428eb978304 SHA256 f40f5cfefec401ec5567feac816c50d1b2250af6fc4cea550ff6cf814fa33c11
 AUX squid-2.7.3-gentoo.patch 12128 RMD160 5cf6e9b709863c324128b49a9660e76fb22f94f6 SHA1 4778c6f8efa8e043300b59c29286b81bf020818d SHA256 a6f20ea317a7e4b4968aabeddcff0937e0372b2ed45a094284ec56b0563f7874
+AUX squid-2.7.4-gentoo.patch 12115 RMD160 bba9ad08596da94386d6096e85edbdd18179a2e8 SHA1 e3b9443b9bce5f62100c2e3b207c9eae2debfebb SHA256 cc739e81ebb8c3c28261048f19679a9d6616914718ed59e138dc954ec84d926b
 AUX squid-3.0.7-adapted-zph.patch 7671 RMD160 d457ac43aab7a5b9bbfc8cab76e8bd2be5603aa3 SHA1 b149baf26bb649b35c198c09c9a7a2e1d07459aa SHA256 5fd858ac3e332d5187266670186c369d7347113897a5cb2580b3e7087758d849
 AUX squid-3.0.7-gentoo.patch 9388 RMD160 edc8a41d10ee0ff9accff1a37ef841f3ed65d2d8 SHA1 69ca2aa07454ce1e24a0a0cae7cd52006ef4be52 SHA256 95f48929a697317ebc372604f52bd825f1abc8c7d754ca91244c95227acf1b89
 AUX squid-3.0.8-adapted-zph.patch 7704 RMD160 b0ef47037917f4528d27dbd09c06d51ba55b4d54 SHA1 89b81e01436cc99f2cea2def54f0c3beeae71918 SHA256 b942519ffec52aacdea6529c7e982f12db174b84128cb427dc82032ee77eccee
@@ -20,12 +24,21 @@ AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933faba
 DIST squid-2.6.STABLE19.tar.gz 1740046 RMD160 02af108b9c63d3585c4f1553e553683dcb743069 SHA1 92c88eaee8b22eb6c52bebb025eda6064a52a5c7 SHA256 8d82ae7a7afecdc72a473053a735c9f9baf55b0a40af2c94facc046d0f53d46d
 DIST squid-2.6.STABLE20.tar.gz 1738871 RMD160 080fee57b08a97abfde98a7bc716568301e2f696 SHA1 798fa77dc56fd0dbfadda341aa9099bc19ce6bec SHA256 b2655d8a09f24e650be8a9a1deb1d9eb64ce874f2813319743490f06b69413e6
 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-3.0.STABLE7.tar.gz 2431967 RMD160 6fdbb55bf78e17d0b52cf194a192a99736ba45d5 SHA1 de280b991c6ef241fd8896dea17e6a6ebc617dc9 SHA256 84aa45641a75f5e192781fb449b2ac6d8bc13a655d142ee72ea1b390f99f60ad
 DIST squid-3.0.STABLE8.tar.gz 2443502 RMD160 107ce7b8c21f697019120baddca5926a01abbece SHA1 6eeafd97c83a346d94f4aca8a4407fd45f5abc37 SHA256 f8512f4741b6a0bc041669f36cb28e660861f7b19a68a86de1502fd8f4fccaf2
 EBUILD squid-2.6.19-r1.ebuild 5538 RMD160 40cd230f6ab529522e1f9c7c363f520d8bd708d3 SHA1 02cdce277da00284f4af7a0a8637007ccf75c552 SHA256 22f0a9aadb29c27639d0afc4316fd1cf19f0da7fd7f157ffc8447c1cf7db491d
 EBUILD squid-2.6.20-r1.ebuild 5592 RMD160 bc6e2118857f7c030d1b735506cf2d283d33de9a SHA1 0ef6b742e74e1699455ff676889178d82e148d8d SHA256 0e2aa2fcfa9c2701b79d281bdb2f0197a15448f5fab997c9460136a31204d6a6
 EBUILD squid-2.7.3.ebuild 5764 RMD160 dff51a262e382207b5e3815a442290f52bf854f1 SHA1 013fb9ef164dd504cc5efaf2b18cc5e6de594c53 SHA256 c00e721c5f053bb6161a86fd337d96951cd0d30f51587c45ed8e4c1316af9b41
+EBUILD squid-2.7.4.ebuild 5774 RMD160 3c89f53bbeef202803a0786c6cab2255a5b54a0d SHA1 3e8f7f353975237fe65feecaa35295ca1922ef19 SHA256 26dd2bceb1108fbf5ee31e66de7af891dac38eccafd91986580681ae360e99ea
 EBUILD squid-3.0.7.ebuild 5737 RMD160 a2d30864c5e4287ccde5f0759a1037943fb3dee0 SHA1 bd2bfb76bb0ab1979d01e13d39ec9c727d8de0c5 SHA256 8e0eca4709995f804f442455e102368e370e66bb1581092b6e80491317671a1b
 EBUILD squid-3.0.8.ebuild 5737 RMD160 adfb3e1f53ae02c63817e1f47334ed5f11cd5997 SHA1 8f127ab16b5e8cebb189c5a0946152d506bfb87b SHA256 d6214885cf10e7ab2d4e5df9c4a79bbfacaa9395de699e371ea6888de93fd178
-MISC ChangeLog 45281 RMD160 d2da2dc2b115df434880edae9e66756fb82fd1ae SHA1 42d9367befb6d1724d3549fb549f8c56be6a97da SHA256 01d474d59a7e6c127d3c1b3ee76cdb36da7b4bb03842017408b91e90a2768c9f
+MISC ChangeLog 45443 RMD160 b5ed80c95431cfb54b28ba747bf905be3e8a1bc6 SHA1 af0df8a7a0a79d1be6e5829c196827bbf319bcf6 SHA256 aa509d55f567b729195f58c7b5fafe028b5667f782fccdd2190933e073d2a5ee
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkidVFcACgkQPrHvTlXvhttiFwCgigTarGqbNQvf6YFCxhukau6D
+s7gAnAvmPdQwmFEgyMk5r6HKoAhGt3N8
+=E654
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2.7.4-gentoo.patch b/net-proxy/squid/files/squid-2.7.4-gentoo.patch
new file mode 100644
index 000000000000..6175c6722316
--- /dev/null
+++ b/net-proxy/squid/files/squid-2.7.4-gentoo.patch
@@ -0,0 +1,307 @@
+diff -ur squid-2.7.STABLE4.orig/configure.in squid-2.7.STABLE4/configure.in
+--- squid-2.7.STABLE4.orig/configure.in	2008-08-08 19:21:03.000000000 +0000
++++ squid-2.7.STABLE4/configure.in	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE4/helpers/basic_auth/MSNT/confload.c
+--- squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 19:09:48.000000000 +0000
++++ squid-2.7.STABLE4/helpers/basic_auth/MSNT/confload.c	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE4/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 18:44:28.000000000 +0000
++++ squid-2.7.STABLE4/helpers/basic_auth/MSNT/msntauth.conf.default	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE4/helpers/basic_auth/SMB/Makefile.am
+--- squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 16:56:26.000000000 +0000
++++ squid-2.7.STABLE4/helpers/basic_auth/SMB/Makefile.am	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE4/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-07 23:36:46.000000000 +0000
++++ squid-2.7.STABLE4/helpers/basic_auth/SMB/smb_auth.sh	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE4/helpers/external_acl/session/squid_session.8
+--- squid-2.7.STABLE4.orig/helpers/external_acl/session/squid_session.8	2007-01-06 17:28:35.000000000 +0000
++++ squid-2.7.STABLE4/helpers/external_acl/session/squid_session.8	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE4/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-2.7.STABLE4.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 15:07:24.000000000 +0000
++++ squid-2.7.STABLE4/helpers/external_acl/unix_group/squid_unix_group.8	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/src/access_log.c squid-2.7.STABLE4/src/access_log.c
+--- squid-2.7.STABLE4.orig/src/access_log.c	2008-03-18 02:48:43.000000000 +0000
++++ squid-2.7.STABLE4/src/access_log.c	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/src/cf.data.pre squid-2.7.STABLE4/src/cf.data.pre
+--- squid-2.7.STABLE4.orig/src/cf.data.pre	2008-07-10 09:47:28.000000000 +0000
++++ squid-2.7.STABLE4/src/cf.data.pre	2008-08-09 08:12: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
+@@ -3722,11 +3730,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
+@@ -3755,12 +3763,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
+@@ -4397,12 +4405,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
+@@ -4473,12 +4481,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
+@@ -5375,6 +5383,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 -ur squid-2.7.STABLE4.orig/src/client_side.c squid-2.7.STABLE4/src/client_side.c
+--- squid-2.7.STABLE4.orig/src/client_side.c	2008-07-21 20:43:27.000000000 +0000
++++ squid-2.7.STABLE4/src/client_side.c	2008-08-09 08:12:02.000000000 +0000
+@@ -4687,14 +4687,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 -ur squid-2.7.STABLE4.orig/src/defines.h squid-2.7.STABLE4/src/defines.h
+--- squid-2.7.STABLE4.orig/src/defines.h	2007-09-24 13:31:19.000000000 +0000
++++ squid-2.7.STABLE4/src/defines.h	2008-08-09 08:12: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 -ur squid-2.7.STABLE4.orig/src/main.c squid-2.7.STABLE4/src/main.c
+--- squid-2.7.STABLE4.orig/src/main.c	2008-05-26 23:14:30.000000000 +0000
++++ squid-2.7.STABLE4/src/main.c	2008-08-09 08:12: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)
+ {
+@@ -613,7 +629,7 @@
+ 
+     if (!configured_once) {
+ #if USE_UNLINKD
+-	unlinkdInit();
++	if (needUnlinkd()) unlinkdInit();
+ #endif
+ 	urlInitialize();
+ 	cachemgrInit();
+@@ -636,6 +652,9 @@
+ #if USE_WCCPv2
+     wccp2Init();
+ #endif
++#if USE_UNLINKD
++    if (needUnlinkd()) unlinkdInit();
++#endif
+     serverConnectionsOpen();
+     neighbors_init();
+     if (Config.chroot_dir)
+diff -ur squid-2.7.STABLE4.orig/src/Makefile.am squid-2.7.STABLE4/src/Makefile.am
+--- squid-2.7.STABLE4.orig/src/Makefile.am	2008-01-02 15:50:39.000000000 +0000
++++ squid-2.7.STABLE4/src/Makefile.am	2008-08-09 08:12: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/squid-2.7.4.ebuild b/net-proxy/squid/squid-2.7.4.ebuild
new file mode 100644
index 000000000000..1d3e91c8d765
--- /dev/null
+++ b/net-proxy/squid/squid-2.7.4.ebuild
@@ -0,0 +1,186 @@
+# 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.ebuild,v 1.1 2008/08/09 08:24:44 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate \
+	qos zero-penalty-hit \
+	pf-transparent ipf-transparent \
+	elibc_uclibc kernel_linux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	dev-lang/perl"
+RDEPEND="${DEPEND}
+	samba? ( net-fs/samba )"
+
+S="${WORKDIR}/${S_PP}"
+
+pkg_setup() {
+	if use qos; then
+		eerror "qos patch is no longer supported!"
+		eerror "Please remove qos USE flag and use zph* config options instead."
+		die "unsupported USE flags detected"
+	fi
+	if use zero-penalty-hit; then
+		ewarn "This version supports natively IP TOS/Priority mangling,"
+		ewarn "but it does not support zph_preserve_miss_tos."
+		ewarn "If you need that, please use squid-3.0.6-r2 or higher."
+	fi
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+
+	cd "${S}" || die "source dir not found"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	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}"
+
+	local ext_helpers="ip_user,session,unix_group"
+	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local ntlm_helpers="fakeauth"
+	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
+
+	local myconf=""
+
+	# Support for uclibc #61175
+	if use elibc_uclibc; then
+		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
+		myconf="${myconf} --disable-async-io"
+	else
+		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
+		myconf="${myconf} --enable-async-io"
+	fi
+
+	if use kernel_linux; then
+		myconf="${myconf} --enable-linux-netfilter"
+		if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then
+			myconf="${myconf} --enable-epoll"
+		fi
+	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		myconf="${myconf} --enable-kqueue"
+		if use pf-transparent; then
+			myconf="${myconf} --enable-pf-transparent"
+		elif use ipf-transparent; then
+			myconf="${myconf} --enable-ipf-transparent"
+		fi
+	fi
+
+	export CC=$(tc-getCC)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--datadir=/usr/share/squid \
+		--enable-auth="basic,digest,ntlm" \
+		--enable-removal-policies="lru,heap" \
+		--enable-digest-auth-helpers="password" \
+		--enable-basic-auth-helpers="${basic_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+		--enable-ident-lookups \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-arp-acl \
+		--with-pthreads \
+		--with-large-files \
+		--enable-htcp \
+		--enable-carp \
+		--enable-follow-x-forwarded-for \
+		--with-maxfd=8192 \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/ncsa_auth
+	fowners root:squid /usr/libexec/squid/pam_auth
+	fperms 4750 /usr/libexec/squid/ncsa_auth
+	fperms 4750 /usr/libexec/squid/pam_auth
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
+		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
+	newdoc helpers/basic_auth/SMB/README README.auth_smb
+	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
+	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
+	doman helpers/basic_auth/LDAP/*.8
+	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	rm -rf "${D}"/var
+	diropts -m0755 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Squid authentication helpers have been installed suid root."
+	ewarn "This allows shadow based authentication (see bug #52977 for more)."
+	echo
+	ewarn "Be careful what type of cache_dir you select!"
+	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
+	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
+	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
+	echo
+	ewarn "Squid can be configured to run in transparent mode like this:"
+	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
+}