1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
diff -Nru squid-3.0.STABLE6.orig/configure.in squid-3.0.STABLE6/configure.in
--- squid-3.0.STABLE6.orig/configure.in 2008-05-20 17:01:16.000000000 +0200
+++ squid-3.0.STABLE6/configure.in 2008-06-22 13:20:41.000000000 +0200
@@ -19,9 +19,9 @@
PRESET_LDFLAGS="$LDFLAGS"
dnl Set default LDFLAGS
-if test -z "$LDFLAGS"; then
- LDFLAGS="-g"
-fi
+dnl if test -z "$LDFLAGS"; then
+dnl LDFLAGS="-g"
+dnl fi
dnl Check for GNU cc
AC_PROG_CC
diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c
--- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c 2008-05-20 17:01:10.000000000 +0200
+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c 2008-06-22 13:20:06.000000000 +0200
@@ -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-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default
--- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-05-20 17:01:10.000000000 +0200
+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default 2008-06-22 13:20:06.000000000 +0200
@@ -8,6 +8,6 @@
server other_PDC other_BDC otherdomain
# Denied and allowed users. Comment these if not needed.
-#denyusers /usr/local/squid/etc/msntauth.denyusers
-#allowusers /usr/local/squid/etc/msntauth.allowusers
+#denyusers /etc/squid/msntauth.denyusers
+#allowusers /etc/squid/msntauth.allowusers
diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am
--- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am 2008-05-20 17:01:11.000000000 +0200
+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am 2008-06-22 13:20:06.000000000 +0200
@@ -14,7 +14,7 @@
## FIXME: autoconf should test for the samba path.
SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX=/usr/local/samba
+SAMBAPREFIX=/usr
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh
--- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-05-20 17:01:11.000000000 +0200
+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh 2008-06-22 13:20:06.000000000 +0200
@@ -24,7 +24,7 @@
read AUTHSHARE
read AUTHFILE
read SMBUSER
-read SMBPASS
+read -r SMBPASS
# Find domain controller
echo "Domain name: $DOMAINNAME"
@@ -47,7 +47,7 @@
addropt=""
fi
echo "Query address options: $addropt"
-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
echo "Domain controller IP address: $dcip"
[ -n "$dcip" ] || exit 1
diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8
--- squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 2008-05-20 17:01:11.000000000 +0200
+++ squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8 2008-06-22 13:20:06.000000000 +0200
@@ -35,7 +35,7 @@
.P
Configuration example using the default automatic mode
.IP
-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
.IP
acl session external session
.IP
diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8
--- squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-05-20 17:01:11.000000000 +0200
+++ squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8 2008-06-22 13:20:06.000000000 +0200
@@ -27,7 +27,7 @@
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
matches users in group2 or group3
.IP
-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
.IP
acl usergroup1 external unix_group group1
.IP
diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.pre
--- squid-3.0.STABLE6.orig/src/cf.data.pre 2008-05-20 17:01:14.000000000 +0200
+++ squid-3.0.STABLE6/src/cf.data.pre 2008-06-22 13:20:06.000000000 +0200
@@ -638,6 +638,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
@@ -671,6 +673,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
@@ -688,6 +693,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
@@ -3216,11 +3224,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
@@ -5168,6 +5176,9 @@
If you disable this, it will appear as
X-Forwarded-For: unknown
+NOCOMMENT_START
+forwarded_for off
+NOCOMMENT_END
DOC_END
NAME: cachemgr_passwd
diff -Nru squid-3.0.STABLE6.orig/src/debug.cc squid-3.0.STABLE6/src/debug.cc
--- squid-3.0.STABLE6.orig/src/debug.cc 2008-05-20 17:01:15.000000000 +0200
+++ squid-3.0.STABLE6/src/debug.cc 2008-06-22 13:20:06.000000000 +0200
@@ -465,7 +465,7 @@
#if HAVE_SYSLOG && defined(LOG_LOCAL4)
if (opt_syslog_enable)
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
+ openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility);
#endif /* HAVE_SYSLOG */
diff -Nru squid-3.0.STABLE6.orig/src/defines.h squid-3.0.STABLE6/src/defines.h
--- squid-3.0.STABLE6.orig/src/defines.h 2008-05-20 17:01:15.000000000 +0200
+++ squid-3.0.STABLE6/src/defines.h 2008-06-22 13:20:06.000000000 +0200
@@ -219,7 +219,7 @@
/* were to look for errors if config path fails */
#ifndef DEFAULT_SQUID_ERROR_DIR
-#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
#endif
/* handy to determine the #elements in a static array */
diff -Nru squid-3.0.STABLE6.orig/src/main.cc squid-3.0.STABLE6/src/main.cc
--- squid-3.0.STABLE6.orig/src/main.cc 2008-05-20 17:01:15.000000000 +0200
+++ squid-3.0.STABLE6/src/main.cc 2008-06-22 13:20:06.000000000 +0200
@@ -1482,7 +1482,7 @@
if (*(argv[0]) == '(')
return;
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
if ((pid = fork()) < 0)
syslog(LOG_ALERT, "fork failed: %s", xstrerror());
@@ -1526,7 +1526,7 @@
if ((pid = fork()) == 0) {
/* child */
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
prog = xstrdup(argv[0]);
argv[0] = xstrdup("(squid)");
execvp(prog, argv);
@@ -1534,7 +1534,7 @@
}
/* parent */
- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
diff -Nru squid-3.0.STABLE6.orig/src/Makefile.am squid-3.0.STABLE6/src/Makefile.am
--- squid-3.0.STABLE6.orig/src/Makefile.am 2008-05-20 17:01:14.000000000 +0200
+++ squid-3.0.STABLE6/src/Makefile.am 2008-06-22 13:20:06.000000000 +0200
@@ -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)/'`
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
|
GitWeb