Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-proxy/squid/files
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2008-05-14 22:02:10 +0000
committerAlin Năstac <mrness@gentoo.org>2008-05-14 22:02:10 +0000
commit8b387802ae99e5214c7915a3e83f118af3130df5 (patch)
tree9312c1517b29f0017cb5e96fe066f09c2067988b /net-proxy/squid/files
parentDepend on virtual/pam as the code builds fine with OpenPAM. (diff)
downloadgentoo-2-8b387802ae99e5214c7915a3e83f118af3130df5.tar.gz
gentoo-2-8b387802ae99e5214c7915a3e83f118af3130df5.tar.bz2
gentoo-2-8b387802ae99e5214c7915a3e83f118af3130df5.zip
Version bumps (#218968).
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-proxy/squid/files')
-rw-r--r--net-proxy/squid/files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch (renamed from net-proxy/squid/files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch)30
-rw-r--r--net-proxy/squid/files/squid-2.6.20-gentoo.patch (renamed from net-proxy/squid/files/squid-2.6.17-gentoo.patch)82
-rw-r--r--net-proxy/squid/files/squid-2.6.20-qos.patch (renamed from net-proxy/squid/files/squid-2.6.17-qos.patch)64
-rw-r--r--net-proxy/squid/files/squid-3.0.5-gentoo.patch (renamed from net-proxy/squid/files/squid-3.0.1-gentoo.patch)86
4 files changed, 131 insertions, 131 deletions
diff --git a/net-proxy/squid/files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch b/net-proxy/squid/files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch
index d2dc25581c15..50b6547a29c6 100644
--- a/net-proxy/squid/files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch
+++ b/net-proxy/squid/files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data.pre
---- squid-2.6.STABLE17.orig/src/cf.data.pre 2007-12-04 14:33:41.000000000 +0200
-+++ squid-2.6.STABLE17/src/cf.data.pre 2007-12-04 14:37:55.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.pre squid-2.6.STABLE20/src/cf.data.pre
+--- squid-2.6.STABLE20.orig/src/cf.data.pre 2008-05-15 00:48:45.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.pre 2008-05-15 00:49:24.000000000 +0300
@@ -1181,6 +1181,64 @@
to off when using this directive in such configurations.
DOC_END
@@ -66,9 +66,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
NAME: tcp_outgoing_address
TYPE: acl_address
DEFAULT: none
-diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/src/client_side.c
---- squid-2.6.STABLE17.orig/src/client_side.c 2007-12-04 14:33:41.000000000 +0200
-+++ squid-2.6.STABLE17/src/client_side.c 2007-12-04 14:37:55.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/client_side.c squid-2.6.STABLE20/src/client_side.c
+--- squid-2.6.STABLE20.orig/src/client_side.c 2008-05-15 00:48:45.000000000 +0300
++++ squid-2.6.STABLE20/src/client_side.c 2008-05-15 00:49:24.000000000 +0300
@@ -2632,6 +2632,55 @@
return;
}
@@ -125,9 +125,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/src/clien
rep = http->reply = clientBuildReply(http, buf, size);
if (!rep) {
/* Forward as HTTP/0.9 body with no reply */
-diff -Nru squid-2.6.STABLE17.orig/src/http.c squid-2.6.STABLE17/src/http.c
---- squid-2.6.STABLE17.orig/src/http.c 2007-11-26 13:04:30.000000000 +0200
-+++ squid-2.6.STABLE17/src/http.c 2007-12-04 14:37:55.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/http.c squid-2.6.STABLE20/src/http.c
+--- squid-2.6.STABLE20.orig/src/http.c 2008-04-02 04:03:47.000000000 +0300
++++ squid-2.6.STABLE20/src/http.c 2008-05-15 00:49:24.000000000 +0300
@@ -1393,6 +1393,53 @@
peer *p = httpState->peer;
CWCB *sendHeaderDone;
@@ -182,10 +182,10 @@ diff -Nru squid-2.6.STABLE17.orig/src/http.c squid-2.6.STABLE17/src/http.c
debug(11, 5) ("httpSendRequest: FD %d: httpState %p.\n", fd, httpState);
-diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
---- squid-2.6.STABLE17.orig/src/structs.h 2007-09-06 00:28:34.000000000 +0300
-+++ squid-2.6.STABLE17/src/structs.h 2007-12-04 14:37:55.000000000 +0200
-@@ -669,6 +669,8 @@
+diff -Nru squid-2.6.STABLE20.orig/src/structs.h squid-2.6.STABLE20/src/structs.h
+--- squid-2.6.STABLE20.orig/src/structs.h 2008-04-21 05:56:24.000000000 +0300
++++ squid-2.6.STABLE20/src/structs.h 2008-05-15 00:49:24.000000000 +0300
+@@ -670,6 +670,8 @@
int relaxed_header_parser;
int accel_no_pmtu_disc;
int global_internal_static;
@@ -194,7 +194,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
int httpd_suppress_version_string;
int via;
int check_hostnames;
-@@ -793,6 +795,9 @@
+@@ -794,6 +796,9 @@
int sleep_after_fork; /* microseconds */
time_t minimum_expiry_time; /* seconds */
external_acl *externalAclHelperList;
@@ -204,7 +204,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
errormap *errorMapList;
#if USE_SSL
struct {
-@@ -1724,6 +1729,9 @@
+@@ -1727,6 +1732,9 @@
const char *vary_encoding;
StoreEntry *ims_entry;
time_t refresh_timestamp;
diff --git a/net-proxy/squid/files/squid-2.6.17-gentoo.patch b/net-proxy/squid/files/squid-2.6.20-gentoo.patch
index 2c30896e3017..3738d1f33da6 100644
--- a/net-proxy/squid/files/squid-2.6.17-gentoo.patch
+++ b/net-proxy/squid/files/squid-2.6.20-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/confload.c squid-2.6.STABLE17/helpers/basic_auth/MSNT/confload.c
---- squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 22:09:48.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/basic_auth/MSNT/confload.c 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/confload.c squid-2.6.STABLE20/helpers/basic_auth/MSNT/confload.c
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 22:09:48.000000000 +0300
++++ squid-2.6.STABLE20/helpers/basic_auth/MSNT/confload.c 2008-05-15 00:48:08.000000000 +0300
@@ -24,7 +24,7 @@
/* Path to configuration file */
@@ -10,9 +10,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/confload.c squid-2.6.S
#endif
#define CONFIGFILE SYSCONFDIR "/msntauth.conf"
-diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.6.STABLE17/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 21:44:28.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/basic_auth/MSNT/msntauth.conf.default 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.6.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 21:44:28.000000000 +0300
++++ squid-2.6.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default 2008-05-15 00:48:08.000000000 +0300
@@ -8,6 +8,6 @@
server other_PDC other_BDC otherdomain
@@ -22,9 +22,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/msntauth.conf.default
+#denyusers /etc/squid/msntauth.denyusers
+#allowusers /etc/squid/msntauth.allowusers
-diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE17/helpers/basic_auth/SMB/Makefile.am
---- squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 19:56:26.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/basic_auth/SMB/Makefile.am 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE20/helpers/basic_auth/SMB/Makefile.am
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 19:56:26.000000000 +0300
++++ squid-2.6.STABLE20/helpers/basic_auth/SMB/Makefile.am 2008-05-15 00:48:08.000000000 +0300
@@ -14,7 +14,7 @@
## FIXME: autoconf should test for the samba path.
@@ -34,9 +34,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.S
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
-diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE17/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 01:36:46.000000000 +0200
-+++ squid-2.6.STABLE17/helpers/basic_auth/SMB/smb_auth.sh 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE20/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 01:36:46.000000000 +0200
++++ squid-2.6.STABLE20/helpers/basic_auth/SMB/smb_auth.sh 2008-05-15 00:48:08.000000000 +0300
@@ -24,7 +24,7 @@
read AUTHSHARE
read AUTHFILE
@@ -55,9 +55,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.S
echo "Domain controller IP address: $dcip"
[ -n "$dcip" ] || exit 1
-diff -Nru squid-2.6.STABLE17.orig/helpers/external_acl/session/squid_session.8 squid-2.6.STABLE17/helpers/external_acl/session/squid_session.8
---- squid-2.6.STABLE17.orig/helpers/external_acl/session/squid_session.8 2007-01-06 19:28:35.000000000 +0200
-+++ squid-2.6.STABLE17/helpers/external_acl/session/squid_session.8 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/external_acl/session/squid_session.8 squid-2.6.STABLE20/helpers/external_acl/session/squid_session.8
+--- squid-2.6.STABLE20.orig/helpers/external_acl/session/squid_session.8 2007-01-06 19:28:35.000000000 +0200
++++ squid-2.6.STABLE20/helpers/external_acl/session/squid_session.8 2008-05-15 00:48:08.000000000 +0300
@@ -35,7 +35,7 @@
.P
Configuration example using the default automatic mode
@@ -67,9 +67,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/external_acl/session/squid_session.8 s
.IP
acl session external session
.IP
-diff -Nru squid-2.6.STABLE17.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.6.STABLE17/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-2.6.STABLE17.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-14 18:07:24.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/external_acl/unix_group/squid_unix_group.8 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.6.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-2.6.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-14 18:07:24.000000000 +0300
++++ squid-2.6.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8 2008-05-15 00:48:08.000000000 +0300
@@ -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
@@ -79,9 +79,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/external_acl/unix_group/squid_unix_gro
.IP
acl usergroup1 external unix_group group1
.IP
-diff -Nru squid-2.6.STABLE17.orig/src/access_log.c squid-2.6.STABLE17/src/access_log.c
---- squid-2.6.STABLE17.orig/src/access_log.c 2007-06-03 03:40:32.000000000 +0300
-+++ squid-2.6.STABLE17/src/access_log.c 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/access_log.c squid-2.6.STABLE20/src/access_log.c
+--- squid-2.6.STABLE20.orig/src/access_log.c 2008-03-18 04:58:47.000000000 +0200
++++ squid-2.6.STABLE20/src/access_log.c 2008-05-15 00:48:08.000000000 +0300
@@ -1225,7 +1225,7 @@
LogfileStatus = LOG_ENABLE;
}
@@ -91,9 +91,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/access_log.c squid-2.6.STABLE17/src/access
assert(NULL != headerslog);
#endif
#if FORW_VIA_DB
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data.pre
---- squid-2.6.STABLE17.orig/src/cf.data.pre 2007-11-26 13:03:45.000000000 +0200
-+++ squid-2.6.STABLE17/src/cf.data.pre 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.pre squid-2.6.STABLE20/src/cf.data.pre
+--- squid-2.6.STABLE20.orig/src/cf.data.pre 2008-04-21 05:56:24.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.pre 2008-05-15 00:48:08.000000000 +0300
@@ -640,6 +640,8 @@
acl Safe_ports port 488 # gss-http
acl Safe_ports port 591 # filemaker
@@ -123,7 +123,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
# And finally deny all other access to this proxy
http_access deny all
NOCOMMENT_END
-@@ -3356,11 +3364,11 @@
+@@ -3357,11 +3365,11 @@
NAME: cache_mgr
TYPE: string
@@ -137,7 +137,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
DOC_END
NAME: mail_from
-@@ -3389,12 +3397,12 @@
+@@ -3390,12 +3398,12 @@
NAME: cache_effective_user
TYPE: string
@@ -152,7 +152,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
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
-@@ -4031,12 +4039,12 @@
+@@ -4032,12 +4040,12 @@
NAME: snmp_port
TYPE: ushort
LOC: Config.Port.snmp
@@ -168,7 +168,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
DOC_END
NAME: snmp_access
-@@ -4107,12 +4115,12 @@
+@@ -4108,12 +4116,12 @@
NAME: htcp_port
IFDEF: USE_HTCP
TYPE: ushort
@@ -184,7 +184,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
DOC_END
NAME: log_icp_queries
-@@ -4964,6 +4972,9 @@
+@@ -4981,6 +4989,9 @@
If you disable this, it will appear as
X-Forwarded-For: unknown
@@ -194,9 +194,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
DOC_END
NAME: cachemgr_passwd
-diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/src/client_side.c
---- squid-2.6.STABLE17.orig/src/client_side.c 2007-09-03 16:13:36.000000000 +0300
-+++ squid-2.6.STABLE17/src/client_side.c 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/client_side.c squid-2.6.STABLE20/src/client_side.c
+--- squid-2.6.STABLE20.orig/src/client_side.c 2007-09-03 16:13:36.000000000 +0300
++++ squid-2.6.STABLE20/src/client_side.c 2008-05-15 00:48:08.000000000 +0300
@@ -4597,14 +4597,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 {
@@ -212,9 +212,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/src/clien
/* 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.6.STABLE17.orig/src/defines.h squid-2.6.STABLE17/src/defines.h
---- squid-2.6.STABLE17.orig/src/defines.h 2007-02-04 00:58:20.000000000 +0200
-+++ squid-2.6.STABLE17/src/defines.h 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/defines.h squid-2.6.STABLE20/src/defines.h
+--- squid-2.6.STABLE20.orig/src/defines.h 2007-02-04 00:58:20.000000000 +0200
++++ squid-2.6.STABLE20/src/defines.h 2008-05-15 00:48:08.000000000 +0300
@@ -259,7 +259,7 @@
/* were to look for errors if config path fails */
@@ -224,9 +224,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/defines.h squid-2.6.STABLE17/src/defines.h
#endif
/* gb_type operations */
-diff -Nru squid-2.6.STABLE17.orig/src/main.c squid-2.6.STABLE17/src/main.c
---- squid-2.6.STABLE17.orig/src/main.c 2007-11-26 12:47:23.000000000 +0200
-+++ squid-2.6.STABLE17/src/main.c 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/main.c squid-2.6.STABLE20/src/main.c
+--- squid-2.6.STABLE20.orig/src/main.c 2007-11-26 12:47:23.000000000 +0200
++++ squid-2.6.STABLE20/src/main.c 2008-05-15 00:48:08.000000000 +0300
@@ -372,6 +372,22 @@
asnFreeMemory();
}
@@ -277,9 +277,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/main.c squid-2.6.STABLE17/src/main.c
#endif
urlInitialize();
cachemgrInit();
-diff -Nru squid-2.6.STABLE17.orig/src/Makefile.am squid-2.6.STABLE17/src/Makefile.am
---- squid-2.6.STABLE17.orig/src/Makefile.am 2007-09-06 00:50:15.000000000 +0300
-+++ squid-2.6.STABLE17/src/Makefile.am 2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/Makefile.am squid-2.6.STABLE20/src/Makefile.am
+--- squid-2.6.STABLE20.orig/src/Makefile.am 2007-09-06 00:50:15.000000000 +0300
++++ squid-2.6.STABLE20/src/Makefile.am 2008-05-15 00:48:08.000000000 +0300
@@ -325,12 +325,12 @@
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
diff --git a/net-proxy/squid/files/squid-2.6.17-qos.patch b/net-proxy/squid/files/squid-2.6.20-qos.patch
index 7afe830db5d9..85569f5a3f51 100644
--- a/net-proxy/squid/files/squid-2.6.17-qos.patch
+++ b/net-proxy/squid/files/squid-2.6.20-qos.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE17.orig/src/cache_cf.c squid-2.6.STABLE17/src/cache_cf.c
---- squid-2.6.STABLE17.orig/src/cache_cf.c 2007-08-31 16:49:54.000000000 +0300
-+++ squid-2.6.STABLE17/src/cache_cf.c 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cache_cf.c squid-2.6.STABLE20/src/cache_cf.c
+--- squid-2.6.STABLE20.orig/src/cache_cf.c 2007-08-31 16:49:54.000000000 +0300
++++ squid-2.6.STABLE20/src/cache_cf.c 2008-05-15 00:50:05.000000000 +0300
@@ -891,6 +891,65 @@
}
}
@@ -67,9 +67,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cache_cf.c squid-2.6.STABLE17/src/cache_cf
#if DELAY_POOLS
/* do nothing - free_delay_pool_count is the magic free function.
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.depend squid-2.6.STABLE17/src/cf.data.depend
---- squid-2.6.STABLE17.orig/src/cf.data.depend 2007-09-06 00:50:15.000000000 +0300
-+++ squid-2.6.STABLE17/src/cf.data.depend 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.depend squid-2.6.STABLE20/src/cf.data.depend
+--- squid-2.6.STABLE20.orig/src/cf.data.depend 2007-09-06 00:50:15.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.depend 2008-05-15 00:50:05.000000000 +0300
@@ -5,6 +5,7 @@
acl_address acl
acl_b_size_t acl
@@ -78,9 +78,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.depend squid-2.6.STABLE17/src/cf.d
address
authparam
b_int64_t
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data.pre
---- squid-2.6.STABLE17.orig/src/cf.data.pre 2007-12-04 14:38:45.000000000 +0200
-+++ squid-2.6.STABLE17/src/cf.data.pre 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.pre squid-2.6.STABLE20/src/cf.data.pre
+--- squid-2.6.STABLE20.orig/src/cf.data.pre 2008-05-15 00:49:53.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.pre 2008-05-15 00:50:05.000000000 +0300
@@ -1239,6 +1239,27 @@
Default: 255 (TOS from server is not changed).
DOC_END
@@ -109,9 +109,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
NAME: tcp_outgoing_address
TYPE: acl_address
DEFAULT: none
-diff -Nru squid-2.6.STABLE17.orig/src/comm.c squid-2.6.STABLE17/src/comm.c
---- squid-2.6.STABLE17.orig/src/comm.c 2007-04-17 12:39:56.000000000 +0300
-+++ squid-2.6.STABLE17/src/comm.c 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/comm.c squid-2.6.STABLE20/src/comm.c
+--- squid-2.6.STABLE20.orig/src/comm.c 2007-04-17 12:39:56.000000000 +0300
++++ squid-2.6.STABLE20/src/comm.c 2008-05-15 00:50:05.000000000 +0300
@@ -162,7 +162,7 @@
int flags,
const char *note)
@@ -176,9 +176,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/comm.c squid-2.6.STABLE17/src/comm.c
if (F->flags.close_on_exec)
commSetCloseOnExec(cs->fd);
if (F->flags.nonblocking)
-diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
---- squid-2.6.STABLE17.orig/src/forward.c 2007-09-06 00:28:34.000000000 +0300
-+++ squid-2.6.STABLE17/src/forward.c 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/forward.c squid-2.6.STABLE20/src/forward.c
+--- squid-2.6.STABLE20.orig/src/forward.c 2008-04-02 04:16:29.000000000 +0300
++++ squid-2.6.STABLE20/src/forward.c 2008-05-15 00:50:05.000000000 +0300
@@ -418,6 +418,17 @@
return 0;
}
@@ -197,7 +197,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
struct in_addr
getOutgoingAddr(request_t * request)
{
-@@ -446,6 +457,20 @@
+@@ -456,6 +467,20 @@
return aclMapTOS(Config.accessList.outgoing_tos, &ch);
}
@@ -218,7 +218,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
static void
fwdConnectStart(void *data)
{
-@@ -462,6 +487,7 @@
+@@ -472,6 +497,7 @@
int ftimeout = Config.Timeout.forward - (squid_curtime - fwdState->start);
struct in_addr outgoing;
unsigned short tos;
@@ -226,7 +226,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
#if LINUX_TPROXY
struct in_tproxy itp;
#endif
-@@ -547,15 +573,17 @@
+@@ -557,15 +583,17 @@
#endif
outgoing = getOutgoingAddr(fwdState->request);
tos = getOutgoingTOS(fwdState->request);
@@ -246,9 +246,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
url);
if (fd < 0) {
debug(50, 4) ("fwdConnectStart: %s\n", xstrerror());
-diff -Nru squid-2.6.STABLE17.orig/src/protos.h squid-2.6.STABLE17/src/protos.h
---- squid-2.6.STABLE17.orig/src/protos.h 2007-07-15 12:52:17.000000000 +0300
-+++ squid-2.6.STABLE17/src/protos.h 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/protos.h squid-2.6.STABLE20/src/protos.h
+--- squid-2.6.STABLE20.orig/src/protos.h 2007-07-15 12:52:17.000000000 +0300
++++ squid-2.6.STABLE20/src/protos.h 2008-05-15 00:50:05.000000000 +0300
@@ -160,7 +160,7 @@
extern void comm_init(void);
extern int comm_listen(int sock);
@@ -266,9 +266,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/protos.h squid-2.6.STABLE17/src/protos.h
extern void urnStart(request_t *, StoreEntry *);
-diff -Nru squid-2.6.STABLE17.orig/src/ssl.c squid-2.6.STABLE17/src/ssl.c
---- squid-2.6.STABLE17.orig/src/ssl.c 2007-02-03 23:53:38.000000000 +0200
-+++ squid-2.6.STABLE17/src/ssl.c 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/ssl.c squid-2.6.STABLE20/src/ssl.c
+--- squid-2.6.STABLE20.orig/src/ssl.c 2007-02-03 23:53:38.000000000 +0200
++++ squid-2.6.STABLE20/src/ssl.c 2008-05-15 00:50:05.000000000 +0300
@@ -524,6 +524,7 @@
0,
COMM_NONBLOCKING,
@@ -277,9 +277,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/ssl.c squid-2.6.STABLE17/src/ssl.c
url);
if (sock == COMM_ERROR) {
debug(26, 4) ("sslStart: Failed because we're out of sockets.\n");
-diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
---- squid-2.6.STABLE17.orig/src/structs.h 2007-12-04 14:38:45.000000000 +0200
-+++ squid-2.6.STABLE17/src/structs.h 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/structs.h squid-2.6.STABLE20/src/structs.h
+--- squid-2.6.STABLE20.orig/src/structs.h 2008-05-15 00:49:53.000000000 +0300
++++ squid-2.6.STABLE20/src/structs.h 2008-05-15 00:50:05.000000000 +0300
@@ -296,6 +296,12 @@
int tos;
};
@@ -293,7 +293,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
struct _aclCheck_t {
const acl_access *access_list;
struct in_addr src_addr;
-@@ -705,6 +711,7 @@
+@@ -706,6 +712,7 @@
acl_access *reply;
acl_address *outgoing_address;
acl_tos *outgoing_tos;
@@ -301,7 +301,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
#if USE_HTCP
acl_access *htcp;
acl_access *htcp_clr;
-@@ -876,6 +883,7 @@
+@@ -877,6 +884,7 @@
u_short remote_port;
struct in_addr local_addr;
unsigned char tos;
@@ -309,9 +309,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
char ipaddr[16]; /* dotted decimal address of peer */
char desc[FD_DESC_SZ];
struct {
-diff -Nru squid-2.6.STABLE17.orig/src/typedefs.h squid-2.6.STABLE17/src/typedefs.h
---- squid-2.6.STABLE17.orig/src/typedefs.h 2006-09-02 17:08:42.000000000 +0300
-+++ squid-2.6.STABLE17/src/typedefs.h 2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/typedefs.h squid-2.6.STABLE20/src/typedefs.h
+--- squid-2.6.STABLE20.orig/src/typedefs.h 2006-09-02 17:08:42.000000000 +0300
++++ squid-2.6.STABLE20/src/typedefs.h 2008-05-15 00:50:05.000000000 +0300
@@ -102,6 +102,7 @@
typedef struct _acl_access acl_access;
typedef struct _acl_address acl_address;
diff --git a/net-proxy/squid/files/squid-3.0.1-gentoo.patch b/net-proxy/squid/files/squid-3.0.5-gentoo.patch
index 35c7ac8320b1..e13422042960 100644
--- a/net-proxy/squid/files/squid-3.0.1-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.5-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE1/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 22:09:48.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/basic_auth/MSNT/confload.c 2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE5/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/confload.c 2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/MSNT/confload.c 2008-05-15 00:29:57.000000000 +0300
@@ -24,7 +24,7 @@
/* Path to configuration file */
@@ -10,9 +10,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.ST
#endif
#define CONFIGFILE SYSCONFDIR "/msntauth.conf"
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE1/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 21:44:28.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/basic_auth/MSNT/msntauth.conf.default 2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default 2008-05-15 00:29:57.000000000 +0300
@@ -8,6 +8,6 @@
server other_PDC other_BDC otherdomain
@@ -22,9 +22,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/msntauth.conf.default s
+#denyusers /etc/squid/msntauth.denyusers
+#allowusers /etc/squid/msntauth.allowusers
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/Makefile.am 2003-01-23 02:35:40.000000000 +0200
-+++ squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am 2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE5/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am 2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/SMB/Makefile.am 2008-05-15 00:29:57.000000000 +0300
@@ -14,7 +14,7 @@
## FIXME: autoconf should test for the samba path.
@@ -34,9 +34,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.ST
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE1/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 01:36:46.000000000 +0200
-+++ squid-3.0.STABLE1/helpers/basic_auth/SMB/smb_auth.sh 2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE5/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/SMB/smb_auth.sh 2008-05-15 00:29:57.000000000 +0300
@@ -24,7 +24,7 @@
read AUTHSHARE
read AUTHFILE
@@ -55,9 +55,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.ST
echo "Domain controller IP address: $dcip"
[ -n "$dcip" ] || exit 1
-diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE1/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE1.orig/helpers/external_acl/session/squid_session.8 2007-06-25 14:31:46.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/external_acl/session/squid_session.8 2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE5/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE5.orig/helpers/external_acl/session/squid_session.8 2008-04-29 06:43:28.000000000 +0300
++++ squid-3.0.STABLE5/helpers/external_acl/session/squid_session.8 2008-05-15 00:29:57.000000000 +0300
@@ -35,7 +35,7 @@
.P
Configuration example using the default automatic mode
@@ -67,9 +67,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/session/squid_session.8 sq
.IP
acl session external session
.IP
-diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE1/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE1.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-05 15:44:26.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/external_acl/unix_group/squid_unix_group.8 2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-04-29 06:43:28.000000000 +0300
++++ squid-3.0.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8 2008-05-15 00:29:57.000000000 +0300
@@ -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
@@ -79,10 +79,10 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/unix_group/squid_unix_grou
.IP
acl usergroup1 external unix_group group1
.IP
-diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.pre
---- squid-3.0.STABLE1.orig/src/cf.data.pre 2007-11-16 01:33:05.000000000 +0200
-+++ squid-3.0.STABLE1/src/cf.data.pre 2007-12-20 11:06:11.000000000 +0200
-@@ -622,6 +622,8 @@
+diff -Nru squid-3.0.STABLE5.orig/src/cf.data.pre squid-3.0.STABLE5/src/cf.data.pre
+--- squid-3.0.STABLE5.orig/src/cf.data.pre 2008-04-29 06:43:31.000000000 +0300
++++ squid-3.0.STABLE5/src/cf.data.pre 2008-05-15 00:29:57.000000000 +0300
+@@ -638,6 +638,8 @@
acl Safe_ports port 488 # gss-http
acl Safe_ports port 591 # filemaker
acl Safe_ports port 777 # multiling http
@@ -91,7 +91,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
acl CONNECT method CONNECT
NOCOMMENT_END
DOC_END
-@@ -655,6 +657,9 @@
+@@ -671,6 +673,9 @@
# Only allow cachemgr access from localhost
http_access allow manager localhost
http_access deny manager
@@ -101,7 +101,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
# Deny requests to unknown ports
http_access deny !Safe_ports
# Deny CONNECT to other than SSL ports
-@@ -672,6 +677,9 @@
+@@ -688,6 +693,9 @@
# from where browsing should be allowed
http_access allow localnet
@@ -111,7 +111,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
# And finally deny all other access to this proxy
http_access deny all
NOCOMMENT_END
-@@ -3198,11 +3206,11 @@
+@@ -3216,11 +3224,11 @@
NAME: cache_mgr
TYPE: string
@@ -125,7 +125,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
DOC_END
NAME: mail_from
-@@ -5138,6 +5146,9 @@
+@@ -5156,6 +5164,9 @@
If you disable this, it will appear as
X-Forwarded-For: unknown
@@ -135,10 +135,10 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
DOC_END
NAME: cachemgr_passwd
-diff -Nru squid-3.0.STABLE1.orig/src/debug.cc squid-3.0.STABLE1/src/debug.cc
---- squid-3.0.STABLE1.orig/src/debug.cc 2007-12-04 17:20:22.000000000 +0200
-+++ squid-3.0.STABLE1/src/debug.cc 2007-12-20 11:06:11.000000000 +0200
-@@ -466,7 +466,7 @@
+diff -Nru squid-3.0.STABLE5.orig/src/debug.cc squid-3.0.STABLE5/src/debug.cc
+--- squid-3.0.STABLE5.orig/src/debug.cc 2008-04-29 06:43:31.000000000 +0300
++++ squid-3.0.STABLE5/src/debug.cc 2008-05-15 00:29:57.000000000 +0300
+@@ -465,7 +465,7 @@
#if HAVE_SYSLOG && defined(LOG_LOCAL4)
if (opt_syslog_enable)
@@ -147,9 +147,9 @@ diff -Nru squid-3.0.STABLE1.orig/src/debug.cc squid-3.0.STABLE1/src/debug.cc
#endif /* HAVE_SYSLOG */
-diff -Nru squid-3.0.STABLE1.orig/src/defines.h squid-3.0.STABLE1/src/defines.h
---- squid-3.0.STABLE1.orig/src/defines.h 2007-08-13 20:20:51.000000000 +0300
-+++ squid-3.0.STABLE1/src/defines.h 2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/src/defines.h squid-3.0.STABLE5/src/defines.h
+--- squid-3.0.STABLE5.orig/src/defines.h 2008-04-29 06:43:31.000000000 +0300
++++ squid-3.0.STABLE5/src/defines.h 2008-05-15 00:29:57.000000000 +0300
@@ -219,7 +219,7 @@
/* were to look for errors if config path fails */
@@ -159,10 +159,10 @@ diff -Nru squid-3.0.STABLE1.orig/src/defines.h squid-3.0.STABLE1/src/defines.h
#endif
/* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
---- squid-3.0.STABLE1.orig/src/main.cc 2007-12-02 10:23:56.000000000 +0200
-+++ squid-3.0.STABLE1/src/main.cc 2007-12-20 11:06:11.000000000 +0200
-@@ -1472,7 +1472,7 @@
+diff -Nru squid-3.0.STABLE5.orig/src/main.cc squid-3.0.STABLE5/src/main.cc
+--- squid-3.0.STABLE5.orig/src/main.cc 2008-04-29 06:43:32.000000000 +0300
++++ squid-3.0.STABLE5/src/main.cc 2008-05-15 00:29:57.000000000 +0300
+@@ -1480,7 +1480,7 @@
if (*(argv[0]) == '(')
return;
@@ -171,7 +171,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
if ((pid = fork()) < 0)
syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1516,7 +1516,7 @@
+@@ -1524,7 +1524,7 @@
if ((pid = fork()) == 0) {
/* child */
@@ -180,7 +180,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
prog = xstrdup(argv[0]);
argv[0] = xstrdup("(squid)");
execvp(prog, argv);
-@@ -1524,7 +1524,7 @@
+@@ -1532,7 +1532,7 @@
}
/* parent */
@@ -189,10 +189,10 @@ diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
-diff -Nru squid-3.0.STABLE1.orig/src/Makefile.am squid-3.0.STABLE1/src/Makefile.am
---- squid-3.0.STABLE1.orig/src/Makefile.am 2007-10-31 06:52:15.000000000 +0200
-+++ squid-3.0.STABLE1/src/Makefile.am 2007-12-20 11:06:11.000000000 +0200
-@@ -986,12 +986,12 @@
+diff -Nru squid-3.0.STABLE5.orig/src/Makefile.am squid-3.0.STABLE5/src/Makefile.am
+--- squid-3.0.STABLE5.orig/src/Makefile.am 2008-04-29 06:43:30.000000000 +0300
++++ squid-3.0.STABLE5/src/Makefile.am 2008-05-15 00:29:57.000000000 +0300
+@@ -988,12 +988,12 @@
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`