1 |
mrness 08/10/19 10:00:35 |
2 |
|
3 |
Added: squid-2.7.5-gentoo.patch squid-2.7.5-heimdal.patch |
4 |
Log: |
5 |
Version bump (#242646). |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-proxy/squid/files/squid-2.7.5-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.7.5-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.7.5-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: squid-2.7.5-gentoo.patch |
15 |
=================================================================== |
16 |
diff -Nru squid-2.7.STABLE5.orig/configure.in squid-2.7.STABLE5/configure.in |
17 |
--- squid-2.7.STABLE5.orig/configure.in 2008-10-17 19:01:04.000000000 +0000 |
18 |
+++ squid-2.7.STABLE5/configure.in 2008-10-19 09:48:02.000000000 +0000 |
19 |
@@ -18,9 +18,9 @@ |
20 |
PRESET_LDFLAGS="$LDFLAGS" |
21 |
|
22 |
dnl Set default LDFLAGS |
23 |
-if test -z "$LDFLAGS"; then |
24 |
- LDFLAGS="-g" |
25 |
-fi |
26 |
+dnl if test -z "$LDFLAGS"; then |
27 |
+dnl LDFLAGS="-g" |
28 |
+dnl fi |
29 |
|
30 |
dnl Check for GNU cc |
31 |
AC_PROG_CC |
32 |
diff -Nru squid-2.7.STABLE5.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE5/helpers/basic_auth/MSNT/confload.c |
33 |
--- squid-2.7.STABLE5.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 19:09:48.000000000 +0000 |
34 |
+++ squid-2.7.STABLE5/helpers/basic_auth/MSNT/confload.c 2008-10-19 09:48:02.000000000 +0000 |
35 |
@@ -24,7 +24,7 @@ |
36 |
|
37 |
/* Path to configuration file */ |
38 |
#ifndef SYSCONFDIR |
39 |
-#define SYSCONFDIR "/usr/local/squid/etc" |
40 |
+#define SYSCONFDIR "/etc/squid" |
41 |
#endif |
42 |
#define CONFIGFILE SYSCONFDIR "/msntauth.conf" |
43 |
|
44 |
diff -Nru squid-2.7.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default |
45 |
--- squid-2.7.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 18:44:28.000000000 +0000 |
46 |
+++ squid-2.7.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default 2008-10-19 09:48:02.000000000 +0000 |
47 |
@@ -8,6 +8,6 @@ |
48 |
server other_PDC other_BDC otherdomain |
49 |
|
50 |
# Denied and allowed users. Comment these if not needed. |
51 |
-#denyusers /usr/local/squid/etc/msntauth.denyusers |
52 |
-#allowusers /usr/local/squid/etc/msntauth.allowusers |
53 |
+#denyusers /etc/squid/msntauth.denyusers |
54 |
+#allowusers /etc/squid/msntauth.allowusers |
55 |
|
56 |
diff -Nru squid-2.7.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE5/helpers/basic_auth/SMB/Makefile.am |
57 |
--- squid-2.7.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 16:56:26.000000000 +0000 |
58 |
+++ squid-2.7.STABLE5/helpers/basic_auth/SMB/Makefile.am 2008-10-19 09:48:02.000000000 +0000 |
59 |
@@ -14,7 +14,7 @@ |
60 |
## FIXME: autoconf should test for the samba path. |
61 |
|
62 |
SMB_AUTH_HELPER = smb_auth.sh |
63 |
-SAMBAPREFIX=/usr/local/samba |
64 |
+SAMBAPREFIX=/usr |
65 |
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) |
66 |
|
67 |
libexec_SCRIPTS = $(SMB_AUTH_HELPER) |
68 |
diff -Nru squid-2.7.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE5/helpers/basic_auth/SMB/smb_auth.sh |
69 |
--- squid-2.7.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-07 23:36:46.000000000 +0000 |
70 |
+++ squid-2.7.STABLE5/helpers/basic_auth/SMB/smb_auth.sh 2008-10-19 09:48:02.000000000 +0000 |
71 |
@@ -24,7 +24,7 @@ |
72 |
read AUTHSHARE |
73 |
read AUTHFILE |
74 |
read SMBUSER |
75 |
-read SMBPASS |
76 |
+read -r SMBPASS |
77 |
|
78 |
# Find domain controller |
79 |
echo "Domain name: $DOMAINNAME" |
80 |
@@ -47,7 +47,7 @@ |
81 |
addropt="" |
82 |
fi |
83 |
echo "Query address options: $addropt" |
84 |
-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` |
85 |
+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` |
86 |
echo "Domain controller IP address: $dcip" |
87 |
[ -n "$dcip" ] || exit 1 |
88 |
|
89 |
diff -Nru squid-2.7.STABLE5.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE5/helpers/external_acl/session/squid_session.8 |
90 |
--- squid-2.7.STABLE5.orig/helpers/external_acl/session/squid_session.8 2007-01-06 17:28:35.000000000 +0000 |
91 |
+++ squid-2.7.STABLE5/helpers/external_acl/session/squid_session.8 2008-10-19 09:48:02.000000000 +0000 |
92 |
@@ -35,7 +35,7 @@ |
93 |
.P |
94 |
Configuration example using the default automatic mode |
95 |
.IP |
96 |
-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session |
97 |
+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session |
98 |
.IP |
99 |
acl session external session |
100 |
.IP |
101 |
diff -Nru squid-2.7.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8 |
102 |
--- squid-2.7.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-14 15:07:24.000000000 +0000 |
103 |
+++ squid-2.7.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8 2008-10-19 09:48:02.000000000 +0000 |
104 |
@@ -27,7 +27,7 @@ |
105 |
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 |
106 |
matches users in group2 or group3 |
107 |
.IP |
108 |
-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p |
109 |
+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p |
110 |
.IP |
111 |
acl usergroup1 external unix_group group1 |
112 |
.IP |
113 |
diff -Nru squid-2.7.STABLE5.orig/src/access_log.c squid-2.7.STABLE5/src/access_log.c |
114 |
--- squid-2.7.STABLE5.orig/src/access_log.c 2008-03-18 02:48:43.000000000 +0000 |
115 |
+++ squid-2.7.STABLE5/src/access_log.c 2008-10-19 09:48:02.000000000 +0000 |
116 |
@@ -1261,7 +1261,7 @@ |
117 |
LogfileStatus = LOG_ENABLE; |
118 |
} |
119 |
#if HEADERS_LOG |
120 |
- headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0); |
121 |
+ headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0); |
122 |
assert(NULL != headerslog); |
123 |
#endif |
124 |
#if FORW_VIA_DB |
125 |
diff -Nru squid-2.7.STABLE5.orig/src/cf.data.pre squid-2.7.STABLE5/src/cf.data.pre |
126 |
--- squid-2.7.STABLE5.orig/src/cf.data.pre 2008-09-25 02:33:37.000000000 +0000 |
127 |
+++ squid-2.7.STABLE5/src/cf.data.pre 2008-10-19 09:48:02.000000000 +0000 |
128 |
@@ -676,6 +676,8 @@ |
129 |
acl Safe_ports port 488 # gss-http |
130 |
acl Safe_ports port 591 # filemaker |
131 |
acl Safe_ports port 777 # multiling http |
132 |
+acl Safe_ports port 901 # SWAT |
133 |
+acl purge method PURGE |
134 |
acl CONNECT method CONNECT |
135 |
NOCOMMENT_END |
136 |
DOC_END |
137 |
@@ -709,6 +711,9 @@ |
138 |
# Only allow cachemgr access from localhost |
139 |
http_access allow manager localhost |
140 |
http_access deny manager |
141 |
+# Only allow purge requests from localhost |
142 |
+http_access allow purge localhost |
143 |
+http_access deny purge |
144 |
# Deny requests to unknown ports |
145 |
http_access deny !Safe_ports |
146 |
# Deny CONNECT to other than SSL ports |
147 |
@@ -726,6 +731,9 @@ |
148 |
# from where browsing should be allowed |
149 |
http_access allow localnet |
150 |
|
151 |
+# Allow the localhost to have access by default |
152 |
+http_access allow localhost |
153 |
+ |
154 |
# And finally deny all other access to this proxy |
155 |
http_access deny all |
156 |
NOCOMMENT_END |
157 |
@@ -3745,11 +3753,11 @@ |
158 |
|
159 |
NAME: cache_mgr |
160 |
TYPE: string |
161 |
-DEFAULT: webmaster |
162 |
+DEFAULT: root |
163 |
LOC: Config.adminEmail |
164 |
DOC_START |
165 |
Email-address of local cache manager who will receive |
166 |
- mail if the cache dies. The default is "webmaster". |
167 |
+ mail if the cache dies. The default is "root". |
168 |
DOC_END |
169 |
|
170 |
NAME: mail_from |
171 |
@@ -3778,12 +3786,12 @@ |
172 |
|
173 |
NAME: cache_effective_user |
174 |
TYPE: string |
175 |
-DEFAULT: nobody |
176 |
+DEFAULT: squid |
177 |
LOC: Config.effectiveUser |
178 |
DOC_START |
179 |
If you start Squid as root, it will change its effective/real |
180 |
UID/GID to the user specified below. The default is to change |
181 |
- to UID to nobody. If you define cache_effective_user, but not |
182 |
+ to UID to squid. If you define cache_effective_user, but not |
183 |
cache_effective_group, Squid sets the GID to the effective |
184 |
user's default group ID (taken from the password file) and |
185 |
supplementary group list from the from groups membership of |
186 |
@@ -4420,12 +4428,12 @@ |
187 |
NAME: snmp_port |
188 |
TYPE: ushort |
189 |
LOC: Config.Port.snmp |
190 |
-DEFAULT: 3401 |
191 |
+DEFAULT: 0 |
192 |
IFDEF: SQUID_SNMP |
193 |
DOC_START |
194 |
Squid can now serve statistics and status information via SNMP. |
195 |
- By default it listens to port 3401 on the machine. If you don't |
196 |
- wish to use SNMP, set this to "0". |
197 |
+ By default snmp_port is disabled. If you wish to use SNMP, |
198 |
+ set this to "3401" (or any other number you like). |
199 |
DOC_END |
200 |
|
201 |
NAME: snmp_access |
202 |
@@ -4496,12 +4504,12 @@ |
203 |
NAME: htcp_port |
204 |
IFDEF: USE_HTCP |
205 |
TYPE: ushort |
206 |
-DEFAULT: 4827 |
207 |
+DEFAULT: 0 |
208 |
LOC: Config.Port.htcp |
209 |
DOC_START |
210 |
The port number where Squid sends and receives HTCP queries to |
211 |
- and from neighbor caches. Default is 4827. To disable use |
212 |
- "0". |
213 |
+ and from neighbor caches. To turn it on you want to set it to |
214 |
+ 4827. By default it is set to "0" (disabled). |
215 |
DOC_END |
216 |
|
217 |
NAME: log_icp_queries |
218 |
@@ -5398,6 +5406,9 @@ |
219 |
If you disable this, it will appear as |
220 |
|
221 |
X-Forwarded-For: unknown |
222 |
+NOCOMMENT_START |
223 |
+forwarded_for off |
224 |
+NOCOMMENT_END |
225 |
DOC_END |
226 |
|
227 |
NAME: cachemgr_passwd |
228 |
diff -Nru squid-2.7.STABLE5.orig/src/client_side.c squid-2.7.STABLE5/src/client_side.c |
229 |
--- squid-2.7.STABLE5.orig/src/client_side.c 2008-10-06 21:27:44.000000000 +0000 |
230 |
+++ squid-2.7.STABLE5/src/client_side.c 2008-10-19 09:48:02.000000000 +0000 |
231 |
@@ -4706,14 +4706,7 @@ |
232 |
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); |
233 |
} else { |
234 |
if (do_debug(83, 4)) { |
235 |
- /* Write out the SSL session details.. actually the call below, but |
236 |
- * OpenSSL headers do strange typecasts confusing GCC.. */ |
237 |
- /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */ |
238 |
-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L |
239 |
- 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); |
240 |
-#else |
241 |
PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL); |
242 |
-#endif |
243 |
/* Note: This does not automatically fflush the log file.. */ |
244 |
} |
245 |
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); |
246 |
diff -Nru squid-2.7.STABLE5.orig/src/defines.h squid-2.7.STABLE5/src/defines.h |
247 |
--- squid-2.7.STABLE5.orig/src/defines.h 2007-09-24 13:31:19.000000000 +0000 |
248 |
+++ squid-2.7.STABLE5/src/defines.h 2008-10-19 09:48:02.000000000 +0000 |
249 |
@@ -259,7 +259,7 @@ |
250 |
|
251 |
/* were to look for errors if config path fails */ |
252 |
#ifndef DEFAULT_SQUID_ERROR_DIR |
253 |
-#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" |
254 |
+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English" |
255 |
#endif |
256 |
|
257 |
/* gb_type operations */ |
258 |
diff -Nru squid-2.7.STABLE5.orig/src/main.c squid-2.7.STABLE5/src/main.c |
259 |
--- squid-2.7.STABLE5.orig/src/main.c 2008-09-25 02:21:52.000000000 +0000 |
260 |
+++ squid-2.7.STABLE5/src/main.c 2008-10-19 09:48:02.000000000 +0000 |
261 |
@@ -376,6 +376,22 @@ |
262 |
asnFreeMemory(); |
263 |
} |
264 |
|
265 |
+#if USE_UNLINKD |
266 |
+static int |
267 |
+needUnlinkd(void) |
268 |
+{ |
269 |
+ int i; |
270 |
+ int r = 0; |
271 |
+ for (i = 0; i < Config.cacheSwap.n_configured; i++) { |
272 |
+ if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 || |
273 |
+ strcmp(Config.cacheSwap.swapDirs[i].type, "aufs") == 0 || |
274 |
+ strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0) |
275 |
+ r++; |
276 |
+ } |
277 |
+ return r; |
278 |
+} |
279 |
+#endif |
280 |
+ |
281 |
static void |
282 |
mainReconfigure(void) |
283 |
{ |
284 |
@@ -614,7 +630,7 @@ |
285 |
|
286 |
if (!configured_once) { |
287 |
#if USE_UNLINKD |
288 |
- unlinkdInit(); |
289 |
+ if (needUnlinkd()) unlinkdInit(); |
290 |
#endif |
291 |
urlInitialize(); |
292 |
cachemgrInit(); |
293 |
@@ -637,6 +653,9 @@ |
294 |
#if USE_WCCPv2 |
295 |
wccp2Init(); |
296 |
#endif |
297 |
+#if USE_UNLINKD |
298 |
+ if (needUnlinkd()) unlinkdInit(); |
299 |
+#endif |
300 |
serverConnectionsOpen(); |
301 |
neighbors_init(); |
302 |
if (Config.chroot_dir) |
303 |
diff -Nru squid-2.7.STABLE5.orig/src/Makefile.am squid-2.7.STABLE5/src/Makefile.am |
304 |
--- squid-2.7.STABLE5.orig/src/Makefile.am 2008-01-02 15:50:39.000000000 +0000 |
305 |
+++ squid-2.7.STABLE5/src/Makefile.am 2008-10-19 09:48:02.000000000 +0000 |
306 |
@@ -340,13 +340,13 @@ |
307 |
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf |
308 |
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf |
309 |
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` |
310 |
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs |
311 |
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid |
312 |
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log |
313 |
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log |
314 |
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log |
315 |
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid |
316 |
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid |
317 |
DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state |
318 |
-DEFAULT_SWAP_DIR = $(localstatedir)/cache |
319 |
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid |
320 |
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` |
321 |
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` |
322 |
DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'` |
323 |
|
324 |
|
325 |
|
326 |
1.1 net-proxy/squid/files/squid-2.7.5-heimdal.patch |
327 |
|
328 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.7.5-heimdal.patch?rev=1.1&view=markup |
329 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-2.7.5-heimdal.patch?rev=1.1&content-type=text/plain |
330 |
|
331 |
Index: squid-2.7.5-heimdal.patch |
332 |
=================================================================== |
333 |
diff -Nru squid-2.7.STABLE5.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE5/helpers/negotiate_auth/squid_kerb_auth/Makefile.am |
334 |
--- squid-2.7.STABLE5.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2007-05-14 23:36:29.000000000 +0000 |
335 |
+++ squid-2.7.STABLE5/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2008-10-19 09:50:22.000000000 +0000 |
336 |
@@ -18,10 +18,10 @@ |
337 |
#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) |
338 |
|
339 |
# HEIMDAL |
340 |
-#KERBINC = -DHEIMDAL -I/usr/include/heimdal |
341 |
-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken |
342 |
+KERBINC = -DHEIMDAL -I/usr/include/heimdal |
343 |
+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken |
344 |
|
345 |
# MIT |
346 |
-KERBINC = |
347 |
-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err |
348 |
+#KERBINC = |
349 |
+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err |