Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/squid/files: squid-3.0.8-adapted-zph.patch squid-3.0.8-gentoo.patch squid-3.0.5-gentoo.patch squid-3.0.6-adapted-zph.patch squid-2.7.2-gentoo.patch squid-3.0.6-gentoo.patch squid-3.0.6-lincapver.patch
Date: Fri, 01 Aug 2008 22:13:46
Message-Id: E1KP2sY-0003dJ-LG@stork.gentoo.org
1 mrness 08/08/01 22:13:42
2
3 Added: squid-3.0.8-adapted-zph.patch
4 squid-3.0.8-gentoo.patch
5 Removed: squid-3.0.5-gentoo.patch
6 squid-3.0.6-adapted-zph.patch
7 squid-2.7.2-gentoo.patch squid-3.0.6-gentoo.patch
8 squid-3.0.6-lincapver.patch
9 Log:
10 Remove obsolete test versions. Version bump (#233001).
11 (Portage version: 2.1.4.4)
12
13 Revision Changes Path
14 1.1 net-proxy/squid/files/squid-3.0.8-adapted-zph.patch
15
16 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.8-adapted-zph.patch?rev=1.1&view=markup
17 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.8-adapted-zph.patch?rev=1.1&content-type=text/plain
18
19 Index: squid-3.0.8-adapted-zph.patch
20 ===================================================================
21 diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre
22 --- squid-3.0.STABLE8.orig/src/cf.data.pre 2008-08-01 21:59:10.000000000 +0000
23 +++ squid-3.0.STABLE8/src/cf.data.pre 2008-08-01 22:00:44.000000000 +0000
24 @@ -1127,6 +1127,60 @@
25 making the request.
26 DOC_END
27
28 +NAME: zph_tos_local
29 +TYPE: int
30 +DEFAULT: 0
31 +LOC: Config.zph_tos_local
32 +DOC_START
33 + Allows you to select a TOS/Diffserv value to mark local hits. Read above
34 + (tcp_outgoing_tos) for details/requirements about TOS.
35 + Default: 0 (disabled).
36 +DOC_END
37 +
38 +NAME: zph_tos_peer
39 +TYPE: int
40 +DEFAULT: 0
41 +LOC: Config.zph_tos_peer
42 +DOC_START
43 + Allows you to select a TOS/Diffserv value to mark peer hits. Read above
44 + (tcp_outgoing_tos) for details/requirements about TOS.
45 + Default: 0 (disabled).
46 +DOC_END
47 +
48 +NAME: zph_tos_parent
49 +COMMENT: on|off
50 +TYPE: onoff
51 +LOC: Config.onoff.zph_tos_parent
52 +DEFAULT: on
53 +DOC_START
54 + Set this to off if you want only sibling hits to be marked.
55 + If set to on (default), parent hits are being marked too.
56 +DOC_END
57 +
58 +NAME: zph_preserve_miss_tos
59 +COMMENT: on|off
60 +TYPE: onoff
61 +LOC: Config.onoff.zph_preserve_miss_tos
62 +DEFAULT: on
63 +DOC_START
64 + If set to on (default), any HTTP response towards clients will
65 + have the TOS value of the response comming from the remote
66 + server masked with the value of zph_preserve_miss_tos_mask.
67 + For this to work correctly, you will need to patch your linux
68 + kernel with the TOS preserving ZPH patch.
69 +DOC_END
70 +
71 +NAME: zph_preserve_miss_tos_mask
72 +TYPE: int
73 +DEFAULT: 255
74 +LOC: Config.zph_preserve_miss_tos_mask
75 +DOC_START
76 + Allows you to mask certain bits in the TOS received from the
77 + remote server, before copying the value to the TOS send towards
78 + clients.
79 + Default: 255 (TOS from server is not changed).
80 +DOC_END
81 +
82 NAME: tcp_outgoing_address
83 TYPE: acl_address
84 DEFAULT: none
85 diff -ur squid-3.0.STABLE8.orig/src/client_side_reply.cc squid-3.0.STABLE8/src/client_side_reply.cc
86 --- squid-3.0.STABLE8.orig/src/client_side_reply.cc 2008-07-18 10:02:54.000000000 +0000
87 +++ squid-3.0.STABLE8/src/client_side_reply.cc 2008-08-01 22:00:44.000000000 +0000
88 @@ -48,6 +48,7 @@
89 #include "ESI.h"
90 #endif
91 #include "MemObject.h"
92 +#include "fde.h"
93 #include "ACLChecklist.h"
94 #include "ACL.h"
95 #if DELAY_POOLS
96 @@ -1548,6 +1549,58 @@
97 /* guarantee nothing has been sent yet! */
98 assert(http->out.size == 0);
99 assert(http->out.offset == 0);
100 +
101 + if (Config.zph_tos_local ||
102 + Config.zph_tos_peer ||
103 + Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
104 + {
105 + int need_change = 0;
106 + int hit = 0;
107 + int tos = 0;
108 + int tos_old = 0;
109 + int tos_len = sizeof(tos_old);
110 + int res;
111 +
112 + if (Config.zph_tos_local)
113 + {
114 + /* local hit */
115 + hit = 1;
116 + tos = Config.zph_tos_local;
117 + }
118 + else if (Config.zph_tos_peer &&
119 + (http->request->hier.code==SIBLING_HIT ||
120 + Config.onoff.zph_tos_parent&&http->request->hier.code==PARENT_HIT))
121 + {
122 + /* sibling or parent hit */
123 + hit = 1;
124 + tos = Config.zph_tos_peer;
125 + }
126 +
127 + if (http->request->flags.proxy_keepalive)
128 + {
129 + res = getsockopt(http->getConn()->fd, IPPROTO_IP, IP_TOS, &tos_old, (socklen_t*)&tos_len);
130 + if (res < 0)
131 + {
132 + debugs(33, 1, "ZPH: error in getsockopt(IP_TOS) on keepalived FD "<< http->getConn()->fd << " " << xstrerror());
133 + }
134 + else if (hit && tos_old != tos)
135 + {
136 + /* HIT: 1-st request, or previous was MISS,
137 + * or local/parent hit change.
138 + */
139 + need_change = 1;
140 + }
141 + }
142 + else if (hit)
143 + {
144 + /* no keepalive */
145 + need_change = 1;
146 + }
147 + if (need_change) {
148 + comm_set_tos(http->getConn()->fd,tos);
149 + }
150 + }
151 +
152 tempBuffer.offset = reqofs;
153 tempBuffer.length = getNextNode()->readBuffer.length;
154 tempBuffer.data = getNextNode()->readBuffer.data;
155 @@ -1828,6 +1881,14 @@
156
157 char *body_buf = buf;
158
159 + if (reqofs==0 && !logTypeIsATcpHit(http->logType) &&
160 + Config.onoff.zph_preserve_miss_tos &&
161 + Config.zph_preserve_miss_tos_mask)
162 + {
163 + int tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
164 + comm_set_tos(fd,tos);
165 + }
166 +
167 if (buf != result.data) {
168 /* we've got to copy some data */
169 assert(result.length <= next()->readBuffer.length);
170 diff -ur squid-3.0.STABLE8.orig/src/fde.h squid-3.0.STABLE8/src/fde.h
171 --- squid-3.0.STABLE8.orig/src/fde.h 2008-07-18 10:02:54.000000000 +0000
172 +++ squid-3.0.STABLE8/src/fde.h 2008-08-01 22:00:44.000000000 +0000
173 @@ -106,7 +106,7 @@
174 long handle;
175 } win32;
176 #endif
177 -
178 + unsigned char upstreamTOS; /* see FwdState::dispatch() */
179 };
180
181 #endif /* SQUID_FDE_H */
182 diff -ur squid-3.0.STABLE8.orig/src/forward.cc squid-3.0.STABLE8/src/forward.cc
183 --- squid-3.0.STABLE8.orig/src/forward.cc 2008-07-18 10:02:54.000000000 +0000
184 +++ squid-3.0.STABLE8/src/forward.cc 2008-08-01 22:00:44.000000000 +0000
185 @@ -964,6 +964,52 @@
186
187 netdbPingSite(request->host);
188
189 + /* Retrieves remote server TOS value, and stores it as part of the
190 + * original client request FD object. It is later used to forward
191 + * remote server's TOS in the response to the client in case of a MISS.
192 + */
193 + fde * clientFde = &fd_table[client_fd];
194 + if (clientFde)
195 + {
196 + int tos = 1;
197 + int tos_len = sizeof(tos);
198 + clientFde->upstreamTOS = 0;
199 + if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0)
200 + {
201 + unsigned char buf[512];
202 + int len = 512;
203 + if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0)
204 + {
205 + /* Parse the PKTOPTIONS structure to locate the TOS data message
206 + * prepared in the kernel by the ZPH incoming TCP TOS preserving
207 + * patch.
208 + */
209 + unsigned char * p = buf;
210 + while (p-buf < len)
211 + {
212 + struct cmsghdr *o = (struct cmsghdr*)p;
213 + if (o->cmsg_len<=0)
214 + break;
215 +
216 + if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
217 + {
218 + clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
219 + break;
220 + }
221 + p += CMSG_LEN(o->cmsg_len);
222 + }
223 + }
224 + else
225 + {
226 + debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror());
227 + }
228 + }
229 + else
230 + {
231 + debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror());
232 + }
233 + }
234 +
235 if (servers && (p = servers->_peer)) {
236 p->stats.fetches++;
237 request->peer_login = p->login;
238 diff -ur squid-3.0.STABLE8.orig/src/structs.h squid-3.0.STABLE8/src/structs.h
239 --- squid-3.0.STABLE8.orig/src/structs.h 2008-07-18 10:02:54.000000000 +0000
240 +++ squid-3.0.STABLE8/src/structs.h 2008-08-01 22:00:44.000000000 +0000
241 @@ -553,6 +553,8 @@
242 int emailErrData;
243 int httpd_suppress_version_string;
244 int global_internal_static;
245 + int zph_tos_parent;
246 + int zph_preserve_miss_tos;
247 int debug_override_X;
248 int WIN32_IpAddrChangeMonitor;
249 }
250 @@ -721,6 +723,9 @@
251 int sleep_after_fork; /* microseconds */
252 time_t minimum_expiry_time; /* seconds */
253 external_acl *externalAclHelperList;
254 + int zph_tos_local;
255 + int zph_tos_peer;
256 + int zph_preserve_miss_tos_mask;
257 #if USE_SSL
258
259 struct
260
261
262
263 1.1 net-proxy/squid/files/squid-3.0.8-gentoo.patch
264
265 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.8-gentoo.patch?rev=1.1&view=markup
266 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.8-gentoo.patch?rev=1.1&content-type=text/plain
267
268 Index: squid-3.0.8-gentoo.patch
269 ===================================================================
270 diff -ur squid-3.0.STABLE8.orig/configure.in squid-3.0.STABLE8/configure.in
271 --- squid-3.0.STABLE8.orig/configure.in 2008-07-18 10:02:55.000000000 +0000
272 +++ squid-3.0.STABLE8/configure.in 2008-08-01 21:56:22.000000000 +0000
273 @@ -19,9 +19,9 @@
274 PRESET_LDFLAGS="$LDFLAGS"
275
276 dnl Set default LDFLAGS
277 -if test -z "$LDFLAGS"; then
278 - LDFLAGS="-g"
279 -fi
280 +dnl if test -z "$LDFLAGS"; then
281 +dnl LDFLAGS="-g"
282 +dnl fi
283
284 dnl Check for GNU cc
285 AC_PROG_CC
286 diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c
287 --- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c 2008-07-18 10:02:50.000000000 +0000
288 +++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c 2008-08-01 21:56:22.000000000 +0000
289 @@ -27,7 +27,7 @@
290
291 /* Path to configuration file */
292 #ifndef SYSCONFDIR
293 -#define SYSCONFDIR "/usr/local/squid/etc"
294 +#define SYSCONFDIR "/etc/squid"
295 #endif
296 #define CONFIGFILE SYSCONFDIR "/msntauth.conf"
297
298 diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default
299 --- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-07-18 10:02:50.000000000 +0000
300 +++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default 2008-08-01 21:56:22.000000000 +0000
301 @@ -8,6 +8,6 @@
302 server other_PDC other_BDC otherdomain
303
304 # Denied and allowed users. Comment these if not needed.
305 -#denyusers /usr/local/squid/etc/msntauth.denyusers
306 -#allowusers /usr/local/squid/etc/msntauth.allowusers
307 +#denyusers /etc/squid/msntauth.denyusers
308 +#allowusers /etc/squid/msntauth.allowusers
309
310 diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am
311 --- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am 2008-07-18 10:02:50.000000000 +0000
312 +++ squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am 2008-08-01 21:56:22.000000000 +0000
313 @@ -14,7 +14,7 @@
314 ## FIXME: autoconf should test for the samba path.
315
316 SMB_AUTH_HELPER = smb_auth.sh
317 -SAMBAPREFIX=/usr/local/samba
318 +SAMBAPREFIX=/usr
319 SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
320
321 libexec_SCRIPTS = $(SMB_AUTH_HELPER)
322 diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh
323 --- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-07-18 10:02:50.000000000 +0000
324 +++ squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh 2008-08-01 21:56:22.000000000 +0000
325 @@ -24,7 +24,7 @@
326 read AUTHSHARE
327 read AUTHFILE
328 read SMBUSER
329 -read SMBPASS
330 +read -r SMBPASS
331
332 # Find domain controller
333 echo "Domain name: $DOMAINNAME"
334 @@ -47,7 +47,7 @@
335 addropt=""
336 fi
337 echo "Query address options: $addropt"
338 -dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
339 +dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
340 echo "Domain controller IP address: $dcip"
341 [ -n "$dcip" ] || exit 1
342
343 diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8
344 --- squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 2008-07-18 10:02:50.000000000 +0000
345 +++ squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8 2008-08-01 21:56:22.000000000 +0000
346 @@ -35,7 +35,7 @@
347 .P
348 Configuration example using the default automatic mode
349 .IP
350 -external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
351 +external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
352 .IP
353 acl session external session
354 .IP
355 diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8
356 --- squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-07-18 10:02:50.000000000 +0000
357 +++ squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8 2008-08-01 21:56:22.000000000 +0000
358 @@ -27,7 +27,7 @@
359 This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
360 matches users in group2 or group3
361 .IP
362 -external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
363 +external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
364 .IP
365 acl usergroup1 external unix_group group1
366 .IP
367 diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre
368 --- squid-3.0.STABLE8.orig/src/cf.data.pre 2008-07-18 10:02:53.000000000 +0000
369 +++ squid-3.0.STABLE8/src/cf.data.pre 2008-08-01 21:56:22.000000000 +0000
370 @@ -652,6 +652,8 @@
371 acl Safe_ports port 488 # gss-http
372 acl Safe_ports port 591 # filemaker
373 acl Safe_ports port 777 # multiling http
374 +acl Safe_ports port 901 # SWAT
375 +acl purge method PURGE
376 acl CONNECT method CONNECT
377 NOCOMMENT_END
378 DOC_END
379 @@ -685,6 +687,9 @@
380 # Only allow cachemgr access from localhost
381 http_access allow manager localhost
382 http_access deny manager
383 +# Only allow purge requests from localhost
384 +http_access allow purge localhost
385 +http_access deny purge
386 # Deny requests to unknown ports
387 http_access deny !Safe_ports
388 # Deny CONNECT to other than SSL ports
389 @@ -702,6 +707,9 @@
390 # from where browsing should be allowed
391 http_access allow localnet
392
393 +# Allow the localhost to have access by default
394 +http_access allow localhost
395 +
396 # And finally deny all other access to this proxy
397 http_access deny all
398 NOCOMMENT_END
399 @@ -3249,11 +3257,11 @@
400
401 NAME: cache_mgr
402 TYPE: string
403 -DEFAULT: webmaster
404 +DEFAULT: root
405 LOC: Config.adminEmail
406 DOC_START
407 Email-address of local cache manager who will receive
408 - mail if the cache dies. The default is "webmaster."
409 + mail if the cache dies. The default is "root".
410 DOC_END
411
412 NAME: mail_from
413 @@ -5200,6 +5208,9 @@
414 If you disable this, it will appear as
415
416 X-Forwarded-For: unknown
417 +NOCOMMENT_START
418 +forwarded_for off
419 +NOCOMMENT_END
420 DOC_END
421
422 NAME: cachemgr_passwd
423 diff -ur squid-3.0.STABLE8.orig/src/debug.cc squid-3.0.STABLE8/src/debug.cc
424 --- squid-3.0.STABLE8.orig/src/debug.cc 2008-07-18 10:02:54.000000000 +0000
425 +++ squid-3.0.STABLE8/src/debug.cc 2008-08-01 21:56:22.000000000 +0000
426 @@ -465,7 +465,7 @@
427 #if HAVE_SYSLOG && defined(LOG_LOCAL4)
428
429 if (opt_syslog_enable)
430 - openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
431 + openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility);
432
433 #endif /* HAVE_SYSLOG */
434
435 diff -ur squid-3.0.STABLE8.orig/src/defines.h squid-3.0.STABLE8/src/defines.h
436 --- squid-3.0.STABLE8.orig/src/defines.h 2008-07-18 10:02:54.000000000 +0000
437 +++ squid-3.0.STABLE8/src/defines.h 2008-08-01 21:56:22.000000000 +0000
438 @@ -219,7 +219,7 @@
439
440 /* were to look for errors if config path fails */
441 #ifndef DEFAULT_SQUID_ERROR_DIR
442 -#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
443 +#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
444 #endif
445
446 /* handy to determine the #elements in a static array */
447 diff -ur squid-3.0.STABLE8.orig/src/main.cc squid-3.0.STABLE8/src/main.cc
448 --- squid-3.0.STABLE8.orig/src/main.cc 2008-07-18 10:02:54.000000000 +0000
449 +++ squid-3.0.STABLE8/src/main.cc 2008-08-01 21:56:22.000000000 +0000
450 @@ -1486,7 +1486,7 @@
451 if (*(argv[0]) == '(')
452 return;
453
454 - openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
455 + openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
456
457 if ((pid = fork()) < 0)
458 syslog(LOG_ALERT, "fork failed: %s", xstrerror());
459 @@ -1530,7 +1530,7 @@
460
461 if ((pid = fork()) == 0) {
462 /* child */
463 - openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
464 + openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
465 prog = xstrdup(argv[0]);
466 argv[0] = xstrdup("(squid)");
467 execvp(prog, argv);
468 @@ -1538,7 +1538,7 @@
469 }
470
471 /* parent */
472 - openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
473 + openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
474
475 syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
476
477 diff -ur squid-3.0.STABLE8.orig/src/Makefile.am squid-3.0.STABLE8/src/Makefile.am
478 --- squid-3.0.STABLE8.orig/src/Makefile.am 2008-07-18 10:02:53.000000000 +0000
479 +++ squid-3.0.STABLE8/src/Makefile.am 2008-08-01 21:56:22.000000000 +0000
480 @@ -992,12 +992,12 @@
481 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
482 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
483 DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
484 -DEFAULT_LOG_PREFIX = $(localstatedir)/logs
485 +DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
486 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
487 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
488 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
489 -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
490 -DEFAULT_SWAP_DIR = $(localstatedir)/cache
491 +DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
492 +DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
493 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
494 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
495 DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
Report Message
Find on MARC Find on Google Groups